5580 files changed, 22664 insertions, 48022 deletions

diff --git a/.gitignore b/.gitignore
index e36b9ae130..a2456aef1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ quantum/version.h
 .idea/
 .project
 .settings/
-.vagrant/
 
 # ?
 .dep
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/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/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 2afc1ed516..2845af14f3 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",
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/feature_converters.md b/docs/feature_converters.md
index 9baac14e97..3871f77ee0 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -21,11 +21,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.
 
@@ -88,6 +90,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:
@@ -104,6 +107,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
@@ -168,7 +172,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).
 
@@ -185,6 +189,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:
 
@@ -194,6 +199,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/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/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/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/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/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/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..6097a2f349 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,
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/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/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
index 5943564661..ee33867ec3 100644
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@@ -16,12 +16,6 @@ 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
 
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
index dd106a74a5..4f5cd9564a 100644
--- a/keyboards/10bleoledhub/info.json
+++ b/keyboards/10bleoledhub/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7C99",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B5"],
+        "rows": ["F0", "F5", "F4", "F6"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "C7", "pin_b": "F7"}
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index b58eef1085..edcad67b86 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/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, 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
diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
index 07f35c7340..010a82cb5e 100644
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index ff5f010cbe..1aa9d54fe1 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -18,14 +18,6 @@ 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
 
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 98a9082989..383c7f6525 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"
     },
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 806f23075f..348604d71c 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -1,13 +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, 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
 
diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
index 57a0143544..b0ea1ed036 100644
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -8,6 +8,11 @@
     "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
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index dfed1e4e6f..858e5682d4 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -15,11 +15,6 @@
 #define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
 #endif
 
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { GP21, GP20, GP19, GP18 }
-#define MATRIX_COL_PINS { GP1, GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12 }
-
 #define RGB_DI_PIN GP0
 #define RGB_MATRIX_LED_COUNT 47
 #define RGBLED_NUM 47
diff --git a/keyboards/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json
index 42c0bc7b12..10fb9c1674 100644
--- a/keyboards/1upkeyboards/pi40/info.json
+++ b/keyboards/1upkeyboards/pi40/info.json
@@ -6,6 +6,11 @@
         "pid": "0x5600",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12"],
+        "rows": ["GP21", "GP20", "GP19", "GP18"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "GP14", "pin_b": "GP13"}
diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json
index d8a63123cf..ecb38b92b2 100644
--- a/keyboards/1upkeyboards/pi60/info.json
+++ b/keyboards/1upkeyboards/pi60/info.json
@@ -74,74 +74,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_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json
index 2fb271382f..0fb710fe5b 100644
--- a/keyboards/1upkeyboards/pi60_hse/info.json
+++ b/keyboards/1upkeyboards/pi60_hse/info.json
@@ -54,61 +54,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_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json
index 22afdb58a0..f52fe1f836 100644
--- a/keyboards/1upkeyboards/pi60_rgb/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb/info.json
@@ -102,58 +102,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/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 7af70c5b75..ef1a458c9d 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/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, 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
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index d648c32f3e..53648fbd02 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -8,6 +8,11 @@
     "pid": "0x5516",
     "device_version": "0.0.1"
   },
+  "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"],
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 04f5fdd979..d3235d95ff 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -19,24 +19,6 @@
 
 #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
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
index 13e2c55fa5..ee5ba391fb 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -8,6 +8,11 @@
       "pid": "0x5517",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["D5", "D6", "C2", "D0"],
+      "rows": ["D1", "D2", "D3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "B1", "pin_b": "B2"},
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index 02e8564702..bb68f2b5d4 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
diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
index d549338988..c89680ba2d 100644
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ b/keyboards/1upkeyboards/sweet16/v1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x0161",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index eb8bd97b59..0a8b6b948e 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/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, 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
diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json
index 18023c847e..cd86f9ddf8 100644
--- a/keyboards/25keys/aleth42/rev0/info.json
+++ b/keyboards/25keys/aleth42/rev0/info.json
@@ -2,6 +2,11 @@
     "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"},
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index e0799e65a1..56ba105e5d 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/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 { 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
diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json
index 9d70daf01f..c7e5658ec4 100644
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ b/keyboards/25keys/aleth42/rev1/info.json
@@ -2,6 +2,11 @@
     "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"},
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index f791a83e48..2b33220ad9 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -24,12 +24,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/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index 776f7f3138..b537056e6b 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -25,11 +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
 
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
index fa41ed213f..5d9ec2d7d4 100644
--- a/keyboards/25keys/zinc/rev1/info.json
+++ b/keyboards/25keys/zinc/rev1/info.json
@@ -1,5 +1,10 @@
 {
   "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"
   }
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/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index 0a7e29a9a6..b537056e6b 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -25,11 +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
 
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
index ec98ea65a9..3bf44bfe8f 100644
--- a/keyboards/25keys/zinc/reva/info.json
+++ b/keyboards/25keys/zinc/reva/info.json
@@ -1,5 +1,10 @@
 {
   "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"
   }
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/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/config.h b/keyboards/2key2crawl/config.h
index 67a1b48157..a1bbffcef4 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
 
diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json
index e4ab7f79a9..1421a7b1e0 100644
--- a/keyboards/2key2crawl/info.json
+++ b/keyboards/2key2crawl/info.json
@@ -8,6 +8,11 @@
         "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}
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/config.h b/keyboards/3keyecosystem/2key2/config.h
index 6bb66fc39f..dca5d4a1ff 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -16,14 +16,6 @@ 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
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
index 1da073d0fc..398a4d3439 100644
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/keyboards/3keyecosystem/2key2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3304",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "D7"],
+        "rows": ["F6"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B7"
     },
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/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..b113485584 100644
--- a/keyboards/40percentclub/5x5/info.json
+++ b/keyboards/40percentclub/5x5/info.json
@@ -8,6 +8,11 @@
         "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"],
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..627d9d6dbb 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json
index ee85708f19..0f889aa04d 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"
   },
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/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/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/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..933c4f8616 100644
--- a/keyboards/40percentclub/i75/promicro/info.json
+++ b/keyboards/40percentclub/i75/promicro/info.json
@@ -1,4 +1,9 @@
 {
+    "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"
 }
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
index 29394855a6..0a617ac36c 100644
--- a/keyboards/40percentclub/i75/promicro/promicro.h
+++ b/keyboards/40percentclub/i75/promicro/promicro.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "i75.h"
 #include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
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..2296a57828 100644
--- a/keyboards/40percentclub/i75/teensy2/info.json
+++ b/keyboards/40percentclub/i75/teensy2/info.json
@@ -1,4 +1,9 @@
 {
+    "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"
 }
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
index 29394855a6..0a617ac36c 100644
--- a/keyboards/40percentclub/i75/teensy2/teensy2.h
+++ b/keyboards/40percentclub/i75/teensy2/teensy2.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "i75.h"
 #include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 2848c7a32c..2f4ce8ee17 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
 
diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json
index 948ef091bd..d81a6b842a 100644
--- a/keyboards/40percentclub/luddite/info.json
+++ b/keyboards/40percentclub/luddite/info.json
@@ -8,6 +8,11 @@
     "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
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..eecade3b22 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
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 6bdf5db350..60d3b4e424 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/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, 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
diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
index fa12a8ef03..97c793b069 100644
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@@ -8,6 +8,11 @@
       "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"
     },
@@ -17,108 +22,108 @@
     "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 } ]
+            { "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_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 } ]
+            { "x": 0, "y": 0 },
+            { "x": 1, "y": 0 },
+            { "x": 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 } ]
       },
         "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 } ]
+              { "x": 0, "y": 0 },
+              { "x": 1, "y": 0 },
+              { "x": 2, "y": 0 },
+              { "x": 3, "y": 0 },
+              { "x": 4, "y": 0 },
+              { "x": 5, "y": 0 },
+              { "x": 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 } ]
         }
     }
 }
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..a8169c93dd 100644
--- a/keyboards/40percentclub/polyandry/promicro/info.json
+++ b/keyboards/40percentclub/polyandry/promicro/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "E6", "B4", "F4", "F5", "F6", "F7", "B3", "B2"],
+        "rows": ["D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
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
index 0a6f8b36b8..e2a9dbcf35 100644
--- a/keyboards/40percentclub/polyandry/promicro/promicro.h
+++ b/keyboards/40percentclub/polyandry/promicro/promicro.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "polyandry.h"
+#include "quantum.h"
 
 #define LAYOUT_ortho_4x3( \
 	K000, K001, K002, \
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..0a870332b2 100644
--- a/keyboards/40percentclub/polyandry/teensy2/info.json
+++ b/keyboards/40percentclub/polyandry/teensy2/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B7", "D0", "D1", "D2", "C6", "C7", "F6", "F7", "B6", "B5", "D7", "D6"],
+        "rows": ["D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay"
 }
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
index ce7790434b..dd6ef3f6bb 100644
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h
+++ b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
@@ -20,7 +20,7 @@
 //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"
+#include "quantum.h"
 
 #define LAYOUT_ortho_4x3( \
 	K000, K001, K002, \
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index 357380e3a7..5e3bf27f3d 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
 
diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json
index cbaefde2bd..8877c31429 100644
--- a/keyboards/40percentclub/tomato/info.json
+++ b/keyboards/40percentclub/tomato/info.json
@@ -8,6 +8,11 @@
     "pid": "0x546F",
     "device_version": "0.0.1"
   },
+  "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"],
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..f4f163ccc1 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"}
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..ade503696c 100644
--- a/keyboards/4by3/info.json
+++ b/keyboards/4by3/info.json
@@ -8,6 +8,11 @@
         "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",
     "layouts": {
diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h
index f7ef22d986..d922c2e10f 100644
--- a/keyboards/4pplet/aekiso60/rev_a/config.h
+++ b/keyboards/4pplet/aekiso60/rev_a/config.h
@@ -1,13 +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
 
diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json
index 9932b6ec55..2c5c25df4b 100644
--- a/keyboards/4pplet/aekiso60/rev_a/info.json
+++ b/keyboards/4pplet/aekiso60/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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..6892802218 100644
--- a/keyboards/4pplet/aekiso60/rev_b/config.h
+++ b/keyboards/4pplet/aekiso60/rev_b/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 {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
diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json
index fe2e424999..92cd38952a 100644
--- a/keyboards/4pplet/aekiso60/rev_b/info.json
+++ b/keyboards/4pplet/aekiso60/rev_b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0011",
         "device_version": "0.0.2"
     },
+    "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 8f3b5eb2bf..9ff31a1ee3 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"
@@ -72,7 +77,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/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
index 3d480a1e93..76bc9a6b4f 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/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 { 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
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
index 8748b32480..23c7496c60 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
@@ -8,6 +8,11 @@
         "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,
@@ -74,7 +79,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_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
index eed3b708c4..6ecc98da2d 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
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
index 7ced2cf40c..b815c9bf4f 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,
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..0710674dff 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/info.json
+++ b/keyboards/4pplet/perk60_iso/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0009",
         "device_version": "0.0.1"
     },
+    "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/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h
index f7ef22d986..d922c2e10f 100644
--- a/keyboards/4pplet/steezy60/rev_a/config.h
+++ b/keyboards/4pplet/steezy60/rev_a/config.h
@@ -1,13 +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
 
diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json
index b6e9c37ba2..cf8bfba558 100644
--- a/keyboards/4pplet/steezy60/rev_a/info.json
+++ b/keyboards/4pplet/steezy60/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "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/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_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h
index 7c1e13ce84..85521fa3b6 100644
--- a/keyboards/4pplet/waffling60/rev_b/config.h
+++ b/keyboards/4pplet/waffling60/rev_b/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 {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
 
diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json
index 866ae5c1ac..72a9ac953c 100644
--- a/keyboards/4pplet/waffling60/rev_b/info.json
+++ b/keyboards/4pplet/waffling60/rev_b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.2"
     },
+    "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..979a022177 100644
--- a/keyboards/4pplet/waffling60/rev_c/config.h
+++ b/keyboards/4pplet/waffling60/rev_c/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 {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
 
diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json
index 1a6937b096..d7bceba391 100644
--- a/keyboards/4pplet/waffling60/rev_c/info.json
+++ b/keyboards/4pplet/waffling60/rev_c/info.json
@@ -8,6 +8,11 @@
         "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"]
+    },
+    "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..91a0e7f0cd 100644
--- a/keyboards/4pplet/waffling60/rev_d/config.h
+++ b/keyboards/4pplet/waffling60/rev_d/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 {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
diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json
index 7b09f0a0d3..9648794a7d 100644
--- a/keyboards/4pplet/waffling60/rev_d/info.json
+++ b/keyboards/4pplet/waffling60/rev_d/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000E",
         "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_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..063cfb1b3c 100644
--- a/keyboards/4pplet/waffling80/rev_a/config.h
+++ b/keyboards/4pplet/waffling80/rev_a/config.h
@@ -16,14 +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
 
diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json
index 13bffb7384..434b615f4a 100644
--- a/keyboards/4pplet/waffling80/rev_a/info.json
+++ b/keyboards/4pplet/waffling80/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "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..5656563fa1 100644
--- a/keyboards/4pplet/waffling80/rev_b/config.h
+++ b/keyboards/4pplet/waffling80/rev_b/config.h
@@ -16,14 +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 {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
diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json
index f6a835652f..cc5829cb43 100644
--- a/keyboards/4pplet/waffling80/rev_b/info.json
+++ b/keyboards/4pplet/waffling80/rev_b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000F",
         "device_version": "0.0.2"
     },
+    "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/info.json b/keyboards/7c8/framework/info.json
index ca440e9a76..862acea115 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"}
diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h
index 8f721392c8..a5dd0856a3 100644
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@@ -17,17 +17,9 @@ 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..e4109ef2aa 100644
--- a/keyboards/9key/info.json
+++ b/keyboards/9key/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6"],
+    "rows": ["D1", "D0", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index 2e28b792a1..e579dea057 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/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 { 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
diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json
index 132187db26..b2fd151cec 100644
--- a/keyboards/abacus/info.json
+++ b/keyboards/abacus/info.json
@@ -8,6 +8,11 @@
         "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"}
@@ -18,54 +23,54 @@
     "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/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index f7932863e9..d3feabbe20 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/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 { 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
diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json
index 230e286c5d..693faa86b5 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},
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 07378f5e3d..3a01bebf93 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/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   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
diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json
index 00629035c0..00399db841 100644
--- a/keyboards/acekeyboard/titan60/info.json
+++ b/keyboards/acekeyboard/titan60/info.json
@@ -8,6 +8,11 @@
         "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
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..377801604d 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 */
diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json
index 4e14f51df0..0ad176f451 100644
--- a/keyboards/acheron/apollo/87h/delta/info.json
+++ b/keyboards/acheron/apollo/87h/delta/info.json
@@ -4,6 +4,11 @@
         "pid": "0x8775",
         "device_version": "0.0.4"
     },
+    "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"
 }
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/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
index 4a93afd70c..424f64405d 100644
--- a/keyboards/acheron/apollo/87h/gamma/info.json
+++ b/keyboards/acheron/apollo/87h/gamma/info.json
@@ -4,6 +4,11 @@
         "pid": "0x8774",
         "device_version": "0.0.3"
     },
+    "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"
 }
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 8b61b285fd..7447e1dd29 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 */
diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json
index 68fc1b018a..36897ff86e 100644
--- a/keyboards/acheron/apollo/87htsc/info.json
+++ b/keyboards/acheron/apollo/87htsc/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8776",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 490c13c2e9..377801604d 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 */
diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json
index 92dd801826..3a7e0f7e5a 100644
--- a/keyboards/acheron/apollo/88htsc/info.json
+++ b/keyboards/acheron/apollo/88htsc/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8873",
         "device_version": "0.0.1"
     },
+    "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": {
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/config.h b/keyboards/acheron/athena/alpha/config.h
index e99fb83328..fba5b051cc 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
 
diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json
index 2ebf2da8de..a59bf20ff9 100644
--- a/keyboards/acheron/athena/alpha/info.json
+++ b/keyboards/acheron/athena/alpha/info.json
@@ -4,6 +4,11 @@
         "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,
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/config.h b/keyboards/acheron/athena/beta/config.h
index 7fbc624522..dc5f354876 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
 
diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json
index dd8e766f90..a303c5a25c 100644
--- a/keyboards/acheron/athena/beta/info.json
+++ b/keyboards/acheron/athena/beta/info.json
@@ -4,6 +4,11 @@
         "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,
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..30b0b74c95 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/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, 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
diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json
index 1f625bca83..e373bb6654 100644
--- a/keyboards/acheron/elongate/beta/info.json
+++ b/keyboards/acheron/elongate/beta/info.json
@@ -8,6 +8,11 @@
         "pid": "0x454C",
         "device_version": "0.0.1"
     },
+    "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..60362ab065 100755
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/config.h
@@ -17,12 +17,6 @@ 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
diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json
index f5f87333eb..5341ab654e 100644
--- a/keyboards/acheron/elongate/delta/info.json
+++ b/keyboards/acheron/elongate/delta/info.json
@@ -8,6 +8,11 @@
         "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,
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/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/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/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..07c6550cb8 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"}
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 8cfc57b9d5..9a08dd1234 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
 
diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json
index 73025df6c4..313e877c8e 100644
--- a/keyboards/acheron/shark/beta/info.json
+++ b/keyboards/acheron/shark/beta/info.json
@@ -4,6 +4,11 @@
         "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"}
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/config.h b/keyboards/ada/ada1800mini/config.h
index 54da0bdad4..378ffa80b4 100644
--- a/keyboards/ada/ada1800mini/config.h
+++ b/keyboards/ada/ada1800mini/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, 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
diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json
index e3f97c6706..fdc7df02df 100644
--- a/keyboards/ada/ada1800mini/info.json
+++ b/keyboards/ada/ada1800mini/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1800",
         "device_version": "0.0.1"
     },
+    "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..0d64933ad9 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/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 { 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
diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json
index 5c32cd0639..6f4a6ac996 100644
--- a/keyboards/ada/infinity81/info.json
+++ b/keyboards/ada/infinity81/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0081",
         "device_version": "0.0.1"
     },
+    "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/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..1a9a95cec3 100644
--- a/keyboards/adkb96/info.json
+++ b/keyboards/adkb96/info.json
@@ -8,6 +8,11 @@
 		"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"
 	},
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
index 4c4c7bae3c..03a9211bb9 100644
--- a/keyboards/adkb96/rev1/rev1.h
+++ b/keyboards/adkb96/rev1/rev1.h
@@ -1,14 +1,6 @@
 #pragma once
 
-#include "adkb96.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
+#include "quantum.h"
 
 // Keymap with right side flipped
 // (TRRS jack on both halves are to the right)
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..5d518c3b86 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -9,6 +9,11 @@
         "pid": "0xE873",
         "device_version": "0.0.1"
     },
+    "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..73a212910a 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -16,9 +16,6 @@
 
 #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
diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h
index 47fcf429ac..9743566d12 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 */
diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json
index 9b5a8d6ef6..80085f949e 100644
--- a/keyboards/adpenrose/akemipad/info.json
+++ b/keyboards/adpenrose/akemipad/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0004",
         "vid": "0x4450"
     },
+    "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/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
index 5ffeb86837..0e10856cc8 100644
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/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, 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: */
diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
index a26c65b42a..efe7d069d0 100644
--- a/keyboards/adpenrose/kintsugi/info.json
+++ b/keyboards/adpenrose/kintsugi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "1.0.0"
     },
+    "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..fd9156ca82 100644
--- a/keyboards/adpenrose/obi/config.h
+++ b/keyboards/adpenrose/obi/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 { 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: */
diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
index c0c1b73c64..6417bf57ca 100644
--- a/keyboards/adpenrose/obi/info.json
+++ b/keyboards/adpenrose/obi/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0002",
         "vid": "0x4450"
     },
+    "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/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/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/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..e031108f51 100644
--- a/keyboards/afternoonlabs/gust/rev1/info.json
+++ b/keyboards/afternoonlabs/gust/rev1/info.json
@@ -8,6 +8,11 @@
         "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": {
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
index 22c1910a1f..635a5877bb 100644
--- a/keyboards/afternoonlabs/gust/rev1/rev1.h
+++ b/keyboards/afternoonlabs/gust/rev1/rev1.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include "gust.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
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/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..e29bb3e121 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",
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/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/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/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..ef52a070e2 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",
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 871f4bc8db..3946e761c3 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/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 { 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
diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json
index ae0fcb927d..ee2f32ffae 100644
--- a/keyboards/ai03/polaris/info.json
+++ b/keyboards/ai03/polaris/info.json
@@ -8,6 +8,11 @@
         "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,
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/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..f10a5d4000 100644
--- a/keyboards/ai03/soyuz/info.json
+++ b/keyboards/ai03/soyuz/info.json
@@ -8,6 +8,11 @@
         "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"],
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..704a6879f5 100644
--- a/keyboards/ai03/voyager60_alps/config.h
+++ b/keyboards/ai03/voyager60_alps/config.h
@@ -14,12 +14,6 @@ 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
diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json
index a7a68e43b0..fed5542930 100644
--- a/keyboards/ai03/voyager60_alps/info.json
+++ b/keyboards/ai03/voyager60_alps/info.json
@@ -8,6 +8,11 @@
         "pid": "0x060A",
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/aidansmithdotdev/fine40/fine40.c b/keyboards/aidansmithdotdev/fine40/fine40.c
index 73c453b6c0..0bd190321a 100644
--- a/keyboards/aidansmithdotdev/fine40/fine40.c
+++ b/keyboards/aidansmithdotdev/fine40/fine40.c
@@ -71,15 +71,15 @@ bool oled_task_kb(void) {
 
 #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;
+   if (!encoder_update_user(index, clockwise)) {
+       return false;
+   }
+   // Volume control
+   if (clockwise) {
+   	tap_code(KC_VOLU);
+   } else {
+   	tap_code(KC_VOLD);
+   }
+   return true;
 }
 #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/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/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/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/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/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..5f80ba36b4 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -18,12 +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
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
index 8211117625..ca63fd47dd 100644
--- a/keyboards/aleblazer/zodiark/info.json
+++ b/keyboards/aleblazer/zodiark/info.json
@@ -8,6 +8,11 @@
         "pid": "0xF902",
         "device_version": "0.0.1"
     },
+    "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/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index e81b6a2010..b62a2cc0ac 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/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 }
-#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
diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json
index faf199d8a0..1ec142f403 100644
--- a/keyboards/alf/dc60/info.json
+++ b/keyboards/alf/dc60/info.json
@@ -7,6 +7,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": 5,
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index 04ebe0c657..1c4361c5c5 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/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 }
-#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
diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json
index 8b3ae6f2ba..a3e18ce9b3 100644
--- a/keyboards/alf/x11/info.json
+++ b/keyboards/alf/x11/info.json
@@ -8,6 +8,11 @@
     "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
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index 374873d5d5..5faf0aad8b 100644
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@@ -16,16 +16,6 @@
 
 #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
 
diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json
index 5e0b3087a8..7c1b3b9967 100644
--- a/keyboards/alf/x2/info.json
+++ b/keyboards/alf/x2/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h
index 585855ebe9..1fc317877d 100644
--- a/keyboards/alfredslab/swift65/hotswap/config.h
+++ b/keyboards/alfredslab/swift65/hotswap/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 { 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
diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json
index 89ac7c7b17..775c580879 100644
--- a/keyboards/alfredslab/swift65/hotswap/info.json
+++ b/keyboards/alfredslab/swift65/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD4C4",
         "device_version": "0.0.1"
     },
+    "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..ae3dc8c2e0 100644
--- a/keyboards/alfredslab/swift65/solder/config.h
+++ b/keyboards/alfredslab/swift65/solder/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)
- *
- */
-#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
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
index 0f1d9c428e..23f3e16fc4 100644
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD4C3",
         "device_version": "0.0.1"
     },
+    "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/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..60fd6a7ba9 100644
--- a/keyboards/aliceh66/pianoforte/info.json
+++ b/keyboards/aliceh66/pianoforte/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/aliceh66/pianoforte/pianoforte.h b/keyboards/aliceh66/pianoforte/pianoforte.h
index 614af44cfe..d6891d8cab 100644
--- a/keyboards/aliceh66/pianoforte/pianoforte.h
+++ b/keyboards/aliceh66/pianoforte/pianoforte.h
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ 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 }, \
+	{ K100, K101, ____, ____, ____, K105, 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..42bc824a9f 100644
--- a/keyboards/aliceh66/pianoforte_hs/info.json
+++ b/keyboards/aliceh66/pianoforte_hs/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
index 828839870a..0f104a2a5c 100755
--- a/keyboards/alpha/config.h
+++ b/keyboards/alpha/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json
index 472bedb1fa..1f76cce458 100644
--- a/keyboards/alpha/info.json
+++ b/keyboards/alpha/info.json
@@ -7,6 +7,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "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/config.h b/keyboards/alpine65/config.h
index 61af018700..1dee90a07f 100644
--- a/keyboards/alpine65/config.h
+++ b/keyboards/alpine65/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 , 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 */
diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/info.json
index 1c1407b45b..ec59236ea5 100644
--- a/keyboards/alpine65/info.json
+++ b/keyboards/alpine65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "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/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..b49357c686 100644
--- a/keyboards/alt34/rev1/info.json
+++ b/keyboards/alt34/rev1/info.json
@@ -8,6 +8,11 @@
         "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"],
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
index 5600b0d5ad..115415bb5f 100644
--- a/keyboards/alt34/rev1/rev1.h
+++ b/keyboards/alt34/rev1/rev1.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "alt34.h"
 #include "quantum.h"
 
 #define ____ KC_NO
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..de2e733507 100644
--- a/keyboards/amag23/info.json
+++ b/keyboards/amag23/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2323",
         "device_version": "0.0.1"
     },
+    "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/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index bdefff8c4f..f14e2fb185 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 */
diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json
index fe66c34b86..60eeb456f4 100644
--- a/keyboards/amjkeyboard/amj40/info.json
+++ b/keyboards/amjkeyboard/amj40/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index 0a38f73032..0f15b43161 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/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, 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
diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json
index d624894691..2f322c3bb6 100644
--- a/keyboards/amjkeyboard/amj60/info.json
+++ b/keyboards/amjkeyboard/amj60/info.json
@@ -8,6 +8,11 @@
         "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,
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..277d2ed790 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
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/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index 63e6e899fa..02b595d6f7 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 */
diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index 7a22d14639..3bd3a7f24c 100644
--- a/keyboards/amjkeyboard/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
@@ -8,6 +8,11 @@
     "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
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/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..f5054f1b20 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": {
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
index 466eff89af..84928fb975 100644
--- a/keyboards/aos/tkl/config.h
+++ b/keyboards/aos/tkl/config.h
@@ -17,13 +17,6 @@ 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
diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json
index c6d37930a4..06a8892c63 100644
--- a/keyboards/aos/tkl/info.json
+++ b/keyboards/aos/tkl/info.json
@@ -7,6 +7,11 @@
         "pid": "0x1000",
         "device_version": "0.0.1"
     },
+    "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": {
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/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..167699150f 100644
--- a/keyboards/aplyard/aplx6/rev1/info.json
+++ b/keyboards/aplyard/aplx6/rev1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x0030",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B6", "F4"],
+        "rows": ["E6", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
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..726dab814c 100644
--- a/keyboards/aplyard/aplx6/rev2/info.json
+++ b/keyboards/aplyard/aplx6/rev2/info.json
@@ -3,6 +3,11 @@
         "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"}
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..62111b4b71 100644
--- a/keyboards/arabica37/rev1/config.h
+++ b/keyboards/arabica37/rev1/config.h
@@ -18,14 +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
 
diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
index 3629bf761f..36ff667df1 100644
--- a/keyboards/arabica37/rev1/info.json
+++ b/keyboards/arabica37/rev1/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/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..ecbe2c18dc 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"
     },
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..f34dfa63fe 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]
     },
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..9790c75556 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
 
diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json
index 0269bd1e27..eb731f3860 100644
--- a/keyboards/atlantis/ak81_ve/info.json
+++ b/keyboards/atlantis/ak81_ve/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0081",
         "device_version": "0.0.1"
     },
+    "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"}
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/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..0324d8533e 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"
     },
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/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/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/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/config.h b/keyboards/atxkb/1894/config.h
index e4f44cdfce..637150ae7b 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/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, 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
diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json
index fef98bcacf..69615775b4 100644
--- a/keyboards/atxkb/1894/info.json
+++ b/keyboards/atxkb/1894/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h
index 7b3f4608ea..38fa2c0881 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
diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json
index 28adec5eab..3d7c71815a 100644
--- a/keyboards/aurora65/info.json
+++ b/keyboards/aurora65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4136",
         "device_version": "0.0.1"
     },
+    "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"],
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..1b6ce7be90 100644
--- a/keyboards/avalanche/v2/config.h
+++ b/keyboards/avalanche/v2/config.h
@@ -3,11 +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
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
index 7105fc1787..3289a95faf 100644
--- a/keyboards/avalanche/v2/info.json
+++ b/keyboards/avalanche/v2/info.json
@@ -8,6 +8,11 @@
         "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}
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..699a7c88fa 100644
--- a/keyboards/avalanche/v3/config.h
+++ b/keyboards/avalanche/v3/config.h
@@ -3,11 +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
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
index 70ffcc9efc..27ae1d8a13 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}
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..10d9ca889a 100644
--- a/keyboards/avalanche/v4/config.h
+++ b/keyboards/avalanche/v4/config.h
@@ -3,11 +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
-
 #ifdef RGBLIGHT_ENABLE
 #    define RGB_DI_PIN D3
 #    define RGBLED_NUM 64
diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
index 5b31b5ca11..93207e83b1 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}
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/config.h b/keyboards/aves60/config.h
index f8a64364ad..fef8226df6 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/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 { 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
diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json
index 71420c4423..3cb54d2180 100644
--- a/keyboards/aves60/info.json
+++ b/keyboards/aves60/info.json
@@ -8,6 +8,11 @@
         "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]
     },
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
index 9037aa13f4..00312ff335 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 */
diff --git a/keyboards/aves65/info.json b/keyboards/aves65/info.json
index 8984465f07..26e9a7ab44 100644
--- a/keyboards/aves65/info.json
+++ b/keyboards/aves65/info.json
@@ -8,6 +8,11 @@
         "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"
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/info.json b/keyboards/axolstudio/foundation_gamma/info.json
index ecc7bcad90..aac82dd201 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"
     },
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/info.json b/keyboards/axolstudio/helpo/info.json
index 1174a32d05..c6d1d58f6c 100644
--- a/keyboards/axolstudio/helpo/info.json
+++ b/keyboards/axolstudio/helpo/info.json
@@ -8,6 +8,11 @@
         "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": {
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..064d987d13 100644
--- a/keyboards/axolstudio/yeti/hotswap/info.json
+++ b/keyboards/axolstudio/yeti/hotswap/info.json
@@ -8,6 +8,11 @@
     "pid": "0x9F9E",
     "device_version": "0.0.1"
   },
+  "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/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..0f283bc675 100644
--- a/keyboards/axolstudio/yeti/soldered/info.json
+++ b/keyboards/axolstudio/yeti/soldered/info.json
@@ -8,6 +8,11 @@
     "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"],
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/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/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..737ea0b4fd 100644
--- a/keyboards/bacca70/info.json
+++ b/keyboards/bacca70/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..088f0737bf 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",
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index 7a25216afd..df9c7cf5fc 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -15,29 +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 { 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
diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json
index d0d470a4e4..f176e18d22 100644
--- a/keyboards/bandominedoni/info.json
+++ b/keyboards/bandominedoni/info.json
@@ -8,6 +8,11 @@
         "pid": "0xF4B5",
         "device_version": "0.0.1"
     },
+    "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": {
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/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..7f50d959f5 100644
--- a/keyboards/barracuda/info.json
+++ b/keyboards/barracuda/info.json
@@ -8,6 +8,11 @@
         "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": {
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..783d097ad0 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
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
index fb6a19bc2f..dfbdde65d6 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..36f691da43 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -16,16 +16,6 @@
 
 #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
 
diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
index 8743e3aad1..dfe5b680c9 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"},
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..f635d80fff 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"}
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
index ef99f3b631..69e269a963 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
@@ -19,12 +19,6 @@
 
 #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.
 
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
index cbe8ac12e7..c9d7b1bf7f 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/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/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
index 909cd05978..484ccc523f 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h
@@ -18,17 +18,6 @@
 
 #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
 
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
index 11cc51ad46..8cbe3d419f 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -3,8 +3,19 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
index 510a55be41..20b610172d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/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
 
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
index 5c56d68554..daa5bfacad 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
index 304e89ce21..f09dc72c01 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
 
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
index 4b914a775f..34ef6d6e74 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
index d497261418..bb85468a86 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
 
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
index 4b914a775f..daee96bb36 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
index 0138b9656f..e01419b97a 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
 
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
index 9e1c778cc3..1153761ca0 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
index 93d897a4fe..1070dbd066 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
@@ -17,12 +17,6 @@
 
 #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.
 
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index 9fa70f3ca1..8287b3112d 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/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..a1d7885943 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
@@ -17,17 +17,6 @@
 
 #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
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index 5a8b815e95..9dd366e1dd 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -3,8 +3,19 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
index ba2bd4ac36..20b610172d 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/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
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index d84a7f314c..d575fdb216 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
index 053d780161..f09dc72c01 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
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 4e1c96298d..e6a3a2318d 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
index e4afc5a866..bb85468a86 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
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index 4e1c96298d..d06e372938 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
index 658819f936..e01419b97a 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
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index b667f6d76a..99d33fd668 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
index e37df487fd..69e269a963 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
@@ -19,12 +19,6 @@
 
 #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.
 
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index ec2b0cbad0..c27515d0fb 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/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..484ccc523f 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
@@ -18,17 +18,6 @@
 
 #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
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
index c9921cd341..5dda4a73a5 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -3,8 +3,19 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
index 8e586b89b2..20b610172d 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/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
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 9349712a41..cf70250a15 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/splinky_2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
index 3e7e3529c8..f09dc72c01 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
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
index 6931f9e876..1815ea2b0a 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
index 827267d2cf..bb85468a86 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
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
index 6931f9e876..94f0db8353 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
index fc4e3efadf..e01419b97a 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
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 0b7ea21560..5f0fd50578 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/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/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/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index a30b98a10a..250732dc7a 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -17,12 +17,6 @@
 
 #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.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index a4fe592587..a6e0d16a65 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -4,6 +4,11 @@
         "device_version": "2.0.0",
         "pid": "0x1835"
     },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
+        "rows": ["GP4", "GP5", "GP27", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
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/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h
index 773ee947d7..b5166aed2a 100644
--- a/keyboards/bastardkb/scylla/blackpill/config.h
+++ b/keyboards/bastardkb/scylla/blackpill/config.h
@@ -19,12 +19,6 @@
 
 #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.
 
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
index a701797dc0..7e31dc1674 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/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/v1/elitec/config.h b/keyboards/bastardkb/scylla/v1/elitec/config.h
index 967a8c6c53..384e19c3d2 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/config.h
+++ b/keyboards/bastardkb/scylla/v1/elitec/config.h
@@ -18,12 +18,6 @@
 
 #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
 
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
index 1ed2cee71d..b6a9eac7a1 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h
index e9691010ed..178bafa5cc 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/config.h
+++ b/keyboards/bastardkb/scylla/v2/elitec/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
 
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index 4674e238a6..f1db245dd0 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
index f65dcfb0b3..00f0dbf1f3 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
 
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index 6d3edbd0ee..698342ad2d 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
index 09d5af43c8..ff5d7db4ff 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
 
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
index 6d3edbd0ee..733b214195 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
index 5528531b91..4e5b142aa3 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
 
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index eccfea99f4..d0624dd909 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/skeletyl/blackpill/config.h b/keyboards/bastardkb/skeletyl/blackpill/config.h
index cbff281ddc..b5166aed2a 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/config.h
+++ b/keyboards/bastardkb/skeletyl/blackpill/config.h
@@ -19,12 +19,6 @@
 
 #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.
 
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
index b058d2424a..3a066df353 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/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/v1/elitec/config.h b/keyboards/bastardkb/skeletyl/v1/elitec/config.h
index f98185755f..384e19c3d2 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/config.h
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/config.h
@@ -18,12 +18,6 @@
 
 #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
 
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index 392e3168ff..7d5ea2600d 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/v2/elitec/config.h b/keyboards/bastardkb/skeletyl/v2/elitec/config.h
index 6f001c5e24..178bafa5cc 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/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
 
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index ae98ff793a..5c40b6ae42 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/splinky_2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
index 7fef28b05e..00f0dbf1f3 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
 
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
index a39c13a0ae..69b741769d 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
index eda378df84..ff5d7db4ff 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
 
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
index a39c13a0ae..321dd7229d 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
index 86bbdd199b..4e5b142aa3 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
 
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index 257eb6f62e..47cc622d8a 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/tbk/config.h b/keyboards/bastardkb/tbk/config.h
index 7a273050c0..1801b70053 100644
--- a/keyboards/bastardkb/tbk/config.h
+++ b/keyboards/bastardkb/tbk/config.h
@@ -17,10 +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 }
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index 22f10cee96..247e86160f 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -5,6 +5,11 @@
         "device_version": "0.0.1",
         "pid": "0x1828"
     },
+    "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/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h
index ba0c93ff93..b5166aed2a 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/config.h
+++ b/keyboards/bastardkb/tbkmini/blackpill/config.h
@@ -19,12 +19,6 @@
 
 #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.
 
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
index 025b442468..98ec607fb0 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/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/v1/elitec/config.h b/keyboards/bastardkb/tbkmini/v1/elitec/config.h
index c17e20b3d7..384e19c3d2 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/config.h
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/config.h
@@ -18,12 +18,6 @@
 
 #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
 
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
index 4fee403604..bc311eb815 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "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/v2/elitec/config.h b/keyboards/bastardkb/tbkmini/v2/elitec/config.h
index 01ce7edc7c..178bafa5cc 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/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
 
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
index d91729481f..4e9bafbaf5 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/splinky_2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
index d5da5febdf..00f0dbf1f3 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
 
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
index 870f9db26e..5d0212960c 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
index 8d60f74a6f..ff5d7db4ff 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
 
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
index 870f9db26e..87fac0c46c 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+        "rows": ["GP26", "GP5", "GP4", "GP9"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "GP1"
     },
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
index e40513cae8..4e5b142aa3 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
 
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
index f8901144af..71c5633a78 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "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/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h
index 28c21cb9f5..d449b25d86 100644
--- a/keyboards/bbrfkr/dynamis/config.h
+++ b/keyboards/bbrfkr/dynamis/config.h
@@ -16,10 +16,6 @@
 
 #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
@@ -34,8 +30,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..377b50f882 100644
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -8,6 +8,11 @@
         "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"}
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/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/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
index bfd93fb77d..2776ce7582 100755
--- a/keyboards/bemeier/bmek/rev1/config.h
+++ b/keyboards/bemeier/bmek/rev1/config.h
@@ -15,10 +15,5 @@
  */
 #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..e11b7355ce 100644
--- a/keyboards/bemeier/bmek/rev1/info.json
+++ b/keyboards/bemeier/bmek/rev1/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "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
index d2ef3e23c2..281c50703c 100755
--- a/keyboards/bemeier/bmek/rev2/config.h
+++ b/keyboards/bemeier/bmek/rev2/config.h
@@ -15,10 +15,4 @@
  */
 #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..005c444cdc 100644
--- a/keyboards/bemeier/bmek/rev2/info.json
+++ b/keyboards/bemeier/bmek/rev2/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "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
index a8a1575b78..281c50703c 100755
--- a/keyboards/bemeier/bmek/rev3/config.h
+++ b/keyboards/bemeier/bmek/rev3/config.h
@@ -15,10 +15,4 @@
  */
 #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..114b603406 100644
--- a/keyboards/bemeier/bmek/rev3/info.json
+++ b/keyboards/bemeier/bmek/rev3/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "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/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..069eed9093 100644
--- a/keyboards/bfake/info.json
+++ b/keyboards/bfake/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"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
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..ae477fb0f3 100644
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ b/keyboards/biacco42/ergo42/rev1/config.h
@@ -19,15 +19,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 { 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 */
diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json
index a519cb23d6..98b4703714 100644
--- a/keyboards/biacco42/ergo42/rev1/info.json
+++ b/keyboards/biacco42/ergo42/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0042",
     "device_version": "1.0.0"
   },
+  "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..73b8a74f2a 100644
--- a/keyboards/biacco42/meishi/info.json
+++ b/keyboards/biacco42/meishi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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..ae5c28ddfc 100644
--- a/keyboards/biacco42/meishi2/info.json
+++ b/keyboards/biacco42/meishi2/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F5", "F6"],
+    "rows": ["D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
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/bn009/config.h b/keyboards/binepad/bn009/config.h
index 1651cc699e..77f51ecf5a 100644
--- a/keyboards/binepad/bn009/config.h
+++ b/keyboards/binepad/bn009/config.h
@@ -16,12 +16,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/binepad/bn009/info.json b/keyboards/binepad/bn009/info.json
index 8e4221f49f..3304476f61 100644
--- a/keyboards/binepad/bn009/info.json
+++ b/keyboards/binepad/bn009/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4295",
     "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/bioi/f60/config.h b/keyboards/bioi/f60/config.h
index 32e179e918..1df5ab5104 100644
--- a/keyboards/bioi/f60/config.h
+++ b/keyboards/bioi/f60/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, 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
diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json
index 65c59db2b4..35d18ea678 100644
--- a/keyboards/bioi/f60/info.json
+++ b/keyboards/bioi/f60/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h
index d3172d1812..d723d4d2bd 100644
--- a/keyboards/bioi/g60/config.h
+++ b/keyboards/bioi/g60/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, 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
diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json
index 16b09ca00c..e466fb0c28 100644
--- a/keyboards/bioi/g60/info.json
+++ b/keyboards/bioi/g60/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index eb20ed7515..431f73e2e6 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -1,15 +1,5 @@
 #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
 
diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json
index cca5ed456f..275bb03c19 100644
--- a/keyboards/bioi/g60ble/info.json
+++ b/keyboards/bioi/g60ble/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index 6d609e0185..df0daa52fb 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/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, 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
diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json
index 1a822b2113..9251d4cad7 100644
--- a/keyboards/bioi/morgan65/info.json
+++ b/keyboards/bioi/morgan65/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h
index 6556560112..e9a0f89ab2 100644
--- a/keyboards/bioi/s65/config.h
+++ b/keyboards/bioi/s65/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 { 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
diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json
index b80b37b2ea..75359db964 100644
--- a/keyboards/bioi/s65/info.json
+++ b/keyboards/bioi/s65/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
index aedf2b5544..781f5a9bff 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
 
diff --git a/keyboards/blackplum/info.json b/keyboards/blackplum/info.json
index c869fcbef5..ec9ca2f763 100644
--- a/keyboards/blackplum/info.json
+++ b/keyboards/blackplum/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4250",
         "device_version": "10.0.1"
     },
+    "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"],
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 afe48b150c..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 { F6, F5, F4, B6, D3 }
-#define MATRIX_COL_PINS { B5, B4, D7, D6, F0, F1, C6 }
-#define MATRIX_ROW_PINS_RIGHT { D6, D7, B4, F7, E6 }
-#define MATRIX_COL_PINS_RIGHT { B1, B2, B3, F1, F4, F5, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/info.json
index 4044a561c1..ac2ac42b33 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": ["B5", "B4", "D7", "D6", "F0", "F1", "C6"],
+        "rows": ["F6", "F5", "F4", "B6", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B1", "B2", "B3", "F1", "F4", "F5", "F6"],
+                "rows": ["D6", "D7", "B4", "F7", "E6"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
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/blockey/config.h b/keyboards/blockey/config.h
index ecc29f6399..0c254d0dba 100644
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/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, 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
 
diff --git a/keyboards/blockey/info.json b/keyboards/blockey/info.json
index 404614fd99..0089490f69 100644
--- a/keyboards/blockey/info.json
+++ b/keyboards/blockey/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "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..f46df6af82 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
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
index 49dcc857e9..7a0adea313 100644
--- a/keyboards/bluebell/swoop/info.json
+++ b/keyboards/bluebell/swoop/info.json
@@ -8,6 +8,11 @@
     "pid": "0x3046",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["B1", "F7", "F6", "F5", "F4"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "B4", "pin_b": "B5"}
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
index 0d8bdde6dc..1245d9ae58 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 */
diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json
index 49d67451cb..5605fec1b7 100644
--- a/keyboards/boardrun/bizarre/info.json
+++ b/keyboards/boardrun/bizarre/info.json
@@ -9,6 +9,11 @@
         "pid": "0x5339",
         "device_version": "0.0.1"
     },
+    "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/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
index b2cd5ab73c..d4766283fc 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 */
diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json
index 60839d5ef0..c65db69495 100644
--- a/keyboards/boardrun/classic/info.json
+++ b/keyboards/boardrun/classic/info.json
@@ -9,6 +9,11 @@
         "pid": "0x5338",
         "device_version": "0.0.1"
     },
+    "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/boardwalk/config.h b/keyboards/boardwalk/config.h
index 38cdc18fce..d4766283fc 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 */
diff --git a/keyboards/boardwalk/info.json b/keyboards/boardwalk/info.json
index 76fea555e4..9960a7760f 100644
--- a/keyboards/boardwalk/info.json
+++ b/keyboards/boardwalk/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5337",
         "device_version": "0.0.1"
     },
+    "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"],
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..b813424f65 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"}
diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h
index 8d95b371bd..ce64cbe57f 100644
--- a/keyboards/bolsa/bolsalice/config.h
+++ b/keyboards/bolsa/bolsalice/config.h
@@ -16,12 +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
diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/info.json
index 7e32e74a56..09ee356a7e 100644
--- a/keyboards/bolsa/bolsalice/info.json
+++ b/keyboards/bolsa/bolsalice/info.json
@@ -6,6 +6,11 @@
         "vid": "0x4253",
         "device_version": "0.0.1"
     },
+    "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": "",
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/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/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..62a12b77e9 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
diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json
index 1d8e39f29d..4e9e209ff6 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}
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..3469e28bb9 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.
  */
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
index 22f54c3472..125914db3b 100644
--- a/keyboards/boston_meetup/2019/info.json
+++ b/keyboards/boston_meetup/2019/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "20.1.9"
     },
+    "matrix_pins": {
+        "cols": ["A7", "A8", "B2", "B10"],
+        "rows": ["A3", "B8", "B9", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B13", "pin_b": "B14"}
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
index e1d9d92060..4b000a1ca5 100644
--- a/keyboards/boston_meetup/boston_meetup.h
+++ b/keyboards/boston_meetup/boston_meetup.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifdef KEYBOARD_boston_meetup_2019
-    #include "2019.h"
+#include "quantum.h"
+
 #define LAYOUT( \
     K00, \
     K10, K11, K12, K13, \
@@ -14,6 +14,3 @@
   {  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/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..6bacff31f0 100644
--- a/keyboards/bpiphany/four_banger/config.h
+++ b/keyboards/bpiphany/four_banger/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json
index cb9b7d148d..57e8b04dc7 100644
--- a/keyboards/bpiphany/four_banger/info.json
+++ b/keyboards/bpiphany/four_banger/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4"],
+        "rows": ["B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/pegasushoof/2013/2013.h b/keyboards/bpiphany/pegasushoof/2013/2013.h
index 7454c7c860..d34f0a0382 100644
--- a/keyboards/bpiphany/pegasushoof/2013/2013.h
+++ b/keyboards/bpiphany/pegasushoof/2013/2013.h
@@ -71,5 +71,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         /* 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 } \
+        /* 7 */  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KF7,   KG7,   KH7,   KI7,   KJ7,   KK7,   KL7,   KM7,   KN7,   KO7,   KP7,   KC_NO, KC_NO } \
 }
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index c5007ffbbb..7bf04c9b76 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
 
diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json
index 91b824b6a4..e474a8d691 100644
--- a/keyboards/bt66tech/bt66tech60/info.json
+++ b/keyboards/bt66tech/bt66tech60/info.json
@@ -8,6 +8,11 @@
         "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,
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/info.json b/keyboards/bthlabs/geekpad/info.json
index d68530dadf..8200e7d036 100644
--- a/keyboards/bthlabs/geekpad/info.json
+++ b/keyboards/bthlabs/geekpad/info.json
@@ -8,6 +8,11 @@
     "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": {
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h
index e59cba6a50..fdee023e7d 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
 
diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json
index b9519f15f1..5de7cffae7 100644
--- a/keyboards/bubble75/hotswap/info.json
+++ b/keyboards/bubble75/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5A4C",
         "device_version": "0.0.1"
     },
+    "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/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
index 3d1926093c..7ed15ef362 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 */
diff --git a/keyboards/buildakb/potato65/info.json b/keyboards/buildakb/potato65/info.json
index 505eb72b11..7673e12dc5 100644
--- a/keyboards/buildakb/potato65/info.json
+++ b/keyboards/buildakb/potato65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "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"],
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
index cfd82ac3b6..dba700af6c 100644
--- a/keyboards/buildakb/potato65hs/config.h
+++ b/keyboards/buildakb/potato65hs/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 { 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
 
diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/info.json
index 8d41e422e4..3fe24a3b05 100644
--- a/keyboards/buildakb/potato65hs/info.json
+++ b/keyboards/buildakb/potato65hs/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
index 629fa34c2b..53ad1077bb 100644
--- a/keyboards/buildakb/potato65s/config.h
+++ b/keyboards/buildakb/potato65s/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 { 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
 
diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json
index 47e6690389..46d8461d2a 100644
--- a/keyboards/buildakb/potato65s/info.json
+++ b/keyboards/buildakb/potato65s/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "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/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/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..8b17e3e199 100644
--- a/keyboards/cablecardesigns/cypher/rev6/config.h
+++ b/keyboards/cablecardesigns/cypher/rev6/config.h
@@ -2,13 +2,6 @@
 // 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 */
diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json
index 4fc447236e..0e8006486c 100644
--- a/keyboards/cablecardesigns/cypher/rev6/info.json
+++ b/keyboards/cablecardesigns/cypher/rev6/info.json
@@ -6,6 +6,11 @@
       "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,
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/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json
index 069d812665..55e0ea0c56 100644
--- a/keyboards/canary/canary60rgb/info.json
+++ b/keyboards/canary/canary60rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0621",
         "device_version": "0.0.1"
     },
+    "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..999ec9f108 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/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 { 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
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index e5f6cbedab..59f438cfca 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/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, 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
diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json
index d075dc199a..5dd8a27b23 100644
--- a/keyboards/cannonkeys/adelie/info.json
+++ b/keyboards/cannonkeys/adelie/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "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/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/config.h b/keyboards/cannonkeys/an_c/config.h
index a6b9872268..3120b3167a 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
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json
index 0517bb09d3..25b2ce528c 100644
--- a/keyboards/cannonkeys/an_c/info.json
+++ b/keyboards/cannonkeys/an_c/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h
index 9689ba3d22..0ff5f383bb 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 */
diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json
index fbc4e94d83..c3132a7780 100644
--- a/keyboards/cannonkeys/atlas/info.json
+++ b/keyboards/cannonkeys/atlas/info.json
@@ -8,6 +8,11 @@
         "pid": "0xA7A5",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
index 9adbb67a2f..52b15c350c 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
 
diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json
index e1831be72a..ee7c94c0ad 100644
--- a/keyboards/cannonkeys/atlas_alps/info.json
+++ b/keyboards/cannonkeys/atlas_alps/info.json
@@ -8,6 +8,11 @@
         "pid": "0xA7A5",
         "device_version": "0.1.0"
     },
+    "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"],
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_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/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..e5b30d6ea3 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,
diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h
index d7c7052163..8826d5568a 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
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index d5d8b817ea..e6dc43ea10 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000A",
         "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,
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/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..1bdd8995f7 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
diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json
index 5f4a94d367..3b1d9fc608 100644
--- a/keyboards/cannonkeys/db60/info.json
+++ b/keyboards/cannonkeys/db60/info.json
@@ -6,6 +6,11 @@
         "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,
diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h
index cd6fa15243..ab8f8fa121 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
diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json
index 557b53817b..58c46c21ac 100644
--- a/keyboards/cannonkeys/devastatingtkl/info.json
+++ b/keyboards/cannonkeys/devastatingtkl/info.json
@@ -8,6 +8,11 @@
         "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,
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/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/info.json b/keyboards/cannonkeys/gentoo_hs/info.json
index 8595a321b2..f42bb88baa 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
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 103faf39f9..c4e3629964 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -17,11 +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
diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 4d0adb731a..cd08c00354 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -8,6 +8,11 @@
         "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"
diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h
index 8e7158765d..3120b3167a 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
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json
index 56f5126d0d..f10aa02bb9 100644
--- a/keyboards/cannonkeys/instant60/info.json
+++ b/keyboards/cannonkeys/instant60/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h
index 5afccde3a7..898aff0ff5 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
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json
index eedb9bd5c7..24e2315c1e 100644
--- a/keyboards/cannonkeys/instant65/info.json
+++ b/keyboards/cannonkeys/instant65/info.json
@@ -8,6 +8,11 @@
         "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,
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..39eaa70731 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,
diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h
index 57fa0cf7c3..a45b992779 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
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index 9058e07878..cb2691325b 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -8,6 +8,11 @@
         "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,
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/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h
index 6d2ab14c6b..898aff0ff5 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
diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json
index 30ea22bd74..fb2e02da53 100644
--- a/keyboards/cannonkeys/obliterated75/info.json
+++ b/keyboards/cannonkeys/obliterated75/info.json
@@ -8,6 +8,11 @@
         "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,
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/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h
index 5c864541c7..fd38d4677f 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
 
diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json
index ba7f1dbdd4..4e368c2ae3 100644
--- a/keyboards/cannonkeys/ortho48/info.json
+++ b/keyboards/cannonkeys/ortho48/info.json
@@ -8,6 +8,11 @@
     "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,
diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h
index f9c6596a9f..378e08c49d 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
 
diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json
index 8426955dae..edb26a8ed1 100644
--- a/keyboards/cannonkeys/ortho60/info.json
+++ b/keyboards/cannonkeys/ortho60/info.json
@@ -8,6 +8,11 @@
     "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,
diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h
index 5246778d13..378e08c49d 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
 
diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json
index 751eeb5297..e74049eb82 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"}
diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h
index 287b1484e9..6e361ccf78 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
 
diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json
index a25485038b..f9c793f76e 100644
--- a/keyboards/cannonkeys/practice60/info.json
+++ b/keyboards/cannonkeys/practice60/info.json
@@ -8,6 +8,11 @@
     "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,
diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h
index ac3f193da9..1e62cd6a51 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
 
diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json
index 17e548a825..64bab13892 100644
--- a/keyboards/cannonkeys/practice65/info.json
+++ b/keyboards/cannonkeys/practice65/info.json
@@ -8,6 +8,11 @@
         "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,
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/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index 5edf9fdeb9..b65cf4792b 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
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index 2b25ee6b98..e5e01875a5 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -8,6 +8,11 @@
         "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,
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/savage65/config.h b/keyboards/cannonkeys/savage65/config.h
index 79414a9a78..97fbded3c0 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
diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json
index 1aa34de891..c8e3dd0cf8 100644
--- a/keyboards/cannonkeys/savage65/info.json
+++ b/keyboards/cannonkeys/savage65/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h
index 8722ba8d54..1dfaa69473 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
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json
index bdb6cd7453..cee401b524 100644
--- a/keyboards/cannonkeys/tmov2/info.json
+++ b/keyboards/cannonkeys/tmov2/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h
index 8987acd837..97fbded3c0 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
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json
index fb5b22e5b7..7cf2cba414 100644
--- a/keyboards/cannonkeys/tsukuyomi/info.json
+++ b/keyboards/cannonkeys/tsukuyomi/info.json
@@ -8,6 +8,11 @@
         "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,
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..d995250980 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,
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
index 65f64c2f09..e6492683ee 100644
--- a/keyboards/capsunlocked/cu24/config.h
+++ b/keyboards/capsunlocked/cu24/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, 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
diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json
index ea361a2bf4..a95382d562 100644
--- a/keyboards/capsunlocked/cu24/info.json
+++ b/keyboards/capsunlocked/cu24/info.json
@@ -8,6 +8,11 @@
         "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,
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/info.json b/keyboards/capsunlocked/cu65/info.json
index 8f91a34974..137bef46a5 100644
--- a/keyboards/capsunlocked/cu65/info.json
+++ b/keyboards/capsunlocked/cu65/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index cdc031b93b..067756faab 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/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 { 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 */
diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json
index ebd7b6d491..c210f9a96c 100644
--- a/keyboards/capsunlocked/cu7/info.json
+++ b/keyboards/capsunlocked/cu7/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F7", "F4"],
+        "rows": ["D7", "F0", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D6", "pin_b": "D4", "resolution": 2}
diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
index 52dff09103..c37363f63d 100644
--- a/keyboards/capsunlocked/cu75/config.h
+++ b/keyboards/capsunlocked/cu75/config.h
@@ -17,11 +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
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..14565d0f70 100644
--- a/keyboards/capsunlocked/cu75/info.json
+++ b/keyboards/capsunlocked/cu75/info.json
@@ -8,6 +8,11 @@
     "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
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..655318e063 100644
--- a/keyboards/capsunlocked/cu80/v1/info.json
+++ b/keyboards/capsunlocked/cu80/v1/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json
index 09bf2e334c..4f652bf86b 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/info.json
+++ b/keyboards/capsunlocked/cu80/v2_ansi/info.json
@@ -53,82 +53,82 @@
       "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": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "F1", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "F2", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "F3", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "F4", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0 },
+        { "label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0 },
+        { "label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0 },
+        { "label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0 },
+        { "label": "F9", "matrix": [0, 10], "x": 11, "y": 0 },
+        { "label": "F10", "matrix": [0, 11], "x": 12, "y": 0 },
+        { "label": "F11", "matrix": [0, 12], "x": 13, "y": 0 },
+        { "label": "F12", "matrix": [0, 13], "x": 14, "y": 0 },
+        { "label": "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": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5 },
+        { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.5 },
+        { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.5 },
+        { "label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5 },
+        { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.5 },
+        { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.5 },
+        { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.5 },
+        { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.5 },
+        { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.5 },
+        { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.5 },
+        { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.5 },
+        { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.5 },
+        { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.5 },
         { "label": "Backspace", "matrix": [1, 13], "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": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5 },
+        { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5 },
+        { "label": "PgUp", "matrix": [1, 16], "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": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5 },
+        { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5 },
+        { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5 },
+        { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5 },
+        { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5 },
+        { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5 },
+        { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5 },
+        { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5 },
+        { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5 },
+        { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5 },
+        { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.5 },
+        { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.5 },
         { "label": "|", "matrix": [2, 13], "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": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5 },
+        { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5 },
+        { "label": "PgDn", "matrix": [2, 16], "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": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5 },
+        { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5 },
+        { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5 },
+        { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5 },
+        { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5 },
+        { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5 },
+        { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5 },
+        { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5 },
+        { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5 },
+        { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.5 },
+        { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.5 },
         { "label": "Enter", "matrix": [3, 12], "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": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5 },
+        { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5 },
+        { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5 },
+        { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5 },
+        { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5 },
+        { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5 },
+        { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5 },
+        { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.5 },
+        { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.5 },
+        { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.5 },
         { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.5 },
-        { "label": "Up", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.5 },
+        { "label": "Up", "matrix": [4, 15], "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 },
@@ -137,9 +137,9 @@
         { "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 }
+        { "label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.5 },
+        { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.5 },
+        { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.5 }
       ]
     }
   }
diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json
index 0c71c940c1..4e2cfafff5 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/info.json
+++ b/keyboards/capsunlocked/cu80/v2_iso/info.json
@@ -53,83 +53,83 @@
       "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": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+        { "label": "F1", "matrix": [0, 2], "x": 2, "y": 0 },
+        { "label": "F2", "matrix": [0, 3], "x": 3, "y": 0 },
+        { "label": "F3", "matrix": [0, 4], "x": 4, "y": 0 },
+        { "label": "F4", "matrix": [0, 5], "x": 5, "y": 0 },
+        { "label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0 },
+        { "label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0 },
+        { "label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0 },
+        { "label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0 },
+        { "label": "F9", "matrix": [0, 10], "x": 11, "y": 0 },
+        { "label": "F10", "matrix": [0, 11], "x": 12, "y": 0 },
+        { "label": "F11", "matrix": [0, 12], "x": 13, "y": 0 },
+        { "label": "F12", "matrix": [0, 13], "x": 14, "y": 0 },
+        { "label": "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": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5 },
+        { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.5 },
+        { "label": "\"", "matrix": [1, 2], "x": 2, "y": 1.5 },
+        { "label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5 },
+        { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.5 },
+        { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.5 },
+        { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.5 },
+        { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.5 },
+        { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.5 },
+        { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.5 },
+        { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.5 },
+        { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.5 },
+        { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.5 },
         { "label": "Backspace", "matrix": [1, 13], "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": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5 },
+        { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5 },
+        { "label": "PgUp", "matrix": [1, 16], "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": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5 },
+        { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5 },
+        { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5 },
+        { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5 },
+        { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5 },
+        { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5 },
+        { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5 },
+        { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5 },
+        { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5 },
+        { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5 },
+        { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.5 },
+        { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.5 },
+        { "label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5 },
+        { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5 },
+        { "label": "PgDn", "matrix": [2, 16], "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 },
+        { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5 },
+        { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5 },
+        { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5 },
+        { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5 },
+        { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5 },
+        { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5 },
+        { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5 },
+        { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5 },
+        { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5 },
+        { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.5 },
+        { "label": "@", "matrix": [3, 11], "x": 11.75, "y": 3.5 },
+        { "label": "~", "matrix": [3, 12], "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": "|", "matrix": [4, 1], "x": 1.25, "y": 4.5 },
+        { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5 },
+        { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5 },
+        { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5 },
+        { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5 },
+        { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5 },
+        { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5 },
+        { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5 },
+        { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.5 },
+        { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.5 },
+        { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.5 },
         { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.5 },
-        { "label": "Up", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.5 },
+        { "label": "Up", "matrix": [4, 15], "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 },
@@ -138,9 +138,9 @@
         { "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 }
+        { "label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.5 },
+        { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.5 },
+        { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.5 }
       ]
     }
   }
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/config.h b/keyboards/catch22/config.h
index 91bf0b5d95..396a5ce868 100644
--- a/keyboards/catch22/config.h
+++ b/keyboards/catch22/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 { 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 \
diff --git a/keyboards/catch22/info.json b/keyboards/catch22/info.json
index dcdf23f953..f9a9b08ff7 100644
--- a/keyboards/catch22/info.json
+++ b/keyboards/catch22/info.json
@@ -6,6 +6,11 @@
         "pid": "0xCA22",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["B6", "B2", "B3", "B1", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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/chalice/config.h b/keyboards/chalice/config.h
index a71d46d6b5..88e9e5f9c8 100644
--- a/keyboards/chalice/config.h
+++ b/keyboards/chalice/config.h
@@ -17,13 +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
diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json
index 35f5c5fb1e..4075fa42f2 100644
--- a/keyboards/chalice/info.json
+++ b/keyboards/chalice/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000C",
         "device_version": "0.0.1"
     },
+    "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": {
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..0be9791911 100644
--- a/keyboards/chaos65/info.json
+++ b/keyboards/chaos65/info.json
@@ -8,6 +8,11 @@
         "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"],
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_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index b3a3ab3f9b..e720d702d4 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -3,14 +3,6 @@
 
 #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
diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json
index fcd9d0b3fe..4d37fcd819 100644
--- a/keyboards/charue/sunsetter_r2/info.json
+++ b/keyboards/charue/sunsetter_r2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5335",
         "device_version": "0.0.1"
     },
+    "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/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/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/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h
index aca5940c63..825d77b4ae 100644
--- a/keyboards/checkerboards/axon40/config.h
+++ b/keyboards/checkerboards/axon40/config.h
@@ -16,15 +16,6 @@
 
 #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
 
diff --git a/keyboards/checkerboards/axon40/info.json b/keyboards/checkerboards/axon40/info.json
index d3c6c1cb70..7bc52e7b9c 100644
--- a/keyboards/checkerboards/axon40/info.json
+++ b/keyboards/checkerboards/axon40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1119",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/checkerboards/candybar_ortho/config.h
index 966e9c79a5..091065e483 100644
--- a/keyboards/checkerboards/candybar_ortho/config.h
+++ b/keyboards/checkerboards/candybar_ortho/config.h
@@ -16,15 +16,6 @@
 
  #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
 
diff --git a/keyboards/checkerboards/candybar_ortho/info.json b/keyboards/checkerboards/candybar_ortho/info.json
index a254f9ef6e..ceadcc42ad 100644
--- a/keyboards/checkerboards/candybar_ortho/info.json
+++ b/keyboards/checkerboards/candybar_ortho/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3215",
         "device_version": "0.0.1"
     },
+    "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/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..5d3e817aac 100644
--- a/keyboards/checkerboards/nop60/config.h
+++ b/keyboards/checkerboards/nop60/config.h
@@ -17,14 +17,6 @@ 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
diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json
index 96467b7702..c1d9d31763 100644
--- a/keyboards/checkerboards/nop60/info.json
+++ b/keyboards/checkerboards/nop60/info.json
@@ -8,6 +8,11 @@
         "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,
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..41922cb584 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"}
diff --git a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h b/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h
index 8abf2875a9..bbf1bc5ca8 100644
--- a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h
+++ b/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h
@@ -52,7 +52,7 @@
     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 }, \
+    { 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, 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..f365fe865a 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 */
diff --git a/keyboards/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json
index 87d2e74deb..92739951f8 100644
--- a/keyboards/checkerboards/plexus75/info.json
+++ b/keyboards/checkerboards/plexus75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5338",
         "device_version": "0.0.1"
     },
+    "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..04b03054f1 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
 
diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/info.json
index dbac1f2f6a..d977b2f5a9 100644
--- a/keyboards/checkerboards/plexus75_he/info.json
+++ b/keyboards/checkerboards/plexus75_he/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5339",
         "device_version": "0.0.1"
     },
+    "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/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
index cec9db65e9..e60a7e4d0c 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
 
diff --git a/keyboards/checkerboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json
index f9915cdf19..81988112a9 100644
--- a/keyboards/checkerboards/pursuit40/info.json
+++ b/keyboards/checkerboards/pursuit40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1620",
         "device_version": "0.0.1"
     },
+    "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/quark/config.h b/keyboards/checkerboards/quark/config.h
index 42ccb06300..1cf03ae980 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
 
diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json
index 0f7f3b0f44..ba624b4009 100644
--- a/keyboards/checkerboards/quark/info.json
+++ b/keyboards/checkerboards/quark/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5340",
         "device_version": "0.0.1"
     },
+    "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_lp/config.h b/keyboards/checkerboards/quark_lp/config.h
index 89fc05ed71..ff88273648 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
 
diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json
index 6cd764fa80..d449a5a46b 100644
--- a/keyboards/checkerboards/quark_lp/info.json
+++ b/keyboards/checkerboards/quark_lp/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5354",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h
index 69781c0fa2..319f588aa2 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
 
diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json
index 49ab42adcb..37360618b5 100644
--- a/keyboards/checkerboards/quark_plus/info.json
+++ b/keyboards/checkerboards/quark_plus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5344",
         "device_version": "0.0.1"
     },
+    "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..de0e84aa33 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
 
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json
index de8496a798..46bfedda21 100644
--- a/keyboards/checkerboards/quark_squared/info.json
+++ b/keyboards/checkerboards/quark_squared/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5342",
         "device_version": "0.0.1"
     },
+    "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/snop60/config.h b/keyboards/checkerboards/snop60/config.h
index 5015355170..4ef42eeb79 100644
--- a/keyboards/checkerboards/snop60/config.h
+++ b/keyboards/checkerboards/snop60/config.h
@@ -17,14 +17,6 @@ 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
diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/info.json
index 0c543a7c85..0d5392f073 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"}
diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h
index 76fe9ae327..309d6ccf54 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
 
diff --git a/keyboards/checkerboards/ud40_ortho_alt/info.json b/keyboards/checkerboards/ud40_ortho_alt/info.json
index fa72a206d3..701f129163 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/info.json
+++ b/keyboards/checkerboards/ud40_ortho_alt/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7030",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index cc6d24ebc1..fbd6d0e2fd 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -13,24 +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
diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json
index 8d96a17bcc..ade4585e42 100644
--- a/keyboards/cherrybstudio/cb1800/info.json
+++ b/keyboards/cherrybstudio/cb1800/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
index b298fec8dc..6251ae58ef 100644
--- a/keyboards/cherrybstudio/cb65/config.h
+++ b/keyboards/cherrybstudio/cb65/config.h
@@ -13,24 +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
-*/
-#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
diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json
index 223d5560d4..6f29ae1dfd 100644
--- a/keyboards/cherrybstudio/cb65/info.json
+++ b/keyboards/cherrybstudio/cb65/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index f78600ed04..2d7e2722e5 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -13,24 +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
diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json
index 09a4fe132a..4f64388126 100644
--- a/keyboards/cherrybstudio/cb87/info.json
+++ b/keyboards/cherrybstudio/cb87/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h
index eedd4de339..750ca2634c 100644
--- a/keyboards/cherrybstudio/cb87rgb/config.h
+++ b/keyboards/cherrybstudio/cb87rgb/config.h
@@ -13,24 +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
diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json
index 059b6d61d4..5e93754cfc 100644
--- a/keyboards/cherrybstudio/cb87rgb/info.json
+++ b/keyboards/cherrybstudio/cb87rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8785",
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
         "layouts": {
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index 55b8bc4bee..03549bc495 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -13,24 +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
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 45aea95248..8e7720928d 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"
     },
diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h
index 8c60236697..d93e66215b 100644
--- a/keyboards/cheshire/curiosity/config.h
+++ b/keyboards/cheshire/curiosity/config.h
@@ -17,12 +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
 
diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json
index 0e63e3b660..854b10890b 100644
--- a/keyboards/cheshire/curiosity/info.json
+++ b/keyboards/cheshire/curiosity/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0FAD",
         "device_version": "0.0.1"
     },
+    "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"],
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/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/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h
index 731309b6fa..5a54a2ab89 100644
--- a/keyboards/chlx/str_merro60/config.h
+++ b/keyboards/chlx/str_merro60/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, 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
diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json
index e9ab25aedb..20f8eb6681 100644
--- a/keyboards/chlx/str_merro60/info.json
+++ b/keyboards/chlx/str_merro60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0602",
         "device_version": "1.0.0"
     },
+    "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/chocofly/chocofly.c b/keyboards/chocofly/chocofly.c
index 8ae38602ab..0f00afe2f9 100644
--- a/keyboards/chocofly/chocofly.c
+++ b/keyboards/chocofly/chocofly.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Vitaly Volkov (@vlkv)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "chocofly.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
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/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..16ba0fe4d2 100644
--- a/keyboards/chocv/info.json
+++ b/keyboards/chocv/info.json
@@ -8,6 +8,11 @@
     "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"],
diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h
index 66140bc3ed..62e682cd0c 100644
--- a/keyboards/cipulot/kallos/config.h
+++ b/keyboards/cipulot/kallos/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 \
-    { 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
diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json
index 1295d76e7f..a0e9aefe17 100644
--- a/keyboards/cipulot/kallos/info.json
+++ b/keyboards/cipulot/kallos/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6B7A",
         "device_version": "0.0.1"
     },
+    "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": {
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..317149fa67 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": {
diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h
index 908eb0d188..1304a2fe31 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
diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json
index 22e8f265f6..d99757f19b 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"}
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/info.json b/keyboards/ckeys/handwire_101/info.json
index 3d270685c5..970a052385 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": {
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..9fbcc7635e 100644
--- a/keyboards/ckeys/nakey/info.json
+++ b/keyboards/ckeys/nakey/info.json
@@ -8,6 +8,11 @@
     "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"],
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..33c7a23471 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"
   },
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..a442db236d 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"}
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..03649056f2 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"}
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..d0ac88f548 100644
--- a/keyboards/clawsome/bookerboard/info.json
+++ b/keyboards/clawsome/bookerboard/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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/info.json b/keyboards/clawsome/doodle/info.json
index 6c40392ec8..8b675684eb 100644
--- a/keyboards/clawsome/doodle/info.json
+++ b/keyboards/clawsome/doodle/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "F4", "E6"],
+        "rows": ["D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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/info.json b/keyboards/clawsome/fightpad/info.json
index df9c621627..3aad087486 100644
--- a/keyboards/clawsome/fightpad/info.json
+++ b/keyboards/clawsome/fightpad/info.json
@@ -8,6 +8,11 @@
         "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": {
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..b4875077f4 100644
--- a/keyboards/clawsome/gamebuddy/v1_0/info.json
+++ b/keyboards/clawsome/gamebuddy/v1_0/info.json
@@ -8,6 +8,11 @@
         "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": {
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..3330139b59 100644
--- a/keyboards/clawsome/gamebuddy/v1_m/info.json
+++ b/keyboards/clawsome/gamebuddy/v1_m/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..3c813bd36a 100644
--- a/keyboards/clawsome/luggage_rack/info.json
+++ b/keyboards/clawsome/luggage_rack/info.json
@@ -8,6 +8,11 @@
         "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": {
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..f51ea9fa56 100644
--- a/keyboards/clawsome/numeros/info.json
+++ b/keyboards/clawsome/numeros/info.json
@@ -8,6 +8,11 @@
         "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"],
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/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..65a979315c 100644
--- a/keyboards/clawsome/sedan/info.json
+++ b/keyboards/clawsome/sedan/info.json
@@ -8,6 +8,11 @@
         "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"],
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..cfc028476f 100644
--- a/keyboards/clawsome/sidekick/info.json
+++ b/keyboards/clawsome/sidekick/info.json
@@ -8,6 +8,11 @@
         "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": {
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/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json
index cdd9d713a6..1390b98d1c 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"}
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..c669255cb1 100644
--- a/keyboards/clueboard/17/info.json
+++ b/keyboards/clueboard/17/info.json
@@ -55,23 +55,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/info.json b/keyboards/clueboard/2x1800/2018/info.json
index 03162625c6..8267dd983c 100644
--- a/keyboards/clueboard/2x1800/2018/info.json
+++ b/keyboards/clueboard/2x1800/2018/info.json
@@ -54,386 +54,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/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..4f9f0a1642 100644
--- a/keyboards/clueboard/66/rev1/info.json
+++ b/keyboards/clueboard/66/rev1/info.json
@@ -57,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": [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 +120,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 +191,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/rev2/info.json b/keyboards/clueboard/66/rev2/info.json
index 5945c2c833..ff8128627e 100644
--- a/keyboards/clueboard/66/rev2/info.json
+++ b/keyboards/clueboard/66/rev2/info.json
@@ -61,62 +61,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 +124,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 +195,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..fc655351fb 100644
--- a/keyboards/clueboard/66/rev3/info.json
+++ b/keyboards/clueboard/66/rev3/info.json
@@ -61,62 +61,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 +124,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 +195,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..dbe3b49756 100644
--- a/keyboards/clueboard/66/rev4/info.json
+++ b/keyboards/clueboard/66/rev4/info.json
@@ -55,62 +55,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 +118,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 +189,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..7f80684d8d 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/info.json
@@ -61,134 +61,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 +196,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..5b6a208c16 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -47,15 +47,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..5cf553bca9 100644
--- a/keyboards/cmm_studio/fuji65/config.h
+++ b/keyboards/cmm_studio/fuji65/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 { 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
diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index 9f47befd54..30d273318e 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x364D",
         "device_version": "0.0.1"
     },
+    "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/info.json b/keyboards/cmm_studio/saka68/hotswap/info.json
index ee91cf527f..555d98c147 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": {
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..a4d5ae4f05 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": {
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/info.json b/keyboards/coarse/cordillera/info.json
index 9d84f0dee3..507d499236 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,
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/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..0caf3a3e33 100644
--- a/keyboards/coarse/vinta/info.json
+++ b/keyboards/coarse/vinta/info.json
@@ -8,6 +8,11 @@
     "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,
diff --git a/keyboards/coarse/vinta/vinta.h b/keyboards/coarse/vinta/vinta.h
index 18f51cd434..4041217cab 100644
--- a/keyboards/coarse/vinta/vinta.h
+++ b/keyboards/coarse/vinta/vinta.h
@@ -31,7 +31,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, XXX, k3C, XXX, k3E, k3F }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, XXX, k4D, k4E, k4F } \
+    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E, k4F } \
 }
 
 #define LAYOUT_65_ansi_blocker( \
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..2371ec5ef1 100644
--- a/keyboards/contender/config.h
+++ b/keyboards/contender/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, 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 { \
diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json
index 942963aaee..385aad6e0e 100644
--- a/keyboards/contender/info.json
+++ b/keyboards/contender/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC010",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "D6", "B3", "B0", "B1"],
+        "rows": ["D4", "D3", "B5", "B7", "B4", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json
index 1b46444ba8..e889432474 100644
--- a/keyboards/converter/a1200/info.json
+++ b/keyboards/converter/a1200/info.json
@@ -69,7 +69,7 @@
             {"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":"Enter", "x":14, "y":2.5, "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}, 
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/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/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 3f947eac2a..d68bb0389f 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..ae160c7038 100644
--- a/keyboards/converter/numeric_keypad_iie/info.json
+++ b/keyboards/converter/numeric_keypad_iie/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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/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
index bcd8b52974..87f70bc07a 100644
--- a/keyboards/converter/usb_usb/usb_usb.h
+++ b/keyboards/converter/usb_usb/usb_usb.h
@@ -19,14 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #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
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/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/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..1298de4c89 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
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/info.json b/keyboards/coseyfannitutti/discipad/info.json
index ac3d9a07c5..86a6836466 100644
--- a/keyboards/coseyfannitutti/discipad/info.json
+++ b/keyboards/coseyfannitutti/discipad/info.json
@@ -8,6 +8,11 @@
         "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": {
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/info.json b/keyboards/coseyfannitutti/discipline/info.json
index aa1afd9fcc..0f947f807a 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": {
diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h
index 5ee6b135fc..d56fccaf1f 100644
--- a/keyboards/coseyfannitutti/mullet/config.h
+++ b/keyboards/coseyfannitutti/mullet/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
-
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/info.json
index 8bdb22f18d..fc2f47c2c0 100644
--- a/keyboards/coseyfannitutti/mullet/info.json
+++ b/keyboards/coseyfannitutti/mullet/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6969",
         "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",
     "layouts": {
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..48b3df3c83 100644
--- a/keyboards/coseyfannitutti/mulletpad/info.json
+++ b/keyboards/coseyfannitutti/mulletpad/info.json
@@ -8,6 +8,11 @@
         "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"],
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..3c54053079 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": [
+                {"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_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": [
+                {"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_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": [
+                {"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_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": [
+                {"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}
+            ]
         }
     }
 }
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/cosmo65/config.h b/keyboards/cosmo65/config.h
index b8131f5d7d..b8a063e9ab 100644
--- a/keyboards/cosmo65/config.h
+++ b/keyboards/cosmo65/config.h
@@ -27,8 +27,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..b98db6c790 100644
--- a/keyboards/cosmo65/info.json
+++ b/keyboards/cosmo65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6331",
         "device_version": "0.0.1"
     },
+    "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 +75,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/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..3810d5c40e 100644
--- a/keyboards/cozykeys/bloomer/v2/info.json
+++ b/keyboards/cozykeys/bloomer/v2/info.json
@@ -2,6 +2,11 @@
   "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": {
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..0c5e01cd05 100644
--- a/keyboards/cozykeys/bloomer/v3/info.json
+++ b/keyboards/cozykeys/bloomer/v3/info.json
@@ -2,6 +2,11 @@
   "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": {
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..0e94558e17 100644
--- a/keyboards/cozykeys/speedo/v2/info.json
+++ b/keyboards/cozykeys/speedo/v2/info.json
@@ -8,6 +8,11 @@
     "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": {
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..85beda5e41 100644
--- a/keyboards/cozykeys/speedo/v3/config.h
+++ b/keyboards/cozykeys/speedo/v3/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 { 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
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index 2aa0d94485..a1a3bc18e4 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1192",
     "device_version": "0.0.3"
   },
+  "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/craftwalk/config.h b/keyboards/craftwalk/config.h
index fdf42006ff..5b878f779e 100644
--- a/keyboards/craftwalk/config.h
+++ b/keyboards/craftwalk/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, 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
diff --git a/keyboards/craftwalk/info.json b/keyboards/craftwalk/info.json
index 6fd1b7cea6..67c7fe6525 100644
--- a/keyboards/craftwalk/info.json
+++ b/keyboards/craftwalk/info.json
@@ -8,6 +8,11 @@
       "pid": "0x2E8F",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["B1", "F7", "F5", "F4", "B2", "E6", "B4"],
+      "rows": ["F6", "B3", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h
index f0c5263403..9a38384749 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
 
diff --git a/keyboards/crawlpad/info.json b/keyboards/crawlpad/info.json
index 0cdc5ef29a..11582d861f 100644
--- a/keyboards/crawlpad/info.json
+++ b/keyboards/crawlpad/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6070",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D4", "D5", "D6", "D7"],
+    "rows": ["F0", "F1", "F4", "F5"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["ortho_4x4"],
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index 15f68b19b2..5298ea8a77 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/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, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN F6
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 84
diff --git a/keyboards/crazy_keyboard_68/info.json b/keyboards/crazy_keyboard_68/info.json
index 740813ff4d..f1519acc41 100644
--- a/keyboards/crazy_keyboard_68/info.json
+++ b/keyboards/crazy_keyboard_68/info.json
@@ -8,6 +8,11 @@
         "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
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/info.json b/keyboards/crbn/info.json
index 20d5ad2ff4..63d2d92a67 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,153 @@
   "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 } ]
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 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_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 },
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 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": 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 } ]
+        { "x": 7, "y": 3 },
+        { "x": 8, "y": 3 },
+        { "x": 9, "y": 3 },
+        { "x": 10, "y": 3 },
+        { "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 },
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 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": 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 } ]
+        { "x": 8, "y": 3 },
+        { "x": 9, "y": 3 },
+        { "x": 10, "y": 3 },
+        { "x": 11, "y": 3 } ]
     }
   }
 }
diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h
index 68655d9d8f..76fcf3fa59 100644
--- a/keyboards/creatkeebs/glacier/config.h
+++ b/keyboards/creatkeebs/glacier/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/creatkeebs/glacier/info.json b/keyboards/creatkeebs/glacier/info.json
index 227adcbea2..3e306346f8 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": {
diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h
index 3a17d73f17..72e4f39e53 100644
--- a/keyboards/creatkeebs/thera/config.h
+++ b/keyboards/creatkeebs/thera/config.h
@@ -16,14 +16,6 @@
 
 #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
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/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/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/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..9f1b12ca25 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/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",
   "processor": "atmega32u4",
   "community_layouts": ["split_3x5_3", "split_3x6_3"],
   "layouts": {
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
index 2219e0d228..06dc572be1 100644
--- a/keyboards/crkbd/r2g/config.h
+++ b/keyboards/crkbd/r2g/config.h
@@ -69,7 +69,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/r2g.h b/keyboards/crkbd/r2g/r2g.h
index 126c4b8998..fd3cf557a7 100644
--- a/keyboards/crkbd/r2g/r2g.h
+++ b/keyboards/crkbd/r2g/r2g.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "crkbd.h"
 #include "quantum.h"
 
 // clang-format off
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index 1614ebc53b..854a63a35d 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -35,5 +35,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/rev1.h b/keyboards/crkbd/rev1/rev1.h
index 126c4b8998..fd3cf557a7 100644
--- a/keyboards/crkbd/rev1/rev1.h
+++ b/keyboards/crkbd/rev1/rev1.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "crkbd.h"
 #include "quantum.h"
 
 // clang-format off
diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h
index c5e7661c65..f739f1abfb 100644
--- a/keyboards/custommk/genesis/rev1/config.h
+++ b/keyboards/custommk/genesis/rev1/config.h
@@ -16,14 +16,6 @@
 
 #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
diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json
index aaab705432..d957e4c604 100644
--- a/keyboards/custommk/genesis/rev1/info.json
+++ b/keyboards/custommk/genesis/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFAB0",
         "device_version": "0.0.1"
     },
+    "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},
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
index f152f723fe..00b9711420 100644
--- a/keyboards/custommk/genesis/rev2/config.h
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -16,14 +16,6 @@
 
 #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
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
index 45b83c512a..901376fb3b 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFAB1",
         "device_version": "0.0.1"
     },
+    "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},
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/info.json b/keyboards/cutie_club/giant_macro_pad/info.json
index d68b8aa4d4..0ee63b2221 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": {
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/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/info.json b/keyboards/cutie_club/keebcats/dougal/info.json
index 7555611d89..5060e14677 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"
     },
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/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..56f7ce0fdd 100644
--- a/keyboards/cx60/config.h
+++ b/keyboards/cx60/config.h
@@ -16,14 +16,6 @@ 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
diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json
index c859379563..1220b32c8a 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
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..d4b4e36b41 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"
     },
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/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..032023388d 100644
--- a/keyboards/dailycraft/sandbox/rev1/info.json
+++ b/keyboards/dailycraft/sandbox/rev1/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..e20a1a2692 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"
     },
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/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/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..04bb07c0bc 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"
     },
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_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..f80dcd0dfe 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"
     },
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/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..61304e85fa 100644
--- a/keyboards/daji/seis_cinco/info.json
+++ b/keyboards/daji/seis_cinco/info.json
@@ -8,6 +8,11 @@
         "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": {
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/info.json b/keyboards/db/db63/info.json
index 9518ef5a42..6aa87efd5b 100644
--- a/keyboards/db/db63/info.json
+++ b/keyboards/db/db63/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"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index 5de4b65388..5a33d5d981 100644
--- a/keyboards/delikeeb/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/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, 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
diff --git a/keyboards/delikeeb/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json
index 09f1bcd78f..e409060f74 100644
--- a/keyboards/delikeeb/flatbread60/info.json
+++ b/keyboards/delikeeb/flatbread60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index 3708284700..4bf4e669c1 100644
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/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, 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
diff --git a/keyboards/delikeeb/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json
index e976a6a155..aa7a1fd727 100644
--- a/keyboards/delikeeb/vaguettelite/info.json
+++ b/keyboards/delikeeb/vaguettelite/info.json
@@ -8,6 +8,11 @@
         "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"},
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index d8a6d95c9b..fe6ada22ec 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/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 { 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
diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json
index 4434ba95d7..7b5df84f67 100644
--- a/keyboards/delikeeb/vanana/rev1/info.json
+++ b/keyboards/delikeeb/vanana/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "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/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index e28d974b78..2f93c2a799 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/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 { 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
diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json
index 589c8c5089..6b9c051a94 100644
--- a/keyboards/delikeeb/vanana/rev2/info.json
+++ b/keyboards/delikeeb/vanana/rev2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "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/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..218fcaefdc 100644
--- a/keyboards/delikeeb/vaneela/info.json
+++ b/keyboards/delikeeb/vaneela/info.json
@@ -8,6 +8,11 @@
         "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": {
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/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 4d5aa33be9..2bdd2a4f2c 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/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 { 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
diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index 8301a03813..794647015f 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/keyboards/delikeeb/waaffle/rev3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0012",
         "device_version": "0.0.3"
     },
+    "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"},
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/info.json b/keyboards/deltapad/info.json
index bef25e6350..608c8712c9 100644
--- a/keyboards/deltapad/info.json
+++ b/keyboards/deltapad/info.json
@@ -8,6 +8,11 @@
     "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": {
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..26b7101a1d 100644
--- a/keyboards/deltasplit75/v2/config.h
+++ b/keyboards/deltasplit75/v2/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 { 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 */
diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json
index 055ad1e00f..40c7135717 100644
--- a/keyboards/deltasplit75/v2/info.json
+++ b/keyboards/deltasplit75/v2/info.json
@@ -7,6 +7,11 @@
       "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"
     },
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..ab19a9a57e 100755
--- a/keyboards/demiurge/config.h
+++ b/keyboards/demiurge/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 { 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
diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
index 92b0c7243c..cc7e1fbbea 100644
--- a/keyboards/demiurge/info.json
+++ b/keyboards/demiurge/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h
index 8193eae02f..5896f3cd70 100644
--- a/keyboards/deng/djam/config.h
+++ b/keyboards/deng/djam/config.h
@@ -15,11 +15,6 @@
  */
 #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
diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json
index abf18685b2..cdba6219d4 100644
--- a/keyboards/deng/djam/info.json
+++ b/keyboards/deng/djam/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7325",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h
index e80b0d97a4..e96dee185b 100644
--- a/keyboards/deng/thirty/config.h
+++ b/keyboards/deng/thirty/config.h
@@ -15,12 +15,6 @@
  */
 #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
diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json
index 0fda78c76d..454577c1eb 100644
--- a/keyboards/deng/thirty/info.json
+++ b/keyboards/deng/thirty/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7342",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B3", "A4", "A6"],
+        "rows": ["B15", "A5", "A3", "A15", "B7", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "driver": "software",
         "pin": "B11",
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..cbe8f13cdf 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -24,14 +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
 
diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json
index 38f18f0cc1..4214de3415 100644
--- a/keyboards/dm9records/ergoinu/info.json
+++ b/keyboards/dm9records/ergoinu/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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..d495b69365 100644
--- a/keyboards/dm9records/plaid/info.json
+++ b/keyboards/dm9records/plaid/info.json
@@ -8,110 +8,115 @@
     "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"],
   "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 },
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 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": 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 } ]
+        { "x": 7, "y": 3 },
+        { "x": 8, "y": 3 },
+        { "x": 9, "y": 3 },
+        { "x": 10, "y": 3 },
+        { "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 } ]
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 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 } ]
     }
   }
 }
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/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h
index 1e908ea029..e64609c8fb 100644
--- a/keyboards/dmqdesign/spin/config.h
+++ b/keyboards/dmqdesign/spin/config.h
@@ -17,15 +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
diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json
index ff5101f8ea..47804ea542 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"},
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index 969d620d93..946ad61026 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/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, F4, B4, D7, D6, B3, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow
  * F5 PIN for DO60's pre-soldered WS2812 LEDs
  */
diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json
index 86d02df61e..0f55b0bdb8 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
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
index aa066fe393..c01191e869 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
 
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index d0acdedfb9..03deae0cbc 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1601",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F1", "F0", "B7"],
+        "rows": ["D5", "D4", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F7", "pin_b": "E6"},
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
index e7e2791ac8..a11f7c8d3a 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
 
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 8b5eeb45c2..c208bec1bf 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1601",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B0", "A7"],
+        "rows": ["B3", "B4", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6"},
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
index 866bd3e1d9..c2fe07026c 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 */
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index 9fe8e83185..f4e43522d5 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3001",
         "device_version": "0.0.1"
     },
+    "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"},
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..20ae2de10f 100644
--- a/keyboards/donutcables/budget96/info.json
+++ b/keyboards/donutcables/budget96/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..ea0659607c 100644
--- a/keyboards/donutcables/scrabblepad/info.json
+++ b/keyboards/donutcables/scrabblepad/info.json
@@ -8,6 +8,11 @@
     "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": {
diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index d4617a8786..40327dbc9a 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -16,17 +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
 
diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index f2ee7bb80a..b79348d03c 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/keyboards/doodboard/duckboard/info.json
@@ -8,6 +8,11 @@
         "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}
diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h
index d4617a8786..40327dbc9a 100644
--- a/keyboards/doodboard/duckboard_r2/config.h
+++ b/keyboards/doodboard/duckboard_r2/config.h
@@ -16,17 +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
 
diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json
index b2de93f477..bc3c8661f2 100644
--- a/keyboards/doodboard/duckboard_r2/info.json
+++ b/keyboards/doodboard/duckboard_r2/info.json
@@ -8,6 +8,11 @@
         "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}
diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
index 7fb78172d4..21b4c6f146 100644
--- a/keyboards/doppelganger/config.h
+++ b/keyboards/doppelganger/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 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
diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json
index d576f73d69..5c489fe44e 100644
--- a/keyboards/doppelganger/info.json
+++ b/keyboards/doppelganger/info.json
@@ -8,8 +8,19 @@
         "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"]
+            }
+        }
     },
     "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..40d56dfad3 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
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..1b042b720f 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
diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
index 471415402a..f9860ae4ed 100644
--- a/keyboards/doro67/rgb/config.h
+++ b/keyboards/doro67/rgb/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 { 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
diff --git a/keyboards/doro67/rgb/info.json b/keyboards/doro67/rgb/info.json
index cf46ac8739..61b515b76f 100644
--- a/keyboards/doro67/rgb/info.json
+++ b/keyboards/doro67/rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5247",
         "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
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index 63c16c1c71..13bc6fedfe 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -17,12 +17,6 @@ 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
diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json
index 83b071e98b..926b755b0c 100644
--- a/keyboards/draculad/info.json
+++ b/keyboards/draculad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1B1E",
         "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": "B2", "pin_b": "B6"},
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index e701420bee..6be876da3d 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 */
diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json
index c847a45650..c149e3e7de 100644
--- a/keyboards/draytronics/daisy/info.json
+++ b/keyboards/draytronics/daisy/info.json
@@ -8,6 +8,11 @@
         "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"},
diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
index 63619e7148..601a3befa8 100644
--- a/keyboards/draytronics/elise/config.h
+++ b/keyboards/draytronics/elise/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 { 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 */
diff --git a/keyboards/draytronics/elise/info.json b/keyboards/draytronics/elise/info.json
index 9772e6d872..0a059ae386 100644
--- a/keyboards/draytronics/elise/info.json
+++ b/keyboards/draytronics/elise/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h
index f352f96b39..2c590e67c6 100644
--- a/keyboards/draytronics/elise_v2/config.h
+++ b/keyboards/draytronics/elise_v2/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 { 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 */
diff --git a/keyboards/draytronics/elise_v2/info.json b/keyboards/draytronics/elise_v2/info.json
index d04e1374ed..a2194a657a 100644
--- a/keyboards/draytronics/elise_v2/info.json
+++ b/keyboards/draytronics/elise_v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x454C",
         "device_version": "2.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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
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..e929c7656d 100644
--- a/keyboards/draytronics/scarlet/info.json
+++ b/keyboards/draytronics/scarlet/info.json
@@ -8,6 +8,11 @@
         "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"],
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..562c231c26 100644
--- a/keyboards/drewkeys/iskar/info.json
+++ b/keyboards/drewkeys/iskar/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..965ef6d815 100644
--- a/keyboards/drhigsby/ogurec/info.json
+++ b/keyboards/drhigsby/ogurec/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", "F4", "F5"],
+        "rows": ["F6", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/drhigsby/ogurec/left_pm/left_pm.h b/keyboards/drhigsby/ogurec/left_pm/left_pm.h
index ecf87a2a49..3a397dda5f 100644
--- a/keyboards/drhigsby/ogurec/left_pm/left_pm.h
+++ b/keyboards/drhigsby/ogurec/left_pm/left_pm.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "ogurec.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *
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/right_pm.h b/keyboards/drhigsby/ogurec/right_pm/right_pm.h
index e413a835bc..2ad2fe32c9 100644
--- a/keyboards/drhigsby/ogurec/right_pm/right_pm.h
+++ b/keyboards/drhigsby/ogurec/right_pm/right_pm.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "ogurec.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *
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/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..5723fc1e77 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/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, 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
diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json
index 286396776e..c1a730dda8 100644
--- a/keyboards/dtisaac/dosa40rgb/info.json
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4973",
         "device_version": "0.0.4"
     },
+    "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 +53,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/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/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/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/info.json b/keyboards/dumbo/info.json
index 3fe1a8b4f8..5b4a7bb23a 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"},
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..a3846ef5e5 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"}
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..6555d4ac7a 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"},
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..1b5e9e8779 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"}
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..989abb6dc6 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"}
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..742eaabd91 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"},
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..d0362f0561 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"},
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..ff07570f9e 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"}
diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h
index 2c00ba8eef..7050460d34 100644
--- a/keyboards/dumbpad/v3x/config.h
+++ b/keyboards/dumbpad/v3x/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 { C6, D7, E6, B4, B5 }
-
 /* Onboard LEDs  */
 #define LED_00 B1
 #define LED_01 B3
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
index acdbe2c590..8e613d3f38 100644
--- a/keyboards/dumbpad/v3x/info.json
+++ b/keyboards/dumbpad/v3x/info.json
@@ -5,6 +5,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"}
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/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.h b/keyboards/durgod/dgk6x/galaxy/galaxy.h
index 3ba96aaf7b..3a2da6f863 100644
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.h
+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.h
@@ -17,8 +17,6 @@
 
 #include "quantum.h"
 
-#define CAPS_LED 46
-
 #define XXX KC_NO
 
 // This a shortcut to help you visually see your layout.
diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/info.json
index e7b843f107..c9aa18024e 100644
--- a/keyboards/durgod/dgk6x/galaxy/info.json
+++ b/keyboards/durgod/dgk6x/galaxy/info.json
@@ -8,6 +8,11 @@
       "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": {
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.h b/keyboards/durgod/dgk6x/hades/hades.h
index 630f7e92b5..a1840dff0f 100644
--- a/keyboards/durgod/dgk6x/hades/hades.h
+++ b/keyboards/durgod/dgk6x/hades/hades.h
@@ -17,8 +17,6 @@
 
 #include "quantum.h"
 
-#define CAPS_LED 30
-
 #define XXX KC_NO
 
 // This a shortcut to help you visually see your layout.
diff --git a/keyboards/durgod/dgk6x/hades/info.json b/keyboards/durgod/dgk6x/hades/info.json
index 2ebd9c8a41..f553a06c9b 100644
--- a/keyboards/durgod/dgk6x/hades/info.json
+++ b/keyboards/durgod/dgk6x/hades/info.json
@@ -8,6 +8,11 @@
       "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": {
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/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/dz60/config.h b/keyboards/dz60/config.h
index fdac282e3b..0202967002 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/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 { 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
diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json
index 37ba71fcdf..520605c0d6 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
diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h
index e93336086c..b6b02cd5ec 100644
--- a/keyboards/dztech/bocc/config.h
+++ b/keyboards/dztech/bocc/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, 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
diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json
index 87073419ab..eaed62fef5 100644
--- a/keyboards/dztech/bocc/info.json
+++ b/keyboards/dztech/bocc/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
index e74f584c91..419464662b 100644
--- a/keyboards/dztech/duo_s/config.h
+++ b/keyboards/dztech/duo_s/config.h
@@ -16,12 +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
diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json
index 54672e21ae..36dc05b3c9 100644
--- a/keyboards/dztech/duo_s/info.json
+++ b/keyboards/dztech/duo_s/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1012",
     "device_version": "0.0.1"
   },
+  "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"],
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..68b332c9cd 100644
--- a/keyboards/dztech/dz60rgb/v1/info.json
+++ b/keyboards/dztech/dz60rgb/v1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1120",
         "device_version": "1.0.0"
     },
+    "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/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..3553fab9b2 100644
--- a/keyboards/dztech/dz60rgb/v2/info.json
+++ b/keyboards/dztech/dz60rgb/v2/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1121",
         "device_version": "2.0.0"
     },
+    "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_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..89e4532160 100644
--- a/keyboards/dztech/dz60rgb/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb/v2_1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1121",
         "device_version": "2.1.0"
     },
+    "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/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..377c8cd036 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1220",
         "device_version": "1.0.0"
     },
+    "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/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..52070e8996 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1221",
         "device_version": "2.0.0"
     },
+    "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_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..d18a84790d 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1221",
         "device_version": "2.1.0"
     },
+    "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/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..278c245871 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1320",
         "device_version": "1.0.0"
     },
+    "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/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..1265608dbc 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1321",
         "device_version": "2.0.0"
     },
+    "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_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..bd9e24e880 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1321",
         "device_version": "2.1.0"
     },
+    "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/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..14d9c0122b 100644
--- a/keyboards/dztech/dz64rgb/info.json
+++ b/keyboards/dztech/dz64rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1013",
         "device_version": "0.0.2"
     },
+    "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/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/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..761d31ffb7 100644
--- a/keyboards/dztech/dz65rgb/v1/info.json
+++ b/keyboards/dztech/dz65rgb/v1/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1420",
         "device_version": "1.0.0"
     },
+    "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",
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..332acae14d 100644
--- a/keyboards/dztech/dz65rgb/v2/info.json
+++ b/keyboards/dztech/dz65rgb/v2/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1421",
         "device_version": "2.0.0"
     },
+    "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
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..d40193459d 100644
--- a/keyboards/dztech/dz65rgb/v3/info.json
+++ b/keyboards/dztech/dz65rgb/v3/info.json
@@ -3,6 +3,11 @@
         "pid": "0x1424",
         "device_version": "3.0.0"
     },
+    "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"
 }
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/info.json b/keyboards/dztech/dz96/info.json
index 1119a8f2ab..a7229ce131 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
diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
index c07c913bb9..2200253ff1 100644
--- a/keyboards/dztech/endless80/config.h
+++ b/keyboards/dztech/endless80/config.h
@@ -15,10 +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
diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json
index eb80943837..00ac43a171 100644
--- a/keyboards/dztech/endless80/info.json
+++ b/keyboards/dztech/endless80/info.json
@@ -8,6 +8,11 @@
         "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
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/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..efeb89011c 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -17,13 +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
diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json
index d8b388c331..df4bd4751c 100644
--- a/keyboards/ealdin/quadrant/info.json
+++ b/keyboards/ealdin/quadrant/info.json
@@ -8,6 +8,11 @@
         "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"}
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/info.json b/keyboards/earth_rover/info.json
index 429c9b1cbd..329f4d90e1 100644
--- a/keyboards/earth_rover/info.json
+++ b/keyboards/earth_rover/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/eason/aeroboard/config.h b/keyboards/eason/aeroboard/config.h
index 3c23bce9be..c8c69d2ee0 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
diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json
index 73ef41d221..26f5309847 100644
--- a/keyboards/eason/aeroboard/info.json
+++ b/keyboards/eason/aeroboard/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8870",
         "device_version": "0.0.1"
     },
+    "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/capsule65/config.h b/keyboards/eason/capsule65/config.h
index 176ccc1689..0048707fd2 100644
--- a/keyboards/eason/capsule65/config.h
+++ b/keyboards/eason/capsule65/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 { 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
diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json
index 4c49f6feef..9935a33134 100644
--- a/keyboards/eason/capsule65/info.json
+++ b/keyboards/eason/capsule65/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..42a4a77d69 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
diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json
index 83061d92df..e470045744 100644
--- a/keyboards/ebastler/isometria_75/rev1/info.json
+++ b/keyboards/ebastler/isometria_75/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1337",
         "device_version": "0.0.1"
     },
+    "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/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/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..a04bd1e5f7 100644
--- a/keyboards/edc40/config.h
+++ b/keyboards/edc40/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 { 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/info.json b/keyboards/edc40/info.json
index 43314e1d82..6d2506331d 100644
--- a/keyboards/edc40/info.json
+++ b/keyboards/edc40/info.json
@@ -8,6 +8,11 @@
         "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",
     "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/info.json b/keyboards/edda/info.json
index 9b3c6c733a..8893abdd95 100644
--- a/keyboards/edda/info.json
+++ b/keyboards/edda/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
index 5d074c2e4a..273c65f800 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 */
diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json
index 7849eae7ca..ee4d27aa19 100644
--- a/keyboards/edi/hardlight/mk1/info.json
+++ b/keyboards/edi/hardlight/mk1/info.json
@@ -6,8 +6,13 @@
         "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",
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_4x16": {
             "layout": [
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index c140a7bad5..847660514c 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/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, 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 */
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
index aff84f1e32..ab2e78088a 100644
--- a/keyboards/edi/hardlight/mk2/info.json
+++ b/keyboards/edi/hardlight/mk2/info.json
@@ -6,6 +6,11 @@
         "pid": "0x2408",
         "device_version": "0.0.7"
     },
+    "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"],
diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
index df40d532f8..16354b4b55 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 */
diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json
index 95d3e6d6ee..2310db8948 100644
--- a/keyboards/edi/standaside/info.json
+++ b/keyboards/edi/standaside/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/edinburgh41/config.h b/keyboards/edinburgh41/config.h
index 2f65982579..16cca4e830 100644
--- a/keyboards/edinburgh41/config.h
+++ b/keyboards/edinburgh41/config.h
@@ -3,14 +3,6 @@
 
 #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
diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json
index 6a8d8b4bf9..5c7ac53a85 100644
--- a/keyboards/edinburgh41/info.json
+++ b/keyboards/edinburgh41/info.json
@@ -10,6 +10,11 @@
         "pid": "0x0000",
         "vid": "0xFEED"
     },
+    "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..54d5cae5b6 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/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, 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
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..88931fc133 100644
--- a/keyboards/eek/info.json
+++ b/keyboards/eek/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.4"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["split_3x5_3"],
diff --git a/keyboards/eek/silk_down/silk_down.h b/keyboards/eek/silk_down/silk_down.h
index c8ececd939..23ff61e58f 100644
--- a/keyboards/eek/silk_down/silk_down.h
+++ b/keyboards/eek/silk_down/silk_down.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "eek.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *
diff --git a/keyboards/eek/silk_up/silk_up.h b/keyboards/eek/silk_up/silk_up.h
index 8b9fe39596..eebcc8fd2e 100644
--- a/keyboards/eek/silk_up/silk_up.h
+++ b/keyboards/eek/silk_up/silk_up.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include "eek.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *
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/info.json b/keyboards/efreet/info.json
index 8a971a9c71..664010de25 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
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index 457f0a5013..077a3d6efe 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
diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
index 3eaa251d78..35cc35828d 100644
--- a/keyboards/ein_60/info.json
+++ b/keyboards/ein_60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "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"},
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..8aa3a46e8a 100644
--- a/keyboards/elephant42/config.h
+++ b/keyboards/elephant42/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 }
-#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 }
diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
index 161ec776cd..69a64bfa31 100644
--- a/keyboards/elephant42/info.json
+++ b/keyboards/elephant42/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0721",
         "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/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/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
index 237b073721..06a88a7240 100644
--- a/keyboards/emi20/config.h
+++ b/keyboards/emi20/config.h
@@ -16,14 +16,6 @@
 
 #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
diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json
index 093b3e5b45..dff7a57bc1 100644
--- a/keyboards/emi20/info.json
+++ b/keyboards/emi20/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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/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/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/info.json b/keyboards/eniigmakeyboards/ek87/info.json
index af5eb06bad..5ccc2added 100644
--- a/keyboards/eniigmakeyboards/ek87/info.json
+++ b/keyboards/eniigmakeyboards/ek87/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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/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..a2b530e002 100644
--- a/keyboards/ep/comsn/mollydooker/config.h
+++ b/keyboards/ep/comsn/mollydooker/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, 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 */
diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json
index 69641b24b8..52038e9455 100644
--- a/keyboards/ep/comsn/mollydooker/info.json
+++ b/keyboards/ep/comsn/mollydooker/info.json
@@ -7,6 +7,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/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/info.json b/keyboards/epoch80/info.json
index d8b83f8882..c35edcbc02 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",
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index 2dbfdbba73..8551c8f3a1 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 )
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/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/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..0fcd2e74ae 100644
--- a/keyboards/ergoslab/rev1/config.h
+++ b/keyboards/ergoslab/rev1/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 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 
diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json
index 9133612a18..77a215f130 100644
--- a/keyboards/ergoslab/rev1/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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/keymaps/ian/rules.mk b/keyboards/ergotravel/keymaps/ian/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/ergotravel/keymaps/ian/rules.mk
+++ /dev/null
diff --git a/keyboards/ergotravel/keymaps/rs/rules.mk b/keyboards/ergotravel/keymaps/rs/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/ergotravel/keymaps/rs/rules.mk
+++ /dev/null
diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h
index a24148772b..f36740aa93 100644
--- a/keyboards/ergotravel/rev1/config.h
+++ b/keyboards/ergotravel/rev1/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 }
-#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 */
diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json
index f442549194..e86f675385 100644
--- a/keyboards/ergotravel/rev1/info.json
+++ b/keyboards/ergotravel/rev1/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h
index 08b356c839..5306309c5b 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
diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json
index c9ed1ff7d5..d57891bf6c 100644
--- a/keyboards/esca/getawayvan/info.json
+++ b/keyboards/esca/getawayvan/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h
index 08b356c839..5306309c5b 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
diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json
index d93fe2f1a1..6b112210f0 100644
--- a/keyboards/esca/getawayvan_f042/info.json
+++ b/keyboards/esca/getawayvan_f042/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "STM32F042",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index 069eb056bf..2e8dcc0ad3 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/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
-
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 8
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json
index 4ca85c261e..c66bf46084 100644
--- a/keyboards/eternal_keypad/info.json
+++ b/keyboards/eternal_keypad/info.json
@@ -8,6 +8,11 @@
         "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]
     },
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/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/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..240e6a4b0a 100644
--- a/keyboards/evancookaudio/tenpad/info.json
+++ b/keyboards/evancookaudio/tenpad/info.json
@@ -8,6 +8,11 @@
         "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": {
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..a346e851e8 100644
--- a/keyboards/eve/meteor/info.json
+++ b/keyboards/eve/meteor/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/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..a857240c81 100644
--- a/keyboards/evolv/config.h
+++ b/keyboards/evolv/config.h
@@ -17,10 +17,6 @@ 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 */
diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json
index 76b428b1cd..a6fe24f12a 100644
--- a/keyboards/evolv/info.json
+++ b/keyboards/evolv/info.json
@@ -8,6 +8,11 @@
         "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}
@@ -18,184 +23,221 @@
     "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..bb61a6c852 100644
--- a/keyboards/evyd13/atom47/rev2/config.h
+++ b/keyboards/evyd13/atom47/rev2/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 {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 */
diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
index 9a7ac37f30..8ac2fa2f2e 100644
--- a/keyboards/evyd13/atom47/rev2/info.json
+++ b/keyboards/evyd13/atom47/rev2/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
index 5cee6379ff..27a5e7ca66 100644
--- a/keyboards/evyd13/atom47/rev3/config.h
+++ b/keyboards/evyd13/atom47/rev3/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 {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
diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
index 644a095eca..fd0f4fa3a8 100644
--- a/keyboards/evyd13/atom47/rev3/info.json
+++ b/keyboards/evyd13/atom47/rev3/info.json
@@ -8,6 +8,11 @@
         "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,
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..bf2e6b69ac 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"}
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..a71ee1e241 100644
--- a/keyboards/evyd13/atom47/rev5/info.json
+++ b/keyboards/evyd13/atom47/rev5/info.json
@@ -8,6 +8,11 @@
         "pid": "0x92EA",
         "device_version": "0.0.1"
     },
+    "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",
     "layouts": {
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/info.json b/keyboards/evyd13/eon40/info.json
index cda0c495a4..efed477015 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"},
diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h
index 2660c3ddf2..5b471d6d5e 100644
--- a/keyboards/evyd13/eon65/config.h
+++ b/keyboards/evyd13/eon65/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,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
diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json
index 9f1a67689f..48f202a4fb 100644
--- a/keyboards/evyd13/eon65/info.json
+++ b/keyboards/evyd13/eon65/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi", "65_ansi_blocker", "65_iso", "65_iso_blocker"],
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/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..a5b74985e8 100644
--- a/keyboards/evyd13/eon87/config.h
+++ b/keyboards/evyd13/eon87/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,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
diff --git a/keyboards/evyd13/eon87/info.json b/keyboards/evyd13/eon87/info.json
index 2dcdea0dd8..59de0b3585 100644
--- a/keyboards/evyd13/eon87/info.json
+++ b/keyboards/evyd13/eon87/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
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/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/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/info.json b/keyboards/evyd13/gh80_3700/info.json
index 7ab1267ed9..91b8b5ee59 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"}
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..45641c27d7 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",
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/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..f9aae13680 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",
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..24b25114f5 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
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/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/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/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..0ea40b5ea2 100644
--- a/keyboards/evyd13/pockettype/info.json
+++ b/keyboards/evyd13/pockettype/info.json
@@ -8,6 +8,11 @@
     "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"],
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..b6ec7756b0 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",
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..049a931242 100644
--- a/keyboards/evyd13/solheim68/info.json
+++ b/keyboards/evyd13/solheim68/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h
index ef8948786b..77d5e5bd4e 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 */
diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json
index da501c6756..694894c511 100644
--- a/keyboards/evyd13/ta65/info.json
+++ b/keyboards/evyd13/ta65/info.json
@@ -8,6 +8,11 @@
         "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"}
diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h
index 8d41a6a924..2c33be09c6 100644
--- a/keyboards/evyd13/wonderland/config.h
+++ b/keyboards/evyd13/wonderland/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 {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
diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json
index 9a84e03c0e..bc7aa9113c 100644
--- a/keyboards/evyd13/wonderland/info.json
+++ b/keyboards/evyd13/wonderland/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index ef92b06249..9ec802d8d4 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -16,16 +16,6 @@
 
 #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
 
diff --git a/keyboards/exclusive/e65/e65.h b/keyboards/exclusive/e65/e65.h
index 281b52c76e..5800060a3f 100644
--- a/keyboards/exclusive/e65/e65.h
+++ b/keyboards/exclusive/e65/e65.h
@@ -129,7 +129,7 @@
 	{ 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 }, \
+	{ 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 }  \
 }
 
diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json
index 436faa5f3d..3e541994de 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
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index bf8b3b483a..56fd4db25d 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -4,12 +4,6 @@
  */
 #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
diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/info.json
index 076ff4a505..39e9940732 100644
--- a/keyboards/exclusive/e6_rgb/info.json
+++ b/keyboards/exclusive/e6_rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4536",
         "device_version": "0.6.2"
     },
+    "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
index 65bd782b7e..865d5e5ead 100644
--- a/keyboards/exclusive/e6v2/le/config.h
+++ b/keyboards/exclusive/e6v2/le/config.h
@@ -17,11 +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
@@ -39,5 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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..c5184493fa 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,
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..0faeed9a49 100644
--- a/keyboards/exclusive/e6v2/le_bmc/info.json
+++ b/keyboards/exclusive/e6v2/le_bmc/info.json
@@ -7,6 +7,11 @@
         "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"
     },
diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h
index 88ec4faa04..b7fd9fcff4 100644
--- a/keyboards/exclusive/e6v2/oe/config.h
+++ b/keyboards/exclusive/e6v2/oe/config.h
@@ -17,11 +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
@@ -39,5 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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..d16df07cc6 100644
--- a/keyboards/exclusive/e6v2/oe/info.json
+++ b/keyboards/exclusive/e6v2/oe/info.json
@@ -8,6 +8,11 @@
         "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,
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..b2eac92849 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/info.json
+++ b/keyboards/exclusive/e6v2/oe_bmc/info.json
@@ -7,6 +7,11 @@
         "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"
     },
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index 46944506a1..6d2de14931 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json
index d014e6d47c..5e7e72ff24 100644
--- a/keyboards/exclusive/e7v1/info.json
+++ b/keyboards/exclusive/e7v1/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index 3da5cb8935..81c34a03b1 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/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, 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
diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json
index 9994741f24..a473dc818e 100644
--- a/keyboards/exclusive/e7v1se/info.json
+++ b/keyboards/exclusive/e7v1se/info.json
@@ -8,6 +8,11 @@
         "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
@@ -17,88 +22,88 @@
     "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..98d2fd8634 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/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
-#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
diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json
index 0065b2b84c..e86c11ad09 100644
--- a/keyboards/exclusive/e85/hotswap/info.json
+++ b/keyboards/exclusive/e85/hotswap/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json
index cda9f689cd..3003d16c4b 100644
--- a/keyboards/exclusive/e85/soldered/info.json
+++ b/keyboards/exclusive/e85/soldered/info.json
@@ -8,6 +8,11 @@
         "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,
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/info.json b/keyboards/exent/info.json
index 9aa80a4a11..4850a9ae57 100644
--- a/keyboards/exent/info.json
+++ b/keyboards/exent/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h
index 6da702919e..a8cca9403d 100644
--- a/keyboards/eyeohdesigns/babyv/config.h
+++ b/keyboards/eyeohdesigns/babyv/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, 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
diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json
index 2a55943c78..3555fef3b2 100644
--- a/keyboards/eyeohdesigns/babyv/info.json
+++ b/keyboards/eyeohdesigns/babyv/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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.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..6a06240552 100644
--- a/keyboards/eyeohdesigns/theboulevard/config.h
+++ b/keyboards/eyeohdesigns/theboulevard/config.h
@@ -17,12 +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
diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json
index 0a12742903..8f739f0fce 100644
--- a/keyboards/eyeohdesigns/theboulevard/info.json
+++ b/keyboards/eyeohdesigns/theboulevard/info.json
@@ -8,6 +8,11 @@
         "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}
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/info.json b/keyboards/facew/info.json
index 6dcc9cb14d..9b1b32e32c 100644
--- a/keyboards/facew/info.json
+++ b/keyboards/facew/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"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index fd84faa44d..08b197cbff 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
  */
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
index 65007a2ce9..1dbccf8dd5 100644
--- a/keyboards/fallacy/info.json
+++ b/keyboards/fallacy/info.json
@@ -7,6 +7,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
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/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/info.json b/keyboards/feels/feels65/info.json
index 3ccc6eca98..b0deb4d58c 100644
--- a/keyboards/feels/feels65/info.json
+++ b/keyboards/feels/feels65/info.json
@@ -8,6 +8,11 @@
         "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"],
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..7fc70330f7 100644
--- a/keyboards/feker/ik75/info.json
+++ b/keyboards/feker/ik75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1226",
         "device_version": "0.0.1"
     },
+    "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/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h
index 6f88b36fe7..d87c5bfac9 100644
--- a/keyboards/ffkeebs/puca/config.h
+++ b/keyboards/ffkeebs/puca/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
-#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
 
diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/info.json
index 1cf9fd94eb..6abad1adb7 100644
--- a/keyboards/ffkeebs/puca/info.json
+++ b/keyboards/ffkeebs/puca/info.json
@@ -8,6 +8,11 @@
         "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"}
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/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h
index d4ec1bd96e..a658b20356 100644
--- a/keyboards/fjlabs/7vhotswap/config.h
+++ b/keyboards/fjlabs/7vhotswap/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 { 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 */
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index fa8becc815..992abd81b9 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/config.h b/keyboards/fjlabs/avalon/config.h
index fe7128047c..d21494f77b 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/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 { 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 */
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
index 2590221b60..c99511977d 100644
--- a/keyboards/fjlabs/avalon/info.json
+++ b/keyboards/fjlabs/avalon/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h
index 0739e5a634..f3a0775a81 100644
--- a/keyboards/fjlabs/bks65/config.h
+++ b/keyboards/fjlabs/bks65/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/bks65/info.json b/keyboards/fjlabs/bks65/info.json
index 6b4ef9e95f..4d6878caca 100644
--- a/keyboards/fjlabs/bks65/info.json
+++ b/keyboards/fjlabs/bks65/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h
index 0739e5a634..f3a0775a81 100644
--- a/keyboards/fjlabs/bks65solder/config.h
+++ b/keyboards/fjlabs/bks65solder/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/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json
index 1c20963164..54bd92e278 100644
--- a/keyboards/fjlabs/bks65solder/info.json
+++ b/keyboards/fjlabs/bks65solder/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
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..017faf66dc 100644
--- a/keyboards/fjlabs/bolsa65/info.json
+++ b/keyboards/fjlabs/bolsa65/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h
index e5b70cc14c..d3ed772dae 100644
--- a/keyboards/fjlabs/kf87/config.h
+++ b/keyboards/fjlabs/kf87/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/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json
index 6f783e6476..03c179f44e 100644
--- a/keyboards/fjlabs/kf87/info.json
+++ b/keyboards/fjlabs/kf87/info.json
@@ -8,6 +8,11 @@
         "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"
diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
index 4c824ca7b6..5c93dd25f9 100644
--- a/keyboards/fjlabs/kyuu/config.h
+++ b/keyboards/fjlabs/kyuu/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/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json
index 50f60e805e..c149abce4f 100644
--- a/keyboards/fjlabs/kyuu/info.json
+++ b/keyboards/fjlabs/kyuu/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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..a79fcfb9c7 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"
     },
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/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h
index 708ad1d193..d148935ab0 100644
--- a/keyboards/fjlabs/mk61rgbansi/config.h
+++ b/keyboards/fjlabs/mk61rgbansi/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 { 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 */
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json
index 649afd6e36..3dece0ae3f 100644
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ b/keyboards/fjlabs/mk61rgbansi/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
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..8737d21ad9 100644
--- a/keyboards/fjlabs/peaker/info.json
+++ b/keyboards/fjlabs/peaker/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/fjlabs/peaker/peaker.h b/keyboards/fjlabs/peaker/peaker.h
index a1f53a87d6..189ac59635 100644
--- a/keyboards/fjlabs/peaker/peaker.h
+++ b/keyboards/fjlabs/peaker/peaker.h
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     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   }, \
+    { 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,   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/ready100/config.h b/keyboards/fjlabs/ready100/config.h
index 6294876072..0ec13eda5f 100644
--- a/keyboards/fjlabs/ready100/config.h
+++ b/keyboards/fjlabs/ready100/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 { 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 */
diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json
index b53457010f..1187608433 100644
--- a/keyboards/fjlabs/ready100/info.json
+++ b/keyboards/fjlabs/ready100/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
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/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/solanis/config.h b/keyboards/fjlabs/solanis/config.h
index 6a022cc81c..d3d15d09d4 100644
--- a/keyboards/fjlabs/solanis/config.h
+++ b/keyboards/fjlabs/solanis/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/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json
index f4df560aed..5dd97927e5 100644
--- a/keyboards/fjlabs/solanis/info.json
+++ b/keyboards/fjlabs/solanis/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/fjlabs/swordfish/config.h b/keyboards/fjlabs/swordfish/config.h
index 0940cefc5e..38e9c023ee 100644
--- a/keyboards/fjlabs/swordfish/config.h
+++ b/keyboards/fjlabs/swordfish/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 { 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 */
diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json
index 4d9bffdf2f..609324ec39 100644
--- a/keyboards/fjlabs/swordfish/info.json
+++ b/keyboards/fjlabs/swordfish/info.json
@@ -8,11 +8,98 @@
         "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",
     "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": [
+                {"x": 0, "y": 0},
+                {"x": 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.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": 15.5, "y": 0},
+                {"x": 16.75, "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, "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, "w": 1.5},
+                {"x": 16.75, "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.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, "w": 2.25},
+                {"x": 16.75, "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.5},
+
+                {"x": 15.75, "y": 3.25},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 3.25, "y": 4, "w": 1.25},
+                {"x": 4.5, "y": 4, "w": 2.75},
+
+                {"x": 8, "y": 4, "w": 2.25},
+                {"x": 10.25, "y": 4, "w": 1.25},
+                {"x": 12, "y": 4, "w": 1.25},
+                {"x": 13.25, "y": 4, "w": 1.25},
+
+                {"x": 14.75, "y": 4.25},
+                {"x": 15.75, "y": 4.25},
+                {"x": 16.75, "y": 4.25}
+            ]
         }
     }
 }
diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h
index 708ad1d193..d148935ab0 100644
--- a/keyboards/fjlabs/tf60ansi/config.h
+++ b/keyboards/fjlabs/tf60ansi/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 { 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 */
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json
index ad1452f7f8..964545c5e2 100644
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ b/keyboards/fjlabs/tf60ansi/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
index 708ad1d193..d148935ab0 100644
--- a/keyboards/fjlabs/tf60v2/config.h
+++ b/keyboards/fjlabs/tf60v2/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 { 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 */
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json
index 4604425dca..7b0b3b6f95 100644
--- a/keyboards/fjlabs/tf60v2/info.json
+++ b/keyboards/fjlabs/tf60v2/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi_arrow"],
diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h
index 77441206d7..f8b5ae2db6 100644
--- a/keyboards/fjlabs/tf65rgbv2/config.h
+++ b/keyboards/fjlabs/tf65rgbv2/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 { 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 */
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json
index d7e54e5cf6..92ab742f35 100644
--- a/keyboards/fjlabs/tf65rgbv2/info.json
+++ b/keyboards/fjlabs/tf65rgbv2/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h
index dbc8b329c6..e288eb343b 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 \
diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json
index 851672c35c..e19da4fb61 100644
--- a/keyboards/flehrad/bigswitch/info.json
+++ b/keyboards/flehrad/bigswitch/info.json
@@ -7,6 +7,11 @@
         "pid": "0xB195",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6"],
+        "rows": ["B5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "debounce": 50,
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/info.json b/keyboards/flehrad/downbubble/info.json
index e454726124..77cdd44ee0 100644
--- a/keyboards/flehrad/downbubble/info.json
+++ b/keyboards/flehrad/downbubble/info.json
@@ -7,6 +7,11 @@
     "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": {
diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h
index 587cf8f15c..c04d29e83b 100644
--- a/keyboards/flehrad/numbrero/config.h
+++ b/keyboards/flehrad/numbrero/config.h
@@ -1,13 +1,5 @@
 #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
 
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/snagpad/config.h b/keyboards/flehrad/snagpad/config.h
index 4b3eb4b53e..56d04557a7 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
 
diff --git a/keyboards/flehrad/snagpad/info.json b/keyboards/flehrad/snagpad/info.json
index 74f54c8f55..439b1bba27 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"],
diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h
index 374993cd17..bd178662c5 100644
--- a/keyboards/flehrad/tradestation/config.h
+++ b/keyboards/flehrad/tradestation/config.h
@@ -15,14 +15,6 @@
 
 #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
 
diff --git a/keyboards/flehrad/tradestation/info.json b/keyboards/flehrad/tradestation/info.json
index 6d4d7c17b5..e720f03c02 100644
--- a/keyboards/flehrad/tradestation/info.json
+++ b/keyboards/flehrad/tradestation/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h
index 36d169b5ae..fe496a65ed 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 */
diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json
index 72c744987f..2459612958 100644
--- a/keyboards/fleuron/info.json
+++ b/keyboards/fleuron/info.json
@@ -7,6 +7,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/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..c0ff6682a9 100644
--- a/keyboards/flx/lodestone/info.json
+++ b/keyboards/flx/lodestone/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h
index f0c8fe016a..fe61b1ada8 100644
--- a/keyboards/flx/virgo/config.h
+++ b/keyboards/flx/virgo/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 { 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
diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json
index 3464c98976..213f439287 100644
--- a/keyboards/flx/virgo/info.json
+++ b/keyboards/flx/virgo/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/flxlb/zplit/config.h b/keyboards/flxlb/zplit/config.h
index 83dcb4fe42..52d687fc10 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
diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json
index 2cfb64b793..29689aa5fe 100644
--- a/keyboards/flxlb/zplit/info.json
+++ b/keyboards/flxlb/zplit/info.json
@@ -8,6 +8,11 @@
         "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"}
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/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/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/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..1d69f62e70 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
diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json
index e2aa377324..19215647ab 100644
--- a/keyboards/fortitude60/rev1/info.json
+++ b/keyboards/fortitude60/rev1/info.json
@@ -8,6 +8,11 @@
     "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
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..2ae5d9b328 100644
--- a/keyboards/foxlab/key65/hotswap/config.h
+++ b/keyboards/foxlab/key65/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 { 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
diff --git a/keyboards/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json
index 712897a7f3..427f7e7653 100644
--- a/keyboards/foxlab/key65/hotswap/info.json
+++ b/keyboards/foxlab/key65/hotswap/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h
index 159e0cff79..48e6e2484e 100644
--- a/keyboards/foxlab/key65/universal/config.h
+++ b/keyboards/foxlab/key65/universal/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, 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
diff --git a/keyboards/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/info.json
index a886275ff5..2c1b9fd09a 100644
--- a/keyboards/foxlab/key65/universal/info.json
+++ b/keyboards/foxlab/key65/universal/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h
index ee55e167d6..6176399052 100644
--- a/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/keyboards/foxlab/leaf60/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 { 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
diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json
index 43f287ebca..f69a16c100 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,
diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h
index d856375a5d..9d4ebe73a2 100644
--- a/keyboards/foxlab/leaf60/universal/config.h
+++ b/keyboards/foxlab/leaf60/universal/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, 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
diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json
index c782a6e50f..f8173b5b3e 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
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..bc37ea152b 100644
--- a/keyboards/foxlab/time80/info.json
+++ b/keyboards/foxlab/time80/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..9431d13f2e 100644
--- a/keyboards/foxlab/time_re/hotswap/config.h
+++ b/keyboards/foxlab/time_re/hotswap/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 { 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
diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json
index e955aaf4da..056700c31e 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"
     },
diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h
index 9a8820cfd9..9431d13f2e 100644
--- a/keyboards/foxlab/time_re/universal/config.h
+++ b/keyboards/foxlab/time_re/universal/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 { 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
diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json
index e955aaf4da..056700c31e 100644
--- a/keyboards/foxlab/time_re/universal/info.json
+++ b/keyboards/foxlab/time_re/universal/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"
     },
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/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/fractal/config.h b/keyboards/fractal/config.h
index 31c7dd512f..b44dfaac52 100755
--- a/keyboards/fractal/config.h
+++ b/keyboards/fractal/config.h
@@ -1,14 +1,5 @@
 #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
 
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json
index 4b98a751e4..a8d41c884a 100644
--- a/keyboards/fractal/info.json
+++ b/keyboards/fractal/info.json
@@ -8,6 +8,11 @@
     "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"],
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/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/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/ft/mars65/config.h b/keyboards/ft/mars65/config.h
index 53f33428df..abc2e5cea2 100644
--- a/keyboards/ft/mars65/config.h
+++ b/keyboards/ft/mars65/config.h
@@ -3,22 +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
diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json
index 1d1dd840d9..2820016fda 100644
--- a/keyboards/ft/mars65/info.json
+++ b/keyboards/ft/mars65/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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..e5fb19a64d 100644
--- a/keyboards/ft/mars80/info.json
+++ b/keyboards/ft/mars80/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/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..8dd0f575c7 100644
--- a/keyboards/function96/v2/info.json
+++ b/keyboards/function96/v2/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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/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..f7e36e63eb 100644
--- a/keyboards/gami_studio/lex60/config.h
+++ b/keyboards/gami_studio/lex60/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 {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
diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json
index 8c1d730787..62ac3b40bf 100644
--- a/keyboards/gami_studio/lex60/info.json
+++ b/keyboards/gami_studio/lex60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0160",
         "device_version": "0.0.1"
     },
+    "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/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..84c54c9e2e 100644
--- a/keyboards/gboards/butterstick/sten.h
+++ b/keyboards/gboards/butterstick/sten.h
@@ -5,9 +5,10 @@
 //
 // Amen.
 
+#pragma once
+
 #include QMK_KEYBOARD_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..5b2da811d8 100644
--- a/keyboards/gboards/engine/engine.h
+++ b/keyboards/gboards/engine/engine.h
@@ -10,9 +10,8 @@
         crap is removed where possible
 */
 
-#include QMK_KEYBOARD_H
 #pragma once
-#include "keymap.h"
+#include QMK_KEYBOARD_H
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index 163b76db19..8414985841 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
-                }
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 0.5},
+                {"x": 2, "y": 0.25},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0.75},
+                {"x": 5, "y": 1.5},
+
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 0.75},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0.25},
+                {"x": 11, "y": 0.5},
+                {"x": 12, "y": 1}
             ]
         }
     }
diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h
index 547ea09fdd..e166ba37d2 100644
--- a/keyboards/gboards/g/engine.h
+++ b/keyboards/gboards/g/engine.h
@@ -10,9 +10,9 @@
         crap is removed where possible
 */
 
-#include QMK_KEYBOARD_H
 #pragma once
-#include "keymap.h"
+
+#include QMK_KEYBOARD_H
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
index 320c49514c..05d518efac 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 "mousekey.h"
-#include "keymap.h"
 #include "keymap_steno.h"
 #include "wait.h"
 
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..97d2c078fe 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1319",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "D2", "D3"],
+        "rows": ["B0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "debounce": 3,
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..fe6292d80f 100644
--- a/keyboards/generic_panda/panda65_01/info.json
+++ b/keyboards/generic_panda/panda65_01/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/generic_panda/panda65_01/panda65_01.h b/keyboards/generic_panda/panda65_01/panda65_01.h
index ced6e9b196..0a4de225ab 100644
--- a/keyboards/generic_panda/panda65_01/panda65_01.h
+++ b/keyboards/generic_panda/panda65_01/panda65_01.h
@@ -47,7 +47,7 @@
     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 },  \
+    { 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 }, \
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/info.json b/keyboards/genone/eclipse_65/info.json
index b17bc2bf68..ad20ba2837 100644
--- a/keyboards/genone/eclipse_65/info.json
+++ b/keyboards/genone/eclipse_65/info.json
@@ -8,6 +8,11 @@
     "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"],
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/info.json b/keyboards/genone/g1_65/info.json
index da5a1df03a..2e02a77ff1 100644
--- a/keyboards/genone/g1_65/info.json
+++ b/keyboards/genone/g1_65/info.json
@@ -8,6 +8,11 @@
     "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"],
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/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/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json
index 35b52cb9c4..8963434bd9 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": {
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..27b1d36847 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": {
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/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/satan/config.h b/keyboards/gh60/satan/config.h
index ce76bc8233..3e9a6d3a1c 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 */
diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json
index 88a09cb3f6..9a3b190d54 100644
--- a/keyboards/gh60/satan/info.json
+++ b/keyboards/gh60/satan/info.json
@@ -8,6 +8,11 @@
     "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
diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h
index a7d7231e25..5382607589 100644
--- a/keyboards/gh60/v1p3/config.h
+++ b/keyboards/gh60/v1p3/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 { 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
diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json
index 4806535fd0..648a98e37c 100644
--- a/keyboards/gh60/v1p3/info.json
+++ b/keyboards/gh60/v1p3/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h
index 5befa284fa..b44dfaac52 100644
--- a/keyboards/gh80_3000/config.h
+++ b/keyboards/gh80_3000/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/gh80_3000/info.json b/keyboards/gh80_3000/info.json
index b03ea8f6a3..abc9c14051 100644
--- a/keyboards/gh80_3000/info.json
+++ b/keyboards/gh80_3000/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h
index 2853b095cc..ea09e835d0 100644
--- a/keyboards/ghs/rar/config.h
+++ b/keyboards/ghs/rar/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, 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
diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json
index 1a8b534e56..b97ee064fd 100644
--- a/keyboards/ghs/rar/info.json
+++ b/keyboards/ghs/rar/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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 01e84b4cdd..1b2a8bdf5b 100644
--- a/keyboards/giabalanai/config.h
+++ b/keyboards/giabalanai/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, 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:
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
index 30bd26159f..31c0c3366d 100644
--- a/keyboards/giabalanai/info.json
+++ b/keyboards/giabalanai/info.json
@@ -8,6 +8,11 @@
         "pid": "0xF4B0",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
+        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": []
     },
@@ -19,6 +24,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/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/info.json b/keyboards/gizmo_engineering/gk6/info.json
index a8c0e5b05d..f3169e3c0d 100644
--- a/keyboards/gizmo_engineering/gk6/info.json
+++ b/keyboards/gizmo_engineering/gk6/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "30.3.1"
     },
+    "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": {
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index 9589c7887d..036340f2fd 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/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, 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
diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json
index ca200a1485..4719f1ee94 100644
--- a/keyboards/gkeyboard/gkb_m16/info.json
+++ b/keyboards/gkeyboard/gkb_m16/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4201",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D4", "D5", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json
index 76e6e89925..0ece27735d 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5045",
         "device_version": "0.0.1"
     },
+    "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/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..af52b203dc 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p65/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x504A",
         "device_version": "0.0.1"
     },
+    "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/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..5a67f0b74c 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x504B",
         "device_version": "0.0.1"
     },
+    "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/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..22678f64a1 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x505A",
         "device_version": "0.0.1"
     },
+    "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/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/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
index 6aed1d6e18..3df15d71f2 100644
--- a/keyboards/gmmk/pro/pro.c
+++ b/keyboards/gmmk/pro/pro.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 "pro.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
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..7e66ad5043 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
+    "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/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 48181ec488..082f28a774 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
+    "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/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..0a20c97d2e 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
+    "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/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index c37ccd53df..e3cb707c48 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
+    "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/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/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..ac7d8a0ce7 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"
     },
diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h
index f660448b46..86fc4cef7f 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
 
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
index dc017f23c4..d03cbc899b 100644
--- a/keyboards/gopolar/gg86/info.json
+++ b/keyboards/gopolar/gg86/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "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": {
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/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/info.json b/keyboards/gowla/info.json
index 8393d1c82d..b9225b0cf0 100644
--- a/keyboards/gowla/info.json
+++ b/keyboards/gowla/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h
index 479ca4c744..70ee32e0a3 100644
--- a/keyboards/gray_studio/aero75/config.h
+++ b/keyboards/gray_studio/aero75/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 { 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
diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json
index 37376a90e9..aaf8cf8dfd 100644
--- a/keyboards/gray_studio/aero75/info.json
+++ b/keyboards/gray_studio/aero75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3075",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/gray_studio/apollo80/config.h
index 8d360498a5..ceab86fb29 100644
--- a/keyboards/gray_studio/apollo80/config.h
+++ b/keyboards/gray_studio/apollo80/config.h
@@ -16,21 +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
diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json
index 2f090ef342..5fc332b465 100644
--- a/keyboards/gray_studio/apollo80/info.json
+++ b/keyboards/gray_studio/apollo80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3001",
         "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",
         "on_state": 0
diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h
index 64b58911e3..ee5248471a 100644
--- a/keyboards/gray_studio/cod67/config.h
+++ b/keyboards/gray_studio/cod67/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, 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
diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json
index 2f8a81d08e..06de4b4f4b 100644
--- a/keyboards/gray_studio/cod67/info.json
+++ b/keyboards/gray_studio/cod67/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1000",
     "device_version": "0.0.1"
   },
+  "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/info.json b/keyboards/gray_studio/hb85/info.json
index a8b7641a0b..e49b1667c5 100644
--- a/keyboards/gray_studio/hb85/info.json
+++ b/keyboards/gray_studio/hb85/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h
index 17a91e8e47..1b3e39536f 100644
--- a/keyboards/gray_studio/space65/config.h
+++ b/keyboards/gray_studio/space65/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, 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
diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json
index 0689443af5..92eb084b56 100644
--- a/keyboards/gray_studio/space65/info.json
+++ b/keyboards/gray_studio/space65/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h
index 0cd753963c..089bb27b17 100644
--- a/keyboards/gray_studio/space65r3/config.h
+++ b/keyboards/gray_studio/space65r3/config.h
@@ -2,23 +2,6 @@
 // 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
diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json
index b514a2886b..c2eca2b769 100644
--- a/keyboards/gray_studio/space65r3/info.json
+++ b/keyboards/gray_studio/space65r3/info.json
@@ -8,6 +8,11 @@
         "pid":"0x3003",
         "device_version": "0.0.3",
     },
+    "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"],
diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h
index cad954709b..1934bc77ad 100644
--- a/keyboards/gray_studio/think65/hotswap/config.h
+++ b/keyboards/gray_studio/think65/hotswap/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 { 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
diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json
index 1ec54ad748..ff21f224f4 100644
--- a/keyboards/gray_studio/think65/hotswap/info.json
+++ b/keyboards/gray_studio/think65/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4001",
         "device_version": "0.0.1"
     },
+    "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",
diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h
index b6e0419aa1..1934bc77ad 100644
--- a/keyboards/gray_studio/think65/solder/config.h
+++ b/keyboards/gray_studio/think65/solder/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)
- *
- */
- //                        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
diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/info.json
index 5374b4619d..c16f665209 100644
--- a/keyboards/gray_studio/think65/solder/info.json
+++ b/keyboards/gray_studio/think65/solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4000",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h
index a5a0733063..38cde33eec 100644
--- a/keyboards/grid600/press/config.h
+++ b/keyboards/grid600/press/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 }
-#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
diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json
index 6fb7c8d5b0..0e0aaff476 100644
--- a/keyboards/grid600/press/info.json
+++ b/keyboards/grid600/press/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7539",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6"],
+        "rows": ["F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/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/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..8f2d8bbc54 100644
--- a/keyboards/h0oni/hotduck/config.h
+++ b/keyboards/h0oni/hotduck/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 { 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
  */
diff --git a/keyboards/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/info.json
index 6ca8cfcde7..cb1147aae6 100644
--- a/keyboards/h0oni/hotduck/info.json
+++ b/keyboards/h0oni/hotduck/info.json
@@ -8,6 +8,11 @@
         "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",
     "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..d897f2840d 100644
--- a/keyboards/hadron/ver2/config.h
+++ b/keyboards/hadron/ver2/config.h
@@ -16,10 +16,6 @@ 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
 
diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json
index 23af3e77ef..0c4d8c6820 100644
--- a/keyboards/hadron/ver2/info.json
+++ b/keyboards/hadron/ver2/info.json
@@ -2,6 +2,11 @@
     "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",
     "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..69aede865f 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
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
index 2fd5bda881..dbe98c593c 100644
--- a/keyboards/hadron/ver3/info.json
+++ b/keyboards/hadron/ver3/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "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"}
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/halokeys/elemental75/config.h b/keyboards/halokeys/elemental75/config.h
index 0ecdf933b0..fd3d1d5b67 100644
--- a/keyboards/halokeys/elemental75/config.h
+++ b/keyboards/halokeys/elemental75/config.h
@@ -15,10 +15,6 @@
   */
 #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
diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json
index 191b105542..89c693a7ac 100644
--- a/keyboards/halokeys/elemental75/info.json
+++ b/keyboards/halokeys/elemental75/info.json
@@ -8,6 +8,11 @@
         "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"}
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/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/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/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/config.h b/keyboards/handwired/2x5keypad/config.h
index 10e2265749..4b1dc39862 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
 
diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json
index 7267d48672..3679eca918 100644
--- a/keyboards/handwired/2x5keypad/info.json
+++ b/keyboards/handwired/2x5keypad/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..dd04753084 100644
--- a/keyboards/handwired/3dp660/info.json
+++ b/keyboards/handwired/3dp660/info.json
@@ -8,6 +8,11 @@
         "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": {
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..e8e7ab9241 100644
--- a/keyboards/handwired/412_64/info.json
+++ b/keyboards/handwired/412_64/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..fec35620a2 100644
--- a/keyboards/handwired/6key/info.json
+++ b/keyboards/handwired/6key/info.json
@@ -8,6 +8,11 @@
       "pid": "0x0007",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["D3", "D2", "D1"],
+      "rows": ["B4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index 0dc61becd3..e93fe5511f 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -17,14 +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
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
index 1d1aac48ad..d081a75d3e 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -8,6 +8,11 @@
       "pid": "0x0037",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["B0", "B1", "B2"],
+      "rows": ["B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
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/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/info.json b/keyboards/handwired/alcor_dactyl/info.json
index 7bdde8550c..a09727ae0e 100644
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -36,94 +36,94 @@
     "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/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..b7e08c2b24 100644
--- a/keyboards/handwired/angel/config.h
+++ b/keyboards/handwired/angel/config.h
@@ -17,17 +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 { 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
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/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..76aff146f2 100644
--- a/keyboards/handwired/aplx2/info.json
+++ b/keyboards/handwired/aplx2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0030",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "D3"],
+        "rows": ["D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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/arrow_pad/arrow_pad.h b/keyboards/handwired/arrow_pad/arrow_pad.h
index 2d677beb5c..489dae2a4e 100644
--- a/keyboards/handwired/arrow_pad/arrow_pad.h
+++ b/keyboards/handwired/arrow_pad/arrow_pad.h
@@ -1,13 +1,6 @@
 #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
 
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..91690cf83e 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"
   },
diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h
index 69a24d9038..9876e14fd3 100644
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/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, 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 */
diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json
index 2ef04b31f4..4b12ba33d4 100644
--- a/keyboards/handwired/atreus50/info.json
+++ b/keyboards/handwired/atreus50/info.json
@@ -8,6 +8,11 @@
     "pid": "0x040D",
     "device_version": "0.0.1"
   },
+  "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/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..89300e2398 100644
--- a/keyboards/handwired/axon/info.json
+++ b/keyboards/handwired/axon/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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/config.h b/keyboards/handwired/bolek/config.h
index ec81b3337a..02f5f29c3f 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 */
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..f29633d429 100644
--- a/keyboards/handwired/boss566y/redragon_vara/info.json
+++ b/keyboards/handwired/boss566y/redragon_vara/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 9b7c48da75..088f03a379 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
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
index a085da297f..aad4662d72 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -8,6 +8,11 @@
         "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]
     },
@@ -15,6 +20,11 @@
         "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/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..4d316b4397 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",
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..e3938ebc42 100644
--- a/keyboards/handwired/cans12er/info.json
+++ b/keyboards/handwired/cans12er/info.json
@@ -8,6 +8,11 @@
         "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": {
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/config.h b/keyboards/handwired/chiron/config.h
index d881fecbaa..5a01accc73 100644
--- a/keyboards/handwired/chiron/config.h
+++ b/keyboards/handwired/chiron/config.h
@@ -17,18 +17,9 @@ 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
 
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
index b1590d8ded..e737e8428c 100644
--- a/keyboards/handwired/chiron/info.json
+++ b/keyboards/handwired/chiron/info.json
@@ -8,6 +8,11 @@
         "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
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/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..661f4edb2a 100644
--- a/keyboards/handwired/ck4x4/info.json
+++ b/keyboards/handwired/ck4x4/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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/rev7/config.h b/keyboards/handwired/co60/rev7/config.h
index 6647698dfb..d31fe37783 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 */
diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json
index 67d54fb0fb..eecfabfca3 100644
--- a/keyboards/handwired/co60/rev7/info.json
+++ b/keyboards/handwired/co60/rev7/info.json
@@ -3,6 +3,11 @@
     "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
diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h
index 4e981b4428..36417b4a7b 100644
--- a/keyboards/handwired/colorlice/config.h
+++ b/keyboards/handwired/colorlice/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, 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 */
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json
index 9a884c6718..66e5836a15 100644
--- a/keyboards/handwired/colorlice/info.json
+++ b/keyboards/handwired/colorlice/info.json
@@ -8,6 +8,11 @@
       "pid": "0x0302",
       "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h
index 2eb9a4cd67..29473a1720 100644
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -16,14 +16,8 @@
 
 #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..86a5a1326c 100644
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3632",
         "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",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h
index 59aa11f675..800ed9d19a 100644
--- a/keyboards/handwired/consolekeyboard/18key/config.h
+++ b/keyboards/handwired/consolekeyboard/18key/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 { 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
diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json
index 9fb64bcf21..a7c04ae242 100644
--- a/keyboards/handwired/consolekeyboard/18key/info.json
+++ b/keyboards/handwired/consolekeyboard/18key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3332",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/handwired/consolekeyboard/20key/config.h
index 7d8f67d24e..800ed9d19a 100644
--- a/keyboards/handwired/consolekeyboard/20key/config.h
+++ b/keyboards/handwired/consolekeyboard/20key/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 { 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
diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json
index 085815f58a..4d99a74d5b 100644
--- a/keyboards/handwired/consolekeyboard/20key/info.json
+++ b/keyboards/handwired/consolekeyboard/20key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3432",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/handwired/consolekeyboard/27key/config.h
index 59966bc857..800ed9d19a 100644
--- a/keyboards/handwired/consolekeyboard/27key/config.h
+++ b/keyboards/handwired/consolekeyboard/27key/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 { 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
diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json
index 37124c0196..0f17682dc6 100644
--- a/keyboards/handwired/consolekeyboard/27key/info.json
+++ b/keyboards/handwired/consolekeyboard/27key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3433",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
index ba82037cf4..305448feec 100644
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ b/keyboards/handwired/consolekeyboard/30key/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 { 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
diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json
index e8f51b2c79..0c53a6fa9c 100644
--- a/keyboards/handwired/consolekeyboard/30key/info.json
+++ b/keyboards/handwired/consolekeyboard/30key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3433",
         "device_version": "0.0.1"
     },
+    "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..be2926baf4 100644
--- a/keyboards/handwired/croxsplit44/config.h
+++ b/keyboards/handwired/croxsplit44/config.h
@@ -17,12 +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
diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json
index 7e5eaca944..fc8279c820 100644
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -8,55 +8,67 @@
         "pid": "0x6146",
         "device_version": "0.0.1"
     },
+    "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/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..befd720cc3 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
 
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json
index e14b964e21..d83be6176f 100644
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/info.json
@@ -8,6 +8,11 @@
         "pid": "0x432A",
         "device_version": "0.0.1"
     },
+    "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/d48/config.h b/keyboards/handwired/d48/config.h
index 23dbfa831c..c793057a92 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -1,14 +1,5 @@
 #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
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json
index c607f21937..08c9e6a1f8 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "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/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/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/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
index 33f7c9769e..ddae773bad 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
@@ -16,13 +16,6 @@ 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
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
index 7302ced47e..f99eba6502 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3536",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "ROW2COL",
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h
index 8cb68765ba..fbff478bed 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/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 { 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..0f47f25afa 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3435",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h
index 64844dd7bf..fbff478bed 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/config.h
@@ -18,14 +18,6 @@ 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..7f89885c89 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3436",
         "device_version": "0.0.1"
     },
+    "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_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
index 64844dd7bf..fbff478bed 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
@@ -18,14 +18,6 @@ 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..93f4ec5bc1 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3436",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h
index 5abd1a68a2..fbff478bed 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/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
-
 // 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..532a1746d0 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3536",
         "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/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/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/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..9635c47123 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"
     },
diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h
index 38e4b1ab4b..fbff478bed 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/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 { 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..6e3b62e218 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3537",
         "device_version": "0.0.1"
     },
+    "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/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..85aee07d82 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
@@ -16,13 +16,6 @@
 
 #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..32c81a5f93 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
@@ -1,4 +1,9 @@
 {
+    "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_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
index ebf41bd292..fbff478bed 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/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 { 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..b2da174b5a 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
index ebf41bd292..fbff478bed 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/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 { 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..190acc1848 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h
index 1cbf1f6545..fbff478bed 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x7/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, 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..5f774715a0 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
index dd38c6af7d..c7f20b1103 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
@@ -1,39 +1,5 @@
 #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
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index d26f06c45b..4e86c8b3a6 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -10,6 +10,11 @@
         "pid": "0x3632",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "enabled": true,
         "soft_serial_pin": "D0"
diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h
index dc6f53955c..00548e339c 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
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..48202d90cd 100644
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ b/keyboards/handwired/dactyl_promicro/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/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/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/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/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/info.json b/keyboards/handwired/ddg_56/info.json
index f7253711e4..a6407d262d 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"},
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/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/info.json b/keyboards/handwired/elrgo_s/info.json
index 33e3c7566c..ba850bb5d4 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"
     },
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/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/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/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/info.json b/keyboards/handwired/floorboard/info.json
index 226041e40d..b56a6309fe 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",
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/info.json b/keyboards/handwired/frankie_macropad/info.json
index 24fb55f5da..3416222269 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"},
diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h
index 56a55afd7c..16acada5e7 100644
--- a/keyboards/handwired/freoduo/config.h
+++ b/keyboards/handwired/freoduo/config.h
@@ -15,15 +15,8 @@ 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)
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
index 12024a8c90..aaa5a77193 100644
--- a/keyboards/handwired/freoduo/info.json
+++ b/keyboards/handwired/freoduo/info.json
@@ -8,6 +8,11 @@
     "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"
 },
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/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/info.json b/keyboards/handwired/gamenum/info.json
index daf77d1784..e35fb4a4e5 100644
--- a/keyboards/handwired/gamenum/info.json
+++ b/keyboards/handwired/gamenum/info.json
@@ -8,6 +8,11 @@
     "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": {
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/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..ced4a9b4e5 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/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
-
 #define RGB_DI_PIN D4
 #ifdef RGB_DI_PIN
 	#define RGBLED_NUM 6
diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json
index 2ad37b00c6..a839fe711b 100644
--- a/keyboards/handwired/heisenberg/info.json
+++ b/keyboards/handwired/heisenberg/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/hexon38/config.h b/keyboards/handwired/hexon38/config.h
index 5a75dff220..599f001661 100644
--- a/keyboards/handwired/hexon38/config.h
+++ b/keyboards/handwired/hexon38/config.h
@@ -2,14 +2,6 @@
 
 #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
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..875f441b12 100644
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/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, 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
diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json
index 116591fddf..e18dc6c09d 100644
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.2"
     },
+    "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"}
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/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..c964590d80 100644
--- a/keyboards/handwired/hnah40rgb/config.h
+++ b/keyboards/handwired/hnah40rgb/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, 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
diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json
index ab8ec811c3..743a0bbecd 100644
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "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 +53,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/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/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/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/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/jopr/config.h b/keyboards/handwired/jopr/config.h
index 7078ebb31d..00bbcf507d 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 */
 
diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json
index f9bb248aee..3e0ce0ab5f 100644
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1000",
     "device_version": "0.0.1"
   },
+  "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..f7cfe21d00 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
diff --git a/keyboards/handwired/jotanck/config.h b/keyboards/handwired/jotanck/config.h
index f3e53c98ce..81fc446b3a 100644
--- a/keyboards/handwired/jotanck/config.h
+++ b/keyboards/handwired/jotanck/config.h
@@ -1,18 +1,10 @@
 #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 }
-
 /* 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 57e41a0f8b..0a3c9a9e83 100644
--- a/keyboards/handwired/jotanck/info.json
+++ b/keyboards/handwired/jotanck/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", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x12"],
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..2d01be7b48 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,
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/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/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..ceac0277d0 100644
--- a/keyboards/handwired/k_numpad17/info.json
+++ b/keyboards/handwired/k_numpad17/info.json
@@ -8,6 +8,11 @@
         "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"],
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/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/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/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..c265fe3cfe 100644
--- a/keyboards/handwired/leftynumpad/info.json
+++ b/keyboards/handwired/leftynumpad/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index f99c65303c..d960bc9b2a 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -2,13 +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
 
diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json
index be3541c4fd..f5cecc75e5 100644
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/info.json
@@ -8,6 +8,11 @@
         "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
     },
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..d5eeb65eb0 100644
--- a/keyboards/handwired/m40/5x5_macropad/info.json
+++ b/keyboards/handwired/m40/5x5_macropad/info.json
@@ -8,6 +8,11 @@
     	"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": {
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index 4063b253b6..a3de56d076 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -17,20 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used 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
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..e14cb41fd3 100644
--- a/keyboards/handwired/macroboard/f401/info.json
+++ b/keyboards/handwired/macroboard/f401/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F401"
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..a912b9f141 100644
--- a/keyboards/handwired/macroboard/f411/info.json
+++ b/keyboards/handwired/macroboard/f411/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
+        "rows": ["A15", "B3", "B4", "B5", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411"
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/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/marauder/config.h b/keyboards/handwired/marauder/config.h
index 608411ef31..1d6272b3d4 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -16,20 +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, 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
diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json
index 16fdc30e26..059cc1dd33 100644
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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/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..6d751780f6 100644
--- a/keyboards/handwired/mechboards_micropad/info.json
+++ b/keyboards/handwired/mechboards_micropad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B1", "F7"],
+        "rows": ["B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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/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/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/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..15b8d4bc69 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}
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..20a10a7e83 100644
--- a/keyboards/handwired/nicekey/info.json
+++ b/keyboards/handwired/nicekey/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6464",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6"],
+        "rows": ["B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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/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..be6e3a1764 100644
--- a/keyboards/handwired/novem/info.json
+++ b/keyboards/handwired/novem/info.json
@@ -8,6 +8,11 @@
         "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": {
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..5d796312cc 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"
     },
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..fb3a11e400 100644
--- a/keyboards/handwired/numpad20/info.json
+++ b/keyboards/handwired/numpad20/info.json
@@ -8,6 +8,11 @@
     "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": {
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..6bec9fa163 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"},
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..f22616b338 100644
--- a/keyboards/handwired/oem_ansi_fullsize/info.json
+++ b/keyboards/handwired/oem_ansi_fullsize/info.json
@@ -8,6 +8,11 @@
         "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"],
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/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.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/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..860d0441a4 100644
--- a/keyboards/handwired/ortho_brass/info.json
+++ b/keyboards/handwired/ortho_brass/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h
index a3693706d4..ced8197ddb 100644
--- a/keyboards/handwired/p65rgb/config.h
+++ b/keyboards/handwired/p65rgb/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 { 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
diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json
index 316fa0f61d..82e433527a 100644
--- a/keyboards/handwired/p65rgb/info.json
+++ b/keyboards/handwired/p65rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x75B4",
         "device_version": "0.0.1"
     },
+    "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/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/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/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/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/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_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h
index 935d12bedb..1b683fdce9 100644
--- a/keyboards/handwired/prime_exl_plus/config.h
+++ b/keyboards/handwired/prime_exl_plus/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 { 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
diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json
index 0114de4c26..0d6d19bf5a 100644
--- a/keyboards/handwired/prime_exl_plus/info.json
+++ b/keyboards/handwired/prime_exl_plus/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6579",
     "device_version": "0.0.1"
   },
+  "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..f8d36fe894 100644
--- a/keyboards/handwired/prkl30/feather/config.h
+++ b/keyboards/handwired/prkl30/feather/config.h
@@ -15,12 +15,6 @@
  */
 #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
diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json
index 8078ee0481..5a3e21d8f1 100644
--- a/keyboards/handwired/prkl30/feather/info.json
+++ b/keyboards/handwired/prkl30/feather/info.json
@@ -1,4 +1,9 @@
 {
+    "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/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h
index c3767088c7..f8d36fe894 100644
--- a/keyboards/handwired/prkl30/promicro/config.h
+++ b/keyboards/handwired/prkl30/promicro/config.h
@@ -15,12 +15,6 @@
  */
 #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
diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/info.json
index a7ca847765..ddec0f8eeb 100644
--- a/keyboards/handwired/prkl30/promicro/info.json
+++ b/keyboards/handwired/prkl30/promicro/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2"}
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/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..d728ba1a73 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},
+        {"x":0, "y":0.75},
+        {"x":1, "y":0.25},
+        {"x":2, "y":0},
+        {"x":3, "y":0.35},
+        {"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},
+        {"x":10, "y":0.45},
+        {"x":11, "y":0.35},
+        {"x":12, "y":0},
+        {"x":13, "y":0.25},
+        {"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},
+        {"x":0, "y":1.75},
+        {"x":1, "y":1.25},
+        {"x":2, "y":1},
+        {"x":3, "y":1.35},
+        {"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},
+        {"x":10, "y":1.45},
+        {"x":11, "y":1.35},
+        {"x":12, "y":1},
+        {"x":13, "y":1.25},
+        {"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},
+        {"x":0, "y":2.75},
+        {"x":1, "y":2.25},
+        {"x":2, "y":2},
+        {"x":3, "y":2.35},
+        {"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},
+        {"x":10, "y":2.45},
+        {"x":11, "y":2.35},
+        {"x":12, "y":2},
+        {"x":13, "y":2.25},
+        {"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},
+        {"x":3, "y":3.35},
+        {"x":4, "y":3.45},
+        {"x":5, "y":3.65},
+        {"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}
+        {"x":8, "y":3.95},
+        {"x":9, "y":3.65},
+        {"x":10, "y":3.45},
+        {"x":11, "y":3.35}
       ]
     }
   }
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/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/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..2d65522a5d 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0C60",
     "device_version": "1.0.0"
   },
+  "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"
   },
diff --git a/keyboards/handwired/qc60/proto/config.h b/keyboards/handwired/qc60/proto/config.h
index 2e7d2f3b9b..209a5ea30d 100644
--- a/keyboards/handwired/qc60/proto/config.h
+++ b/keyboards/handwired/qc60/proto/config.h
@@ -1,11 +1,5 @@
 #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..9440cda961 100644
--- a/keyboards/handwired/reclined/info.json
+++ b/keyboards/handwired/reclined/info.json
@@ -26,54 +26,54 @@
       "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 }
+        { "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": "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": "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": "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 }
       ]
     }
   }
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/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..60cfdb9d3b 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",
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..3a4c78b948 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",
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..4269af4173 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",
diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h
index f0b09a2a7f..c346b07623 100644
--- a/keyboards/handwired/selene/config.h
+++ b/keyboards/handwired/selene/config.h
@@ -16,15 +16,8 @@
 
 #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..2ce960ed20 100644
--- a/keyboards/handwired/selene/info.json
+++ b/keyboards/handwired/selene/info.json
@@ -8,6 +8,11 @@
   	"pid": "0x0001",
   	"device_version": "0.0.1"
   },
+  "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/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..53ee2f7ee5 100644
--- a/keyboards/handwired/sick68/info.json
+++ b/keyboards/handwired/sick68/info.json
@@ -8,6 +8,11 @@
         "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"],
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..8ba6353c99 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",
diff --git a/keyboards/handwired/skakunm_dactyl/config.h b/keyboards/handwired/skakunm_dactyl/config.h
index 2e01a71d28..3e57cd2e76 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
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/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/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..908a390c33 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"},
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..9a1e829e46 100644
--- a/keyboards/handwired/space_oddity/config.h
+++ b/keyboards/handwired/space_oddity/config.h
@@ -7,13 +7,6 @@
 #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
 
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/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/promicro/config.h b/keyboards/handwired/splittest/promicro/config.h
index 45f005222f..f0fd3dfc85 100644
--- a/keyboards/handwired/splittest/promicro/config.h
+++ b/keyboards/handwired/splittest/promicro/config.h
@@ -20,9 +20,6 @@
 // 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 */
diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/info.json
index ecf716ff97..a99bc3ea13 100644
--- a/keyboards/handwired/splittest/promicro/info.json
+++ b/keyboards/handwired/splittest/promicro/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B6"],
+        "rows": ["B3"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D1"
     },
diff --git a/keyboards/handwired/splittest/teensy_2/config.h b/keyboards/handwired/splittest/teensy_2/config.h
index 7b77a5e36b..6b52516807 100644
--- a/keyboards/handwired/splittest/teensy_2/config.h
+++ b/keyboards/handwired/splittest/teensy_2/config.h
@@ -20,9 +20,6 @@
 // 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 */
diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/info.json
index a67cb4e2f2..f6fd6faf33 100644
--- a/keyboards/handwired/splittest/teensy_2/info.json
+++ b/keyboards/handwired/splittest/teensy_2/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["F7"],
+        "rows": ["F5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D1"
     },
diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h
index b52e370419..9885c0737c 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 */
diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json
index ed10d8005b..8e7670c2de 100644
--- a/keyboards/handwired/steamvan/rev1/info.json
+++ b/keyboards/handwired/steamvan/rev1/info.json
@@ -8,6 +8,11 @@
     "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
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/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..7733b642ec 100644
--- a/keyboards/handwired/sticc14/info.json
+++ b/keyboards/handwired/sticc14/info.json
@@ -8,6 +8,11 @@
         "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": {
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..8de67f3706 100644
--- a/keyboards/handwired/swiftrax/astro65/info.json
+++ b/keyboards/handwired/swiftrax/astro65/info.json
@@ -8,6 +8,11 @@
         "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"],
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/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.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..48211c215f 100644
--- a/keyboards/handwired/swiftrax/bumblebee/config.h
+++ b/keyboards/handwired/swiftrax/bumblebee/config.h
@@ -17,14 +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, 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
diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json
index 2147a556c2..ad779c155b 100644
--- a/keyboards/handwired/swiftrax/bumblebee/info.json
+++ b/keyboards/handwired/swiftrax/bumblebee/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE881",
         "device_version": "0.0.1"
     },
+    "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/info.json b/keyboards/handwired/swiftrax/cowfish/info.json
index 4de9d07292..0d725ab8bc 100644
--- a/keyboards/handwired/swiftrax/cowfish/info.json
+++ b/keyboards/handwired/swiftrax/cowfish/info.json
@@ -8,6 +8,11 @@
         "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",
     "layouts": {
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/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json
index 2eef105756..49066b6654 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"}
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/info.json b/keyboards/handwired/swiftrax/digicarpice/info.json
index f311c9606d..7e92b0a59c 100644
--- a/keyboards/handwired/swiftrax/digicarpice/info.json
+++ b/keyboards/handwired/swiftrax/digicarpice/info.json
@@ -8,6 +8,11 @@
         "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": {
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/info.json b/keyboards/handwired/swiftrax/equator/info.json
index 0e58b5569c..697e23d590 100644
--- a/keyboards/handwired/swiftrax/equator/info.json
+++ b/keyboards/handwired/swiftrax/equator/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/handwired/swiftrax/glacier/config.h b/keyboards/handwired/swiftrax/glacier/config.h
index b83d4cc943..cdc4c78084 100644
--- a/keyboards/handwired/swiftrax/glacier/config.h
+++ b/keyboards/handwired/swiftrax/glacier/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, 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
 
diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json
index dc3bae097c..993f4ca040 100644
--- a/keyboards/handwired/swiftrax/glacier/info.json
+++ b/keyboards/handwired/swiftrax/glacier/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE890",
         "device_version": "0.0.1"
     },
+    "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..4ff90591d1 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"}
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/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/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/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/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/walter/config.h b/keyboards/handwired/swiftrax/walter/config.h
index 7bfee265ab..5af5a9ff81 100644
--- a/keyboards/handwired/swiftrax/walter/config.h
+++ b/keyboards/handwired/swiftrax/walter/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 { 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
diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json
index 88da47f36b..0a6fd97837 100644
--- a/keyboards/handwired/swiftrax/walter/info.json
+++ b/keyboards/handwired/swiftrax/walter/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE964",
         "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"}
diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h
index 7c1deda7d5..776749f54a 100644
--- a/keyboards/handwired/symmetry60/config.h
+++ b/keyboards/handwired/symmetry60/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, 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
diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json
index 850ae03b35..6b6019821a 100644
--- a/keyboards/handwired/symmetry60/info.json
+++ b/keyboards/handwired/symmetry60/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "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"],
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/tennie/config.h b/keyboards/handwired/tennie/config.h
index 71a51554f2..b24f5b8c97 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/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, 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
diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json
index f2a8bcc1f9..a6e31cba07 100644
--- a/keyboards/handwired/tennie/info.json
+++ b/keyboards/handwired/tennie/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1313",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["C6", "D4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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/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..a1778c2220 100644
--- a/keyboards/handwired/trackpoint/info.json
+++ b/keyboards/handwired/trackpoint/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5678",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5"],
+        "rows": ["F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "layouts": {
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..971e75680e 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/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 { 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
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index ab4b08c8eb..e0123bb019 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -6,6 +6,11 @@
         "pid": "0x3537",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3",
         "bootmagic": {
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/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
index c52610e9d3..b472107f42 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/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_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
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..7300efd02b 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"}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index d10cb0bd8b..5ca6f5d958 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -18,17 +18,6 @@ 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
 
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..34357594de 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
@@ -1,5 +1,10 @@
 {
     "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",
     "encoder": {
         "rotary": [
             {"pin_a": "A7", "pin_b": "A8"}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 227863aaa5..d562a2a41c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/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_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
 
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..034170e6a3 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
@@ -1,5 +1,10 @@
 {
     "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",
     "encoder": {
         "rotary": [
             {"pin_a": "A13", "pin_b": "A14"}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
index 51ff0d3123..069b6e876c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/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_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
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
index 7f60ae0edc..facf346943 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"}
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..4c71623b24 100644
--- a/keyboards/handwired/traveller/config.h
+++ b/keyboards/handwired/traveller/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, 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
diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json
index ee064ad0cc..9c7270c6de 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "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..e2db822d67 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 */
diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json
index b2ca85264e..f152b8bb5b 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
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/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/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/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h
index c6674b53f7..177ad60ecd 100644
--- a/keyboards/handwired/unk/rev1/config.h
+++ b/keyboards/handwired/unk/rev1/config.h
@@ -20,16 +20,6 @@ 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 */
diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json
index bb6031cfd0..1faa61b706 100644
--- a/keyboards/handwired/unk/rev1/info.json
+++ b/keyboards/handwired/unk/rev1/info.json
@@ -8,8 +8,19 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "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/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/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..744e66d948 100644
--- a/keyboards/handwired/uthol/rev2/config.h
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -17,11 +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
diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json
index 95112123d5..bcefbb4956 100644
--- a/keyboards/handwired/uthol/rev2/info.json
+++ b/keyboards/handwired/uthol/rev2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "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..d7829f2fdc 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
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
index b5d099b27a..34c0a3503a 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "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
index 3e1cbdc72b..6130f7f1b2 100644
--- a/keyboards/handwired/uthol/uthol.h
+++ b/keyboards/handwired/uthol/uthol.h
@@ -19,17 +19,6 @@
 
 #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, \
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/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..6f9fb6cb93 100644
--- a/keyboards/handwired/wabi/info.json
+++ b/keyboards/handwired/wabi/info.json
@@ -8,6 +8,11 @@
         "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": {
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..de084c3c1f 100644
--- a/keyboards/handwired/woodpad/info.json
+++ b/keyboards/handwired/woodpad/info.json
@@ -8,6 +8,11 @@
         "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"],
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..fcfaa31914 100644
--- a/keyboards/handwired/wulkan/info.json
+++ b/keyboards/handwired/wulkan/info.json
@@ -8,6 +8,11 @@
       "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",
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..9910669457 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.
diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json
index c470e72a16..bc310cad07 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": {
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/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..ca385ce6cb 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"
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/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/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/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/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_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/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h
index a03f9066a9..93cfd37632 100644
--- a/keyboards/hfdkb/ac001/config.h
+++ b/keyboards/hfdkb/ac001/config.h
@@ -18,13 +18,6 @@
 
 #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 */
diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json
index 2e1011b7f6..fb4974968b 100644
--- a/keyboards/hfdkb/ac001/info.json
+++ b/keyboards/hfdkb/ac001/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "C4", "C5"],
+        "rows": ["B15"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "WB32FQ95",
     "bootloader": "wb32-dfu",
     "layouts": {
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/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/config.h b/keyboards/hidtech/bastyl/config.h
index 64bd94c007..15f2170a04 100644
--- a/keyboards/hidtech/bastyl/config.h
+++ b/keyboards/hidtech/bastyl/config.h
@@ -18,9 +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
diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
index 26b3d13ddd..dc831abe04 100644
--- a/keyboards/hidtech/bastyl/info.json
+++ b/keyboards/hidtech/bastyl/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/hifumi/config.h b/keyboards/hifumi/config.h
index 4f7e1e89ec..71cc73befd 100644
--- a/keyboards/hifumi/config.h
+++ b/keyboards/hifumi/config.h
@@ -16,21 +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 { 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
diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/info.json
index f345bf7f3c..0bfb7cd27f 100644
--- a/keyboards/hifumi/info.json
+++ b/keyboards/hifumi/info.json
@@ -8,6 +8,11 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6"],
+    "rows": ["D4", "C6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
index 7037db7735..27c2811e68 100644
--- a/keyboards/hineybush/h08_ocelot/config.h
+++ b/keyboards/hineybush/h08_ocelot/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, 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
diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json
index d7e395285b..439b37e379 100644
--- a/keyboards/hineybush/h08_ocelot/info.json
+++ b/keyboards/hineybush/h08_ocelot/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE8E9",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "C7", "D0", "D1"],
+        "rows": ["B4", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/info.json b/keyboards/hineybush/h10/info.json
index e59ba7f3e4..d63c6da200 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
diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h
index ca8f344793..c0365b76e7 100644
--- a/keyboards/hineybush/h60/config.h
+++ b/keyboards/hineybush/h60/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, 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
diff --git a/keyboards/hineybush/h60/info.json b/keyboards/hineybush/h60/info.json
index eece82f5f2..7defbee93c 100644
--- a/keyboards/hineybush/h60/info.json
+++ b/keyboards/hineybush/h60/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
index 925f0498ca..49d4991b06 100644
--- a/keyboards/hineybush/h65/config.h
+++ b/keyboards/hineybush/h65/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, 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
diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json
index e1bebb560c..70ccfc19d3 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
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
index 925f0498ca..49d4991b06 100644
--- a/keyboards/hineybush/h65_hotswap/config.h
+++ b/keyboards/hineybush/h65_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 { 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
diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json
index 9eebb77345..457f09921a 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
diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h
index e8e84f1117..707d202266 100644
--- a/keyboards/hineybush/h660s/config.h
+++ b/keyboards/hineybush/h660s/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, 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
diff --git a/keyboards/hineybush/h660s/info.json b/keyboards/hineybush/h660s/info.json
index d773651ee6..8faaa2f505 100644
--- a/keyboards/hineybush/h660s/info.json
+++ b/keyboards/hineybush/h660s/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h
index 55b920a2b9..45e93b7ebd 100644
--- a/keyboards/hineybush/h75_singa/config.h
+++ b/keyboards/hineybush/h75_singa/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, 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
diff --git a/keyboards/hineybush/h75_singa/info.json b/keyboards/hineybush/h75_singa/info.json
index 94e8d256fd..3114f46d35 100644
--- a/keyboards/hineybush/h75_singa/info.json
+++ b/keyboards/hineybush/h75_singa/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
index f267f09020..652b910feb 100644
--- a/keyboards/hineybush/h87a/config.h
+++ b/keyboards/hineybush/h87a/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 { 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 */
diff --git a/keyboards/hineybush/h87a/info.json b/keyboards/hineybush/h87a/info.json
index db1fd91d13..2baf4c7e5e 100644
--- a/keyboards/hineybush/h87a/info.json
+++ b/keyboards/hineybush/h87a/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h
index 9a75238cb3..3f57906377 100644
--- a/keyboards/hineybush/h88/config.h
+++ b/keyboards/hineybush/h88/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, 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 */
diff --git a/keyboards/hineybush/h88/info.json b/keyboards/hineybush/h88/info.json
index bd362c74b5..acab34777a 100644
--- a/keyboards/hineybush/h88/info.json
+++ b/keyboards/hineybush/h88/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h
index acf19753f5..b44dfaac52 100644
--- a/keyboards/hineybush/hineyg80/config.h
+++ b/keyboards/hineybush/hineyg80/config.h
@@ -1,13 +1,5 @@
 #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
 
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..77d8169cfe 100644
--- a/keyboards/hineybush/physix/config.h
+++ b/keyboards/hineybush/physix/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, 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
diff --git a/keyboards/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json
index b611de62e4..597beceb54 100644
--- a/keyboards/hineybush/physix/info.json
+++ b/keyboards/hineybush/physix/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h
index c11c6431ce..95d44f631d 100644
--- a/keyboards/hineybush/sm68/config.h
+++ b/keyboards/hineybush/sm68/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, 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
diff --git a/keyboards/hineybush/sm68/info.json b/keyboards/hineybush/sm68/info.json
index 642e7b5e07..94765a6a14 100644
--- a/keyboards/hineybush/sm68/info.json
+++ b/keyboards/hineybush/sm68/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/info.json b/keyboards/hnahkb/freyr/info.json
index 7c946bd78a..95f77556a9 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
diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h
index 34c3aafab4..6ca9acf258 100644
--- a/keyboards/hnahkb/stella/config.h
+++ b/keyboards/hnahkb/stella/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
-
 #define RGB_DI_PIN E2
 #define RGBLED_NUM 14
 
diff --git a/keyboards/hnahkb/stella/info.json b/keyboards/hnahkb/stella/info.json
index 593dc47771..31f797445c 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
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index 8436f5df25..6e62054150 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/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, 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
diff --git a/keyboards/hnahkb/vn66/info.json b/keyboards/hnahkb/vn66/info.json
index b35cabd1a1..81a8b81d43 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}
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/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/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/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
index f336f57a52..5b44ceb954 100644
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/info.json
index 4eb4941102..72e71bef6d 100644
--- a/keyboards/horrortroll/caticorn/rev1/solder/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/solder/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
index 9e040808d2..64aebdefe2 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
index 24fae0c08a..cf9df8be98 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
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index fde006a091..d62ef3c41e 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
 
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
index 96168dd67e..ee24a6261f 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7001",
         "device_version": "0.0.1"
     },
+    "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index 07e9591b24..563ce20ad6 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
 
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
index 150973eaf0..edbcaf98de 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5104",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/horrortroll/lemon40/config.h b/keyboards/horrortroll/lemon40/config.h
index e40642946b..93d89532e6 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
 
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
index 40e6f70ccd..327131ab8b 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2434",
         "device_version": "0.0.1"
     },
+    "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/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/hotdox/hotdox.h b/keyboards/hotdox/hotdox.h
index 348ec6b291..3db092d3bd 100644
--- a/keyboards/hotdox/hotdox.h
+++ b/keyboards/hotdox/hotdox.h
@@ -134,7 +134,7 @@ void ergodox_blink_all_leds(void);
     { 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    }, \
+    { 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, KC_NO  }  \
    }
 
diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json
index 70c62212f1..e0f9ed5f26 100644
--- a/keyboards/hotdox76v2/info.json
+++ b/keyboards/hotdox76v2/info.json
@@ -37,187 +37,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/hp69/config.h b/keyboards/hp69/config.h
index d51682491d..7c72c3437a 100644
--- a/keyboards/hp69/config.h
+++ b/keyboards/hp69/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 { 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
diff --git a/keyboards/hp69/info.json b/keyboards/hp69/info.json
index d411fae52b..812cb14cb3 100644
--- a/keyboards/hp69/info.json
+++ b/keyboards/hp69/info.json
@@ -8,6 +8,11 @@
         "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"
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..a8b59352cb 100644
--- a/keyboards/hs60/v1/info.json
+++ b/keyboards/hs60/v1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0257",
     "device_version": "0.0.1"
   },
+  "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/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/hub20/config.h b/keyboards/hub20/config.h
index 41a98ac983..c619b2d24d 100644
--- a/keyboards/hub20/config.h
+++ b/keyboards/hub20/config.h
@@ -18,12 +18,6 @@ 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
 
diff --git a/keyboards/hub20/info.json b/keyboards/hub20/info.json
index 10ec779fdf..a577b70f6b 100644
--- a/keyboards/hub20/info.json
+++ b/keyboards/hub20/info.json
@@ -8,6 +8,11 @@
       "pid": "0x4414",
       "device_version": "0.0.1"
     },
+    "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"},
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/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/config.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
index 37e578dfea..c02ea1f913 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
@@ -18,31 +18,6 @@
 
 #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-// All pins in order from left-to-right, as seen on the keyboard:
-// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10,
-// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible.
-
-// On this keyboard the right-most pin is not used, A10 can be ignored.
-// On this keyboard the pins are ordered in the following way: (top/bottom meaning where the trace is routed on the membranes)
-// top, top, top, top, top, top, top, top, bottom, top, bottom, top, bottom, top, bottom, top, bottom, bottom, top, top, top, top, bottom, bottom
-
-#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, C4, B0, B10, B13, C6, C7, C8, C9 }
-#define MATRIX_ROW_PINS { A7, C5, B1, B12, B14, B15, A8, A9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 #define MATRIX_HAS_GHOST
 
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 2aebd925ee..95a572bd17 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "C4", "B0", "B10", "B13", "C6", "C7", "C8", "C9"],
+        "rows": ["A7", "C5", "B1", "B12", "B14", "B15", "A8", "A9"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C11",
         "num_lock": "C12",
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/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
index bf563918c9..2521d16e8c 100644
--- a/keyboards/ibnuda/gurindam/config.h
+++ b/keyboards/ibnuda/gurindam/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, 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
diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json
index 7b3c71aa88..3fd6dfe21a 100644
--- a/keyboards/ibnuda/gurindam/info.json
+++ b/keyboards/ibnuda/gurindam/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6974",
         "device_version": "0.0.1"
     },
+    "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/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..e2e2b4a3f7 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"
     },
@@ -145,15 +150,15 @@
                 {"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":"bspc", "x":3, "y":3.6},
+                {"label":"esc/sft", "x":4, "y":3.65},
+                {"label":"ent/alt", "x":5, "y":3.65},
+                {"label":"spc", "x":6, "y":3.6},
 
-                {"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}
+                {"label":"lower", "x":3, "y":4.6},
+                {"label":"gui", "x":4, "y":4.65},
+                {"label":"tab", "x":5, "y":4.65},
+                {"label":"raise", "x":6, "y":4.6}
             ]
         }
     }
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
index 73cb7abd2f..7d2ce91cdd 100644
--- a/keyboards/ibnuda/squiggle/rev1/rev1.h
+++ b/keyboards/ibnuda/squiggle/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "squiggle.h"
-
 #include "quantum.h"
 
 #define ___ KC_NO
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..a7035245f0 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": {
diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h
index 54f0fc0c7c..4f15181dfd 100644
--- a/keyboards/idobao/id75/v1/config.h
+++ b/keyboards/idobao/id75/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, 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
diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json
index a192072701..b0d2c6f712 100644
--- a/keyboards/idobao/id75/v1/info.json
+++ b/keyboards/idobao/id75/v1/info.json
@@ -8,6 +8,11 @@
     "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"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7",
     "breathing": true
diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
index d44e54d32c..707f040992 100644
--- a/keyboards/idobao/id75/v2/config.h
+++ b/keyboards/idobao/id75/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 { 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
diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json
index 558cbda3c8..599e02ab59 100644
--- a/keyboards/idobao/id75/v2/info.json
+++ b/keyboards/idobao/id75/v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0075",
         "device_version": "0.0.2"
     },
+    "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"],
diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h
index d3eb71dc92..fc65958e3e 100644
--- a/keyboards/idobao/id80/v2/config.h
+++ b/keyboards/idobao/id80/v2/config.h
@@ -17,37 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins 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 */
diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json
index 89b64f3951..c8ee450e44 100644
--- a/keyboards/idobao/id80/v2/info.json
+++ b/keyboards/idobao/id80/v2/info.json
@@ -6,6 +6,11 @@
         "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
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
index 2f4ebd7744..881174152c 100644
--- a/keyboards/idobao/id87/v1/config.h
+++ b/keyboards/idobao/id87/v1/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 { 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
diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json
index ca39654575..ea98558455 100644
--- a/keyboards/idobao/id87/v1/info.json
+++ b/keyboards/idobao/id87/v1/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
index 7f48dc7752..1d968410b1 100644
--- a/keyboards/idobao/id96/config.h
+++ b/keyboards/idobao/id96/config.h
@@ -18,14 +18,6 @@
 
 #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
 
diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json
index 2046283d8e..5acdaba228 100644
--- a/keyboards/idobao/id96/info.json
+++ b/keyboards/idobao/id96/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
index 5c612855fb..0cb9bb1f19 100644
--- a/keyboards/idobao/montex/v1/config.h
+++ b/keyboards/idobao/montex/v1/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json
index 725ddc0c4d..e5c423e527 100644
--- a/keyboards/idobao/montex/v1/info.json
+++ b/keyboards/idobao/montex/v1/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h
index a3b2a5ef92..4851844dad 100755
--- a/keyboards/idobao/montex/v1rgb/config.h
+++ b/keyboards/idobao/montex/v1rgb/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)
- */
-#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)
diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json
index 75add6a896..f77698554d 100755
--- a/keyboards/idobao/montex/v1rgb/info.json
+++ b/keyboards/idobao/montex/v1rgb/info.json
@@ -6,6 +6,11 @@
         "pid": "0x0127",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0"],
+        "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["numpad_6x5"],
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..c1816b5e2a 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,
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/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/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..e9f4488dc7 100644
--- a/keyboards/ilumkb/simpler61/info.json
+++ b/keyboards/ilumkb/simpler61/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC361",
         "device_version": "0.0.1"
     },
+    "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/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..40371b7a28 100644
--- a/keyboards/ilumkb/simpler64/info.json
+++ b/keyboards/ilumkb/simpler64/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC364",
         "device_version": "0.0.1"
     },
+    "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/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..a194f0e444 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.
diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json
index 1d9014bdbd..54c18859f2 100644
--- a/keyboards/inett_studio/sqx/hotswap/info.json
+++ b/keyboards/inett_studio/sqx/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5336",
         "device_version": "0.0.1"
     },
+    "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/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index be6d4a8e65..21929f17f3 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.
diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json
index 7da0598d91..fa6fa373f9 100644
--- a/keyboards/inett_studio/sqx/universal/info.json
+++ b/keyboards/inett_studio/sqx/universal/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5336",
         "device_version": "0.0.1"
     },
+    "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/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index fdadcd5642..6ebc0f4083 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -39,13 +39,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/info.json b/keyboards/input_club/ergodox_infinity/info.json
index 635355d490..c751cfe3f2 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -6,6 +6,11 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "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",
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/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..c05785ac69 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "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",
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..80853b4847 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
@@ -7,6 +7,11 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "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",
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/irene/config.h b/keyboards/irene/config.h
index eefaa897a1..9386d03e74 100644
--- a/keyboards/irene/config.h
+++ b/keyboards/irene/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, 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
diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json
index a9e943db5c..9e3a4a220d 100644
--- a/keyboards/irene/info.json
+++ b/keyboards/irene/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3000",
         "device_version": "0.0.1"
     },
+    "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/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..9231437bd1 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"
   },
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..cde00d1c4d 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/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 { 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
 
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
index ed5768bf32..c5ae580453 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -10,6 +10,11 @@
         "pid": "0x000A",
         "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"
     },
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/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index 147dc2ade4..26e7ee3f33 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -10,6 +10,11 @@
         "pid": "0x0428",
         "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"
     },
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/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index d7a8bf543b..7b1324e3f3 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -16,20 +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
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json
index f2e51f63ac..685504afb1 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0007",
         "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"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 1a6e9cea9e..1359eafc9a 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/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)
- *
- *
- *                        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
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json
index 639b5a3897..dac233ecc1 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json
@@ -8,6 +8,11 @@
         "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"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6",
         "levels": 15
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..b0b1c9792c 100644
--- a/keyboards/jadookb/jkb2/info.json
+++ b/keyboards/jadookb/jkb2/info.json
@@ -8,6 +8,11 @@
     "pid": "0x3225",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B3", "B2"],
+    "rows": ["B1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index 00bc0c3488..2ef7a6cf7b 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN F0
 
 #define RGB_MATRIX_LED_COUNT 67
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/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/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..27ee90931d 100644
--- a/keyboards/jc65/v32a/info.json
+++ b/keyboards/jc65/v32a/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
index eca08d7d92..68e8005dec 100644
--- a/keyboards/jc65/v32u4/config.h
+++ b/keyboards/jc65/v32u4/config.h
@@ -17,11 +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
@@ -39,5 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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..e9d3e2b897 100644
--- a/keyboards/jc65/v32u4/info.json
+++ b/keyboards/jc65/v32u4/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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/jd40/config.h b/keyboards/jd40/config.h
index 11a868ab3e..36c2f16578 100644
--- a/keyboards/jd40/config.h
+++ b/keyboards/jd40/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, 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 */
diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json
index 9bb96326d3..924122544e 100644
--- a/keyboards/jd40/info.json
+++ b/keyboards/jd40/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"],
+    "rows": ["F0", "F1", "F5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
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/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..418410c3ff 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"
     },
@@ -76,7 +81,7 @@
                 { "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": 6.5, "y": 4 },
                 { "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 },
@@ -208,13 +213,13 @@
                 { "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": "Win", "x": 1.5, "y": 4 },
                 { "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": "Win", "x": 12.5, "y": 4 },
                 { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
             ]
         },
@@ -276,11 +281,11 @@
                 { "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": "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, "w": 1 },
+                { "label": "Win", "x": 12.5, "y": 4 },
                 { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
             ]
         },
diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index b655834c02..3eec23b214 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -16,13 +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
 
@@ -43,9 +36,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..6542e29a08 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -8,6 +8,11 @@
         "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]
     },
@@ -269,7 +274,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.h b/keyboards/jian/handwired/handwired.h
index 9b388b94ae..7d961690d2 100644
--- a/keyboards/jian/handwired/handwired.h
+++ b/keyboards/jian/handwired/handwired.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "jian.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 #define LAYOUT( \
diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/info.json
index 712c3d9b01..bd76da9e96 100644
--- a/keyboards/jian/handwired/info.json
+++ b/keyboards/jian/handwired/info.json
@@ -3,6 +3,11 @@
     "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"
 }
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/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 3e2fa93f31..5eda1a6724 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -17,14 +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, D1, D0, D7, E6 }
-#define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 }
-
 #define PHYSICAL_LEDS_ENABLE
 
 /* ws2812 RGB LED */
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json
index 74121b2fda..e51b65c501 100644
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/info.json
@@ -3,6 +3,11 @@
     "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,
diff --git a/keyboards/jian/nsrev2/nsrev2.h b/keyboards/jian/nsrev2/nsrev2.h
index 9dfb7240b1..80dd6def0c 100644
--- a/keyboards/jian/nsrev2/nsrev2.h
+++ b/keyboards/jian/nsrev2/nsrev2.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "jian.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index 083b235a2e..a00830b7f7 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 */
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
index fc65cb13b8..9ca0a41785 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@@ -3,6 +3,11 @@
     "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
diff --git a/keyboards/jian/rev1/rev1.h b/keyboards/jian/rev1/rev1.h
index ee55de6287..bba95a1dd7 100644
--- a/keyboards/jian/rev1/rev1.h
+++ b/keyboards/jian/rev1/rev1.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "jian.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index 37e8f0458d..92b15fab65 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
 
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
index 642bf83efc..6cae5556e2 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@@ -3,6 +3,11 @@
     "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
diff --git a/keyboards/jian/rev2/rev2.h b/keyboards/jian/rev2/rev2.h
index d71fc8495d..7abf46e303 100644
--- a/keyboards/jian/rev2/rev2.h
+++ b/keyboards/jian/rev2/rev2.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "jian.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
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/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/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..b7fcc584f3 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]
     },
diff --git a/keyboards/jkeys_design/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h
index f8280340e8..a0012f33b5 100644
--- a/keyboards/jkeys_design/gentleman65/config.h
+++ b/keyboards/jkeys_design/gentleman65/config.h
@@ -18,14 +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
diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json
index fff5b9b752..85f73603ae 100644
--- a/keyboards/jkeys_design/gentleman65/info.json
+++ b/keyboards/jkeys_design/gentleman65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2020",
         "device_version": "0.0.1"
     },
+    "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_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
index c80b64ef10..532bf95acb 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/config.h
+++ b/keyboards/jkeys_design/gentleman65_se_s/config.h
@@ -18,14 +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
diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json
index 2415eb5c18..3a389231a4 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/info.json
+++ b/keyboards/jkeys_design/gentleman65_se_s/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2322",
         "device_version": "0.0.1"
     },
+    "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/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..b53df6cf7f 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
 
diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json
index 5bf9c1eda2..7b8a2ad030 100644
--- a/keyboards/jolofsor/denial75/info.json
+++ b/keyboards/jolofsor/denial75/info.json
@@ -8,6 +8,11 @@
         "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"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
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/v1/config.h b/keyboards/jones/v1/config.h
index 1936d5d256..acf9a541b3 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
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
index 37f0b70087..fc690aa6cd 100644
--- a/keyboards/jones/v1/info.json
+++ b/keyboards/jones/v1/info.json
@@ -8,6 +8,11 @@
     "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"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F5", "pin_b": "F4"},
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..77316af07c 100644
--- a/keyboards/jorne/rev1/config.h
+++ b/keyboards/jorne/rev1/config.h
@@ -2,12 +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..b4bbb6748a 100644
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/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"
     },
@@ -16,235 +21,57 @@
     "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/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/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h
index bd6afd6e53..d3ff10faa3 100644
--- a/keyboards/kabedon/kabedon78s/config.h
+++ b/keyboards/kabedon/kabedon78s/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 {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
diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json
index 7ca4605cef..f2fe41a517 100644
--- a/keyboards/kabedon/kabedon78s/info.json
+++ b/keyboards/kabedon/kabedon78s/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x3738",
     	"device_version": "0.0.1"
     },
+    "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.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..1fac2485f7 100644
--- a/keyboards/kabedon/kabedon980/config.h
+++ b/keyboards/kabedon/kabedon980/config.h
@@ -17,13 +17,7 @@ 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
diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json
index fc0384f649..2d553f1837 100644
--- a/keyboards/kabedon/kabedon980/info.json
+++ b/keyboards/kabedon/kabedon980/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x3938",
     	"device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h
index b2156c4ada..597b290f93 100644
--- a/keyboards/kabedon/kabedon98e/config.h
+++ b/keyboards/kabedon/kabedon98e/config.h
@@ -15,11 +15,6 @@
  */
 #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
diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json
index def8f72612..32969da049 100644
--- a/keyboards/kabedon/kabedon98e/info.json
+++ b/keyboards/kabedon/kabedon98e/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3935",
         "device_version": "0.0.2"
     },
+    "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"},
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..175c33a7f3 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/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 { 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
diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json
index 43ab1df6e9..a56a2993db 100644
--- a/keyboards/kagizaraya/halberd/info.json
+++ b/keyboards/kagizaraya/halberd/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "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..81892324aa 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/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 { 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
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
index acab68f80b..5fbdf4c1d5 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..7e8e85f520
--- /dev/null
+++ b/keyboards/kakunpc/angel17/alpha/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
index 0c2a432d5f..637881b917 100644
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/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 { F4, F5, F6, F7, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 17
diff --git a/keyboards/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/info.json
new file mode 100644
index 0000000000..7e8e85f520
--- /dev/null
+++ b/keyboards/kakunpc/angel17/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW"
+}
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/config.h b/keyboards/kakunpc/business_card/alpha/config.h
index 93130b4f99..e96decbc87 100644
--- a/keyboards/kakunpc/business_card/alpha/config.h
+++ b/keyboards/kakunpc/business_card/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 { 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
diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json
index 3cbeeef196..5ec079fe7f 100644
--- a/keyboards/kakunpc/business_card/alpha/info.json
+++ b/keyboards/kakunpc/business_card/alpha/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5"],
+        "rows": ["B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/config.h b/keyboards/kakunpc/business_card/beta/config.h
index 405e4daefb..e96decbc87 100644
--- a/keyboards/kakunpc/business_card/beta/config.h
+++ b/keyboards/kakunpc/business_card/beta/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 }
-#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
diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json
index 1dab5c4d3a..67018ad142 100644
--- a/keyboards/kakunpc/business_card/beta/info.json
+++ b/keyboards/kakunpc/business_card/beta/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B5"],
+        "rows": ["B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
index efc247b38b..1f12a638e2 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/config.h
+++ b/keyboards/kakunpc/rabbit_capture_plan/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, 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}
diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
index 7c7157bdf4..263656554c 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/info.json
+++ b/keyboards/kakunpc/rabbit_capture_plan/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEB59",
         "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"
     },
@@ -16,303 +21,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/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index a2fcf4c628..ee45daecdb 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/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 { 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
diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json
index 76c31631ff..3bdc353644 100644
--- a/keyboards/kakunpc/suihankey/alpha/info.json
+++ b/keyboards/kakunpc/suihankey/alpha/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "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..ee45daecdb 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/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, 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
diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json
index 76c31631ff..6129a83f6c 100644
--- a/keyboards/kakunpc/suihankey/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "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/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index f8fd8a6b5f..dae056200b 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/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 { 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
diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json
new file mode 100644
index 0000000000..d1bbbdde66
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/split/alpha/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index c05fe6d365..bb80874bed 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/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 { 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
diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json
new file mode 100644
index 0000000000..3d13b5b2f2
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/split/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW"
+}
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..1cb5612aec 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},
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.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/paladin64/config.h b/keyboards/kapcave/paladin64/config.h
index 58fd5aff24..e5da848720 100755
--- a/keyboards/kapcave/paladin64/config.h
+++ b/keyboards/kapcave/paladin64/config.h
@@ -72,13 +72,6 @@ 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
 
diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json
index f64fdc2a65..0f851cba86 100644
--- a/keyboards/kapcave/paladin64/info.json
+++ b/keyboards/kapcave/paladin64/info.json
@@ -8,6 +8,11 @@
       "pid": "0x5036",
       "device_version": "0.0.1"
     },
+    "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/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/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h
index 959d80429c..4fcbe6d698 100644
--- a/keyboards/kapcave/paladinpad/rev1/config.h
+++ b/keyboards/kapcave/paladinpad/rev1/config.h
@@ -16,11 +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
diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json
index 90ac25f360..5568345bd3 100644
--- a/keyboards/kapcave/paladinpad/rev1/info.json
+++ b/keyboards/kapcave/paladinpad/rev1/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "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..8229921777 100644
--- a/keyboards/kapcave/paladinpad/rev2/config.h
+++ b/keyboards/kapcave/paladinpad/rev2/config.h
@@ -16,11 +16,6 @@ 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
diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json
index e557e4d307..f8d1864f8e 100644
--- a/keyboards/kapcave/paladinpad/rev2/info.json
+++ b/keyboards/kapcave/paladinpad/rev2/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "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..155c94909f 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -2,13 +2,6 @@
 // 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
 
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index 483bc655c0..7bd8f7f36c 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0001",
     "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/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/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/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..0919a75d01 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"
     },
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/info.json b/keyboards/kb_elmo/elmopad/info.json
index a4e3e090e5..8da14ea006 100644
--- a/keyboards/kb_elmo/elmopad/info.json
+++ b/keyboards/kb_elmo/elmopad/info.json
@@ -8,6 +8,11 @@
         "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"],
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/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/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h
index 8b59b3abd4..6aafdcded9 100644
--- a/keyboards/kb_elmo/noah_avr/config.h
+++ b/keyboards/kb_elmo/noah_avr/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 { 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
diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json
index 151eda35b4..fb9bbdb0e4 100644
--- a/keyboards/kb_elmo/noah_avr/info.json
+++ b/keyboards/kb_elmo/noah_avr/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1DB0",
         "device_version": "0.0.1"
     },
+    "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"
     },
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..c8b0ccd1e8 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"
     },
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..d94b427175 100644
--- a/keyboards/kb_elmo/sesame/info.json
+++ b/keyboards/kb_elmo/sesame/info.json
@@ -8,6 +8,11 @@
     "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]
   },
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..5e87b29cf6 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,
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/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..aa10f79501 100644
--- a/keyboards/kbdclack/kaishi65/info.json
+++ b/keyboards/kbdclack/kaishi65/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h
index bc3241eb93..0888a3d3a7 100644
--- a/keyboards/kbdfans/baguette66/rgb/config.h
+++ b/keyboards/kbdfans/baguette66/rgb/config.h
@@ -16,13 +16,6 @@
 
 #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/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json
index d179a751d8..bee4eb8c08 100644
--- a/keyboards/kbdfans/baguette66/rgb/info.json
+++ b/keyboards/kbdfans/baguette66/rgb/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0106",
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/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..102591107f 100644
--- a/keyboards/kbdfans/bella/rgb/info.json
+++ b/keyboards/kbdfans/bella/rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0008",
         "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", "B7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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..711977a2ac 100644
--- a/keyboards/kbdfans/bella/rgb_iso/info.json
+++ b/keyboards/kbdfans/bella/rgb_iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0009",
         "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", "B7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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..ab67607867 100644
--- a/keyboards/kbdfans/boop65/rgb/info.json
+++ b/keyboards/kbdfans/boop65/rgb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1000",
     "device_version": "0.0.1"
   },
+ "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": {
diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h
index 680ae93a7b..15550775e2 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -16,13 +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
diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json
index fd47cfdd7f..4adafc1e09 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/info.json
+++ b/keyboards/kbdfans/bounce/75/hotswap/info.json
@@ -7,6 +7,11 @@
         "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
diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h
index 3e8cea1f74..7448ffef3d 100644
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -16,13 +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
diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json
index e4ee498ee7..aff015ce0f 100644
--- a/keyboards/kbdfans/bounce/75/soldered/info.json
+++ b/keyboards/kbdfans/bounce/75/soldered/info.json
@@ -8,6 +8,11 @@
         "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
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..8e0105c073 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"
     },
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index 0fd9b10373..27228e040b 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/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, 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
diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index 9333221c57..563fddf7b8 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"
     },
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index fd338e9214..b1a70ae409 100644
--- a/keyboards/kbdfans/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/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 }
-#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
diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
index e8e7168ccc..bd57aee969 100644
--- a/keyboards/kbdfans/kbd4x/info.json
+++ b/keyboards/kbdfans/kbd4x/info.json
@@ -8,6 +8,11 @@
         "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
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/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index d509761fee..9ea1e9b842 100644
--- a/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/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 { 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
diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json
index e81600b117..45f2902ecb 100644
--- a/keyboards/kbdfans/kbd67/hotswap/info.json
+++ b/keyboards/kbdfans/kbd67/hotswap/info.json
@@ -8,6 +8,11 @@
         "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
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..bc77a50964 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
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..97af362b45 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
@@ -4,6 +4,11 @@
         "pid": "0x1224",
         "device_version": "0.0.1"
     },
+    "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",
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..4b43f71ee7 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
@@ -4,6 +4,11 @@
         "pid": "0x1225",
         "device_version": "0.0.2"
     },
+    "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
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..1028d2a818 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
@@ -4,6 +4,11 @@
         "pid": "0x1226",
         "device_version": "0.0.3"
     },
+    "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"
 }
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index a5dfcb76fe..ff0970af2e 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -16,13 +16,6 @@
 
 #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
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
index 36ed264dad..dc1ffa4cf6 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
@@ -4,6 +4,11 @@
         "pid": "0x1227",
         "device_version": "0.0.4"
     },
+    "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"
 }
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index 7ee1b5ee30..3dd332212e 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -16,13 +16,6 @@
 
 #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
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
index e9f206395e..da3d1c5474 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0105",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index 0980b80ed3..d0a39afdf2 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/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 { 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
diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json
index f4e5ca006d..b6c4720440 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
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
index 89bb76ca9f..28ce0dd707 100644
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -17,13 +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
diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json
index b148eff402..be5032126e 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"
     },
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index 823f3c6f35..917b37c2b7 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/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, 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
diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json
index 1aa4481830..1c1b40f8cd 100644
--- a/keyboards/kbdfans/kbd6x/info.json
+++ b/keyboards/kbdfans/kbd6x/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index 7b630434d4..38211cdee5 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -3,14 +3,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/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/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json
index e1cc9ee7bc..7688d2fd32 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
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
index ac7b38ed02..22333324e4 100644
--- a/keyboards/kbdfans/kbd75/rev1/rev1.h
+++ b/keyboards/kbdfans/kbd75/rev1/rev1.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "kbd75.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json
index a5436f05ac..2e89c075be 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
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
index f37be40094..dba3cc2fab 100644
--- a/keyboards/kbdfans/kbd75/rev2/rev2.h
+++ b/keyboards/kbdfans/kbd75/rev2/rev2.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "kbd75.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h
index d4e1e40ea0..10fc5ca8b5 100644
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -16,13 +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 FORCE_NKRO
 
 #define RGB_DI_PIN F0
diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json
index 9af7103b3b..1cae94957d 100644
--- a/keyboards/kbdfans/kbd75hs/info.json
+++ b/keyboards/kbdfans/kbd75hs/info.json
@@ -7,6 +7,11 @@
         "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"
     },
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index ace45e8245..c30cb3a505 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -16,13 +16,6 @@
 
 #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
 
diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json
index 63ce9ebf36..c462db3e85 100644
--- a/keyboards/kbdfans/kbd75rgb/info.json
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6063",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index 26f5030f4d..d98d6cb41d 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/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, 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
diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json
index 400e29bb3f..2b6ae5b5a0 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
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index c11821425f..556f2f82d4 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/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, 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
diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json
index 5fb4c7c089..303d1becd7 100644
--- a/keyboards/kbdfans/kbd8x_mk2/info.json
+++ b/keyboards/kbdfans/kbd8x_mk2/info.json
@@ -8,6 +8,11 @@
         "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
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..f01b329e67 100644
--- a/keyboards/kbdfans/kbdmini/info.json
+++ b/keyboards/kbdfans/kbdmini/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2001",
         "device_version": "0.0.1"
     },
+    "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/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..e3dd95ace4 100644
--- a/keyboards/kbdfans/kbdpad/mk1/info.json
+++ b/keyboards/kbdfans/kbdpad/mk1/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index ffc9d00e5f..a2a29bccf7 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/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, 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
diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json
index 54657e5c12..1472e876d0 100644
--- a/keyboards/kbdfans/kbdpad/mk2/info.json
+++ b/keyboards/kbdfans/kbdpad/mk2/info.json
@@ -8,6 +8,11 @@
     	"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,
diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json
index a22c82c681..ec522cc82c 100644
--- a/keyboards/kbdfans/kbdpad/mk3/info.json
+++ b/keyboards/kbdfans/kbdpad/mk3/info.json
@@ -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..96f1e27a36 100644
--- a/keyboards/kbdfans/maja/info.json
+++ b/keyboards/kbdfans/maja/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6068",
         "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", "B5", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
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..70f86c6dbc 100644
--- a/keyboards/kbdfans/niu_mini/config.h
+++ b/keyboards/kbdfans/niu_mini/config.h
@@ -17,14 +17,6 @@ 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
 
diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json
index f381993ad3..82bbf786dd 100644
--- a/keyboards/kbdfans/niu_mini/info.json
+++ b/keyboards/kbdfans/niu_mini/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index 12c5e539da..5c0d856986 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -16,11 +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 RGBLED_NUM 104
 #define RGB_MATRIX_LED_COUNT 104
 #define RGB_DI_PIN B15
diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json
index 1de7004739..f776104754 100644
--- a/keyboards/kbdfans/odin/rgb/info.json
+++ b/keyboards/kbdfans/odin/rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0102",
         "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",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index dcda05b8d0..28cb2aba4b 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -16,11 +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
diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json
index 7189d537fe..fa7a390c08 100644
--- a/keyboards/kbdfans/odin/soldered/info.json
+++ b/keyboards/kbdfans/odin/soldered/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
index 5ed85f0b91..13a06b3209 100644
--- a/keyboards/kbdfans/odin/v2/config.h
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -16,11 +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
diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json
index 29a96330f6..8421ab3b47 100644
--- a/keyboards/kbdfans/odin/v2/info.json
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json
index 850cfb1dc2..c4b262c26c 100644
--- a/keyboards/kbdfans/odinmini/info.json
+++ b/keyboards/kbdfans/odinmini/info.json
@@ -54,88 +54,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/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h
index 9b72111b60..825a7f5bbc 100644
--- a/keyboards/kbdfans/phaseone/config.h
+++ b/keyboards/kbdfans/phaseone/config.h
@@ -16,11 +16,6 @@
 
 #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 */
diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json
index 57cf6a1c62..58f2eca0e4 100644
--- a/keyboards/kbdfans/phaseone/info.json
+++ b/keyboards/kbdfans/phaseone/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h
index 6b4667513c..58b4d3f933 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
 
 #ifdef RGB_DI_PIN
diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json
index 9741c68cb2..c5d677d26e 100644
--- a/keyboards/kbdfans/tiger80/info.json
+++ b/keyboards/kbdfans/tiger80/info.json
@@ -15,6 +15,11 @@
         "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,
diff --git a/keyboards/kbnordic/nordic60/rev_a/config.h b/keyboards/kbnordic/nordic60/rev_a/config.h
index 1ccdd6d1d8..a47daa75a0 100644
--- a/keyboards/kbnordic/nordic60/rev_a/config.h
+++ b/keyboards/kbnordic/nordic60/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 {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
 
diff --git a/keyboards/kbnordic/nordic60/rev_a/info.json b/keyboards/kbnordic/nordic60/rev_a/info.json
index 8019c480bd..6668549524 100644
--- a/keyboards/kbnordic/nordic60/rev_a/info.json
+++ b/keyboards/kbnordic/nordic60/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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/kc60/config.h b/keyboards/kc60/config.h
index fa74b02663..b30d0e92b8 100644
--- a/keyboards/kc60/config.h
+++ b/keyboards/kc60/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, 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
diff --git a/keyboards/kc60/info.json b/keyboards/kc60/info.json
index 7783ffee54..e257d0cef9 100644
--- a/keyboards/kc60/info.json
+++ b/keyboards/kc60/info.json
@@ -8,6 +8,11 @@
         "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,
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/keebformom/config.h b/keyboards/keebformom/config.h
index 0b6b140682..08547b17a7 100644
--- a/keyboards/keebformom/config.h
+++ b/keyboards/keebformom/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)
- *
- */
-/* 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
diff --git a/keyboards/keebformom/info.json b/keyboards/keebformom/info.json
index 5d9c9b6515..17f3bd9858 100644
--- a/keyboards/keebformom/info.json
+++ b/keyboards/keebformom/info.json
@@ -8,6 +8,11 @@
         "pid": "0x14E2",
         "device_version": "1.0.0"
     },
+    "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": {
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index 8d60a33d48..8ef3598f38 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -3,16 +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
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 5559d586e9..cb4728ae34 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1114",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B6", "B7"],
+        "rows": ["F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keebio/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h
index 684674d7af..894f7fbe62 100644
--- a/keyboards/keebio/bfo9000/config.h
+++ b/keyboards/keebio/bfo9000/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, 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 */
diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
index 432857124c..f578783905 100644
--- a/keyboards/keebio/bfo9000/info.json
+++ b/keyboards/keebio/bfo9000/info.json
@@ -8,6 +8,11 @@
       "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"
     },
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..03301a75f1 100644
--- a/keyboards/keebio/bigswitchseat/info.json
+++ b/keyboards/keebio/bigswitchseat/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1011",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0"],
+        "rows": ["E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h
index 6d28712e8c..213ffd7936 100644
--- a/keyboards/keebio/chocopad/config.h
+++ b/keyboards/keebio/chocopad/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json
index 9b047cc4fc..473452a984 100644
--- a/keyboards/keebio/chocopad/info.json
+++ b/keyboards/keebio/chocopad/info.json
@@ -8,6 +8,11 @@
     "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
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/rev1/rev1.h b/keyboards/keebio/convolution/rev1/rev1.h
index c50074c3f3..3bbc40146a 100644
--- a/keyboards/keebio/convolution/rev1/rev1.h
+++ b/keyboards/keebio/convolution/rev1/rev1.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "convolution.h"
 #include "quantum.h"
 
 #define LAYOUT_65xt( \
diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h
index c10fe13a30..1d2a07e38a 100644
--- a/keyboards/keebio/dilly/config.h
+++ b/keyboards/keebio/dilly/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json
index f69290454a..898096aef4 100644
--- a/keyboards/keebio/dilly/info.json
+++ b/keyboards/keebio/dilly/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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..1b45aa5ed6 100644
--- a/keyboards/keebio/dsp40/rev1/config.h
+++ b/keyboards/keebio/dsp40/rev1/config.h
@@ -16,13 +16,7 @@ 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
diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json
index c5ce2f5a17..b262561abf 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"}
diff --git a/keyboards/keebio/dsp40/rev1/rev1.h b/keyboards/keebio/dsp40/rev1/rev1.h
index f03792175e..bc0a86d302 100644
--- a/keyboards/keebio/dsp40/rev1/rev1.h
+++ b/keyboards/keebio/dsp40/rev1/rev1.h
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include "dsp40.h"
 #include "quantum.h"
 
 #define LAYOUT_ortho_4x12( \
diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h
index c9f49ad1fb..3d35f8b66c 100644
--- a/keyboards/keebio/ergodicity/config.h
+++ b/keyboards/keebio/ergodicity/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, 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
diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json
index 94203340ce..1bb55ed4ee 100644
--- a/keyboards/keebio/ergodicity/info.json
+++ b/keyboards/keebio/ergodicity/info.json
@@ -8,6 +8,11 @@
         "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,
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..3dd11100d6 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 */
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
index 00dffdc401..a3b12965ec 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"}
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..0f2d67caaa 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
 
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..dbe60ec677 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",
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/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/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 436c47ccac..c6fa1b9512 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/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 { 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 */
diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
index 736b6006b9..ba412159e2 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
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..c6fa1b9512 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/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 { 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 */
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
index e5d71a70b0..816b2fe390 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
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..698827a767 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/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 { 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 */
diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index 7ac3883bb5..f85f82a627 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
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..a84d0c02e4 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -17,14 +17,8 @@ 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 */
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index 0fc9aa4832..15dd75e680 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"}
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..7af2b5fd94 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -17,16 +17,8 @@ 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 */
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index a0689c0ed4..464a7b2d43 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"}
@@ -27,6 +32,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..77825d3c1c 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -17,16 +17,8 @@ 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 */
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index 8279cdcc2b..2df637509b 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"}
@@ -27,6 +32,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..98ed5187f3 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -17,16 +17,8 @@ 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
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 8470624a31..f4bb81a81a 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -4,13 +4,24 @@
         "pid": "0x6256",
         "device_version": "6.0.0"
     },
+    "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"}
         ]
     },
     "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/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index dd05a6ec3b..430abd2ef0 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -17,16 +17,8 @@ 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
diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json
index 027a79f512..2f5d8cb655 100644
--- a/keyboards/keebio/iris/rev6a/info.json
+++ b/keyboards/keebio/iris/rev6a/info.json
@@ -4,13 +4,24 @@
         "pid": "0x6356",
         "device_version": "6.1.0"
     },
+    "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"}
         ]
     },
     "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/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index dd05a6ec3b..430abd2ef0 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -17,16 +17,8 @@ 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
diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json
index b8d1f076a4..9327bf0678 100644
--- a/keyboards/keebio/iris/rev6b/info.json
+++ b/keyboards/keebio/iris/rev6b/info.json
@@ -4,13 +4,24 @@
         "pid": "0x6456",
         "device_version": "6.2.0"
     },
+    "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"}
         ]
     },
     "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/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 906b65b0b2..e51677e6d2 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -17,16 +17,8 @@ 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
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index 086f8907a9..e68af28df1 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -4,6 +4,11 @@
         "pid": "0x7256",
         "device_version": "7.0.0"
     },
+    "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"},
@@ -11,7 +16,13 @@
         ]
     },
     "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/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..5f765e89a5 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
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index 5df36178e7..c45bfad4d4 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x126A",
         "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"}
@@ -25,6 +30,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..cce01b488e 100644
--- a/keyboards/keebio/laplace/config.h
+++ b/keyboards/keebio/laplace/config.h
@@ -17,11 +17,6 @@ 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
@@ -36,7 +31,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..c0ee05d92a 100644
--- a/keyboards/keebio/laplace/info.json
+++ b/keyboards/keebio/laplace/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1147",
         "device_version": "1.0.0"
     },
+    "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/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..9efacf6599 100644
--- a/keyboards/keebio/levinson/rev1/config.h
+++ b/keyboards/keebio/levinson/rev1/config.h
@@ -19,12 +19,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 { 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/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json
index 05416bd138..5a280a3549 100644
--- a/keyboards/keebio/levinson/rev1/info.json
+++ b/keyboards/keebio/levinson/rev1/info.json
@@ -7,6 +7,11 @@
         "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
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..9efacf6599 100644
--- a/keyboards/keebio/levinson/rev2/config.h
+++ b/keyboards/keebio/levinson/rev2/config.h
@@ -19,12 +19,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 }
-#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 */
diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json
index dbd0901737..f73f9ee1a7 100644
--- a/keyboards/keebio/levinson/rev2/info.json
+++ b/keyboards/keebio/levinson/rev2/info.json
@@ -7,6 +7,11 @@
         "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
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..d8a0366f14 100644
--- a/keyboards/keebio/levinson/rev3/config.h
+++ b/keyboards/keebio/levinson/rev3/config.h
@@ -19,15 +19,8 @@ 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 */
diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json
index 8cc3fa9fb9..af854a93d5 100644
--- a/keyboards/keebio/levinson/rev3/info.json
+++ b/keyboards/keebio/levinson/rev3/info.json
@@ -1,12 +1,23 @@
 {
     "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
diff --git a/keyboards/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c
index b569fbd9fb..c464270517 100644
--- a/keyboards/keebio/levinson/rev3/rev3.c
+++ b/keyboards/keebio/levinson/rev3/rev3.c
@@ -1,4 +1,4 @@
-#include "levinson.h"
+#include "rev3.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
index da7349d2e7..d6a0ef4227 100644
--- a/keyboards/keebio/levinson/rev3/rev3.h
+++ b/keyboards/keebio/levinson/rev3/rev3.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
-
 #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/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..e0e8582286 100644
--- a/keyboards/keebio/nyquist/rev1/config.h
+++ b/keyboards/keebio/nyquist/rev1/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, 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 */
diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json
index 768687f5c9..b5718457aa 100644
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ b/keyboards/keebio/nyquist/rev1/info.json
@@ -4,6 +4,11 @@
         "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"
     },
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..e0e8582286 100644
--- a/keyboards/keebio/nyquist/rev2/config.h
+++ b/keyboards/keebio/nyquist/rev2/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, 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 */
diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json
index b47bb7511b..7e409611b1 100644
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ b/keyboards/keebio/nyquist/rev2/info.json
@@ -4,6 +4,11 @@
         "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
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..dfb8f79aaa 100644
--- a/keyboards/keebio/nyquist/rev3/config.h
+++ b/keyboards/keebio/nyquist/rev3/config.h
@@ -17,14 +17,8 @@ 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 */
diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json
index e7bd8635ae..a948868f33 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
diff --git a/keyboards/keebio/nyquist/rev3/rev3.h b/keyboards/keebio/nyquist/rev3/rev3.h
index e365c0e417..648c774730 100644
--- a/keyboards/keebio/nyquist/rev3/rev3.h
+++ b/keyboards/keebio/nyquist/rev3/rev3.h
@@ -1,16 +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
-
 #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/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 d9a14c439c..0000000000
--- a/keyboards/keebio/quefrency/quefrency.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_keebio_quefrency_rev1
-    #include "rev1.h"
-#endif
-#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..5842393aa2 100644
--- a/keyboards/keebio/quefrency/rev1/config.h
+++ b/keyboards/keebio/quefrency/rev1/config.h
@@ -18,15 +18,8 @@ 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 */
diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json
index 648104baa2..a715b1040f 100644
--- a/keyboards/keebio/quefrency/rev1/info.json
+++ b/keyboards/keebio/quefrency/rev1/info.json
@@ -8,8 +8,19 @@
         "pid": "0x1257",
         "device_version": "1.0.0"
     },
+    "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/rev1/rev1.c b/keyboards/keebio/quefrency/rev1/rev1.c
index 6704b062f5..f34f85b2cc 100644
--- a/keyboards/keebio/quefrency/rev1/rev1.c
+++ b/keyboards/keebio/quefrency/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "quefrency.h"
+#include "rev1.h"
 
 void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/keebio/quefrency/rev1/rev1.h b/keyboards/keebio/quefrency/rev1/rev1.h
index da62f904cc..89a9c4a19d 100644
--- a/keyboards/keebio/quefrency/rev1/rev1.h
+++ b/keyboards/keebio/quefrency/rev1/rev1.h
@@ -1,18 +1,7 @@
 #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( \
   LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
   LB1, LB2, LB3, LB4, LB5, LB6,      RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h
index 63f1408cda..0d7e9f8a30 100644
--- a/keyboards/keebio/quefrency/rev2/config.h
+++ b/keyboards/keebio/quefrency/rev2/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 }
-#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
diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json
index 508e2431b9..e9e037ea90 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"}
@@ -24,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",
diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c
index 4e3e75a21f..3992687b7a 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.c
+++ b/keyboards/keebio/quefrency/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "quefrency.h"
+#include "rev2.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
index 2f57ac489f..e9814575b2 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.h
+++ b/keyboards/keebio/quefrency/rev2/rev2.h
@@ -1,16 +1,7 @@
 #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, \
diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h
index 63f1408cda..0d7e9f8a30 100644
--- a/keyboards/keebio/quefrency/rev3/config.h
+++ b/keyboards/keebio/quefrency/rev3/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 }
-#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
diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json
index cd335a1d27..85e78eb203 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"}
@@ -24,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",
diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c
index 52ce977ac7..24791f75d0 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 "rev3.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
index 12f76d5c85..120186f9c0 100644
--- a/keyboards/keebio/quefrency/rev3/rev3.h
+++ b/keyboards/keebio/quefrency/rev3/rev3.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "quefrency.h"
 #include "quantum.h"
 
 #define LAYOUT_60( \
diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h
index 3292fbf302..e3adf83576 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 */
diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json
index de9a383d4f..c3f2fc4041 100644
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ b/keyboards/keebio/quefrency/rev4/info.json
@@ -8,6 +8,11 @@
         "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"}
@@ -21,6 +26,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",
diff --git a/keyboards/keebio/quefrency/rev4/rev4.c b/keyboards/keebio/quefrency/rev4/rev4.c
index 66d73a934a..78e48dcf70 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 "rev4.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
index 2284a6da43..4f51cc8f32 100644
--- a/keyboards/keebio/quefrency/rev4/rev4.h
+++ b/keyboards/keebio/quefrency/rev4/rev4.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "quefrency.h"
 #include "quantum.h"
 
 #define LAYOUT_60( \
diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h
index 3292fbf302..e3adf83576 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 */
diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json
index 422d987258..7c62abecac 100644
--- a/keyboards/keebio/quefrency/rev5/info.json
+++ b/keyboards/keebio/quefrency/rev5/info.json
@@ -8,6 +8,11 @@
         "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"}
@@ -21,6 +26,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",
diff --git a/keyboards/keebio/quefrency/rev5/rev5.c b/keyboards/keebio/quefrency/rev5/rev5.c
index 66d73a934a..a94fecd967 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 "rev5.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
index 2284a6da43..4f51cc8f32 100644
--- a/keyboards/keebio/quefrency/rev5/rev5.h
+++ b/keyboards/keebio/quefrency/rev5/rev5.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "quefrency.h"
 #include "quantum.h"
 
 #define LAYOUT_60( \
diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h
index 435ebb2845..73161d7a99 100644
--- a/keyboards/keebio/rorschach/rev1/config.h
+++ b/keyboards/keebio/rorschach/rev1/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 { 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 */
diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json
index 88cec27844..0a117cc944 100644
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@@ -8,6 +8,11 @@
     "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
@@ -20,67 +25,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/rev1/rev1.h b/keyboards/keebio/sinc/rev1/rev1.h
index 1fbbc2d6af..45d7ab05d1 100644
--- a/keyboards/keebio/sinc/rev1/rev1.h
+++ b/keyboards/keebio/sinc/rev1/rev1.h
@@ -1,15 +1,8 @@
 #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 XXX KC_NO
 
 #define LAYOUT_75( \
   LF3, LF4, LF5, LF6, LF7, LF8, LF9,           RF2, RF3, RF4, RF5, RF6, RF7, RF8, \
@@ -20,18 +13,18 @@
   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 } \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80( \
@@ -43,18 +36,18 @@
   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 }, \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, 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 } \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_75_with_macro( \
@@ -67,17 +60,17 @@
   ) \
   { \
     { 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 } \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { LD1, LD2, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80_with_macro( \
@@ -90,17 +83,17 @@
   ) \
   { \
     { 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 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { LD1, LD2, LD3, XXX, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, 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 } \
+    { RC1, RC2, RC3, RC4, RC5, RC6, XXX, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_75_iso( \
@@ -112,18 +105,18 @@
   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 } \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80_iso( \
@@ -135,18 +128,18 @@
   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 }, \
+    { XXX, XXX, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { XXX, XXX, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { XXX, XXX, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
+    { XXX, XXX, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { XXX, XXX, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { XXX, XXX, 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 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, 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 } \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_75_iso_with_macro( \
@@ -159,17 +152,17 @@
   ) \
   { \
     { 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 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
     { 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 } \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, LF3, LF4, LF5, LF6, LF7, LF8, LF9 }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, XXX }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, XXX }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, XXX }, \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, XXX }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, XXX }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, XXX } \
   }
 
 #define LAYOUT_80_iso_with_macro( \
@@ -182,17 +175,17 @@
   ) \
   { \
     { 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 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
     { 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 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, 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 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, XXX, 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 } \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
 
 #define LAYOUT_all( \
@@ -205,15 +198,15 @@
   ) \
   { \
     { 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 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, XXX }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, XXX }, \
     { 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 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, XXX }, \
+    { LF1, XXX, 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 } \
+    { RD1, RD2, RD3, RD4, RD5, XXX, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, XXX, RE7, RE8, RE9 }, \
+    { XXX, RF2, RF3, RF4, RF5, RF6, RF7, RF8, RF9 } \
   }
diff --git a/keyboards/keebio/sinc/rev2/rev2.h b/keyboards/keebio/sinc/rev2/rev2.h
index 15d4b402b0..8960cf7579 100644
--- a/keyboards/keebio/sinc/rev2/rev2.h
+++ b/keyboards/keebio/sinc/rev2/rev2.h
@@ -16,17 +16,8 @@ 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, \
diff --git a/keyboards/keebio/sinc/rev3/rev3.h b/keyboards/keebio/sinc/rev3/rev3.h
index 57d072398a..b863ddfe20 100644
--- a/keyboards/keebio/sinc/rev3/rev3.h
+++ b/keyboards/keebio/sinc/rev3/rev3.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "sinc.h"
 #include "quantum.h"
 
 #define LAYOUT_75( \
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/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..2fabf5d47b 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,
diff --git a/keyboards/keebio/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h
index d911b45208..a31e17e1ab 100644
--- a/keyboards/keebio/viterbi/rev1/config.h
+++ b/keyboards/keebio/viterbi/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 { 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 */
diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json
index d91c35fc85..001886d11e 100644
--- a/keyboards/keebio/viterbi/rev1/info.json
+++ b/keyboards/keebio/viterbi/rev1/info.json
@@ -6,5 +6,10 @@
     "usb": {
         "pid": "0x1157",
         "device_version": "1.0.0"
-    }
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW"
 }
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..d455adcba8 100644
--- a/keyboards/keebio/viterbi/rev2/config.h
+++ b/keyboards/keebio/viterbi/rev2/config.h
@@ -17,14 +17,8 @@ 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 */
diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json
index dd375f3053..dd20a662e6 100644
--- a/keyboards/keebio/viterbi/rev2/info.json
+++ b/keyboards/keebio/viterbi/rev2/info.json
@@ -7,6 +7,11 @@
         "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
diff --git a/keyboards/keebio/viterbi/rev2/rev2.c b/keyboards/keebio/viterbi/rev2/rev2.c
index a72cc44436..6158903e22 100644
--- a/keyboards/keebio/viterbi/rev2/rev2.c
+++ b/keyboards/keebio/viterbi/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "viterbi.h"
+#include "rev2.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
index 599e6415a3..a48c13d46b 100644
--- a/keyboards/keebio/viterbi/rev2/rev2.h
+++ b/keyboards/keebio/viterbi/rev2/rev2.h
@@ -1,17 +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
-
 #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, \
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..846d9b2da2 100644
--- a/keyboards/keebio/wavelet/config.h
+++ b/keyboards/keebio/wavelet/config.h
@@ -19,13 +19,6 @@ 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 */
diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json
index 1a1663c4d7..f09cc3593a 100644
--- a/keyboards/keebio/wavelet/info.json
+++ b/keyboards/keebio/wavelet/info.json
@@ -8,6 +8,11 @@
     "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
diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h
index afd480e018..6d29b5bb9e 100644
--- a/keyboards/keebio/wtf60/config.h
+++ b/keyboards/keebio/wtf60/config.h
@@ -16,24 +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
diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/info.json
index d6932595cf..33fd15d6c6 100644
--- a/keyboards/keebio/wtf60/info.json
+++ b/keyboards/keebio/wtf60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1337",
         "device_version": "0.0.1"
     },
+    "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/keebmonkey/kbmg68/config.h b/keyboards/keebmonkey/kbmg68/config.h
index 8872d8c9c6..7ed31afbd2 100644
--- a/keyboards/keebmonkey/kbmg68/config.h
+++ b/keyboards/keebmonkey/kbmg68/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 { 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
diff --git a/keyboards/keebmonkey/kbmg68/info.json b/keyboards/keebmonkey/kbmg68/info.json
index 802f3d6360..2069100fdf 100644
--- a/keyboards/keebmonkey/kbmg68/info.json
+++ b/keyboards/keebmonkey/kbmg68/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h
index e30cb58610..b23c9a9d38 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
diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json
index d769b4e7d0..eb29fe6a61 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}
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/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..e2c2c93808 100644
--- a/keyboards/keebsforall/freebirdnp/lite/info.json
+++ b/keyboards/keebsforall/freebirdnp/lite/info.json
@@ -8,6 +8,11 @@
         "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"],
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..a11dabe388 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"}
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/info.json b/keyboards/keebsforall/freebirdtkl/info.json
index a55626c908..68eb0c3bf9 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": {
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..ef73d9d1ff 100755
--- a/keyboards/keebwerk/mega/ansi/info.json
+++ b/keyboards/keebwerk/mega/ansi/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h
index f0e1766733..7d84b547ad 100644
--- a/keyboards/keebwerk/nano_slider/config.h
+++ b/keyboards/keebwerk/nano_slider/config.h
@@ -17,18 +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
diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json
index bd47ae0a4b..38e2902dae 100644
--- a/keyboards/keebwerk/nano_slider/info.json
+++ b/keyboards/keebwerk/nano_slider/info.json
@@ -8,6 +8,11 @@
         "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
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/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..f993b81f2f 100644
--- a/keyboards/keebzdotnet/wazowski/info.json
+++ b/keyboards/keebzdotnet/wazowski/info.json
@@ -8,25 +8,30 @@
         "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}
+                {"x":1, "y":0},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":7, "y":2},
+                {"x":0, "y":2},
+                {"x":2, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":1},
+                {"x":1, "y":3},
+                {"x":3, "y":3},
+                {"x":7, "y":0},
+                {"x":8, "y":1}
             ]
         }
     }
diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h
index e9ad8c2fee..ce174f57bb 100644
--- a/keyboards/kegen/gboy/config.h
+++ b/keyboards/kegen/gboy/config.h
@@ -17,14 +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
diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json
index 909eb6c568..39b15a1a8a 100644
--- a/keyboards/kegen/gboy/info.json
+++ b/keyboards/kegen/gboy/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h
index f2988c8ede..fb5f8a8f60 100644
--- a/keyboards/keybage/radpad/config.h
+++ b/keyboards/keybage/radpad/config.h
@@ -17,12 +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
diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json
index f0c0dcd63f..927e68f6ef 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},
@@ -23,19 +28,24 @@
         "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 +55,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 +76,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/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h
index e3b01a37bb..f4ad38a15e 100644
--- a/keyboards/keybee/keybee65/config.h
+++ b/keyboards/keybee/keybee65/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 { 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
diff --git a/keyboards/keybee/keybee65/info.json b/keyboards/keybee/keybee65/info.json
index fa46a09323..fcb1e138d9 100644
--- a/keyboards/keybee/keybee65/info.json
+++ b/keyboards/keybee/keybee65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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"],
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/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..6e82a2cc6f 100644
--- a/keyboards/keycapsss/kimiko/rev1/config.h
+++ b/keyboards/keycapsss/kimiko/rev1/config.h
@@ -16,12 +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
 
diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json
index 0bfeffe39a..95215542a9 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"}
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..8abe34ac3d 100644
--- a/keyboards/keycapsss/o4l_5x12/config.h
+++ b/keyboards/keycapsss/o4l_5x12/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 { 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
diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json
index 6409b8a712..1797eb41f3 100644
--- a/keyboards/keycapsss/o4l_5x12/info.json
+++ b/keyboards/keycapsss/o4l_5x12/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0512",
         "device_version": "0.0.1"
     },
+    "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"],
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..b384789e47 100644
--- a/keyboards/keycapsss/plaid_pad/info.json
+++ b/keyboards/keycapsss/plaid_pad/info.json
@@ -6,28 +6,33 @@
         "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}
+                {"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}
             ]
         }
     }
diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h
index 28e942da07..616f5494e7 100644
--- a/keyboards/keychron/q0/config.h
+++ b/keyboards/keychron/q0/config.h
@@ -16,9 +16,6 @@
 
 #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 */
diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h
index 80a2e150af..9a5d3bc372 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
diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json
index 334f879d3b..acfd07e390 100644
--- a/keyboards/keychron/q0/rev_0130/info.json
+++ b/keyboards/keychron/q0/rev_0130/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0130",
         "device_version": "1.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "B0"],
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
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..d447502cba 100644
--- a/keyboards/keychron/q0/rev_0131/info.json
+++ b/keyboards/keychron/q0/rev_0131/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0131",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2"],
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A3", "pin_b": "A4"}
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..c878317063 100644
--- a/keyboards/keychron/q1/ansi/info.json
+++ b/keyboards/keychron/q1/ansi/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0100",
     	"device_version": "1.0.0"
     },
+    "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_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..9b1f1ba014 100644
--- a/keyboards/keychron/q1/ansi_encoder/info.json
+++ b/keyboards/keychron/q1/ansi_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0101",
         "device_version": "1.0.0"
     },
+    "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/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..447a246471 100644
--- a/keyboards/keychron/q1/iso/info.json
+++ b/keyboards/keychron/q1/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0102",
         "device_version": "1.0.0"
     },
+    "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_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..ceee988875 100644
--- a/keyboards/keychron/q1/iso_encoder/info.json
+++ b/keyboards/keychron/q1/iso_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0103",
         "device_version": "1.0.2"
     },
+    "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/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/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/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/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..eac3fc529c 100644
--- a/keyboards/keychron/q2/ansi/info.json
+++ b/keyboards/keychron/q2/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0110",
         "device_version": "1.0.0"
     },
+    "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_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..e0f7c6cebd 100644
--- a/keyboards/keychron/q2/ansi_encoder/info.json
+++ b/keyboards/keychron/q2/ansi_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0111",
         "device_version": "1.0.0"
     },
+    "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/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..afc1079ae1 100644
--- a/keyboards/keychron/q2/iso/info.json
+++ b/keyboards/keychron/q2/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0112",
         "device_version": "1.0.0"
     },
+    "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_encoder/info.json b/keyboards/keychron/q2/iso_encoder/info.json
index 028522c259..249813f517 100644
--- a/keyboards/keychron/q2/iso_encoder/info.json
+++ b/keyboards/keychron/q2/iso_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0113",
         "device_version": "1.0.0"
     },
+    "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/jis/info.json b/keyboards/keychron/q2/jis/info.json
index d41bf49cb2..f36cda421f 100644
--- a/keyboards/keychron/q2/jis/info.json
+++ b/keyboards/keychron/q2/jis/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0114",
         "device_version": "1.0.0"
     },
+    "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_encoder/info.json b/keyboards/keychron/q2/jis_encoder/info.json
index 18e800703b..9e217dddea 100644
--- a/keyboards/keychron/q2/jis_encoder/info.json
+++ b/keyboards/keychron/q2/jis_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0115",
         "device_version": "1.0.0"
     },
+    "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/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_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/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_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/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_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/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..cb0fc55e3f 100644
--- a/keyboards/keychron/q4/ansi_v1/info.json
+++ b/keyboards/keychron/q4/ansi_v1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0140",
         "device_version": "1.0.0"
     },
+    "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/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..cb0fc55e3f 100644
--- a/keyboards/keychron/q4/ansi_v2/info.json
+++ b/keyboards/keychron/q4/ansi_v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0140",
         "device_version": "1.0.0"
     },
+    "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/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..908c5bdae1 100644
--- a/keyboards/keychron/q4/iso/info.json
+++ b/keyboards/keychron/q4/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0142",
         "device_version": "1.0.0"
     },
+    "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/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_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/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_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/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_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/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_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/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..cf4e86f8aa 100644
--- a/keyboards/keychron/q60/ansi/info.json
+++ b/keyboards/keychron/q60/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x01C0",
         "device_version": "1.0.0"
     },
+    "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/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/q7/ansi/info.json b/keyboards/keychron/q7/ansi/info.json
index dbbc462a6d..00240fd6a3 100644
--- a/keyboards/keychron/q7/ansi/info.json
+++ b/keyboards/keychron/q7/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0170",
         "device_version": "1.0.0"
     },
+    "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/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..b060b570b9 100644
--- a/keyboards/keychron/q7/iso/info.json
+++ b/keyboards/keychron/q7/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0172",
         "device_version": "1.0.0"
     },
+    "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/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..96efa35d26 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0180",
         "device_version": "1.0.0"
     },
+    "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_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..071a7a25f9 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0181",
         "device_version": "1.0.0"
     },
+    "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/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..e716b347a0 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0182",
         "device_version": "1.0.0"
     },
+    "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_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index 45181452be..f70548f3c4 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0183",
         "device_version": "1.0.0"
     },
+    "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/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..cd971b155a 100644
--- a/keyboards/keychron/q9/ansi/info.json
+++ b/keyboards/keychron/q9/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0190",
         "device_version": "1.0.0"
     },
+    "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_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..7b4e73eee3 100644
--- a/keyboards/keychron/q9/ansi_encoder/info.json
+++ b/keyboards/keychron/q9/ansi_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0191",
         "device_version": "1.0.0"
     },
+    "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/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..7f435a2b7b 100644
--- a/keyboards/keychron/q9/iso/info.json
+++ b/keyboards/keychron/q9/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0192",
         "device_version": "1.0.0"
     },
+    "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_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json
index dee0a8953a..8ecb23b0a3 100644
--- a/keyboards/keychron/q9/iso_encoder/info.json
+++ b/keyboards/keychron/q9/iso_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0193",
         "device_version": "1.0.0"
     },
+    "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/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..2aabe622d4 100644
--- a/keyboards/keychron/s1/ansi/rgb/info.json
+++ b/keyboards/keychron/s1/ansi/rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0410",
         "device_version": "1.0.0"
     },
+    "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/info.json b/keyboards/keychron/s1/ansi/white/info.json
index a64f5eb0a9..e6c0e4f3d1 100644
--- a/keyboards/keychron/s1/ansi/white/info.json
+++ b/keyboards/keychron/s1/ansi/white/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0411",
         "device_version": "1.0.0"
     },
+    "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/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/v2/ansi/info.json b/keyboards/keychron/v2/ansi/info.json
index f0bb49cee2..9c8bffb4f1 100644
--- a/keyboards/keychron/v2/ansi/info.json
+++ b/keyboards/keychron/v2/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0320",
         "device_version": "1.0.0"
     },
+    "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_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/info.json
index 1e729eb636..3a8f9add34 100644
--- a/keyboards/keychron/v2/ansi_encoder/info.json
+++ b/keyboards/keychron/v2/ansi_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0321",
         "device_version": "1.0.0"
     },
+    "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/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..9a79f31149 100644
--- a/keyboards/keychron/v2/iso/info.json
+++ b/keyboards/keychron/v2/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0322",
         "device_version": "1.0.0"
     },
+    "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_encoder/info.json b/keyboards/keychron/v2/iso_encoder/info.json
index a784b33ec5..13a232c6da 100644
--- a/keyboards/keychron/v2/iso_encoder/info.json
+++ b/keyboards/keychron/v2/iso_encoder/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0323",
         "device_version": "1.0.0"
     },
+    "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/info.json b/keyboards/keychron/v2/jis/info.json
index 89ec07b072..a727490f8f 100644
--- a/keyboards/keychron/v2/jis/info.json
+++ b/keyboards/keychron/v2/jis/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0324",
         "device_version": "1.0.0"
     },
+    "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_encoder/info.json b/keyboards/keychron/v2/jis_encoder/info.json
index abb76636f7..222861041c 100644
--- a/keyboards/keychron/v2/jis_encoder/info.json
+++ b/keyboards/keychron/v2/jis_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0325",
         "device_version": "1.0.0"
     },
+    "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/v4/ansi/info.json b/keyboards/keychron/v4/ansi/info.json
index 04bd9e4761..372f8d2bf0 100644
--- a/keyboards/keychron/v4/ansi/info.json
+++ b/keyboards/keychron/v4/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0340",
         "device_version": "1.0.0"
     },
+    "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/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..79d23c7853 100644
--- a/keyboards/keychron/v4/iso/info.json
+++ b/keyboards/keychron/v4/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0342",
         "device_version": "1.0.0"
     },
+    "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/v7/ansi/info.json b/keyboards/keychron/v7/ansi/info.json
index 00df236f6d..7b3eb8db78 100644
--- a/keyboards/keychron/v7/ansi/info.json
+++ b/keyboards/keychron/v7/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0370",
         "device_version": "1.0.0"
     },
+    "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/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..449ec89487 100644
--- a/keyboards/keychron/v7/iso/info.json
+++ b/keyboards/keychron/v7/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0372",
         "device_version": "1.0.0"
     },
+    "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/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json
index f1f2e75e4d..6924af28b5 100644
--- a/keyboards/keychron/v8/ansi/info.json
+++ b/keyboards/keychron/v8/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0380",
         "device_version": "1.0.0"
     },
+    "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_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json
index f6a9de655b..8ff94cedb0 100644
--- a/keyboards/keychron/v8/ansi_encoder/info.json
+++ b/keyboards/keychron/v8/ansi_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0381",
         "device_version": "1.0.0"
     },
+    "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/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..1cfb662ba2 100644
--- a/keyboards/keychron/v8/iso/info.json
+++ b/keyboards/keychron/v8/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0382",
         "device_version": "1.0.0"
     },
+    "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_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json
index 2abaeda111..a70cc2c43b 100644
--- a/keyboards/keychron/v8/iso_encoder/info.json
+++ b/keyboards/keychron/v8/iso_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0383",
         "device_version": "1.0.0"
     },
+    "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/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h
index 8b581bffa0..03303df60e 100644
--- a/keyboards/keygem/kg60ansi/config.h
+++ b/keyboards/keygem/kg60ansi/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 { 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 */
diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json
index 7376b01485..48413f586e 100644
--- a/keyboards/keygem/kg60ansi/info.json
+++ b/keyboards/keygem/kg60ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi"],
diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h
index 6a229d81af..670537b461 100644
--- a/keyboards/keygem/kg65rgbv2/config.h
+++ b/keyboards/keygem/kg65rgbv2/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 { 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 */
diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json
index 326d5256e1..292314e1b9 100644
--- a/keyboards/keygem/kg65rgbv2/info.json
+++ b/keyboards/keygem/kg65rgbv2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index 0c7fe33f6b..f33378524b 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/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, 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
diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
index 336707f239..c57f0ef84e 100644
--- a/keyboards/keyhive/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFEED",
         "device_version": "0.0.1"
     },
+    "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"}
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 6bd579b332..aded22bc7e 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/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, 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
diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
index 872ba2d76b..f9e3944fec 100644
--- a/keyboards/keyhive/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/info.json
@@ -7,6 +7,11 @@
         "pid": "0xE590",
         "device_version": "0.0.1"
     },
+    "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"],
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..f34f6398f6 100644
--- a/keyboards/keyhive/maypad/info.json
+++ b/keyboards/keyhive/maypad/info.json
@@ -8,6 +8,11 @@
         "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"],
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..c721a3f390 100644
--- a/keyboards/keyhive/navi10/rev0/info.json
+++ b/keyboards/keyhive/navi10/rev0/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "F6"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
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..a0e51a3fb8 100644
--- a/keyboards/keyhive/navi10/rev2/info.json
+++ b/keyboards/keyhive/navi10/rev2/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "B1"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
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..704ca05e91 100644
--- a/keyboards/keyhive/navi10/rev3/info.json
+++ b/keyboards/keyhive/navi10/rev3/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D4", "E6", "B1"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
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/smallice/config.h b/keyboards/keyhive/smallice/config.h
index b3114e4011..450f080684 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/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, 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
diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json
index 39bdd4d09a..476411a004 100644
--- a/keyboards/keyhive/smallice/info.json
+++ b/keyboards/keyhive/smallice/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5341",
         "device_version": "0.0.1"
     },
+    "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/southpole/config.h b/keyboards/keyhive/southpole/config.h
index 91718d741f..b44dfaac52 100644
--- a/keyboards/keyhive/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
@@ -1,13 +1,5 @@
 #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
 
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/ut472/config.h b/keyboards/keyhive/ut472/config.h
index 5e00d17106..e96f645d6a 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -16,15 +16,6 @@ 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 */
diff --git a/keyboards/keyhive/ut472/info.json b/keyboards/keyhive/ut472/info.json
index de93aeef6d..d80901cf50 100644
--- a/keyboards/keyhive/ut472/info.json
+++ b/keyboards/keyhive/ut472/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0472",
     "device_version": "0.0.2"
   },
+  "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": {
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/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..4abcf1e3ad 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"}
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/keyquest/enclave/config.h b/keyboards/keyquest/enclave/config.h
index 451048ecc8..94e709e18a 100644
--- a/keyboards/keyquest/enclave/config.h
+++ b/keyboards/keyquest/enclave/config.h
@@ -13,13 +13,6 @@ 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
diff --git a/keyboards/keyquest/enclave/info.json b/keyboards/keyquest/enclave/info.json
index 8fc3055729..02a845423f 100644
--- a/keyboards/keyquest/enclave/info.json
+++ b/keyboards/keyquest/enclave/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0E0E",
         "device_version": "0.0.1"
     },
+    "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..231ead1f33 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
 
diff --git a/keyboards/keysofkings/twokey/info.json b/keyboards/keysofkings/twokey/info.json
index 910d8cc0ef..2738a173f5 100644
--- a/keyboards/keysofkings/twokey/info.json
+++ b/keyboards/keysofkings/twokey/info.json
@@ -8,6 +8,11 @@
         "pid": "0xAE12",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B3", "B2"],
+        "rows": ["B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "E6", "resolution": 1}
diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h
index 75b25e02c3..ccd1b1da6c 100644
--- a/keyboards/keystonecaps/gameroyadvance/config.h
+++ b/keyboards/keystonecaps/gameroyadvance/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 { 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
 
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
index 7a968deded..8307f061da 100644
--- a/keyboards/keystonecaps/gameroyadvance/info.json
+++ b/keyboards/keystonecaps/gameroyadvance/info.json
@@ -8,6 +8,11 @@
         "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"}
@@ -21,6 +26,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 +39,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/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..4d89a079a7 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": {
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..6f83e36c16 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"
     },
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/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..3e8a771785 100644
--- a/keyboards/kikkou/info.json
+++ b/keyboards/kikkou/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", "B5", "B6", "C6", "C7", "F7", "F6"],
+        "rows": ["F0", "F1", "F4", "F5", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kikoslab/ellora65/config.h b/keyboards/kikoslab/ellora65/config.h
index 1243e775d3..1369ec04d7 100644
--- a/keyboards/kikoslab/ellora65/config.h
+++ b/keyboards/kikoslab/ellora65/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 { 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/info.json b/keyboards/kikoslab/ellora65/info.json
index 2fae750985..0b78709509 100644
--- a/keyboards/kikoslab/ellora65/info.json
+++ b/keyboards/kikoslab/ellora65/info.json
@@ -8,6 +8,11 @@
         "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"}
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/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/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/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/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/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/info.json b/keyboards/kindakeyboards/conone65/info.json
index e1dfa932f5..7ea344ed9c 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"
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/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..aa87459cd4 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/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 { 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
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..b9bb73219c 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/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, 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:
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..152a7d9c9b 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -16,50 +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
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..c1699c2d6d 100644
--- a/keyboards/kinesis/kintlc/config.h
+++ b/keyboards/kinesis/kintlc/config.h
@@ -16,50 +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
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..3489b5104b 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -1,23 +1,5 @@
 #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
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/info.json b/keyboards/kineticlabs/emu/hotswap/info.json
index 7e04725e8e..662ad66aba 100644
--- a/keyboards/kineticlabs/emu/hotswap/info.json
+++ b/keyboards/kineticlabs/emu/hotswap/info.json
@@ -8,6 +8,11 @@
         "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"],
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..513287aede 100644
--- a/keyboards/kineticlabs/emu/soldered/info.json
+++ b/keyboards/kineticlabs/emu/soldered/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h
index fadfdae715..22a7e65e04 100644
--- a/keyboards/kingly_keys/ave/config.h
+++ b/keyboards/kingly_keys/ave/config.h
@@ -17,12 +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
diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json
index cdd3f41835..8ad45d243b 100644
--- a/keyboards/kingly_keys/ave/ortho/info.json
+++ b/keyboards/kingly_keys/ave/ortho/info.json
@@ -8,6 +8,11 @@
       "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"}
diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json
index 2e9c83df4c..235228deb2 100644
--- a/keyboards/kingly_keys/ave/staggered/info.json
+++ b/keyboards/kingly_keys/ave/staggered/info.json
@@ -8,6 +8,11 @@
      "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"}
diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h
index 4f79c077e1..dea4456dd4 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 */
diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json
index e306ed38a2..d2206c066c 100644
--- a/keyboards/kingly_keys/little_foot/info.json
+++ b/keyboards/kingly_keys/little_foot/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "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": {
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..668b4d2f0b 100644
--- a/keyboards/kingly_keys/romac/info.json
+++ b/keyboards/kingly_keys/romac/info.json
@@ -8,6 +8,11 @@
     "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": {
diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
index 8392caa689..21095a7358 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
 
diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json
index a93fa6496b..5976a3ff86 100644
--- a/keyboards/kingly_keys/romac_plus/info.json
+++ b/keyboards/kingly_keys/romac_plus/info.json
@@ -8,6 +8,11 @@
     "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"}
diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h
index d1e5d91340..67ac57d54c 100644
--- a/keyboards/kingly_keys/ropro/config.h
+++ b/keyboards/kingly_keys/ropro/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 { 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
 
diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json
index b2d3cf21e5..2afcd7dc59 100644
--- a/keyboards/kingly_keys/ropro/info.json
+++ b/keyboards/kingly_keys/ropro/info.json
@@ -8,6 +8,11 @@
     "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"}
diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h
index 2b4eecd70c..ada89746af 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 */
diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json
index f6bbca9289..8aa1f12dbf 100644
--- a/keyboards/kingly_keys/smd_milk/info.json
+++ b/keyboards/kingly_keys/smd_milk/info.json
@@ -8,6 +8,11 @@
     "pid": "0xB195",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D3"],
+    "rows": ["C5", "D2"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
index 3127ee9411..ef8911b082 100644
--- a/keyboards/kingly_keys/soap/config.h
+++ b/keyboards/kingly_keys/soap/config.h
@@ -14,13 +14,6 @@
  * 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
 
diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json
index b910faac32..16f229f043 100644
--- a/keyboards/kingly_keys/soap/info.json
+++ b/keyboards/kingly_keys/soap/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0003",
     "device_version": "0.0.4"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F1", "F0", "D5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D6", "pin_b": "D7"}
diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h
index 6a69df05e7..6fa39cf9e6 100644
--- a/keyboards/kira75/config.h
+++ b/keyboards/kira75/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 }
-#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
diff --git a/keyboards/kira75/info.json b/keyboards/kira75/info.json
index fa366854b2..9b691efd2c 100644
--- a/keyboards/kira75/info.json
+++ b/keyboards/kira75/info.json
@@ -8,6 +8,11 @@
         "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
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..23fa877fae 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
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..b0fbe9f9ed 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"}
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..5af9357c95 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"}
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
index a698476a5f..08467cfd14 100644
--- a/keyboards/kiwikey/borderland/config.h
+++ b/keyboards/kiwikey/borderland/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, 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
diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json
index 84b17c4385..56f5367bd1 100644
--- a/keyboards/kiwikey/borderland/info.json
+++ b/keyboards/kiwikey/borderland/info.json
@@ -8,6 +8,11 @@
         "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"}
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
index 086a8c839f..13374ee337 100644
--- a/keyboards/kiwikey/kawii9/config.h
+++ b/keyboards/kiwikey/kawii9/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 }
-#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
diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json
index e1511b544c..a71e963a05 100644
--- a/keyboards/kiwikey/kawii9/info.json
+++ b/keyboards/kiwikey/kawii9/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0303",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6"],
+        "rows": ["B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index 5332a91304..337277fadc 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/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, 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
diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json
index 3bab46fb4a..3489d64245 100644
--- a/keyboards/kiwikey/wanderland/info.json
+++ b/keyboards/kiwikey/wanderland/info.json
@@ -8,6 +8,11 @@
         "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
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..103efeef4e 100644
--- a/keyboards/kkatano/bakeneko65/rev2/info.json
+++ b/keyboards/kkatano/bakeneko65/rev2/info.json
@@ -8,6 +8,11 @@
         "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"],
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/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..6fdcd422cb 100644
--- a/keyboards/kkatano/bakeneko80/info.json
+++ b/keyboards/kkatano/bakeneko80/info.json
@@ -8,6 +8,11 @@
         "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"],
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..7372dcacb2 100644
--- a/keyboards/kkatano/wallaby/info.json
+++ b/keyboards/kkatano/wallaby/info.json
@@ -8,6 +8,11 @@
         "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"],
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..3f77786c89 100644
--- a/keyboards/kkatano/yurei/info.json
+++ b/keyboards/kkatano/yurei/info.json
@@ -8,6 +8,11 @@
         "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"],
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..68cf23a41a 100644
--- a/keyboards/knops/mini/info.json
+++ b/keyboards/knops/mini/info.json
@@ -8,6 +8,11 @@
 		"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": {
diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h
index 4b0c193cc1..7e634bd2b3 100644
--- a/keyboards/kona_classic/config.h
+++ b/keyboards/kona_classic/config.h
@@ -17,18 +17,6 @@ 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
diff --git a/keyboards/kona_classic/info.json b/keyboards/kona_classic/info.json
index 6a6f996d90..d1097921ed 100644
--- a/keyboards/kona_classic/info.json
+++ b/keyboards/kona_classic/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.3"
   },
+  "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/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_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..f2b51fa065 100644
--- a/keyboards/kopibeng/mnk88/config.h
+++ b/keyboards/kopibeng/mnk88/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 { 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
diff --git a/keyboards/kopibeng/mnk88/info.json b/keyboards/kopibeng/mnk88/info.json
index 813767a89a..3333de9814 100644
--- a/keyboards/kopibeng/mnk88/info.json
+++ b/keyboards/kopibeng/mnk88/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8800",
         "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"
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..6163c3555d 100644
--- a/keyboards/kopibeng/xt60/config.h
+++ b/keyboards/kopibeng/xt60/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 { 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
diff --git a/keyboards/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/info.json
index 62da3ebf2f..b6b27ee2fd 100644
--- a/keyboards/kopibeng/xt60/info.json
+++ b/keyboards/kopibeng/xt60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0600",
         "device_version": "0.0.2"
     },
+    "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/config.h b/keyboards/kopibeng/xt60_singa/config.h
index 1f4191e6d7..6163c3555d 100644
--- a/keyboards/kopibeng/xt60_singa/config.h
+++ b/keyboards/kopibeng/xt60_singa/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 { 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
diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json
index 9b156ebbf5..6024919cbf 100644
--- a/keyboards/kopibeng/xt60_singa/info.json
+++ b/keyboards/kopibeng/xt60_singa/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0601",
         "device_version": "0.0.1"
     },
+    "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/xt65/config.h b/keyboards/kopibeng/xt65/config.h
index e7b6507f53..04a7030393 100644
--- a/keyboards/kopibeng/xt65/config.h
+++ b/keyboards/kopibeng/xt65/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 { 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
diff --git a/keyboards/kopibeng/xt65/info.json b/keyboards/kopibeng/xt65/info.json
index 5becaacc09..eb01ffb630 100644
--- a/keyboards/kopibeng/xt65/info.json
+++ b/keyboards/kopibeng/xt65/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h
index 395687caff..053c826450 100644
--- a/keyboards/kopibeng/xt8x/config.h
+++ b/keyboards/kopibeng/xt8x/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 { 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
diff --git a/keyboards/kopibeng/xt8x/info.json b/keyboards/kopibeng/xt8x/info.json
index 61c8edb509..c2985e4fc3 100644
--- a/keyboards/kopibeng/xt8x/info.json
+++ b/keyboards/kopibeng/xt8x/info.json
@@ -8,6 +8,11 @@
         "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"
diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
index c84de01fd5..c629c8721a 100755
--- a/keyboards/kprepublic/bm16s/config.h
+++ b/keyboards/kprepublic/bm16s/config.h
@@ -1,12 +1,5 @@
 #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
 
diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json
index adda71d87b..38cbe62e68 100644
--- a/keyboards/kprepublic/bm16s/info.json
+++ b/keyboards/kprepublic/bm16s/info.json
@@ -8,6 +8,11 @@
       "pid": "0x016B",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["F7", "F6", "D4", "D6"],
+      "rows": ["D1", "D0", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x4"],
diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h
index 3028c31e89..2e4942bf63 100755
--- a/keyboards/kprepublic/bm40hsrgb/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/config.h
@@ -15,14 +15,6 @@
  */
 #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
 
diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json
index 10c41a9b3c..68a9803759 100644
--- a/keyboards/kprepublic/bm40hsrgb/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3430",
         "device_version": "0.0.1"
     },
+    "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/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h
index 329615e1d1..fd6a1a0806 100644
--- a/keyboards/kprepublic/bm43a/config.h
+++ b/keyboards/kprepublic/bm43a/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 { 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
diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json
index 4e23be7857..9bb98c34ab 100644
--- a/keyboards/kprepublic/bm43a/info.json
+++ b/keyboards/kprepublic/bm43a/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/kprepublic/bm43hsrgb/config.h b/keyboards/kprepublic/bm43hsrgb/config.h
index 56dd07e278..c19ed0598b 100755
--- a/keyboards/kprepublic/bm43hsrgb/config.h
+++ b/keyboards/kprepublic/bm43hsrgb/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 { 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
diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json
index 8190cded61..c9f0fd458a 100755
--- a/keyboards/kprepublic/bm43hsrgb/info.json
+++ b/keyboards/kprepublic/bm43hsrgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6061",
         "device_version": "0.0.1"
     },
+    "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/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
index a50d259582..c46ccd05a6 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/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)
- *
- */
-
-//                         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
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index ba4d0fcae5..4df7872080 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEF8C",
         "device_version": "0.0.1"
     },
+    "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/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index b30eb50679..bc48c2ec34 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/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, 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
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 9a765bc984..9fe0adf4f4 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1121",
         "device_version": "0.0.2"
     },
+    "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_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
index 8a5d4a50bc..242d2dfffd 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/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)
- *
- */
-
-//                         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
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index a255a480b3..e90e82c48d 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEF9C",
         "device_version": "0.0.1"
     },
+    "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/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index b70904fae3..c7426a407a 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/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 { 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
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index 83efb7b5e7..579048eb09 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1124",
         "device_version": "0.0.2"
     },
+    "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_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
index 998d574253..18b28b7560 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/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)
- *
- */
-
-//                         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
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index 3f0e2c6a23..ab1e8a496b 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEF8C",
         "device_version": "0.0.1"
     },
+    "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/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index a17dac0902..c1beccdeab 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/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, 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
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
index 7a49695dbc..4433cc0cc8 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1123",
         "device_version": "0.0.2"
     },
+    "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_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
index bac4d18649..31751e6214 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/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 { 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
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index 734169c9e4..2714ccd654 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEF8D",
         "device_version": "0.0.1"
     },
+    "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/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 5c56764315..9a43993d23 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/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, 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
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index 83962c13ff..9e99df16ad 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1122",
         "device_version": "0.0.2"
     },
+    "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/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index f05ae06ee2..8ed57405b5 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/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 { 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
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
index a2c126ee30..34bf483fc1 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEF6E",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
index e782009849..7712c86201 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
@@ -21,21 +21,6 @@ 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
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
index af805bd81c..9840bd1cd8 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0653",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index b76036f341..b0266a1307 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/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 { 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
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
index 54dc1efe67..12f52f4771 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEF6F",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index d348db3cb6..3f1d379135 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -16,12 +16,6 @@
   */
 #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
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
index b205449d3f..e9f320b2d7 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1131",
         "device_version": "0.0.2"
     },
+    "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": {
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index d42521fb9a..0e1861574a 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/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, 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
diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json
index 1cd8c7cc87..72097bd0c3 100644
--- a/keyboards/kprepublic/bm80hsrgb/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEF83",
         "device_version": "0.0.1"
     },
+    "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
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..aff5ae393f 100644
--- a/keyboards/kprepublic/bm80v2/info.json
+++ b/keyboards/kprepublic/bm80v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1141",
         "device_version": "0.0.2"
     },
+    "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"],
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..d4dd102269 100644
--- a/keyboards/kprepublic/bm80v2_iso/info.json
+++ b/keyboards/kprepublic/bm80v2_iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1142",
         "device_version": "0.0.2"
     },
+    "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"],
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index 52b58dcf6f..73cb52e6f8 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/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, 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
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
index cae17f2ce4..3856b0b681 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEF61",
         "device_version": "0.0.1"
     },
+    "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",
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index b271703558..a28b6c8c1f 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/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, 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
diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json
index ccf1ed42b0..a422152962 100644
--- a/keyboards/kprepublic/cospad/info.json
+++ b/keyboards/kprepublic/cospad/info.json
@@ -8,6 +8,11 @@
         "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
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..ffca844d84 100644
--- a/keyboards/kprepublic/jj40/info.json
+++ b/keyboards/kprepublic/jj40/info.json
@@ -8,6 +8,11 @@
     "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,
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..d914700ff2 100644
--- a/keyboards/kprepublic/jj4x4/info.json
+++ b/keyboards/kprepublic/jj4x4/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/kprepublic/jj50/config.h b/keyboards/kprepublic/jj50/config.h
index ef614b1f69..0b5a4ea80e 100644
--- a/keyboards/kprepublic/jj50/config.h
+++ b/keyboards/kprepublic/jj50/config.h
@@ -20,11 +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
diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json
index 126ba09048..765a33f865 100644
--- a/keyboards/kprepublic/jj50/info.json
+++ b/keyboards/kprepublic/jj50/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index d2103b03c6..3e49bfe194 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/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 }
-#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
diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json
index 6901774b23..7ab279ba6a 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
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/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..789626b6da 100644
--- a/keyboards/kudox/columner/config.h
+++ b/keyboards/kudox/columner/config.h
@@ -16,15 +16,6 @@
 
 #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 */
diff --git a/keyboards/kudox/columner/info.json b/keyboards/kudox/columner/info.json
index ff34bd12e0..eaf29de641 100644
--- a/keyboards/kudox/columner/info.json
+++ b/keyboards/kudox/columner/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..9b6ab4664d 100644
--- a/keyboards/kudox/rev1/config.h
+++ b/keyboards/kudox/rev1/config.h
@@ -16,15 +16,6 @@
 
 #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 */
diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kudox/rev1/info.json
index 918288d95e..8a3496f111 100644
--- a/keyboards/kudox/rev1/info.json
+++ b/keyboards/kudox/rev1/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..9b6ab4664d 100644
--- a/keyboards/kudox/rev2/config.h
+++ b/keyboards/kudox/rev2/config.h
@@ -16,15 +16,6 @@
 
 #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 */
diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kudox/rev2/info.json
index 9d4a453413..f6070be58e 100644
--- a/keyboards/kudox/rev2/info.json
+++ b/keyboards/kudox/rev2/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..789626b6da 100644
--- a/keyboards/kudox/rev3/config.h
+++ b/keyboards/kudox/rev3/config.h
@@ -16,15 +16,6 @@
 
 #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 */
diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kudox/rev3/info.json
index 738321eb13..143c8736fc 100644
--- a/keyboards/kudox/rev3/info.json
+++ b/keyboards/kudox/rev3/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..f277e60187 100644
--- a/keyboards/kudox_full/rev1/config.h
+++ b/keyboards/kudox_full/rev1/config.h
@@ -3,15 +3,6 @@
 
 #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 */
diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kudox_full/rev1/info.json
index 31adb7c81e..cad4c708e1 100644
--- a/keyboards/kudox_full/rev1/info.json
+++ b/keyboards/kudox_full/rev1/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..28bfb4a71c 100644
--- a/keyboards/kudox_game/rev1/config.h
+++ b/keyboards/kudox_game/rev1/config.h
@@ -17,15 +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, 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 */
diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kudox_game/rev1/info.json
index ad889c2304..ea3c15bd64 100644
--- a/keyboards/kudox_game/rev1/info.json
+++ b/keyboards/kudox_game/rev1/info.json
@@ -1,5 +1,10 @@
 {
     "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"
 }
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..7f699d18d8 100644
--- a/keyboards/kudox_game/rev2/config.h
+++ b/keyboards/kudox_game/rev2/config.h
@@ -17,15 +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, 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 */
diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kudox_game/rev2/info.json
index 3bdd63ee28..5957916420 100644
--- a/keyboards/kudox_game/rev2/info.json
+++ b/keyboards/kudox_game/rev2/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "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/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..7103728056 100644
--- a/keyboards/kv/revt/info.json
+++ b/keyboards/kv/revt/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/kwub/bloop/config.h b/keyboards/kwub/bloop/config.h
index e5f9d358a9..700e885658 100644
--- a/keyboards/kwub/bloop/config.h
+++ b/keyboards/kwub/bloop/config.h
@@ -16,16 +16,6 @@
 
 #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
 
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/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/labyrinth75/config.h b/keyboards/labyrinth75/config.h
index 226ef4a530..69d0ac691c 100644
--- a/keyboards/labyrinth75/config.h
+++ b/keyboards/labyrinth75/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, 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
diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/info.json
index 67ad33b84e..74741317f7 100644
--- a/keyboards/labyrinth75/info.json
+++ b/keyboards/labyrinth75/info.json
@@ -8,6 +8,11 @@
         "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]
     },
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..2558cb9faa 100644
--- a/keyboards/late9/rev1/info.json
+++ b/keyboards/late9/rev1/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 2072b4e630..5bbd2a8d23 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
diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
index eeb1bf151c..e103ff8017 100644
--- a/keyboards/latincompass/latin17rgb/info.json
+++ b/keyboards/latincompass/latin17rgb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x7C97",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "F4"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "debounce": 3,
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index 60a41b7fb3..a81c2f86ba 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/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 }
-#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
diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
index 5d695e86cf..a76e893f9b 100644
--- a/keyboards/latincompass/latin47ble/info.json
+++ b/keyboards/latincompass/latin47ble/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["planck_mit"],
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..cd8953c0d7 100644
--- a/keyboards/latincompass/latin60rgb/info.json
+++ b/keyboards/latincompass/latin60rgb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6C69",
     "device_version": "0.0.1"
   },
+  "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,
diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
index f55d3310c2..3a4b3ef671 100644
--- a/keyboards/latincompass/latin64ble/config.h
+++ b/keyboards/latincompass/latin64ble/config.h
@@ -15,13 +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
diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json
index 935e788d96..24a7581686 100644
--- a/keyboards/latincompass/latin64ble/info.json
+++ b/keyboards/latincompass/latin64ble/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6C71",
         "device_version": "0.0.1"
     },
+    "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/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..8dcc401b98 100644
--- a/keyboards/latincompass/latin6rgb/info.json
+++ b/keyboards/latincompass/latin6rgb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x7C96",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "debounce": 3,
diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
index bfbdf01cd7..8059b4d070 100644
--- a/keyboards/latincompass/latinpad/config.h
+++ b/keyboards/latincompass/latinpad/config.h
@@ -16,12 +16,6 @@ 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
 
diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json
index b2f4199dfd..7766de75ae 100644
--- a/keyboards/latincompass/latinpad/info.json
+++ b/keyboards/latincompass/latinpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6C70",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B2"},
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
index fe0ab9999b..b21508ce4d 100644
--- a/keyboards/latincompass/latinpadble/config.h
+++ b/keyboards/latincompass/latinpadble/config.h
@@ -21,11 +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
diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json
index 266f09d8a0..bb0dee70ba 100644
--- a/keyboards/latincompass/latinpadble/info.json
+++ b/keyboards/latincompass/latinpadble/info.json
@@ -8,6 +8,11 @@
         "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"}
diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h
index 380b5575e9..e5f50f6c28 100644
--- a/keyboards/lazydesigners/bolt/config.h
+++ b/keyboards/lazydesigners/bolt/config.h
@@ -17,12 +17,6 @@ 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
diff --git a/keyboards/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/info.json
index 98874151a8..9ce7c22aba 100644
--- a/keyboards/lazydesigners/bolt/info.json
+++ b/keyboards/lazydesigners/bolt/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0041",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/lazydesigners/cassette8/config.h
index 8992272f7b..c7e4f41f74 100755
--- a/keyboards/lazydesigners/cassette8/config.h
+++ b/keyboards/lazydesigners/cassette8/config.h
@@ -16,14 +16,6 @@
 
 #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
diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/info.json
index fd2733321b..8960356ea5 100755
--- a/keyboards/lazydesigners/cassette8/info.json
+++ b/keyboards/lazydesigners/cassette8/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "B1", "B0"],
+        "rows": ["B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
index 1f625bafb8..d35dbea6ce 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
 
diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json
index 5bd57ed1b7..4bad513fe6 100644
--- a/keyboards/lazydesigners/dimple/ortho/info.json
+++ b/keyboards/lazydesigners/dimple/ortho/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json
index 1161789c1e..e15b6fe207 100644
--- a/keyboards/lazydesigners/dimple/staggered/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h
index 9d8dca9693..25b86175b7 100644
--- a/keyboards/lazydesigners/dimpleplus/config.h
+++ b/keyboards/lazydesigners/dimpleplus/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, 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
diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json
index fd9b7bc44c..80ec07ceb2 100644
--- a/keyboards/lazydesigners/dimpleplus/info.json
+++ b/keyboards/lazydesigners/dimpleplus/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..264ae2b18a 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"
     },
diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h
index 6f625c41bd..65b240df1e 100644
--- a/keyboards/lazydesigners/the40/config.h
+++ b/keyboards/lazydesigners/the40/config.h
@@ -17,12 +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
diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json
index 009e6fe006..8562a87aec 100644
--- a/keyboards/lazydesigners/the40/info.json
+++ b/keyboards/lazydesigners/the40/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h
index 96b226f6e8..5e0e04031a 100644
--- a/keyboards/lazydesigners/the50/config.h
+++ b/keyboards/lazydesigners/the50/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json
index 9a54671b46..e9f722d9a6 100644
--- a/keyboards/lazydesigners/the50/info.json
+++ b/keyboards/lazydesigners/the50/info.json
@@ -8,6 +8,11 @@
         "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
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..f04ac95151 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
diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h
index 11d38876d3..2c39a1e047 100755
--- a/keyboards/lazydesigners/the60/rev2/config.h
+++ b/keyboards/lazydesigners/the60/rev2/config.h
@@ -17,12 +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
diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/info.json
index 355a8c7bc9..dbb27a4ea2 100755
--- a/keyboards/lazydesigners/the60/rev2/info.json
+++ b/keyboards/lazydesigners/the60/rev2/info.json
@@ -8,6 +8,11 @@
         "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,
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/info.json b/keyboards/leeku/finger65/info.json
index beea79a539..4751e011fc 100644
--- a/keyboards/leeku/finger65/info.json
+++ b/keyboards/leeku/finger65/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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/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/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/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/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/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..7846c3d013 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/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 { 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 */
diff --git a/keyboards/lets_split/rev1/info.json b/keyboards/lets_split/rev1/info.json
index 15821a6da0..08ea058ee7 100644
--- a/keyboards/lets_split/rev1/info.json
+++ b/keyboards/lets_split/rev1/info.json
@@ -6,6 +6,11 @@
         "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"
     }
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
index 6a65954f22..da7bb4ff92 100644
--- a/keyboards/lets_split/rev1/rev1.h
+++ b/keyboards/lets_split/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "lets_split.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index ed53eb4976..8ae5b7143d 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/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 { 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 */
diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/info.json
index 27d850be7e..5617b8bc36 100644
--- a/keyboards/lets_split/rev2/info.json
+++ b/keyboards/lets_split/rev2/info.json
@@ -6,6 +6,11 @@
         "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"
     }
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..735d76e96d 100644
--- a/keyboards/lets_split/sockets/config.h
+++ b/keyboards/lets_split/sockets/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 { 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
 
diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/info.json
index a1e4efc410..c68beff0d1 100644
--- a/keyboards/lets_split/sockets/info.json
+++ b/keyboards/lets_split/sockets/info.json
@@ -6,6 +6,11 @@
         "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"
     }
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..db11cabd45 100644
--- a/keyboards/lfkeyboards/lfk65_hs/config.h
+++ b/keyboards/lfkeyboards/lfk65_hs/config.h
@@ -1,9 +1,5 @@
 #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}
diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json
index a2aea08829..a45b0ff788 100644
--- a/keyboards/lfkeyboards/lfk65_hs/info.json
+++ b/keyboards/lfkeyboards/lfk65_hs/info.json
@@ -8,13 +8,18 @@
     "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
   },
   "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..e71fd36273 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
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..80f734a658 100644
--- a/keyboards/lfkeyboards/lfk78/revb/info.json
+++ b/keyboards/lfkeyboards/lfk78/revb/info.json
@@ -8,6 +8,11 @@
         "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
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..9ce1fbff5b 100644
--- a/keyboards/lfkeyboards/lfk78/revc/info.json
+++ b/keyboards/lfkeyboards/lfk78/revc/info.json
@@ -8,6 +8,11 @@
         "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
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/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json
index 320e5f89ec..78c63c82de 100644
--- a/keyboards/lfkeyboards/lfk78/revj/info.json
+++ b/keyboards/lfkeyboards/lfk78/revj/info.json
@@ -8,6 +8,11 @@
         "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
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/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..4db1c623ce 100644
--- a/keyboards/lfkeyboards/lfkpad/config.h
+++ b/keyboards/lfkeyboards/lfkpad/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, 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
diff --git a/keyboards/lfkeyboards/lfkpad/info.json b/keyboards/lfkeyboards/lfkpad/info.json
index 86180fc6ca..421ddd9d3f 100644
--- a/keyboards/lfkeyboards/lfkpad/info.json
+++ b/keyboards/lfkeyboards/lfkpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3231",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index 2d648c4e4d..f1af54183d 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
diff --git a/keyboards/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json
index 6b66ed9774..4328a52883 100644
--- a/keyboards/lfkeyboards/mini1800/info.json
+++ b/keyboards/lfkeyboards/mini1800/info.json
@@ -8,6 +8,11 @@
         "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
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/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/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..70ab0030c4 100644
--- a/keyboards/lily58/glow_enc/config.h
+++ b/keyboards/lily58/glow_enc/config.h
@@ -20,10 +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
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..01bd6835ff 100644
--- a/keyboards/lily58/glow_enc/info.json
+++ b/keyboards/lily58/glow_enc/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0059",
         "device_version": "1.0.0"
     },
+    "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"}
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..68516c8df2 100644
--- a/keyboards/lily58/lib/layer_state_reader.c
+++ b/keyboards/lily58/lib/layer_state_reader.c
@@ -1,7 +1,6 @@
 
 #include QMK_KEYBOARD_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/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..08ee5dcd82 100644
--- a/keyboards/lily58/light/config.h
+++ b/keyboards/lily58/light/config.h
@@ -20,10 +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
diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json
index 82e9affbd0..0ab0bd68d2 100644
--- a/keyboards/lily58/light/info.json
+++ b/keyboards/lily58/light/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4C4C",
         "device_version": "1.0.0"
     },
+    "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"}
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/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/rev1/config.h b/keyboards/lily58/rev1/config.h
index 1e6d2d08fc..8417a2ee2a 100644
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@@ -19,10 +19,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 }
-
 /* 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..373fd0c5c8 100644
--- a/keyboards/lily58/rev1/info.json
+++ b/keyboards/lily58/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEB2D",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
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/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/info.json b/keyboards/linworks/dolice/info.json
index 1db5f48470..32d0b3aabd 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
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/info.json b/keyboards/linworks/fave104/info.json
index 03beb2ad89..5421e4d623 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,
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
index 22e23f1a71..580504616a 100644
--- a/keyboards/linworks/fave65h/config.h
+++ b/keyboards/linworks/fave65h/config.h
@@ -17,14 +17,6 @@ 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
diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json
index c04eb5644b..d74f078d4e 100644
--- a/keyboards/linworks/fave65h/info.json
+++ b/keyboards/linworks/fave65h/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h
index 37aa1a68fc..b0d41d41df 100644
--- a/keyboards/linworks/fave87/config.h
+++ b/keyboards/linworks/fave87/config.h
@@ -18,12 +18,6 @@ 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
diff --git a/keyboards/linworks/fave87/fave87.h b/keyboards/linworks/fave87/fave87.h
index 7c3490f457..fa86337081 100644
--- a/keyboards/linworks/fave87/fave87.h
+++ b/keyboards/linworks/fave87/fave87.h
@@ -72,14 +72,14 @@
 ) { \
   { 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  }, \
+  { 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,  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 }, \
+  { KC_NO, 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  }  \
 }
@@ -116,14 +116,14 @@
 ) { \
   { 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  }, \
+  { 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,  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 }, \
+  { 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  }  \
 }
diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json
index b6ac9b78c1..31465eca2e 100644
--- a/keyboards/linworks/fave87/info.json
+++ b/keyboards/linworks/fave87/info.json
@@ -7,6 +7,11 @@
         "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
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index 29d57ab51e..8c842171fb 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -17,14 +17,6 @@ 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
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
index 1746353c26..2b40834e8e 100644
--- a/keyboards/linworks/fave87h/info.json
+++ b/keyboards/linworks/fave87h/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index 19580b9464..f6ba28fd80 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -18,12 +18,6 @@ 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
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index b84425f6f6..009eac32a9 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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/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..d2eb93b0fd 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"},
diff --git a/keyboards/ll3macorn/bongopad/config.h b/keyboards/ll3macorn/bongopad/config.h
index 1ea347bfd6..c6118b9baf 100644
--- a/keyboards/ll3macorn/bongopad/config.h
+++ b/keyboards/ll3macorn/bongopad/config.h
@@ -6,13 +6,6 @@
 #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..9d5e1fd5d5 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"}
diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h
index be16ca1652..edbcf0fd48 100644
--- a/keyboards/lm_keyboard/lm60n/config.h
+++ b/keyboards/lm_keyboard/lm60n/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, 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
diff --git a/keyboards/lm_keyboard/lm60n/info.json b/keyboards/lm_keyboard/lm60n/info.json
index cfbce23c2e..386a527553 100644
--- a/keyboards/lm_keyboard/lm60n/info.json
+++ b/keyboards/lm_keyboard/lm60n/info.json
@@ -8,6 +8,11 @@
         "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"
diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h
index 80768d8445..fcdb393a03 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
 
diff --git a/keyboards/loki65/info.json b/keyboards/loki65/info.json
index f2639713a5..78c42a5731 100644
--- a/keyboards/loki65/info.json
+++ b/keyboards/loki65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4C36",
         "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/longnald/corin/config.h b/keyboards/longnald/corin/config.h
index 2ee23c057b..4786eed6af 100644
--- a/keyboards/longnald/corin/config.h
+++ b/keyboards/longnald/corin/config.h
@@ -18,13 +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
diff --git a/keyboards/longnald/corin/info.json b/keyboards/longnald/corin/info.json
index 5381fd0e32..6706662cd0 100644
--- a/keyboards/longnald/corin/info.json
+++ b/keyboards/longnald/corin/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1024",
     "device_version": "0.0.4"
   },
+  "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/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..a5e05b5339 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"
     },
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..e1f7938e1b 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"
     },
@@ -199,7 +204,7 @@
                 {"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":"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},
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..a0dc78a3d6 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"
     },
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/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..86b69429cf 100644
--- a/keyboards/lucid/scarlet/info.json
+++ b/keyboards/lucid/scarlet/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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/lyso1/lck75/config.h b/keyboards/lyso1/lck75/config.h
index 110d7ecfe9..fd8587b1e4 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 */
diff --git a/keyboards/lyso1/lck75/info.json b/keyboards/lyso1/lck75/info.json
index f3102475d9..cbf77708cf 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}
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..017a064c37 100644
--- a/keyboards/lyso1/lefishe/info.json
+++ b/keyboards/lyso1/lefishe/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..de50593b9d 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
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..f6532a6409 100644
--- a/keyboards/machine_industries/m4_a/info.json
+++ b/keyboards/machine_industries/m4_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x004A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7"],
+        "rows": ["C7", "C6"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/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/makrosu/config.h b/keyboards/makrosu/config.h
index c00353db89..98108cce78 100644
--- a/keyboards/makrosu/config.h
+++ b/keyboards/makrosu/config.h
@@ -16,14 +16,7 @@
 
 #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
diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json
index 77974305e5..9abafac946 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"}
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..9051dd7f4e 100644
--- a/keyboards/manta60/config.h
+++ b/keyboards/manta60/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, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 #define RGB_DI_PIN D3
diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json
index e81c4e4580..15594fe13c 100644
--- a/keyboards/manta60/info.json
+++ b/keyboards/manta60/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h
index 1839a1091d..dab95cea0e 100644
--- a/keyboards/manyboard/macro/config.h
+++ b/keyboards/manyboard/macro/config.h
@@ -17,13 +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
diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json
index cdf40f6801..6d82466ac8 100644
--- a/keyboards/manyboard/macro/info.json
+++ b/keyboards/manyboard/macro/info.json
@@ -8,6 +8,11 @@
         "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"}
diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index 4eaec15ad2..6f4decad61 100644
--- a/keyboards/maple_computing/6ball/config.h
+++ b/keyboards/maple_computing/6ball/config.h
@@ -17,11 +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
 
@@ -37,7 +32,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..38f127cffc 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "D4", "B5", "B6", "B2", "F6"],
+        "rows": ["F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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..7cb73383a7 100755
--- a/keyboards/maple_computing/c39/info.json
+++ b/keyboards/maple_computing/c39/info.json
@@ -8,6 +8,11 @@
         "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",
     "layouts": {
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..3ef81f9fd3 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"
   },
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..e9cf604e19 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"
     },
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
index ac338368ed..444224d2b6 100644
--- a/keyboards/maple_computing/ivy/rev1/rev1.h
+++ b/keyboards/maple_computing/ivy/rev1/rev1.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ivy.h"
+#include "quantum.h"
 
 #define LAYOUT( \
 	K00, \
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..cfc198c02e 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"
   },
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..aecb3f02bd 100644
--- a/keyboards/maple_computing/launchpad/rev1/config.h
+++ b/keyboards/maple_computing/launchpad/rev1/config.h
@@ -17,14 +17,6 @@ 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
diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json
index 8ae1835b69..49f4c16bc9 100644
--- a/keyboards/maple_computing/launchpad/rev1/info.json
+++ b/keyboards/maple_computing/launchpad/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "F7"],
+        "rows": ["C6", "B1", "B3", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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
index 2ea6e7e775..54d72d5e54 100644
--- a/keyboards/maple_computing/launchpad/rev1/rev1.h
+++ b/keyboards/maple_computing/launchpad/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "../launchpad.h"
-
 #include "quantum.h"
 
 #define LAYOUT( \
diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
index 55d2428db0..0a12b77265 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/config.h
@@ -18,13 +18,6 @@ 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)
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
index ff37229787..4b97256c1e 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/eh.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/eh.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "lets_split_eh.h"
-
 #include "quantum.h"
 
 #define 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..4d2ee20c0b 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/info.json
+++ b/keyboards/maple_computing/lets_split_eh/eh/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/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..9d1e2b806f 100644
--- a/keyboards/maple_computing/minidox/rev1/info.json
+++ b/keyboards/maple_computing/minidox/rev1/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index 53e7bfe55f..d6c805d7c5 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 */
diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
index 69347412ce..fd4de0bcbf 100644
--- a/keyboards/maple_computing/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6007",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["D6", "D7", "B4", "B5", "B6", "C6"],
+    "rows": ["C7"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h
index bf7aa7f198..9a15aa3826 100644
--- a/keyboards/marksard/leftover30/config.h
+++ b/keyboards/marksard/leftover30/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 { 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
diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json
index 39de1d6bda..7aca7e75df 100644
--- a/keyboards/marksard/leftover30/info.json
+++ b/keyboards/marksard/leftover30/info.json
@@ -8,6 +8,11 @@
         "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"}
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index 9cc003be13..b832cd5ce3 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/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 { 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
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index 6d68519512..376101c642 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xDFA1",
         "device_version": "0.2.0"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
index a460abd0ef..1da59006d4 100644
--- a/keyboards/marksard/treadstone32/lite/config.h
+++ b/keyboards/marksard/treadstone32/lite/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 { 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
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json
index 040083b968..a66783b8c9 100644
--- a/keyboards/marksard/treadstone32/lite/info.json
+++ b/keyboards/marksard/treadstone32/lite/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.1.5"
     },
+    "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/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
index db39ee477c..573427ff75 100644
--- a/keyboards/marksard/treadstone32/rev1/config.h
+++ b/keyboards/marksard/treadstone32/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 { 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
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json
index 51b46b22d2..f7b19c63fa 100644
--- a/keyboards/marksard/treadstone32/rev1/info.json
+++ b/keyboards/marksard/treadstone32/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "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/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index 505548a75d..a9fd1ad829 100644
--- a/keyboards/marksard/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/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 { 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
diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json
index 2c589cac51..7d36463643 100644
--- a/keyboards/marksard/treadstone48/rev1/info.json
+++ b/keyboards/marksard/treadstone48/rev1/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index 02b08d3bf1..87136e222f 100644
--- a/keyboards/marksard/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/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 { 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
diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
index 34f44f1aba..403cd17ebe 100644
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0xDFA3",
         "device_version": "0.2.0"
     },
+    "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/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..8306bcdab3 100644
--- a/keyboards/massdrop/alt/info.json
+++ b/keyboards/massdrop/alt/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEED3",
         "device_version": "1.0.1"
     },
+    "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"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
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..1e21627f28 100644
--- a/keyboards/massdrop/ctrl/info.json
+++ b/keyboards/massdrop/ctrl/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEED2",
         "device_version": "1.0.1"
     },
+    "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/thekey/config.h b/keyboards/massdrop/thekey/config.h
index 0869e77a7a..d5aefdcdd3 100644
--- a/keyboards/massdrop/thekey/config.h
+++ b/keyboards/massdrop/thekey/config.h
@@ -16,15 +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
diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json
index 56fe74729c..71fac9f31b 100644
--- a/keyboards/massdrop/thekey/info.json
+++ b/keyboards/massdrop/thekey/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0"],
+        "rows": ["D4"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6"
     },
diff --git a/keyboards/massdrop/thekey_v2/config.h b/keyboards/massdrop/thekey_v2/config.h
index 3f7dc30ac1..d26d586264 100644
--- a/keyboards/massdrop/thekey_v2/config.h
+++ b/keyboards/massdrop/thekey_v2/config.h
@@ -16,15 +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}
diff --git a/keyboards/massdrop/thekey_v2/info.json b/keyboards/massdrop/thekey_v2/info.json
index 19ae416b6e..01604e6f2e 100644
--- a/keyboards/massdrop/thekey_v2/info.json
+++ b/keyboards/massdrop/thekey_v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D0"],
+        "rows": ["D4"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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..ecbdd0f0ba 100644
--- a/keyboards/masterworks/classy_tkl/rev_a/info.json
+++ b/keyboards/masterworks/classy_tkl/rev_a/info.json
@@ -8,6 +8,11 @@
         "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": {
@@ -90,14 +95,14 @@
                 { "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": "Shift2", "x": 14, "y": 4.5 },
                 { "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": "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": "Win", "x": 12.5, "y": 5.5, "w": 1 },
+                { "label": "Win", "x": 12.5, "y": 5.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 },
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..6715c441a0 100644
--- a/keyboards/matchstickworks/southpad/info.json
+++ b/keyboards/matchstickworks/southpad/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h
index ff49f9aac5..77077bad34 100644
--- a/keyboards/matrix/cain_re/config.h
+++ b/keyboards/matrix/cain_re/config.h
@@ -19,14 +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
diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json
index 84b8dc38eb..b5020cb3db 100644
--- a/keyboards/matrix/cain_re/info.json
+++ b/keyboards/matrix/cain_re/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0106",
         "device_version": "0.0.1"
     },
+    "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..21177855ec 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.
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index e52ffa1c74..c692e1c4ee 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h
index 9df2a43d50..415ab3dbdd 100644
--- a/keyboards/matrix/m12og/rev2/config.h
+++ b/keyboards/matrix/m12og/rev2/config.h
@@ -4,14 +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
diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json
index af7e96d719..1036980434 100644
--- a/keyboards/matrix/m12og/rev2/info.json
+++ b/keyboards/matrix/m12og/rev2/info.json
@@ -8,6 +8,11 @@
     "pid": "0x8712",
     "device_version": "0.0.1"
   },
+  "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": {
diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h
index 69b54b5bd0..487bdb7dea 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.
diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json
index cfe0ad22d4..ecf1640811 100644
--- a/keyboards/matrix/me/info.json
+++ b/keyboards/matrix/me/info.json
@@ -8,6 +8,11 @@
     "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"
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index a5688556f2..d5e609918f 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
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/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/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..eee9c69b3d 100644
--- a/keyboards/matthewdias/model_v/info.json
+++ b/keyboards/matthewdias/model_v/info.json
@@ -7,6 +7,11 @@
         "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": {
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..c01871e836 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": {
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
index e2a0805053..0442643dd0 100644
--- a/keyboards/maxipad/maxipad.h
+++ b/keyboards/maxipad/maxipad.h
@@ -19,12 +19,6 @@
 
 #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
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..62a9702953 100644
--- a/keyboards/maxr1998/phoebe/info.json
+++ b/keyboards/maxr1998/phoebe/info.json
@@ -24,267 +24,214 @@
         "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
                 },
@@ -294,27 +241,22 @@
                     "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
                 }
diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h
index 3756899498..3bc544746e 100644
--- a/keyboards/maxr1998/pulse4k/config.h
+++ b/keyboards/maxr1998/pulse4k/config.h
@@ -17,14 +17,6 @@
 
 #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
diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json
index 9db0307940..bfea52ad4d 100644
--- a/keyboards/maxr1998/pulse4k/info.json
+++ b/keyboards/maxr1998/pulse4k/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B7", "B3", "F0"],
+    "rows": ["B4", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "D2", "pin_b": "D3"},
@@ -19,12 +24,12 @@
   "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 } ]
+        { "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/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..e12e2dfc94 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"}
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/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h
index c86a3af0f1..9611e47e2b 100644
--- a/keyboards/mechanickeys/undead60m/config.h
+++ b/keyboards/mechanickeys/undead60m/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, 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
diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json
index 9bee50289c..92593c3bfc 100644
--- a/keyboards/mechanickeys/undead60m/info.json
+++ b/keyboards/mechanickeys/undead60m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3C4D",
         "device_version": "0.0.1"
     },
+    "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..ffdcf08edd 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"],
diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h
index 7023e30ced..a9375a9833 100644
--- a/keyboards/mechbrewery/mb65s/config.h
+++ b/keyboards/mechbrewery/mb65s/config.h
@@ -17,13 +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
diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json
index 7692ac996c..1890c71def 100644
--- a/keyboards/mechbrewery/mb65s/info.json
+++ b/keyboards/mechbrewery/mb65s/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h
index 493f54b3f7..71131d32ac 100644
--- a/keyboards/mechkeys/acr60/config.h
+++ b/keyboards/mechkeys/acr60/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json
index 816e74a2bb..71287af893 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
diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h
index bb3b38500c..9908ffa03e 100755
--- a/keyboards/mechkeys/alu84/config.h
+++ b/keyboards/mechkeys/alu84/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, 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
diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/info.json
index aaf9cc7ac1..ba3272e4cf 100644
--- a/keyboards/mechkeys/alu84/info.json
+++ b/keyboards/mechkeys/alu84/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index b345f44269..644ebeda46 100755
--- a/keyboards/mechkeys/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json
index 1361065e75..b12beb60ff 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
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..7d6fc121ce 100644
--- a/keyboards/mechkeys/mechmini/v1/config.h
+++ b/keyboards/mechkeys/mechmini/v1/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 }
-#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.
diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
index 751be56e38..84c13147af 100644
--- a/keyboards/mechkeys/mechmini/v1/info.json
+++ b/keyboards/mechkeys/mechmini/v1/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..35421a3b29 100755
--- a/keyboards/mechkeys/mechmini/v2/config.h
+++ b/keyboards/mechkeys/mechmini/v2/config.h
@@ -15,14 +15,6 @@
 
 #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
 
diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
index 58ad7525db..d5f75aedce 100644
--- a/keyboards/mechkeys/mechmini/v2/info.json
+++ b/keyboards/mechkeys/mechmini/v2/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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
index a0a620675e..7e817ae9ab 100755
--- a/keyboards/mechkeys/mechmini/v2/v2.h
+++ b/keyboards/mechkeys/mechmini/v2/v2.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "../mechmini.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index 065c3006c6..7b63a204c3 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/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 }
-#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
diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json
index 42d9c3bd24..07eb87850c 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,
diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h
index e7f24e3985..4eeeb96c19 100644
--- a/keyboards/mechllama/g35/config.h
+++ b/keyboards/mechllama/g35/config.h
@@ -17,9 +17,6 @@ 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/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/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..658e29ccf3 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -1,8 +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
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index f098bdbf95..81adcf57e4 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "pid": "0xAEC1"
     },
+    "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",
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
index 490599c43a..a86b1e5dd5 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 "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index d9d75a4b9e..ac91d0f950 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -1,8 +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
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 7dcd0f1765..afb0b3d017 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "pid": "0xAEC2"
     },
+    "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"}
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index 20b4b69114..78bca55b8e 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 "rev2.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/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index 7457fd50a7..d3e4fc6ba1 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -17,9 +17,6 @@ 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
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index 3f83750e3a..d44e6b2371 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "pid": "0xAEC3"
     },
+    "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"}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h
index e1081a9560..fc7e2ad9b6 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h
@@ -17,12 +17,6 @@ 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
 
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json
index a5f20190d1..2c4386a862 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json
@@ -1,5 +1,10 @@
 {
     "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
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/info.json b/keyboards/mechlovin/delphine/info.json
index 4495943544..7e53ebf464 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"
     },
diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h
index 951eab595b..0cf3af4a8a 100644
--- a/keyboards/mechlovin/foundation/config.h
+++ b/keyboards/mechlovin/foundation/config.h
@@ -17,24 +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
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..5fac5b9aa6 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"}
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/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json
index 2ed43a3fc2..f0e2f9a41a 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "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/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
index 798e67ee78..f66b378aae 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6002",
         "device_version": "0.0.1"
     },
+    "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/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/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h
index be1d769e67..0b9d78276a 100644
--- a/keyboards/mechlovin/hannah910/config.h
+++ b/keyboards/mechlovin/hannah910/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, 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
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..3ddc706922 100644
--- a/keyboards/mechlovin/hannah910/rev1/info.json
+++ b/keyboards/mechlovin/hannah910/rev1/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json
index cfb43e786c..dc59167ddb 100644
--- a/keyboards/mechlovin/hannah910/rev2/info.json
+++ b/keyboards/mechlovin/hannah910/rev2/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json
index 14219cb9b6..ccb9088232 100644
--- a/keyboards/mechlovin/hannah910/rev3/info.json
+++ b/keyboards/mechlovin/hannah910/rev3/info.json
@@ -8,6 +8,11 @@
         "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
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/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/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/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/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..332606561c 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8710",
         "device_version": "0.0.1"
     },
+    "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/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h
index 11ae35100b..1fda2d3097 100644
--- a/keyboards/mechlovin/infinity88/config.h
+++ b/keyboards/mechlovin/infinity88/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 { 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
 
diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json
index 37ccd27537..e9b25efaa9 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
diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h
index e0900333cd..a8a1936209 100644
--- a/keyboards/mechlovin/infinityce/config.h
+++ b/keyboards/mechlovin/infinityce/config.h
@@ -17,13 +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
diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json
index 1ab5cad305..332be74aff 100644
--- a/keyboards/mechlovin/infinityce/info.json
+++ b/keyboards/mechlovin/infinityce/info.json
@@ -8,6 +8,11 @@
         "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
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/kanu/config.h b/keyboards/mechlovin/kanu/config.h
index 6a6dc97744..bb94525e06 100644
--- a/keyboards/mechlovin/kanu/config.h
+++ b/keyboards/mechlovin/kanu/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, 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
diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json
index 628a78e1a5..ac86aaa269 100644
--- a/keyboards/mechlovin/kanu/info.json
+++ b/keyboards/mechlovin/kanu/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
index b05cc594e4..aadc6fcaaa 100644
--- a/keyboards/mechlovin/kay60/config.h
+++ b/keyboards/mechlovin/kay60/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, 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
diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
index a12cb83719..39c7083afd 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h
index d3cacf757a..c6168d930f 100644
--- a/keyboards/mechlovin/kay65/config.h
+++ b/keyboards/mechlovin/kay65/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, 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
diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json
index 3bfc5c66e5..f827f435ed 100644
--- a/keyboards/mechlovin/kay65/info.json
+++ b/keyboards/mechlovin/kay65/info.json
@@ -8,6 +8,11 @@
         "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
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/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 66b4a3c2ed..14fd177986 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",
     "backlight": {
         "pin": "B8",
         "breathing": 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 c0e94e7638..52ac4d0c29 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",
     "backlight": {
         "pin": "D4",
         "breathing": true
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index 89e8a32d4f..a193206552 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -17,14 +17,6 @@ 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
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 9adec5281c..117239c476 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -8,6 +8,11 @@
         "pid": "0xD750",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h
index 225795d3c0..44e13fa7f2 100644
--- a/keyboards/mechlovin/olly/orion/config.h
+++ b/keyboards/mechlovin/olly/orion/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, 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
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json
index 89433dfd1b..de4ed5e986 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 1540505bad..75887406ac 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/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 { 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
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index 19246528e7..133bbbea7a 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/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.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..ff9aea4a02 100644
--- a/keyboards/mechlovin/zed60/config.h
+++ b/keyboards/mechlovin/zed60/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 { 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
diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json
index 3c0c450c69..fd1c52d07d 100644
--- a/keyboards/mechlovin/zed60/info.json
+++ b/keyboards/mechlovin/zed60/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..9f8d4f46f5 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)
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json
index 75fcb44ae3..e27910459c 100644
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ b/keyboards/mechlovin/zed65/mono_led/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6503",
         "device_version": "0.0.1"
     },
+    "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}]       
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/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
index 2f0ea4817f..06777fa219 100644
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
@@ -8,6 +8,11 @@
         "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
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..7c9062f319 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
@@ -17,11 +17,6 @@ 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
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
index e023f83396..518c781713 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/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..7c6f10131d 100644
--- a/keyboards/mechstudio/ud_40_ortho/config.h
+++ b/keyboards/mechstudio/ud_40_ortho/config.h
@@ -16,15 +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
diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json
index a517137f96..e5f367653d 100644
--- a/keyboards/mechstudio/ud_40_ortho/info.json
+++ b/keyboards/mechstudio/ud_40_ortho/info.json
@@ -8,6 +8,11 @@
     "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"
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/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/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index 92a8dfa323..a91a4bf79c 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
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index 29d2497cc1..e3e7308a19 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"}
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index b720c271b2..f33d6c5944 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
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index d3451698f6..c3b9ea2120 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"}
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index d3158c3306..68217b33bf 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -17,16 +17,8 @@ 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
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json
index 92af56f0dd..b396b4a6af 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"},
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 72efdae1e2..a130b99d1e 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -17,25 +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 { 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
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index cbe9f7cfa8..b8c5642b08 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"}
@@ -23,76 +28,80 @@
     "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.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..13e8bbfed2 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,9 +31,6 @@
 
 #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
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
index 825def96a2..0d45c97d50 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"},
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index 88b160a980..b427adc33c 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -17,25 +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 { 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
diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index eb7d2d9f54..1bed5452b0 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1709",
         "device_version": "1.0.1"
     },
+    "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/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..4ccfe90762 100644
--- a/keyboards/mehkee96/info.json
+++ b/keyboards/mehkee96/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", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4"
     },
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..8c11abe429 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}
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..97598af127 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}
diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h
index c016ab1f56..fd83302d27 100644
--- a/keyboards/meletrix/zoom87/config.h
+++ b/keyboards/meletrix/zoom87/config.h
@@ -16,12 +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
diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json
index c60f7f8799..d5824818f9 100644
--- a/keyboards/meletrix/zoom87/info.json
+++ b/keyboards/meletrix/zoom87/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/meletrix/zoom87/zoom87.h b/keyboards/meletrix/zoom87/zoom87.h
index 03b94bfc40..87000be8b7 100644
--- a/keyboards/meletrix/zoom87/zoom87.h
+++ b/keyboards/meletrix/zoom87/zoom87.h
@@ -214,5 +214,5 @@
     { 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    }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   K56,   K57,   KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G    }, \
 }
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..af9f7c2669
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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..af9f7c2669
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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..67a4a004d6
--- /dev/null
+++ b/keyboards/melgeek/mj61/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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..62c5827117
--- /dev/null
+++ b/keyboards/melgeek/mj61/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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..67a4a004d6
--- /dev/null
+++ b/keyboards/melgeek/mj63/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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..62c5827117
--- /dev/null
+++ b/keyboards/melgeek/mj63/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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..67a4a004d6
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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..67a4a004d6
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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..62c5827117
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev3/info.json
@@ -0,0 +1,7 @@
+{
+    "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/mj65/info.json b/keyboards/melgeek/mj65/info.json
index f7a24f9a55..fc2a5923d0 100644
--- a/keyboards/melgeek/mj65/info.json
+++ b/keyboards/melgeek/mj65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "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",
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/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index a093ab8d37..7150128436 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -16,12 +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
diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json
index ccd7165a72..1c36053897 100644
--- a/keyboards/melgeek/mj6xy/rev3/info.json
+++ b/keyboards/melgeek/mj6xy/rev3/info.json
@@ -1,4 +1,9 @@
 {
+    "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",
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json
index a7930598f7..033da3766c 100755
--- a/keyboards/melgeek/mojo68/info.json
+++ b/keyboards/melgeek/mojo68/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0068",
     	"device_version": "0.0.1"
     },
+    "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,
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/mojo75/info.json b/keyboards/melgeek/mojo75/info.json
index 185b3414fc..b03b0bd032 100644
--- a/keyboards/melgeek/mojo75/info.json
+++ b/keyboards/melgeek/mojo75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7075",
         "device_version": "0.0.1"
     },
+    "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",
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/tegic/info.json b/keyboards/melgeek/tegic/info.json
index 9c33a5d3a2..b3792ca9b3 100644
--- a/keyboards/melgeek/tegic/info.json
+++ b/keyboards/melgeek/tegic/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0081",
         "device_version": "0.0.1"
     },
+    "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,
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/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..2eaccdae02 100644
--- a/keyboards/melgeek/z70ultra/info.json
+++ b/keyboards/melgeek/z70ultra/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6570",
         "device_version": "0.0.1"
     },
+    "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",
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/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/meow48/config.h b/keyboards/meow48/config.h
index 7c1f14f2d2..fb0353c631 100644
--- a/keyboards/meow48/config.h
+++ b/keyboards/meow48/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, 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
diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json
index ba3d696cb0..c219c14a1e 100644
--- a/keyboards/meow48/info.json
+++ b/keyboards/meow48/info.json
@@ -7,7 +7,12 @@
         "device_version": "1.0.0",
         "pid": "0xF048",
         "vid": "0xF048"
-           },
+    },
+    "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..7dc2b961f8 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": {
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..a5db1935cb 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"},
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 9dcfb6e074..dec57f0dbd 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -16,9 +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
@@ -36,6 +33,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..983d4e61fc 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x5543",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B3", "B4"],
+    "rows": ["B1", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "F5", "pin_b": "F6"}
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index c249a1816a..4ee40b4071 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -16,12 +16,6 @@
 
 #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
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index e548d63151..a8816d8dd0 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"}
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 238e5f6d43..ed66f143c0 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -16,12 +16,6 @@
 
 #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
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index e3e1359c92..f67817659b 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"}
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/meson/config.h b/keyboards/meson/config.h
index a0df182439..c5f295bfee 100644
--- a/keyboards/meson/config.h
+++ b/keyboards/meson/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, 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
diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
index 869a2ccb7a..7bcd3acbac 100644
--- a/keyboards/meson/info.json
+++ b/keyboards/meson/info.json
@@ -7,6 +7,11 @@
       "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"
     },
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/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..01f4b3354f 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": {
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..eb74b083ef 100644
--- a/keyboards/miller/gm862/info.json
+++ b/keyboards/miller/gm862/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0223",
         "device_version": "0.0.1"
     },
+    "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/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..02f10ea9a2 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"}
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..de5220f1c9 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"}
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/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h
index 4024ac6f45..49328d78ba 100644
--- a/keyboards/minimon/index_tab/config.h
+++ b/keyboards/minimon/index_tab/config.h
@@ -16,15 +16,6 @@ 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 */
diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json
index f3fd4717ec..8655546ea5 100644
--- a/keyboards/minimon/index_tab/info.json
+++ b/keyboards/minimon/index_tab/info.json
@@ -9,6 +9,11 @@
         "pid": "0x1306",
         "device_version": "0.0.1"
     },
+    "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": {
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/info.json b/keyboards/mino/hotswap/info.json
index 4e932f4939..be4f161ed6 100644
--- a/keyboards/mino/hotswap/info.json
+++ b/keyboards/mino/hotswap/info.json
@@ -8,6 +8,11 @@
         "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": {
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..051193bd9f 100644
--- a/keyboards/mint60/config.h
+++ b/keyboards/mint60/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, 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 */
diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
index f8011a5920..b2b795b4a8 100644
--- a/keyboards/mint60/info.json
+++ b/keyboards/mint60/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h
index e5768a480d..dd6c07768b 100644
--- a/keyboards/misonoworks/chocolatebar/config.h
+++ b/keyboards/misonoworks/chocolatebar/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, 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
diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json
index bc577e22fe..fd64d9fa14 100644
--- a/keyboards/misonoworks/chocolatebar/info.json
+++ b/keyboards/misonoworks/chocolatebar/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC456",
         "device_version": "0.0.1"
     },
+    "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..e38f18b40a 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
diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json
index 922e4117e6..c7cb97c0b3 100644
--- a/keyboards/misonoworks/karina/info.json
+++ b/keyboards/misonoworks/karina/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC456",
         "device_version": "0.0.1"
     },
+    "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/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h
index 1021ddf951..4efe1466c6 100644
--- a/keyboards/misterknife/knife66/config.h
+++ b/keyboards/misterknife/knife66/config.h
@@ -17,11 +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
diff --git a/keyboards/misterknife/knife66/info.json b/keyboards/misterknife/knife66/info.json
index 4a7bc23c35..e019cf6ae8 100644
--- a/keyboards/misterknife/knife66/info.json
+++ b/keyboards/misterknife/knife66/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4172",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/misterknife/knife66_iso/config.h
index 4974254844..d13ee6a334 100644
--- a/keyboards/misterknife/knife66_iso/config.h
+++ b/keyboards/misterknife/knife66_iso/config.h
@@ -17,11 +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
diff --git a/keyboards/misterknife/knife66_iso/info.json b/keyboards/misterknife/knife66_iso/info.json
index b3c84a65bc..a1658c460b 100644
--- a/keyboards/misterknife/knife66_iso/info.json
+++ b/keyboards/misterknife/knife66_iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4173",
         "device_version": "0.0.1"
     },
+    "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/miuni32/config.h b/keyboards/miuni32/config.h
index def4cc581c..1e01cae3a3 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 */
diff --git a/keyboards/miuni32/info.json b/keyboards/miuni32/info.json
index 7dd62adb5a..6b217f74ab 100644
--- a/keyboards/miuni32/info.json
+++ b/keyboards/miuni32/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "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",
     "layouts": {
diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h
index bd9c4b6e4e..c95e4a5a95 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
 
diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json
index 2687ada0d9..1b2255ae99 100644
--- a/keyboards/ml/gas75/info.json
+++ b/keyboards/ml/gas75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "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"}
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/rev1/config.h b/keyboards/mlego/m48/rev1/config.h
index 04c1bb4509..b872354f60 100644
--- a/keyboards/mlego/m48/rev1/config.h
+++ b/keyboards/mlego/m48/rev1/config.h
@@ -15,12 +15,6 @@
  */
 #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
diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json
index ecfa4dc940..1e5a70aa92 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"}
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/rev1/config.h b/keyboards/mlego/m60/rev1/config.h
index 7805e6e82b..426e65609d 100644
--- a/keyboards/mlego/m60/rev1/config.h
+++ b/keyboards/mlego/m60/rev1/config.h
@@ -15,11 +15,6 @@
  */
 #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
diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json
index e9e03cb189..4af7c4b11d 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"}
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/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index a835d8c4f3..3dc80b50ef 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
 
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index 237b933eb0..f33c5d04dd 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"}
@@ -16,6 +21,12 @@
     "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..9d5cd08e3e 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
 
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index 4e281733e1..5ab7696dbe 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"}
@@ -16,6 +21,12 @@
     "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/rev1/config.h b/keyboards/mlego/m65/rev1/config.h
index d58ee7627f..83380e9aa4 100644
--- a/keyboards/mlego/m65/rev1/config.h
+++ b/keyboards/mlego/m65/rev1/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
-#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
diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json
index f4d8ba7578..a638ec0b99 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"}
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h
index 8094879b1c..2d595fc4be 100644
--- a/keyboards/mlego/m65/rev2/config.h
+++ b/keyboards/mlego/m65/rev2/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
-#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
diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json
index 7d265197ca..00263c47f5 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"}
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
index 4a71449cb0..d535b8c229 100644
--- a/keyboards/mlego/m65/rev3/config.h
+++ b/keyboards/mlego/m65/rev3/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
-#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
diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json
index 39c26191c6..7118b12af0 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"}
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
index a8b9b596d5..69bdff7cdd 100644
--- a/keyboards/mlego/m65/rev4/config.h
+++ b/keyboards/mlego/m65/rev4/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
-#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
diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json
index 91af43a6a1..1cfe298f8f 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"}
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/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/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..882dfad7d3 100755
--- a/keyboards/mnk50/info.json
+++ b/keyboards/mnk50/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..33e953ba25 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"
   },
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..ea042a2df6 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"
   },
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/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..05fa106877 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" ],
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
index 49f115fdc6..87867de6b4 100644
--- a/keyboards/mode/m80v1/m80h/m80h.h
+++ b/keyboards/mode/m80v1/m80h/m80h.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "m80v1.h"
+#include "quantum.h"
 
 #define LAYOUT_tkl_ansi( \
     K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K415,  K114, K115,  K116, \
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..3c948f5eb4 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
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
index 28d1d2784c..cacf25b114 100644
--- a/keyboards/mode/m80v2/m80v2h/m80v2h.h
+++ b/keyboards/mode/m80v2/m80v2h/m80v2h.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/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.h b/keyboards/mokey/ginkgo65/ginkgo65.h
index 1594e5c793..5aa3d3aa61 100644
--- a/keyboards/mokey/ginkgo65/ginkgo65.h
+++ b/keyboards/mokey/ginkgo65/ginkgo65.h
@@ -212,5 +212,5 @@
     { 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 }, \
+    { k40, k41, k42, K43, k44, XXX, K46, XXX, XXX, K49, k4A, XXX, k4C, k4D, k4E, XXX }, \
 }
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/info.json b/keyboards/mokey/ginkgo65hot/info.json
index 31427c7cb3..347d4f840d 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,
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/info.json b/keyboards/mokey/ibis80/info.json
index df1771d5e8..73fa6c086f 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": {
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/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/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..021f719740 100644
--- a/keyboards/mokey/xox70/info.json
+++ b/keyboards/mokey/xox70/info.json
@@ -8,6 +8,11 @@
         "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"],
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..d7dd16bb75 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": {
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/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
index 5425085bb6..a8482aaef1 100644
--- a/keyboards/momoka_ergo/config.h
+++ b/keyboards/momoka_ergo/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 }
-#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
diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
index 3c1eefd090..e362a3fa92 100644
--- a/keyboards/momoka_ergo/info.json
+++ b/keyboards/momoka_ergo/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/momokai/tap_duo/config.h b/keyboards/momokai/tap_duo/config.h
index ca447bf9c6..d366b2ec11 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
diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json
index b23740befa..6731a44fad 100644
--- a/keyboards/momokai/tap_duo/info.json
+++ b/keyboards/momokai/tap_duo/info.json
@@ -8,16 +8,21 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "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 }
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 0.5, "y": 1.25, "w": 0.5, "h": 0.5 },
+                { "x": 1, "y": 1.25, "w": 0.5, "h": 0.5 },
+                { "x": 1.5, "y": 1.25, "w": 0.5, "h": 0.5 }
             ]
         }
     }
diff --git a/keyboards/momokai/tap_trio/config.h b/keyboards/momokai/tap_trio/config.h
index 7a38599d11..c3d1ebab68 100644
--- a/keyboards/momokai/tap_trio/config.h
+++ b/keyboards/momokai/tap_trio/config.h
@@ -16,13 +16,6 @@
 
 #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..c0406d73ce 100644
--- a/keyboards/momokai/tap_trio/info.json
+++ b/keyboards/momokai/tap_trio/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "B2", "B7", "D1", "D2", "D3"],
+        "rows": ["E0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/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/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h
index d03610af38..4b4bad4056 100644
--- a/keyboards/monstargear/xo87/rgb/config.h
+++ b/keyboards/monstargear/xo87/rgb/config.h
@@ -16,9 +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..73723f3141 100644
--- a/keyboards/monstargear/xo87/rgb/info.json
+++ b/keyboards/monstargear/xo87/rgb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x584F",
     "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",
   "processor": "at90usb646",
   "bootloader": "lufa-dfu",
   "community_layouts": ["tkl_ansi"],
diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h
index 65c76647ab..347f14488f 100644
--- a/keyboards/monstargear/xo87/solderable/config.h
+++ b/keyboards/monstargear/xo87/solderable/config.h
@@ -19,15 +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
diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json
index f3a8ca1657..669c8c1592 100644
--- a/keyboards/monstargear/xo87/solderable/info.json
+++ b/keyboards/monstargear/xo87/solderable/info.json
@@ -8,6 +8,11 @@
         "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"
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..d65fb21767 100644
--- a/keyboards/montsinger/rebound/rev1/info.json
+++ b/keyboards/montsinger/rebound/rev1/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"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12"],
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..e463402970 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"}
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..496b2e9dc6 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"}
diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h
index 58cf478e13..3caa3c9aca 100644
--- a/keyboards/montsinger/rebound/rev4/config.h
+++ b/keyboards/montsinger/rebound/rev4/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, 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 */
diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json
index dd76ea25e9..dfd093eb84 100644
--- a/keyboards/montsinger/rebound/rev4/info.json
+++ b/keyboards/montsinger/rebound/rev4/info.json
@@ -8,6 +8,11 @@
         "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"}
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..9878a204c7 100644
--- a/keyboards/montsinger/rewind/info.json
+++ b/keyboards/montsinger/rewind/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..516d307d2d 100644
--- a/keyboards/mountainblocks/mb17/info.json
+++ b/keyboards/mountainblocks/mb17/info.json
@@ -8,6 +8,11 @@
         "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": {
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/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h
index fef54ac0e1..60a9555a78 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
 
diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json
index 45b0723102..388400c0e5 100644
--- a/keyboards/mss_studio/m63_rgb/info.json
+++ b/keyboards/mss_studio/m63_rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6063",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/mss_studio/m64_rgb/config.h
index 6f095b6aa4..4711bb62a6 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
 
diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/info.json
index ec168e049b..7637456e0a 100644
--- a/keyboards/mss_studio/m64_rgb/info.json
+++ b/keyboards/mss_studio/m64_rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6064",
         "device_version": "0.0.1"
     },
+    "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/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h
index bd4c880e3b..355454f9d4 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 */
diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json
index c16d04cd5b..f2b399b9b9 100644
--- a/keyboards/mt/blocked65/info.json
+++ b/keyboards/mt/blocked65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "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
diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h
index 8a77b3dc7b..32a2dfb2d3 100644
--- a/keyboards/mt/mt40/config.h
+++ b/keyboards/mt/mt40/config.h
@@ -31,27 +31,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..d632160093 100644
--- a/keyboards/mt/mt40/info.json
+++ b/keyboards/mt/mt40/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index d989525a1b..e7c1302a0b 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
diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json
index 20acbceedb..1eb2212598 100644
--- a/keyboards/mt/mt64rgb/info.json
+++ b/keyboards/mt/mt64rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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/mt84/config.h b/keyboards/mt/mt84/config.h
index 0eba561a04..394193bcdd 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
diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json
index ad101223aa..b35a609a8c 100644
--- a/keyboards/mt/mt84/info.json
+++ b/keyboards/mt/mt84/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h
index 8a5dbe68f8..d6697fc076 100644
--- a/keyboards/mt/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json
index 59afd26650..3a99cc6cb7 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"
   },
diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h
index 65ca63af7e..29eb3ae608 100644
--- a/keyboards/mt/ncr80/hotswap/config.h
+++ b/keyboards/mt/ncr80/hotswap/config.h
@@ -17,21 +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
diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json
index ed288b9e8d..8eaa0519cf 100644
--- a/keyboards/mt/ncr80/hotswap/info.json
+++ b/keyboards/mt/ncr80/hotswap/info.json
@@ -8,6 +8,11 @@
         "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",
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..38a7b38e4a 100644
--- a/keyboards/mt/split75/info.json
+++ b/keyboards/mt/split75/info.json
@@ -23,7 +23,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/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h
index a1b98373b4..114c8feab4 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/config.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/config.h
@@ -17,14 +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
 
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index 6f5da086d0..d2ece9ff7f 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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..3ab3171076 100644
--- a/keyboards/mtbkeys/mtb60/solder/config.h
+++ b/keyboards/mtbkeys/mtb60/solder/config.h
@@ -17,14 +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
 
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index 2f97a88913..552985d562 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "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/murcielago/info.json b/keyboards/murcielago/info.json
index b54258280b..4059817b74 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",
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/config.h b/keyboards/mwstudio/alicekk/config.h
index 290871bde5..b4d733a212 100644
--- a/keyboards/mwstudio/alicekk/config.h
+++ b/keyboards/mwstudio/alicekk/config.h
@@ -16,14 +16,6 @@
 
 #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
 
 
diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json
index ec0d58b07e..f33b5d2ccc 100644
--- a/keyboards/mwstudio/alicekk/info.json
+++ b/keyboards/mwstudio/alicekk/info.json
@@ -6,6 +6,11 @@
         "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"}
diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h
index 79d1d5e1b2..6ed183cb4c 100644
--- a/keyboards/mwstudio/mw65_black/config.h
+++ b/keyboards/mwstudio/mw65_black/config.h
@@ -16,14 +16,6 @@
 
 #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
diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json
index 23151df686..1a53a22195 100644
--- a/keyboards/mwstudio/mw65_black/info.json
+++ b/keyboards/mwstudio/mw65_black/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6500",
         "device_version": "0.0.1"
     },
+    "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..94388ff316 100644
--- a/keyboards/mwstudio/mw65_rgb/config.h
+++ b/keyboards/mwstudio/mw65_rgb/config.h
@@ -16,14 +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
 
diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json
index ee00dd70c1..8cace68cce 100644
--- a/keyboards/mwstudio/mw65_rgb/info.json
+++ b/keyboards/mwstudio/mw65_rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6502",
         "device_version": "0.0.1"
     },
+    "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/mw75/config.h b/keyboards/mwstudio/mw75/config.h
index 4cb7a8a22c..cbfaa2221d 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -16,14 +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
 
diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json
index 866f488a6e..f7497ec325 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7501",
         "device_version": "0.0.1"
     },
+    "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"}
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
index b5f4500d58..387015e937 100644
--- a/keyboards/mwstudio/mw75r2/config.h
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -16,14 +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
 
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json
index 4d794246eb..e479c68c96 100644
--- a/keyboards/mwstudio/mw75r2/info.json
+++ b/keyboards/mwstudio/mw75r2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7502",
         "device_version": "0.0.1"
     },
+    "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/mxss/config.h b/keyboards/mxss/config.h
index 14ed456ecf..1a372c72f5 100644
--- a/keyboards/mxss/config.h
+++ b/keyboards/mxss/config.h
@@ -17,14 +17,6 @@ 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
diff --git a/keyboards/mxss/info.json b/keyboards/mxss/info.json
index 8bc0277016..70bb5c5f76 100644
--- a/keyboards/mxss/info.json
+++ b/keyboards/mxss/info.json
@@ -8,6 +8,11 @@
     "pid": "0x5353",
     "device_version": "0.0.1"
   },
+  "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/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/nack/config.h b/keyboards/nack/config.h
index 95bf0d9b87..0dc341052e 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -17,10 +17,6 @@ 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
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 3ece3f5dba..ad7eed8f24 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "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",
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/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/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..64f60becf3 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 */
diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
index a3a3c88e0b..07ccd770c1 100644
--- a/keyboards/nacly/splitreus62/info.json
+++ b/keyboards/nacly/splitreus62/info.json
@@ -8,6 +8,11 @@
       "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"
     },
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/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..04637a3438 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",
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..61a4c20e8f 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
diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
index 0e5ca7a6b6..938da5cbb7 100644
--- a/keyboards/neito/config.h
+++ b/keyboards/neito/config.h
@@ -15,11 +15,6 @@
  */
 #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 */
diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
index 7455762b51..ff6b097b3c 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"}
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/neokeys/g67/element_hs/config.h b/keyboards/neokeys/g67/element_hs/config.h
index dd5d026ea5..8f9caa06b2 100644
--- a/keyboards/neokeys/g67/element_hs/config.h
+++ b/keyboards/neokeys/g67/element_hs/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 { 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
diff --git a/keyboards/neokeys/g67/element_hs/info.json b/keyboards/neokeys/g67/element_hs/info.json
index 24dc48cab2..8b6efd1fc6 100644
--- a/keyboards/neokeys/g67/element_hs/info.json
+++ b/keyboards/neokeys/g67/element_hs/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/neokeys/g67/hotswap/config.h b/keyboards/neokeys/g67/hotswap/config.h
index b77c529e88..bb0046c0c2 100644
--- a/keyboards/neokeys/g67/hotswap/config.h
+++ b/keyboards/neokeys/g67/hotswap/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 { 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
diff --git a/keyboards/neokeys/g67/hotswap/info.json b/keyboards/neokeys/g67/hotswap/info.json
index 9dca75aee1..99f0868fb1 100644
--- a/keyboards/neokeys/g67/hotswap/info.json
+++ b/keyboards/neokeys/g67/hotswap/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/neokeys/g67/soldered/config.h b/keyboards/neokeys/g67/soldered/config.h
index 68374d3e40..397c6d90db 100644
--- a/keyboards/neokeys/g67/soldered/config.h
+++ b/keyboards/neokeys/g67/soldered/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 { 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
diff --git a/keyboards/neokeys/g67/soldered/info.json b/keyboards/neokeys/g67/soldered/info.json
index 7b61a631d2..82c6bcc21a 100644
--- a/keyboards/neokeys/g67/soldered/info.json
+++ b/keyboards/neokeys/g67/soldered/info.json
@@ -8,6 +8,11 @@
         "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,
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..4cc1a3d9d5 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"},
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index 2c1b62448e..047d836eb6 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.
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
index 29f5c0c2f4..feb9c5d506 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index b98385f836..1a3cd3c897 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.
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
index 19de748afb..c96e0c126b 100644
--- a/keyboards/neson_design/n6/info.json
+++ b/keyboards/neson_design/n6/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h
index 5cdbbcea37..bccf17c98e 100644
--- a/keyboards/newgame40/config.h
+++ b/keyboards/newgame40/config.h
@@ -17,11 +17,6 @@ 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
@@ -63,7 +58,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..2c5e1bb152 100644
--- a/keyboards/newgame40/info.json
+++ b/keyboards/newgame40/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": ["F7", "B1", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_4x10"],
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..cffe3da88f 100644
--- a/keyboards/nibiria/stream15/info.json
+++ b/keyboards/nibiria/stream15/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..031895cf23 100644
--- a/keyboards/nightly_boards/adellein/config.h
+++ b/keyboards/nightly_boards/adellein/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, 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
diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json
index 7967cfc99b..97cf05912f 100644
--- a/keyboards/nightly_boards/adellein/info.json
+++ b/keyboards/nightly_boards/adellein/info.json
@@ -8,6 +8,11 @@
     	"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"}
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index acd477fa71..b576b720e3 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/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 { 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
diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json
index 21efb61c29..d59acbf6e2 100644
--- a/keyboards/nightly_boards/alter/rev1/info.json
+++ b/keyboards/nightly_boards/alter/rev1/info.json
@@ -8,6 +8,11 @@
     	"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",
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/config.h b/keyboards/nightly_boards/conde60/config.h
index 9cad75e7b6..4fdd3f76a1 100644
--- a/keyboards/nightly_boards/conde60/config.h
+++ b/keyboards/nightly_boards/conde60/config.h
@@ -17,20 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top 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
@@ -47,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #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..0883b994e3 100644
--- a/keyboards/nightly_boards/conde60/info.json
+++ b/keyboards/nightly_boards/conde60/info.json
@@ -8,6 +8,11 @@
     	"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",
     "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/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/n2/config.h b/keyboards/nightly_boards/n2/config.h
index a59197bcf9..3ca1b97be1 100644
--- a/keyboards/nightly_boards/n2/config.h
+++ b/keyboards/nightly_boards/n2/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 { 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
diff --git a/keyboards/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/info.json
index 8339bedc87..51c563e37b 100644
--- a/keyboards/nightly_boards/n2/info.json
+++ b/keyboards/nightly_boards/n2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "C6"],
+        "rows": ["F1", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h
index 055aea6055..9a4fbf033b 100644
--- a/keyboards/nightly_boards/n40_o/config.h
+++ b/keyboards/nightly_boards/n40_o/config.h
@@ -17,20 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top 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
 
diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json
index f68bc89be3..a6c63fdde2 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"},
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index 7ec0b48079..0c240b4a47 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 } }
diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json
index 519f31cf28..1ab1fbedf4 100644
--- a/keyboards/nightly_boards/n60_s/info.json
+++ b/keyboards/nightly_boards/n60_s/info.json
@@ -8,6 +8,11 @@
     	"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"}
diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h
index 5191be1d84..41defb8722 100644
--- a/keyboards/nightly_boards/n87/config.h
+++ b/keyboards/nightly_boards/n87/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, 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
diff --git a/keyboards/nightly_boards/n87/info.json b/keyboards/nightly_boards/n87/info.json
index a45c8333fc..0c1dde2787 100644
--- a/keyboards/nightly_boards/n87/info.json
+++ b/keyboards/nightly_boards/n87/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h
index e889ad4c4d..d53385a03c 100644
--- a/keyboards/nightly_boards/n9/config.h
+++ b/keyboards/nightly_boards/n9/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 { 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
diff --git a/keyboards/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json
index 3b93fbdac1..37c1a79349 100644
--- a/keyboards/nightly_boards/n9/info.json
+++ b/keyboards/nightly_boards/n9/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x0012",
     	"device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "D4"],
+        "rows": ["F4", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h
index 44868adff6..db8a106663 100644
--- a/keyboards/nightly_boards/octopad/config.h
+++ b/keyboards/nightly_boards/octopad/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, 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
diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json
index d6dfc74805..8aa4f08043 100644
--- a/keyboards/nightly_boards/octopad/info.json
+++ b/keyboards/nightly_boards/octopad/info.json
@@ -8,6 +8,11 @@
     	"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"},
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..2471032f34 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},
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/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/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..0a7fd2adf7 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]
     },
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..666b069f89 100644
--- a/keyboards/nimrod/info.json
+++ b/keyboards/nimrod/info.json
@@ -8,6 +8,11 @@
         "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"],
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/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h
index fa337fe426..fe3a23e110 100644
--- a/keyboards/nix_studio/oxalys80/config.h
+++ b/keyboards/nix_studio/oxalys80/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, 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 */
diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json
index 64e491cc41..ae8c7cae00 100644
--- a/keyboards/nix_studio/oxalys80/info.json
+++ b/keyboards/nix_studio/oxalys80/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/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/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/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h
index fa4ac1b65e..0524f9766c 100644
--- a/keyboards/novelkeys/nk20/config.h
+++ b/keyboards/novelkeys/nk20/config.h
@@ -17,13 +17,6 @@ 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
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json
index e50174c50a..1bb9c61f8c 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E4E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B15", "A4"],
+        "rows": ["B12", "A5", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layout_aliases": {
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/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..758c556ce3 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -17,13 +17,6 @@ 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
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
index 3e60bfd3a4..bbc5b50a95 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E4F",
         "device_version": "0.0.1"
     },
+    "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
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..b2927c353f 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/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, 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
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json
index 6bcc03d93b..6e2cccb337 100755
--- a/keyboards/novelkeys/nk87b/info.json
+++ b/keyboards/novelkeys/nk87b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E50",
         "device_version": "0.0.1"
     },
+    "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/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
index ff56c34c91..5aa35ad4d8 100755
--- a/keyboards/novelkeys/novelpad/config.h
+++ b/keyboards/novelkeys/novelpad/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, 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
diff --git a/keyboards/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json
index ae77ec387c..8440e159b1 100644
--- a/keyboards/novelkeys/novelpad/info.json
+++ b/keyboards/novelkeys/novelpad/info.json
@@ -8,6 +8,11 @@
         "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
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..b1cfb96cee 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
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/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/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..692a4cd8a6 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"
   },
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
index c6460002a9..9c615ac388 100644
--- a/keyboards/noxary/268_2_rgb/config.h
+++ b/keyboards/noxary/268_2_rgb/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 { 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
diff --git a/keyboards/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json
index 9016300e25..38e6c33ea0 100644
--- a/keyboards/noxary/268_2_rgb/info.json
+++ b/keyboards/noxary/268_2_rgb/info.json
@@ -8,6 +8,11 @@
       "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"
     },
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/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/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/x268/config.h b/keyboards/noxary/x268/config.h
index f40f846d61..fc391c7074 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/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, 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
diff --git a/keyboards/noxary/x268/info.json b/keyboards/noxary/x268/info.json
index ee616992dd..2f190a3e68 100644
--- a/keyboards/noxary/x268/info.json
+++ b/keyboards/noxary/x268/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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..002d3cc29b 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"}
diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h
index 23b2f5f1a4..bf0c7568ec 100644
--- a/keyboards/nullbitsco/tidbit/config.h
+++ b/keyboards/nullbitsco/tidbit/config.h
@@ -22,13 +22,6 @@
 // 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
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json
index cce2a2902c..aa95009339 100644
--- a/keyboards/nullbitsco/tidbit/info.json
+++ b/keyboards/nullbitsco/tidbit/info.json
@@ -7,6 +7,11 @@
         "pid": "0x6064",
         "device_version": "0.0.1"
     },
+    "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/numatreus/config.h b/keyboards/numatreus/config.h
index 95883526b1..d11ad6d8e5 100644
--- a/keyboards/numatreus/config.h
+++ b/keyboards/numatreus/config.h
@@ -14,15 +14,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 }
-#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 */
diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/info.json
index 4ce325048a..6139c594d6 100644
--- a/keyboards/numatreus/info.json
+++ b/keyboards/numatreus/info.json
@@ -8,6 +8,11 @@
     "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",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
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/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h
index ae2913396b..c861404357 100644
--- a/keyboards/obosob/arch_36/config.h
+++ b/keyboards/obosob/arch_36/config.h
@@ -17,13 +17,6 @@ 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 }
diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json
index 63736c9a21..9b0fa7841e 100644
--- a/keyboards/obosob/arch_36/info.json
+++ b/keyboards/obosob/arch_36/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/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/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..7f0e25396d 100644
--- a/keyboards/ocean/stealth/info.json
+++ b/keyboards/ocean/stealth/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0010",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D4", "C6"],
+        "rows": ["D1"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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..ffc086aca3 100644
--- a/keyboards/ocean/sus/info.json
+++ b/keyboards/ocean/sus/info.json
@@ -8,6 +8,11 @@
       "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": {
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_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/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/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/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_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/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/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h
index 8069bd427b..46b598cf02 100644
--- a/keyboards/ogre/ergo_single/config.h
+++ b/keyboards/ogre/ergo_single/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 { 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}
diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json
index 04db9ff8d5..c6e8eea75c 100644
--- a/keyboards/ogre/ergo_single/info.json
+++ b/keyboards/ogre/ergo_single/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h
index 017d4792ff..724905efd7 100644
--- a/keyboards/ogre/ergo_split/config.h
+++ b/keyboards/ogre/ergo_split/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 { 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
diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json
index 42cc158acf..e01e6873d1 100644
--- a/keyboards/ogre/ergo_split/info.json
+++ b/keyboards/ogre/ergo_split/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h
index 2dd38f77d0..0309f3820c 100644
--- a/keyboards/ok60/config.h
+++ b/keyboards/ok60/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, 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
 
diff --git a/keyboards/ok60/info.json b/keyboards/ok60/info.json
index 08cb263a2e..53bbbd73bd 100644
--- a/keyboards/ok60/info.json
+++ b/keyboards/ok60/info.json
@@ -8,6 +8,11 @@
     "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
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..c5772b4124 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
 
diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json
index 4b5bd3bb70..5d53117b14 100644
--- a/keyboards/omkbd/ergodash/mini/info.json
+++ b/keyboards/omkbd/ergodash/mini/info.json
@@ -1,23 +1,96 @@
 {
-  "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"
+    },
+    "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..2f3532bbb4 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
 
diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json
index d11b84b733..a5f7e38b5b 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
@@ -18,360 +23,422 @@
     "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..fefd4840a8 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
 
diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json
index 966b9018c6..ebd7e4d2c2 100644
--- a/keyboards/omkbd/runner3680/3x6/info.json
+++ b/keyboards/omkbd/runner3680/3x6/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..9fa7ef6ecb 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
 
diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json
index 8e3e715c67..c55fb295a7 100644
--- a/keyboards/omkbd/runner3680/3x7/info.json
+++ b/keyboards/omkbd/runner3680/3x7/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..1640c1ae10 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
 
diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json
index 1954b6daec..c04f891b76 100644
--- a/keyboards/omkbd/runner3680/3x8/info.json
+++ b/keyboards/omkbd/runner3680/3x8/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..1640c1ae10 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
 
diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json
index 9e3afe60f3..f4edd551ba 100644
--- a/keyboards/omkbd/runner3680/4x6/info.json
+++ b/keyboards/omkbd/runner3680/4x6/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..85cc2719f7 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
 
diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json
index 1e543d9527..df40623eb3 100644
--- a/keyboards/omkbd/runner3680/4x7/info.json
+++ b/keyboards/omkbd/runner3680/4x7/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..aa4a29d56d 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
 
diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json
index 3ddd4e5791..bb1478a47d 100644
--- a/keyboards/omkbd/runner3680/4x8/info.json
+++ b/keyboards/omkbd/runner3680/4x8/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..1d77295725 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
 
diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json
index be646896fb..8881bef9ab 100644
--- a/keyboards/omkbd/runner3680/5x6/info.json
+++ b/keyboards/omkbd/runner3680/5x6/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..658f0bf059 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
 
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json
index 1e8bd452f3..16641e8a53 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5658",
         "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"
     },
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..688e0f7520 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
 
diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json
index 8eaccb2643..a74e20eea6 100644
--- a/keyboards/omkbd/runner3680/5x7/info.json
+++ b/keyboards/omkbd/runner3680/5x7/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..421ceefab9 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
 
diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json
index 4ffa9576a5..f852ca2b52 100644
--- a/keyboards/omkbd/runner3680/5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x8/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/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/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/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..06d5626fa9 100644
--- a/keyboards/opendeck/32/rev1/info.json
+++ b/keyboards/opendeck/32/rev1/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4"],
+        "rows": ["C7", "C6", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
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/org60/config.h b/keyboards/org60/config.h
index 44701c7e17..6382a3b398 100644
--- a/keyboards/org60/config.h
+++ b/keyboards/org60/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 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB Underglow
  * F6 PIN for Org60 that has pre-soldered WS2812 LEDs
  */
diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json
index 83da161e31..ccb05c66ce 100644
--- a/keyboards/org60/info.json
+++ b/keyboards/org60/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",
     "backlight": {
         "pin": "F5",
         "levels": 6
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..6b88be27d1 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,128 @@
   "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 }, 
+        { "x": 0, "y": 0 }, 
+        { "x": 1, "y": 0 }, 
+        { "x": 2, "y": 0 }, 
+        { "x": 3, "y": 0 }, 
+        { "x": 4, "y": 0 }, 
+        { "x": 5, "y": 0 }, 
+        { "x": 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 }, 
         { "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 } ]
+        { "x": 7, "y": 4 }, 
+        { "x": 8, "y": 4 }, 
+        { "x": 9, "y": 4 }, 
+        { "x": 10, "y": 4 }, 
+        { "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 } ]
+        { "x": 0, "y": 0 }, 
+        { "x": 1, "y": 0 }, 
+        { "x": 2, "y": 0 }, 
+        { "x": 3, "y": 0 }, 
+        { "x": 4, "y": 0 }, 
+        { "x": 5, "y": 0 }, 
+        { "x": 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 } ]
     }
   }
 }
diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
index b6a1f1d52c..7a221472cc 100644
--- a/keyboards/orthocode/config.h
+++ b/keyboards/orthocode/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 {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
diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json
index 578cb2b907..2919876772 100644
--- a/keyboards/orthocode/info.json
+++ b/keyboards/orthocode/info.json
@@ -8,6 +8,11 @@
         "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}
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/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..b4a9e0e6bc 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/config.h
+++ b/keyboards/owlab/jelly_epoch/hotswap/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, 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
 
diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json
index 796aa995c3..1db0cc9b9d 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/info.json
+++ b/keyboards/owlab/jelly_epoch/hotswap/info.json
@@ -8,6 +8,11 @@
         "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",
     "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..b4a9e0e6bc 100644
--- a/keyboards/owlab/jelly_epoch/soldered/config.h
+++ b/keyboards/owlab/jelly_epoch/soldered/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, 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
 
diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json
index 9e80a4ff30..3837fd14f7 100644
--- a/keyboards/owlab/jelly_epoch/soldered/info.json
+++ b/keyboards/owlab/jelly_epoch/soldered/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/owlab/jelly_epoch/soldered/soldered.h b/keyboards/owlab/jelly_epoch/soldered/soldered.h
index e69e258027..9b5951a525 100644
--- a/keyboards/owlab/jelly_epoch/soldered/soldered.h
+++ b/keyboards/owlab/jelly_epoch/soldered/soldered.h
@@ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ 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}  \
+	{ K500, K501, K502, ____, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513}  \
 }
 
 #define LAYOUT_75_iso( \
diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h
index bd3ebf9b1e..6785a26580 100644
--- a/keyboards/owlab/spring/config.h
+++ b/keyboards/owlab/spring/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, F4, F7, F6, F5, F1, F0 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* NKRO */
 #define FORCE_NKRO 
 
diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json
index 5d94c0cff8..ece663928e 100644
--- a/keyboards/owlab/spring/info.json
+++ b/keyboards/owlab/spring/info.json
@@ -8,6 +8,11 @@
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
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/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index 9a1aacc4fa..fb7ee7f1cc 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/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, 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
 
diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json
index 7a5215bf86..ad7641b65d 100644
--- a/keyboards/owlab/voice65/hotswap/info.json
+++ b/keyboards/owlab/voice65/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0x564F",
         "device_version": "0.0.1"
     },
+    "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"}
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index fc5aafd1ce..444ca29714 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/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, 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
 
diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json
index 4a3c8a6936..7922e9400c 100644
--- a/keyboards/owlab/voice65/soldered/info.json
+++ b/keyboards/owlab/voice65/soldered/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5657",
         "device_version": "0.0.1"
     },
+    "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"}
diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h
index 961897c4d6..a8026b4d17 100644
--- a/keyboards/p3d/glitch/config.h
+++ b/keyboards/p3d/glitch/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)
- *
- */
-
-/* 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
@@ -46,9 +30,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..ebe7ac6e30 100644
--- a/keyboards/p3d/glitch/info.json
+++ b/keyboards/p3d/glitch/info.json
@@ -8,6 +8,11 @@
         "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}
@@ -18,81 +23,81 @@
     "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..97cca23a29 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"},
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..afe3fb4853 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"},
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..7d9951f4de 100644
--- a/keyboards/pabile/p20/ver2/info.json
+++ b/keyboards/pabile/p20/ver2/info.json
@@ -3,6 +3,11 @@
     "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"
 }
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..e630b3f33f 100644
--- a/keyboards/pabile/p40/info.json
+++ b/keyboards/pabile/p40/info.json
@@ -8,52 +8,57 @@
     	"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}]
+				{"x":0, "y":0},
+				{"x":1, "y":0}, 
+				{"x":2, "y":0}, 
+				{"x":3, "y":0}, 
+				{"x":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":9.25, "y":1}, 
+				{"x":0.5, "y":2}, 
+				{"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":0.75, "y":3}, 
+				{"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}]
         }
     }
 }
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..3ece278ba9 100644
--- a/keyboards/pabile/p40_ortho/info.json
+++ b/keyboards/pabile/p40_ortho/info.json
@@ -7,6 +7,11 @@
         "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": {
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/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..f8587610df 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},
diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h
index 422b15b864..89d5a52301 100644
--- a/keyboards/panc40/config.h
+++ b/keyboards/panc40/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/panc40/info.json b/keyboards/panc40/info.json
index db7a1ead86..60618f6794 100644
--- a/keyboards/panc40/info.json
+++ b/keyboards/panc40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "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/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..80357af091 100644
--- a/keyboards/panc60/info.json
+++ b/keyboards/panc60/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": ["B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "D4"
   },
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/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/config.h b/keyboards/paprikman/albacore/config.h
index 91c434bba4..cfd4fba907 100644
--- a/keyboards/paprikman/albacore/config.h
+++ b/keyboards/paprikman/albacore/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, C7 }
-#define MATRIX_COL_PINS { C6, B6, B5, B4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN B3
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json
index 8e36e83b94..e415a587ca 100644
--- a/keyboards/paprikman/albacore/info.json
+++ b/keyboards/paprikman/albacore/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "B6", "B5", "B4"],
+        "rows": ["D5", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [1, 0]
     },
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/info.json b/keyboards/parallel/parallel_65/hotswap/info.json
index 25a8b75f04..6d45c27faa 100644
--- a/keyboards/parallel/parallel_65/hotswap/info.json
+++ b/keyboards/parallel/parallel_65/hotswap/info.json
@@ -7,6 +7,11 @@
         "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"],
@@ -151,7 +156,7 @@
                 { "x":15, "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 },
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..79df81ddcb 100644
--- a/keyboards/parallel/parallel_65/soldered/info.json
+++ b/keyboards/parallel/parallel_65/soldered/info.json
@@ -7,6 +7,11 @@
         "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"],
@@ -228,7 +233,7 @@
                 { "x":15, "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 },
@@ -457,7 +462,7 @@
                 { "x":15, "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 },
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..522d7959b0 100644
--- a/keyboards/pdxkbc/info.json
+++ b/keyboards/pdxkbc/info.json
@@ -8,6 +8,11 @@
         "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": {
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..a2648599ad 100644
--- a/keyboards/pearl/info.json
+++ b/keyboards/pearl/info.json
@@ -7,6 +7,11 @@
     "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"
   },
diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h
index 92cef2fde0..8725d8ab07 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
diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
index 77c129e79f..f5e1be9ac3 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}
diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h
index c039db9a15..984541d1d6 100644
--- a/keyboards/pearlboards/pandora/config.h
+++ b/keyboards/pearlboards/pandora/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, 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 ==*/
diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json
index 0114fb8e78..d482167bc0 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}
diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h
index 3faaca26a0..5f9978cbdc 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
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
index f6082c1d37..a1e90c6431 100644
--- a/keyboards/pearlboards/pearl/info.json
+++ b/keyboards/pearlboards/pearl/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h
index deb979dd06..4185a8f850 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
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
index 3d2f44a892..7de8efb8d7 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}
diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h
index f61e11fca9..bc31fb049e 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
diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json
index 3258e758a8..6b5cb66ad4 100644
--- a/keyboards/pearlboards/zeuspad/info.json
+++ b/keyboards/pearlboards/zeuspad/info.json
@@ -8,6 +8,11 @@
         "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}
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..8c37a5bf74 100644
--- a/keyboards/peej/lumberjack/info.json
+++ b/keyboards/peej/lumberjack/info.json
@@ -8,6 +8,11 @@
     "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"],
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..fcd6fce1b4 100644
--- a/keyboards/peej/rosaline/ortho/info.json
+++ b/keyboards/peej/rosaline/ortho/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",
   "layouts": {
diff --git a/keyboards/peej/rosaline/ortho/ortho.h b/keyboards/peej/rosaline/ortho/ortho.h
index b3287784c3..30beb92831 100644
--- a/keyboards/peej/rosaline/ortho/ortho.h
+++ b/keyboards/peej/rosaline/ortho/ortho.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "rosaline.h"
+#include "quantum.h"
 
 /*
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@@ -36,6 +36,8 @@
  *                 └───────┘           └───────┘
  */
 
+#define XXX KC_NO
+
 #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, \
@@ -52,6 +54,3 @@
 	{ 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..c5aebfd106 100644
--- a/keyboards/peej/tripel/info.json
+++ b/keyboards/peej/tripel/info.json
@@ -8,6 +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": {
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..0aaa062f4b 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"},
diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h
index b452a0dcb6..35a7541060 100644
--- a/keyboards/percent/booster/config.h
+++ b/keyboards/percent/booster/config.h
@@ -17,12 +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
diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json
index f92476c9f6..89b0744ee0 100644
--- a/keyboards/percent/booster/info.json
+++ b/keyboards/percent/booster/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..2933386c5f 100644
--- a/keyboards/percent/canoe/info.json
+++ b/keyboards/percent/canoe/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
index 7138fe3939..f5bfd30028 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 */
diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json
index e84a835991..9426dd27b9 100644
--- a/keyboards/percent/canoe_gen2/info.json
+++ b/keyboards/percent/canoe_gen2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x89F0",
         "device_version": "0.0.1"
     },
+    "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"],
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..5dc22d2874 100644
--- a/keyboards/percent/skog/info.json
+++ b/keyboards/percent/skog/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"],
+      "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
       "pin": "D4",
       "levels": 5
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..c6151dfba9 100644
--- a/keyboards/percent/skog_lite/info.json
+++ b/keyboards/percent/skog_lite/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/phage_studio/pila87/config.h b/keyboards/phage_studio/pila87/config.h
index d3eee645bf..5e5150abe1 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
diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json
index 5bba67c683..59191d61d5 100644
--- a/keyboards/phage_studio/pila87/info.json
+++ b/keyboards/phage_studio/pila87/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5887",
         "device_version": "0.0.1"
     },
+    "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"
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index 37e5c3bcc3..2496cdd216 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/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 ROW2COL
-
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 20
diff --git a/keyboards/phantom/info.json b/keyboards/phantom/info.json
index b246ac36fe..3c1b5715a4 100644
--- a/keyboards/phantom/info.json
+++ b/keyboards/phantom/info.json
@@ -8,6 +8,11 @@
         "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"
diff --git a/keyboards/phase_studio/titan65/hotswap/config.h b/keyboards/phase_studio/titan65/hotswap/config.h
index cf2ab2ffcb..11fc714e6e 100644
--- a/keyboards/phase_studio/titan65/hotswap/config.h
+++ b/keyboards/phase_studio/titan65/hotswap/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 { 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
diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json
index d1e2b0e58b..ce4d3cf4b5 100644
--- a/keyboards/phase_studio/titan65/hotswap/info.json
+++ b/keyboards/phase_studio/titan65/hotswap/info.json
@@ -8,6 +8,11 @@
         "pid": "0xBB91",
         "device_version": "0.0.1"
     },
+    "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/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/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..f2f82d6d7c 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"
     },
diff --git a/keyboards/phoenix/phoenix.h b/keyboards/phoenix/phoenix.h
index bd8e4a30ab..3657ef05f0 100644
--- a/keyboards/phoenix/phoenix.h
+++ b/keyboards/phoenix/phoenix.h
@@ -69,26 +69,26 @@ inline void led3_off(void) { led_pin_off(6); };
 #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,  \
+    L20,L21,L22,L23,L24,L25,                   R20,R21,R22,R23,R24,R25,  \
     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 )                     \
+    L40,L41,L42,L43,L44,                           R40,R41,R42,R43,R44,  \
+                            L53,L54,   R54,R53,                          \
+                                L55,   R55,                              \
+                        L50,L51,L52,   R52,R51,R50 )                     \
                                           \
    /* matrix positions */                 \
     {                                     \
-    { L00, L10, L02, L03, L04, L05, L06 },\
+    { L00, L01, L02, L03, L04, L05, L06 },\
     { L10, L11, L12, L13, L14, L15, L16 },\
-    { L20, L21, L22, L23, L24, L25 },     \
+    { L20, L21, L22, L23, L24, L25, KC_NO },\
     { L30, L31, L32, L33, L34, L35, L36 },\
-    { L40, L41, L42, L43, L44 },          \
-    { L53, L52, L51, L55, L56, L54 },     \
+    { L40, L41, L42, L43, L44, KC_NO, KC_NO },\
+    { L50, L51, L52, L53, L54, L55, KC_NO },\
                                           \
     { R00, R01, R02, R03, R04, R05, R06 },\
     { R10, R11, R12, R13, R14, R15, R16 },\
-    { R20, R21, R22, R23, R24, R25 },     \
+    { R20, R21, R22, R23, R24, R25, KC_NO },\
     { R30, R31, R32, R33, R34, R35, R36 },\
-    { R40, R41, R42, R43, R44 },          \
-    { R53, R54, R55, R51, R50, R52 },     \
+    { R40, R41, R42, R43, R44, KC_NO, KC_NO },\
+    { R50, R51, R52, R53, R54, R55, KC_NO }\
     }
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/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..789626b6da 100644
--- a/keyboards/pico/65keys/config.h
+++ b/keyboards/pico/65keys/config.h
@@ -16,15 +16,6 @@
 
 #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 */
diff --git a/keyboards/pico/65keys/info.json b/keyboards/pico/65keys/info.json
index 53389861e8..f96b487d78 100644
--- a/keyboards/pico/65keys/info.json
+++ b/keyboards/pico/65keys/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..789626b6da 100644
--- a/keyboards/pico/70keys/config.h
+++ b/keyboards/pico/70keys/config.h
@@ -16,15 +16,6 @@
 
 #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 */
diff --git a/keyboards/pico/70keys/info.json b/keyboards/pico/70keys/info.json
index 5dc25ede27..593e8eeb87 100644
--- a/keyboards/pico/70keys/info.json
+++ b/keyboards/pico/70keys/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..51b917771a 100644
--- a/keyboards/picolab/frusta_fundamental/config.h
+++ b/keyboards/picolab/frusta_fundamental/config.h
@@ -16,17 +16,6 @@
 
 #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
 
diff --git a/keyboards/picolab/frusta_fundamental/info.json b/keyboards/picolab/frusta_fundamental/info.json
index 130b1839bf..8e37509ca6 100644
--- a/keyboards/picolab/frusta_fundamental/info.json
+++ b/keyboards/picolab/frusta_fundamental/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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/pimentoso/paddino02/rev1/config.h b/keyboards/pimentoso/paddino02/rev1/config.h
index e29507dde7..47143f7cd6 100755
--- a/keyboards/pimentoso/paddino02/rev1/config.h
+++ b/keyboards/pimentoso/paddino02/rev1/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/pimentoso/paddino02/rev1/info.json b/keyboards/pimentoso/paddino02/rev1/info.json
index f7fbee01d1..67fb157d8e 100644
--- a/keyboards/pimentoso/paddino02/rev1/info.json
+++ b/keyboards/pimentoso/paddino02/rev1/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/pimentoso/paddino02/rev2/left/config.h b/keyboards/pimentoso/paddino02/rev2/left/config.h
index 976f02f261..47143f7cd6 100755
--- a/keyboards/pimentoso/paddino02/rev2/left/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/left/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/pimentoso/paddino02/rev2/left/info.json b/keyboards/pimentoso/paddino02/rev2/left/info.json
index 90d7e4e90d..5d46fbbf23 100644
--- a/keyboards/pimentoso/paddino02/rev2/left/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/left/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/pimentoso/paddino02/rev2/right/config.h b/keyboards/pimentoso/paddino02/rev2/right/config.h
index 206f0a5429..47143f7cd6 100755
--- a/keyboards/pimentoso/paddino02/rev2/right/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/right/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/pimentoso/paddino02/rev2/right/info.json b/keyboards/pimentoso/paddino02/rev2/right/info.json
index 3e361839f3..d7a29410b0 100644
--- a/keyboards/pimentoso/paddino02/rev2/right/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/right/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/pimentoso/touhoupad/config.h b/keyboards/pimentoso/touhoupad/config.h
index ce44b3ad20..0916e7b729 100644
--- a/keyboards/pimentoso/touhoupad/config.h
+++ b/keyboards/pimentoso/touhoupad/config.h
@@ -15,12 +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
diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json
index 755b1cf6ba..a4db1d1064 100644
--- a/keyboards/pimentoso/touhoupad/info.json
+++ b/keyboards/pimentoso/touhoupad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0031",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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
index add202537a..f492646176 100644
--- a/keyboards/pinky/3/3.h
+++ b/keyboards/pinky/3/3.h
@@ -1,17 +1,7 @@
 #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, \
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..13a87f9121 100644
--- a/keyboards/pinky/3/info.json
+++ b/keyboards/pinky/3/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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
index 9420a320ff..381ce82bce 100644
--- a/keyboards/pinky/4/4.h
+++ b/keyboards/pinky/4/4.h
@@ -1,17 +1,7 @@
 #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, \
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..2c1732ea16 100644
--- a/keyboards/pinky/4/info.json
+++ b/keyboards/pinky/4/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..f1d548a8a0 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"
     },
diff --git a/keyboards/pixelspace/capsule65i/config.h b/keyboards/pixelspace/capsule65i/config.h
index 43026552e1..2b5ec82860 100644
--- a/keyboards/pixelspace/capsule65i/config.h
+++ b/keyboards/pixelspace/capsule65i/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 { 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
diff --git a/keyboards/pixelspace/capsule65i/info.json b/keyboards/pixelspace/capsule65i/info.json
index f63ec17aee..7004108552 100644
--- a/keyboards/pixelspace/capsule65i/info.json
+++ b/keyboards/pixelspace/capsule65i/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..e488cd3cc5 100644
--- a/keyboards/pizzakeyboards/pizza65/info.json
+++ b/keyboards/pizzakeyboards/pizza65/info.json
@@ -8,6 +8,11 @@
         "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": {
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/info.json b/keyboards/pjb/eros/info.json
index cbba6dcecc..fab701e220 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",
diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h
index fa0a4567f9..7114397adf 100644
--- a/keyboards/pkb65/config.h
+++ b/keyboards/pkb65/config.h
@@ -21,14 +21,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, 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
 
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/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..6828e4dce2 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
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index ae67be691d..786814b987 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -6,6 +6,11 @@
     "vid": "0x3297",
     "device_version": "0.0.1"
   },
+  "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"}
diff --git a/keyboards/planck/info.json b/keyboards/planck/info.json
index cc57b6da60..a4911b999e 100644
--- a/keyboards/planck/info.json
+++ b/keyboards/planck/info.json
@@ -4,104 +4,104 @@
   "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 },
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 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": 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 } ]
+        { "x": 7, "y": 3 },
+        { "x": 8, "y": 3 },
+        { "x": 9, "y": 3 },
+        { "x": 10, "y": 3 },
+        { "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 } ]
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 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 } ]
     }
   }
 }
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/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/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/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/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/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/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/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/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..5958899759 100644
--- a/keyboards/planck/light/info.json
+++ b/keyboards/planck/light/info.json
@@ -8,6 +8,11 @@
     "pid": "0xBEA2",
     "device_version": "0.0.1"
   },
+  "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"
   },
diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json
index ebf11c9c8b..649132c30c 100644
--- a/keyboards/planck/rev1/info.json
+++ b/keyboards/planck/rev1/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json
index b7a3a31628..ac4c605313 100644
--- a/keyboards/planck/rev2/info.json
+++ b/keyboards/planck/rev2/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json
index 4ba0085cda..c853b9230d 100644
--- a/keyboards/planck/rev3/info.json
+++ b/keyboards/planck/rev3/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json
index 46513d8248..c541e2dc4d 100644
--- a/keyboards/planck/rev4/info.json
+++ b/keyboards/planck/rev4/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json
index 9fb2ae811e..883572e8e1 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"
   },
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index a60c086b5b..5bde659509 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
diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json
index 9cc60ab5f0..904b998d03 100644
--- a/keyboards/planck/rev6/info.json
+++ b/keyboards/planck/rev6/info.json
@@ -8,6 +8,11 @@
     "pid": "0xA4F9",
     "device_version": "0.0.6"
   },
+  "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"}
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index 192d3fc6d8..296e1ac6d9 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 }
 
diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json
index 828f0c20b8..0b5279b2fb 100644
--- a/keyboards/planck/rev6_drop/info.json
+++ b/keyboards/planck/rev6_drop/info.json
@@ -8,6 +8,11 @@
     "pid": "0xA4F9",
     "device_version": "0.0.6"
   },
+  "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"}
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..c99041be74 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 }
+        { "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": "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": "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": "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 }
       ]
     },
     "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": "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": "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": "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": "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, 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 }
+        { "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 }
       ]
     }
   }
diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index 1c1085c9a1..f7e0e04949 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json
index 809eaa0c39..8cd12628a4 100644
--- a/keyboards/playkbtw/ca66/info.json
+++ b/keyboards/playkbtw/ca66/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h
index b91943278f..2a5d98951a 100644
--- a/keyboards/playkbtw/helen80/config.h
+++ b/keyboards/playkbtw/helen80/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 { 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
diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/info.json
index 2efe949d75..becce0932e 100644
--- a/keyboards/playkbtw/helen80/info.json
+++ b/keyboards/playkbtw/helen80/info.json
@@ -8,6 +8,11 @@
     "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",
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index 42f15b3352..dd2126d072 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -1,13 +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, 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
 
diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json
index 5909204f29..86adea4b61 100644
--- a/keyboards/playkbtw/pk60/info.json
+++ b/keyboards/playkbtw/pk60/info.json
@@ -8,6 +8,11 @@
     "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
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index 91cba0f8e3..4adfcb7db2 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
diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json
index 7cb2950d6a..738e96b781 100644
--- a/keyboards/playkbtw/pk64rgb/info.json
+++ b/keyboards/playkbtw/pk64rgb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3634",
         "device_version": "0.0.1"
     },
+    "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/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/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/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..389b5ff394 100644
--- a/keyboards/plume/plume65/config.h
+++ b/keyboards/plume/plume65/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 { 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
diff --git a/keyboards/plume/plume65/info.json b/keyboards/plume/plume65/info.json
index 1937223b02..7a3570a0d5 100644
--- a/keyboards/plume/plume65/info.json
+++ b/keyboards/plume/plume65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x22CF",
         "device_version": "0.0.1"
     },
+    "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/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h
index 63cc719d84..2e0377a2c9 100644
--- a/keyboards/plut0nium/0x3e/config.h
+++ b/keyboards/plut0nium/0x3e/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, 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
  */
diff --git a/keyboards/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/info.json
index 52ad743a0a..5e96db2c28 100644
--- a/keyboards/plut0nium/0x3e/info.json
+++ b/keyboards/plut0nium/0x3e/info.json
@@ -8,6 +8,11 @@
         "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,
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/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..3a9116340d 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": {
diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h
index 6e6827f0e8..e6bfca0aa4 100644
--- a/keyboards/plywrks/lune/config.h
+++ b/keyboards/plywrks/lune/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, 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
diff --git a/keyboards/plywrks/lune/info.json b/keyboards/plywrks/lune/info.json
index 2061b282e4..6f3f8b8421 100644
--- a/keyboards/plywrks/lune/info.json
+++ b/keyboards/plywrks/lune/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7901",
         "device_version": "0.0.1"
     },
+    "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..59c9e7b69e 100644
--- a/keyboards/pohjolaworks/louhi/config.h
+++ b/keyboards/pohjolaworks/louhi/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, 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
diff --git a/keyboards/pohjolaworks/louhi/info.json b/keyboards/pohjolaworks/louhi/info.json
index 0185fe83bb..1e16cf9cfb 100644
--- a/keyboards/pohjolaworks/louhi/info.json
+++ b/keyboards/pohjolaworks/louhi/info.json
@@ -8,6 +8,11 @@
         "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"}
diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h
index 3332d62aa6..dfec066dab 100644
--- a/keyboards/poker87c/config.h
+++ b/keyboards/poker87c/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 { 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
diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json
index 04c16583a6..94098f7719 100644
--- a/keyboards/poker87c/info.json
+++ b/keyboards/poker87c/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
index fbee1e1858..2c30da7685 100644
--- a/keyboards/poker87d/config.h
+++ b/keyboards/poker87d/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 { 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
diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json
index 22a09c541e..c90fa21e3e 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"
     },
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/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..18844c7f95 100644
--- a/keyboards/polycarbdiet/s20/config.h
+++ b/keyboards/polycarbdiet/s20/config.h
@@ -16,14 +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
diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json
index 5c2ce53150..1398f34cab 100644
--- a/keyboards/polycarbdiet/s20/info.json
+++ b/keyboards/polycarbdiet/s20/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index e59d45ca45..9b560ee1f5 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/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 { 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 */
diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json
index ea829767ba..06dc68f853 100644
--- a/keyboards/pom_keyboards/tnln95/info.json
+++ b/keyboards/pom_keyboards/tnln95/info.json
@@ -8,6 +8,11 @@
         "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,
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/info.json b/keyboards/portal_66/hotswap/info.json
index 3951d86e3f..9a8e12047e 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": {
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..34dd599d44 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": {
@@ -234,7 +239,7 @@
                 { "x":15, "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 },
@@ -463,7 +468,7 @@
                 { "x":15, "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 },
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..53b198ba81 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"
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/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/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/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/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/rev1/info.json b/keyboards/preonic/rev1/info.json
index 340c178635..b843510153 100644
--- a/keyboards/preonic/rev1/info.json
+++ b/keyboards/preonic/rev1/info.json
@@ -6,6 +6,11 @@
         "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"
     },
diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json
index 3da1615c2d..cf1708b061 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"
     },
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index 2269aef97f..a2de64a324 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
diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json
index cc3b944471..7c19a70f9b 100644
--- a/keyboards/preonic/rev3/info.json
+++ b/keyboards/preonic/rev3/info.json
@@ -6,6 +6,11 @@
         "pid": "0xA649",
         "device_version": "0.0.3"
     },
+    "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"}
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index 4d1bfe67b9..f05911872b 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
diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json
index 3f32a10b36..c97543814d 100644
--- a/keyboards/preonic/rev3_drop/info.json
+++ b/keyboards/preonic/rev3_drop/info.json
@@ -6,6 +6,11 @@
         "pid": "0xA649",
         "device_version": "0.0.3"
     },
+    "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"}
diff --git a/keyboards/primekb/meridian/config.h b/keyboards/primekb/meridian/config.h
index 03379a660d..92ac0a089f 100644
--- a/keyboards/primekb/meridian/config.h
+++ b/keyboards/primekb/meridian/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, 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
diff --git a/keyboards/primekb/meridian/info.json b/keyboards/primekb/meridian/info.json
index ab16646490..5dc3d0ef71 100644
--- a/keyboards/primekb/meridian/info.json
+++ b/keyboards/primekb/meridian/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/primekb/meridian_rgb/config.h b/keyboards/primekb/meridian_rgb/config.h
index 58186b3e6d..2777e43a44 100644
--- a/keyboards/primekb/meridian_rgb/config.h
+++ b/keyboards/primekb/meridian_rgb/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, 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
diff --git a/keyboards/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/info.json
index c3dcca05e8..cb5d6478f3 100644
--- a/keyboards/primekb/meridian_rgb/info.json
+++ b/keyboards/primekb/meridian_rgb/info.json
@@ -8,6 +8,11 @@
         "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",
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_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..238633ee3a 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
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_r/config.h b/keyboards/primekb/prime_r/config.h
index d86696aef1..20892b683f 100644
--- a/keyboards/primekb/prime_r/config.h
+++ b/keyboards/primekb/prime_r/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 { 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
 
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/program_yoink/config.h b/keyboards/program_yoink/config.h
index 261ebaca5b..cd0eaa142b 100644
--- a/keyboards/program_yoink/config.h
+++ b/keyboards/program_yoink/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, 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
diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json
index eeab79d169..6f2162b206 100644
--- a/keyboards/program_yoink/ortho/info.json
+++ b/keyboards/program_yoink/ortho/info.json
@@ -8,6 +8,11 @@
         "pid": "0xF10C",
         "device_version": "0.0.1"
     },
+    "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"}
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
index 964c0e363b..e847f16edc 100644
--- a/keyboards/program_yoink/ortho/ortho.h
+++ b/keyboards/program_yoink/ortho/ortho.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "program_yoink.h"
+#include "quantum.h"
 
 /* This is a shortcut to help you visually see your layout.
  *
diff --git a/keyboards/program_yoink/program_yoink.c b/keyboards/program_yoink/program_yoink.c
index 7733aa2ad5..d1373a5283 100644
--- a/keyboards/program_yoink/program_yoink.c
+++ b/keyboards/program_yoink/program_yoink.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "program_yoink.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/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..e23f4ff970 100644
--- a/keyboards/program_yoink/staggered/info.json
+++ b/keyboards/program_yoink/staggered/info.json
@@ -8,6 +8,11 @@
         "pid": "0xF10B",
         "device_version": "0.0.1"
     },
+    "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"}
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
index 1b35e28da7..15def50979 100644
--- a/keyboards/program_yoink/staggered/staggered.h
+++ b/keyboards/program_yoink/staggered/staggered.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "program_yoink.h"
+#include "quantum.h"
 
 /* This is a shortcut to help you visually see your layout.
  *
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..c7441bd1a6 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"}
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..3bda8233e7 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}
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..4a2327d4fd 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},
diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h
index 54918d2b49..e6990c6c48 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
diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/info.json
new file mode 100644
index 0000000000..c4366e81f9
--- /dev/null
+++ b/keyboards/projectkb/alice/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "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/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h
index 1ac58753c7..cd1726d7eb 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
diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/info.json
new file mode 100644
index 0000000000..83d71b16e9
--- /dev/null
+++ b/keyboards/projectkb/alice/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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/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..cc6d437f71 100644
--- a/keyboards/projectkb/signature87/info.json
+++ b/keyboards/projectkb/signature87/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/projectkb/signature87/signature87.h b/keyboards/projectkb/signature87/signature87.h
index b97570ef95..48d7d2f40d 100644
--- a/keyboards/projectkb/signature87/signature87.h
+++ b/keyboards/projectkb/signature87/signature87.h
@@ -71,7 +71,7 @@
 }
 
 #define LAYOUT_wkl_ansi( \
-  K00,      K11, K01, K12, K02, K13, K03, K14, K04,      K15, K06, K16, k07,   K17, K08, K18, \
+  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,                  \
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/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..56ca74bb20 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,
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/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..8436b743be 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
diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json
index 77e1449458..60d8d0f508 100644
--- a/keyboards/protozoa/p01/info.json
+++ b/keyboards/protozoa/p01/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5031",
         "device_version": "0.0.1"
     },
+    "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/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..ef7af4d3a8 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"}
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index be1de23f83..c0243f8ee8 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 */
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
index c65b15cfb2..66092d592c 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"}
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..d5bab56bf3 100644
--- a/keyboards/puck/info.json
+++ b/keyboards/puck/info.json
@@ -8,6 +8,11 @@
     "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": {
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..cee5a88f61 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"},
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/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/info.json b/keyboards/qpockets/eggman/info.json
index 989402411d..58d2975169 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"},
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..5b4806e832 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},
diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index 26b85360c4..53e42221c9 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -16,16 +16,6 @@
 
 #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
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index 580ab0a4d5..aa99956be9 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -8,6 +8,11 @@
   	"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},
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..f9c2841a58 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"},
diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h
index b3a4bf279e..25ceace965 100644
--- a/keyboards/quad_h/lb75/config.h
+++ b/keyboards/quad_h/lb75/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, 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
diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json
index 386ba46067..6f6f5a598a 100644
--- a/keyboards/quad_h/lb75/info.json
+++ b/keyboards/quad_h/lb75/info.json
@@ -8,6 +8,11 @@
     	"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
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/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h
index 1ca7a35849..feb0b65458 100644
--- a/keyboards/quarkeys/z40/config.h
+++ b/keyboards/quarkeys/z40/config.h
@@ -14,10 +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
diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json
index 57159669a4..fd152e4070 100644
--- a/keyboards/quarkeys/z40/info.json
+++ b/keyboards/quarkeys/z40/info.json
@@ -8,6 +8,11 @@
           "pid": "0x2801",
           "device_version": "0.0.1"
       },
+    "matrix_pins": {
+      "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"],
+      "rows": ["E6", "B3", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h
index b23030ad5c..d6945273ef 100644
--- a/keyboards/quarkeys/z60/hotswap/config.h
+++ b/keyboards/quarkeys/z60/hotswap/config.h
@@ -14,11 +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
diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json
index c142c01b7e..82a280e524 100644
--- a/keyboards/quarkeys/z60/hotswap/info.json
+++ b/keyboards/quarkeys/z60/hotswap/info.json
@@ -8,6 +8,11 @@
         "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"]
+    },
+    "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..4f45b2ba12 100644
--- a/keyboards/quarkeys/z60/solder/config.h
+++ b/keyboards/quarkeys/z60/solder/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 77
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json
index e5ec227c7e..bf1cc9230f 100644
--- a/keyboards/quarkeys/z60/solder/info.json
+++ b/keyboards/quarkeys/z60/solder/info.json
@@ -8,6 +8,11 @@
         "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"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h
index 3e3ce2b0a2..74d8d069c7 100644
--- a/keyboards/quarkeys/z67/hotswap/config.h
+++ b/keyboards/quarkeys/z67/hotswap/config.h
@@ -14,11 +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
diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json
index c31a37325d..0431f3bca6 100644
--- a/keyboards/quarkeys/z67/hotswap/info.json
+++ b/keyboards/quarkeys/z67/hotswap/info.json
@@ -8,6 +8,11 @@
         "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"]
+    },
+    "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..778fa5e07f 100644
--- a/keyboards/quarkeys/z67/solder/config.h
+++ b/keyboards/quarkeys/z67/solder/config.h
@@ -14,11 +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
diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json
index af8c81f9d2..d6dbb553ea 100644
--- a/keyboards/quarkeys/z67/solder/info.json
+++ b/keyboards/quarkeys/z67/solder/info.json
@@ -8,6 +8,11 @@
         "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"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h
index 830b5364a5..7ba4700cde 100644
--- a/keyboards/qvex/lynepad/config.h
+++ b/keyboards/qvex/lynepad/config.h
@@ -17,14 +17,6 @@ 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
diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json
index f2930137d2..93d2a04323 100644
--- a/keyboards/qvex/lynepad/info.json
+++ b/keyboards/qvex/lynepad/info.json
@@ -8,6 +8,11 @@
       "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"},
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/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json
index 9f7664ea51..5cfaaf5767 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": {
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..399126e10b 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": {
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 5ea65094f9..44ad35a7ca 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/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)
- *
-*/
-// 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
diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index df34cd9fa7..ee61129722 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -9,6 +9,11 @@
     "pid": "0x1256",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"],
+    "rows": ["B6", "B2", "B3", "B1"]
+  },
+  "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/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..90528d1bd9 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]
   },
diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
index 5dc90ee6e3..e08cc5152e 100644
--- a/keyboards/rainkeebs/delilah/config.h
+++ b/keyboards/rainkeebs/delilah/config.h
@@ -15,14 +15,6 @@
  */
 #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
 
diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json
index f9e876b548..9d45bb6c9c 100644
--- a/keyboards/rainkeebs/delilah/info.json
+++ b/keyboards/rainkeebs/delilah/info.json
@@ -8,6 +8,11 @@
         "pid": "0x645C",
         "device_version": "0.0.1"
     },
+    "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": {
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/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
index 9bb2cbcb5f..e256260367 100644
--- a/keyboards/rainkeebs/yasui/config.h
+++ b/keyboards/rainkeebs/yasui/config.h
@@ -15,17 +15,6 @@
  */
 #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
 
diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/info.json
index ea7d883995..7ce96382de 100644
--- a/keyboards/rainkeebs/yasui/info.json
+++ b/keyboards/rainkeebs/yasui/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7973",
         "device_version": "0.0.1"
     },
+    "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/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/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index d884b12680..d4607263a4 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/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, 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
 
diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json
index ac3014fe7a..b6c0af83ac 100644
--- a/keyboards/rart/rart4x4/info.json
+++ b/keyboards/rart/rart4x4/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "B2", "B5", "B4"],
+        "rows": ["F4", "B6", "B3", "B1"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F6", "pin_b": "F5"},
diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h
index 1c96e49268..ed3fe5d464 100644
--- a/keyboards/rart/rart67/config.h
+++ b/keyboards/rart/rart67/config.h
@@ -17,13 +17,6 @@ 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
 
diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json
index ea1788f669..e33877e783 100644
--- a/keyboards/rart/rart67/info.json
+++ b/keyboards/rart/rart67/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0067",
         "device_version": "0.0.1"
     },
+    "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/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/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/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index f6817e71ce..cb8685a3f8 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/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, 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
 
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
index 27984a03d7..4c10d4b067 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"}
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/rart80/config.h b/keyboards/rart/rart80/config.h
index ae69705fec..a48b3d4eea 100644
--- a/keyboards/rart/rart80/config.h
+++ b/keyboards/rart/rart80/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 { 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
 
diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json
index 28775d7b51..b52626377e 100644
--- a/keyboards/rart/rart80/info.json
+++ b/keyboards/rart/rart80/info.json
@@ -8,6 +8,11 @@
         "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
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/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..6677355a23 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}
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h
index b6c3af7f7f..55b365001d 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 */
diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json
index dccdcf2132..d4978658ee 100644
--- a/keyboards/rart/rartlice/info.json
+++ b/keyboards/rart/rartlice/info.json
@@ -8,6 +8,11 @@
         "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",
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..344ebec135 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/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, 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
 
diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json
index 016b0c49c8..3d1fba3231 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"},
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..e1f218f682 100644
--- a/keyboards/rate/pistachio/rev1/config.h
+++ b/keyboards/rate/pistachio/rev1/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 { 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
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json
new file mode 100644
index 0000000000..0ecbe691df
--- /dev/null
+++ b/keyboards/rate/pistachio/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "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..20e6f23c67 100644
--- a/keyboards/rate/pistachio/rev2/config.h
+++ b/keyboards/rate/pistachio/rev2/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 { 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
 
diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json
new file mode 100644
index 0000000000..992a866125
--- /dev/null
+++ b/keyboards/rate/pistachio/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "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..934872a0c6 100644
--- a/keyboards/rate/pistachio_mp/config.h
+++ b/keyboards/rate/pistachio_mp/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 { 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
diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
index cab8ef68b4..e35c7432bc 100644
--- a/keyboards/rate/pistachio_mp/info.json
+++ b/keyboards/rate/pistachio_mp/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE212",
         "device_version": "0.0.1"
     },
+    "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/rationalist/ratio65_hotswap/rev_a/config.h b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
index 1d483f8d77..403ba8859c 100644
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
+++ b/keyboards/rationalist/ratio65_hotswap/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 {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
 
diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
index 71253c2113..8a389c05c0 100644
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
+++ b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/rationalist/ratio65_solder/rev_a/config.h
index dba1363b48..cb55082c6a 100644
--- a/keyboards/rationalist/ratio65_solder/rev_a/config.h
+++ b/keyboards/rationalist/ratio65_solder/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 {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
 
diff --git a/keyboards/rationalist/ratio65_solder/rev_a/info.json b/keyboards/rationalist/ratio65_solder/rev_a/info.json
index 1fa6dc2b91..2f8fd025ee 100644
--- a/keyboards/rationalist/ratio65_solder/rev_a/info.json
+++ b/keyboards/rationalist/ratio65_solder/rev_a/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "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/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/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/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..9403ff760d 100644
--- a/keyboards/recompile_keys/mio/config.h
+++ b/keyboards/recompile_keys/mio/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, 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
diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json
index 7523573159..c2647c081a 100644
--- a/keyboards/recompile_keys/mio/info.json
+++ b/keyboards/recompile_keys/mio/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4D41",
     "device_version": "0.0.1"
   },
+  "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/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..f8ece5e250 100644
--- a/keyboards/rect44/config.h
+++ b/keyboards/rect44/config.h
@@ -16,14 +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
diff --git a/keyboards/rect44/info.json b/keyboards/rect44/info.json
index 2bb04a7f8b..c136ec6809 100644
--- a/keyboards/rect44/info.json
+++ b/keyboards/rect44/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4DD7",
         "device_version": "0.0.1"
     },
+    "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/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..1c251361f0 100644
--- a/keyboards/redox/rev1/base/info.json
+++ b/keyboards/redox/rev1/base/info.json
@@ -2,6 +2,11 @@
     "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"
     },
diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h
index b768d2f19f..8b05acd7ed 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@@ -17,15 +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, 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 */
diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h
index 71d3470569..c32700fda9 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 */
diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json
index 4f6bae6891..5d5358adb0 100644
--- a/keyboards/redox/rev1/proton_c/info.json
+++ b/keyboards/redox/rev1/proton_c/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "1.0.1"
     },
+    "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/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..a1044084de 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"
     },
diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h
index c05e2f5d7b..8f31e689c3 100644
--- a/keyboards/retro_75/config.h
+++ b/keyboards/retro_75/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, 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
diff --git a/keyboards/retro_75/info.json b/keyboards/retro_75/info.json
index 95a09b613d..d4087ab72d 100644
--- a/keyboards/retro_75/info.json
+++ b/keyboards/retro_75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5275",
         "device_version": "0.0.1"
     },
+    "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/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index 0cd6866c40..f068ad9fd7 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -17,14 +17,6 @@ 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
 
diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/info.json
index 11a57ea4fd..3d9df3ea4a 100644
--- a/keyboards/reversestudio/decadepad/info.json
+++ b/keyboards/reversestudio/decadepad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4450",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "num_lock": "D4",
         "on_state": 0
diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h
index 9b798af9dc..511011a96c 100644
--- a/keyboards/reviung/reviung33/config.h
+++ b/keyboards/reviung/reviung33/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, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 5
diff --git a/keyboards/reviung/reviung33/info.json b/keyboards/reviung/reviung33/info.json
index 32097d284d..f1f82cf55c 100644
--- a/keyboards/reviung/reviung33/info.json
+++ b/keyboards/reviung/reviung33/info.json
@@ -8,6 +8,11 @@
         "pid": "0x516D",
         "device_version": "0.0.1"
     },
+    "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/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/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/reviung41/config.h b/keyboards/reviung/reviung41/config.h
index 23b05ea16c..3cfd68e72f 100644
--- a/keyboards/reviung/reviung41/config.h
+++ b/keyboards/reviung/reviung41/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 }
-#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
diff --git a/keyboards/reviung/reviung41/info.json b/keyboards/reviung/reviung41/info.json
index b7fea0f89f..81275da923 100644
--- a/keyboards/reviung/reviung41/info.json
+++ b/keyboards/reviung/reviung41/info.json
@@ -8,6 +8,11 @@
         "pid": "0xDCCB",
         "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/reviung5/config.h b/keyboards/reviung/reviung5/config.h
index aceb9655f6..7ed2eada3e 100644
--- a/keyboards/reviung/reviung5/config.h
+++ b/keyboards/reviung/reviung5/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 \
-    { D4, C6, D7, E6, B4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM         4
diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json
index 622c880a42..c52e03880a 100644
--- a/keyboards/reviung/reviung5/info.json
+++ b/keyboards/reviung/reviung5/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4F0D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D0", "pin_b": "D1"}
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index c654abc335..207bbe158e 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/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, 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
diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json
index 86e4d054a1..c45b2ac449 100644
--- a/keyboards/reviung/reviung53/info.json
+++ b/keyboards/reviung/reviung53/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E09",
         "device_version": "0.0.1"
     },
+    "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/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/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 8f961078bd..5b1b86b68f 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
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index b68a1586c5..c0bfa319b2 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3505",
         "device_version": "0.0.1"
     },
+    "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/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/rev1/32a/config.h b/keyboards/rgbkb/pan/rev1/32a/config.h
index 5e7c4babbd..432288736d 100644
--- a/keyboards/rgbkb/pan/rev1/32a/config.h
+++ b/keyboards/rgbkb/pan/rev1/32a/config.h
@@ -16,7 +16,4 @@ 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..e6ebce6270 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": {
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/config.h b/keyboards/rgbkb/pan/rev1/proton_c/config.h
index f25713b2be..0013f20e12 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/config.h
+++ b/keyboards/rgbkb/pan/rev1/proton_c/config.h
@@ -16,7 +16,4 @@ 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..0e04b61593 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",
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/info.json b/keyboards/rgbkb/sol/rev1/info.json
index eb742972b1..dfaedb6cff 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "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"}
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/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 264f21d02b..e60042b2c2 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3060",
         "device_version": "0.0.2"
     },
+    "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"
     },
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/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..88d4a84c73 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
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 046a56f390..767a26b222 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3510",
         "device_version": "0.0.1"
     },
+    "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 +30,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/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h
index 327fe840c3..77108690fb 100644
--- a/keyboards/rgbkb/zen/rev1/config.h
+++ b/keyboards/rgbkb/zen/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 { 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 */
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 33b8334958..fbefbf744a 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 85b6a68b79..252ed730fb 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -17,16 +17,8 @@ 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..1303324cbc 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"}
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index df9875ed47..79e7f75b6d 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -21,13 +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
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json
index 7bf6fe4b0d..427c0c6f98 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/info.json
@@ -8,6 +8,11 @@
       "pid": "0x3060",
       "device_version": "0.0.1"
     },
+    "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"}
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/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..1fc94b0d72 100644
--- a/keyboards/rmi_kb/aelith/info.json
+++ b/keyboards/rmi_kb/aelith/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/rmi_kb/chevron/config.h b/keyboards/rmi_kb/chevron/config.h
index cd4c43391b..77ef2c19b8 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 */
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/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h
index ddf1d3199d..06c118b1b6 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 */
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/v1/config.h b/keyboards/rmi_kb/herringbone/v1/config.h
index f5ea6b0f4e..06c118b1b6 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 */
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/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_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/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/squishy65/config.h b/keyboards/rmi_kb/squishy65/config.h
index ab44a877f7..463de85aa1 100644
--- a/keyboards/rmi_kb/squishy65/config.h
+++ b/keyboards/rmi_kb/squishy65/config.h
@@ -17,10 +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
diff --git a/keyboards/rmi_kb/squishy65/info.json b/keyboards/rmi_kb/squishy65/info.json
index 6e374d5f2b..9b00b9387a 100644
--- a/keyboards/rmi_kb/squishy65/info.json
+++ b/keyboards/rmi_kb/squishy65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x10B5",
         "device_version": "0.6.5"
     },
+    "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.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..f7cae14b1b 100644
--- a/keyboards/rmi_kb/squishyfrl/config.h
+++ b/keyboards/rmi_kb/squishyfrl/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 { 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
diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json
index f2dc2ebd24..541ec06731 100644
--- a/keyboards/rmi_kb/squishyfrl/info.json
+++ b/keyboards/rmi_kb/squishyfrl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4BE5",
         "device_version": "0.0.1"
     },
+    "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/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 20e98b3d53..f7cae14b1b 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/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 { 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
diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json
index 17236053ca..f8a33eea8e 100644
--- a/keyboards/rmi_kb/squishytkl/info.json
+++ b/keyboards/rmi_kb/squishytkl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x00B1",
         "device_version": "1.0.0"
     },
+    "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/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..739178173c 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": {
diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h
index 4fa5e6e18b..758a6fabfe 100644
--- a/keyboards/rmi_kb/wete/v1/config.h
+++ b/keyboards/rmi_kb/wete/v1/config.h
@@ -17,10 +17,6 @@ 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
diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json
index cf17e5966d..c2d2f03271 100644
--- a/keyboards/rmi_kb/wete/v1/info.json
+++ b/keyboards/rmi_kb/wete/v1/info.json
@@ -8,6 +8,11 @@
         "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,
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..475cb25078 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/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 { 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
 
diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json
index c477304658..e110a7ff9e 100644
--- a/keyboards/rmi_kb/wete/v2/info.json
+++ b/keyboards/rmi_kb/wete/v2/info.json
@@ -8,6 +8,11 @@
         "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"}
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..0562e534f5 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"}
diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h
index b6d39fd63d..ad3b4c359a 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
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
index 793bad257c..59203f1e53 100644
--- a/keyboards/rocketboard_16/info.json
+++ b/keyboards/rocketboard_16/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFF16",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B8", "B9", "B10", "B11"],
+        "rows": ["A9", "B13", "B14", "B15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "A1"},
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/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/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/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/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..f68be3ceee 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}
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/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..fec1b52ea3 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"}
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/vaengr/config.h b/keyboards/runes/vaengr/config.h
index 1c7e33e966..0bc3b5bed4 100644
--- a/keyboards/runes/vaengr/config.h
+++ b/keyboards/runes/vaengr/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, 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
diff --git a/keyboards/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json
index a96ade853c..2765e7072c 100644
--- a/keyboards/runes/vaengr/info.json
+++ b/keyboards/runes/vaengr/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7661",
         "device_version": "0.0.1"
     },
+    "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/rura66/rev1/config.h b/keyboards/rura66/rev1/config.h
index 1a6ca8ac73..df333efe48 100644
--- a/keyboards/rura66/rev1/config.h
+++ b/keyboards/rura66/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, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Split hand configration */
 #define MASTER_LEFT
 
diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json
index fc4f1793bc..d4f9a92f68 100644
--- a/keyboards/rura66/rev1/info.json
+++ b/keyboards/rura66/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0200",
     "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"
   },
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/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..f93a6e3d04 100644
--- a/keyboards/ryanbaekr/rb18/config.h
+++ b/keyboards/ryanbaekr/rb18/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, 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
diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json
index 4302522a49..d66b072f3e 100644
--- a/keyboards/ryanbaekr/rb18/info.json
+++ b/keyboards/ryanbaekr/rb18/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0018",
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["B2", "B6", "B5", "B4"],
+        "rows": ["B1", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
index 2aab8b1c24..2d312f69bb 100644
--- a/keyboards/ryanbaekr/rb69/config.h
+++ b/keyboards/ryanbaekr/rb69/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, 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
diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json
index de96dc8aed..c3e8101dbb 100644
--- a/keyboards/ryanbaekr/rb69/info.json
+++ b/keyboards/ryanbaekr/rb69/info.json
@@ -8,11 +8,95 @@
         "pid": "0x0069",
         "device_version": "0.0.3"
     },
+    "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/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/rb87/config.h b/keyboards/ryanbaekr/rb87/config.h
index 4e4839cdf7..d55efcf86b 100644
--- a/keyboards/ryanbaekr/rb87/config.h
+++ b/keyboards/ryanbaekr/rb87/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, 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
diff --git a/keyboards/ryanbaekr/rb87/info.json b/keyboards/ryanbaekr/rb87/info.json
index f9401bac65..559c121aeb 100644
--- a/keyboards/ryanbaekr/rb87/info.json
+++ b/keyboards/ryanbaekr/rb87/info.json
@@ -10,6 +10,11 @@
         "pid": "0x0087",
         "device_version": "0.0.3"
     },
+    "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/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h
index a0625ed46f..be974b6787 100755
--- a/keyboards/ryloo_studio/m0110/config.h
+++ b/keyboards/ryloo_studio/m0110/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, 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
 
diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/info.json
index 251737d61e..17e88bac32 100644
--- a/keyboards/ryloo_studio/m0110/info.json
+++ b/keyboards/ryloo_studio/m0110/info.json
@@ -8,6 +8,11 @@
         "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
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..4156fd3aae 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 */
diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json
index 242135b16c..f0bf9b1d98 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/info.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/config.h b/keyboards/salicylic_acid3/7splus/config.h
index 23eae6dac4..b4ac29b52d 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 */
diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
index 7762132ec0..72dcc86573 100644
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ b/keyboards/salicylic_acid3/7splus/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..150c2f4dcc 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 */
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
index 9396eca367..6d0282fdd6 100644
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ b/keyboards/salicylic_acid3/ergoarrows/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..d004f287df 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/config.h
+++ b/keyboards/salicylic_acid3/getta25/rev1/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 { 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 */
diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json
index 7443540704..33f5822449 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/info.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3060",
         "device_version": "0.1.3"
     },
+    "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/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..70e81ae774 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 */
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
index 53f61f87f2..33488610b8 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..4d7fc6297b 100644
--- a/keyboards/salicylic_acid3/nafuda/config.h
+++ b/keyboards/salicylic_acid3/nafuda/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 { 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 */
diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json
index 05cf322ccf..3cef936a33 100644
--- a/keyboards/salicylic_acid3/nafuda/info.json
+++ b/keyboards/salicylic_acid3/nafuda/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3060",
         "device_version": "0.1.2"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
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..3f1c2f9ca5 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/config.h
@@ -17,15 +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 }
-#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 */
diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index 5dc05a02d0..96d81a7e71 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -8,8 +8,19 @@
         "pid": "0xE8BA",
         "device_version": "0.0.1"
     },
+    "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"]
+            }
+        }
     },
     "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/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..4d991f2ea3 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked64/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 { 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 */
diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index 52a7c2906e..2416e063d9 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -8,8 +8,19 @@
         "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"]
+            }
+        }
     },
     "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..24acc89bcf 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 */
diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
index 06d915c2f4..c36278aa47 100644
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ b/keyboards/salicylic_acid3/nknl7en/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h
index 69ef56fe6e..3c8fca5ab0 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 */
diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
index 7338cb15fe..b2f07e233a 100644
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ b/keyboards/salicylic_acid3/nknl7jp/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
index 6672b0014c..26f1bf2661 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/config.h
+++ b/keyboards/salicylic_acid3/setta21/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 }
-#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 */
diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index a798c25e63..b4013093cd 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3060",
         "device_version": "0.1.1"
     },
+    "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"],
diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
index 772c843c57..c309296049 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "setta21.h"
+#include "quantum.h"
 
 #define LAYOUT_numpad_6x4( \
        L05, L15, L25, L35, \
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..3d6d768957 100644
--- a/keyboards/sam/s80/config.h
+++ b/keyboards/sam/s80/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 { 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
diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json
index ab0cde43a1..dd03cf3098 100644
--- a/keyboards/sam/s80/info.json
+++ b/keyboards/sam/s80/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index 7cfba55dc8..946649d038 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -16,21 +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
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index ebf5dda947..9f741abeff 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/info.json b/keyboards/sanctified/dystopia/info.json
index 3c0814074e..c71f327f6a 100644
--- a/keyboards/sanctified/dystopia/info.json
+++ b/keyboards/sanctified/dystopia/info.json
@@ -8,6 +8,11 @@
         "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": {
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..c4e8752997 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,
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/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/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h
index 53a07a179c..a20ec04bdb 100644
--- a/keyboards/sawnsprojects/amber80/solder/config.h
+++ b/keyboards/sawnsprojects/amber80/solder/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 { 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
diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json
index 1e9870fa90..3cd4c7c96d 100644
--- a/keyboards/sawnsprojects/amber80/solder/info.json
+++ b/keyboards/sawnsprojects/amber80/solder/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h
index 76f4acfbf6..6a5ac54353 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h
@@ -16,13 +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
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json
index a54172480d..380fa706b0 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
index 8a947093dc..ef7cb26289 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
@@ -16,13 +16,6 @@
 
 #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 } }
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
index 3872047ef8..94a091b0f8 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"}
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h
index 76f4acfbf6..6a5ac54353 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h
@@ -16,13 +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
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json
index 9666127299..cf337c55f5 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"}
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index f0c527387d..a5f61e98e7 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/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 { 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
diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json
index 50c304dda2..1ab426b2af 100644
--- a/keyboards/sawnsprojects/satxri6key/info.json
+++ b/keyboards/sawnsprojects/satxri6key/info.json
@@ -8,17 +8,23 @@
         "pid": "0x0727",
         "device_version": "0.0.1"
     },
+    "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}
+                {"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/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h
index bd4258f12a..5cb0b63ba9 100644
--- a/keyboards/sawnsprojects/vcl65/solder/config.h
+++ b/keyboards/sawnsprojects/vcl65/solder/config.h
@@ -16,13 +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
diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json
index 1b0c638ecc..617851ba00 100644
--- a/keyboards/sawnsprojects/vcl65/solder/info.json
+++ b/keyboards/sawnsprojects/vcl65/solder/info.json
@@ -8,6 +8,11 @@
         "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
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/sck/gtm/config.h b/keyboards/sck/gtm/config.h
index f4961f2242..a99fc7a3e8 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
 
diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json
index 3f254f2c77..c3cc44cd64 100644
--- a/keyboards/sck/gtm/info.json
+++ b/keyboards/sck/gtm/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6090",
         "device_version": "0.0.2"
     },
+    "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}
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/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..2f233b4066 100644
--- a/keyboards/sck/neiso/info.json
+++ b/keyboards/sck/neiso/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index 801a7fdc16..b81c970db7 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/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, 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
diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json
index c919d3b6e8..547363e414 100644
--- a/keyboards/sck/osa/info.json
+++ b/keyboards/sck/osa/info.json
@@ -8,6 +8,11 @@
         "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",
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..aeaf26da6c 100644
--- a/keyboards/sendyyeah/75pixels/info.json
+++ b/keyboards/sendyyeah/75pixels/info.json
@@ -8,6 +8,11 @@
         "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"],
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/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h
index a5da1ed51e..5c4153e3d0 100644
--- a/keyboards/senselessclay/ck60/config.h
+++ b/keyboards/senselessclay/ck60/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 { 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
diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json
index d089aa333c..45e84f254b 100644
--- a/keyboards/senselessclay/ck60/info.json
+++ b/keyboards/senselessclay/ck60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0601",
         "device_version": "0.0.1"
     },
+    "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/ck65/config.h b/keyboards/senselessclay/ck65/config.h
index 5aeeee7a74..2d2326fb40 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 */
diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json
index cb596c21e2..7bc2839a9f 100644
--- a/keyboards/senselessclay/ck65/info.json
+++ b/keyboards/senselessclay/ck65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0651",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h
index 22dadfed74..02d27c11e6 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 */
diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json
index b1007fe065..bdd73caed4 100644
--- a/keyboards/senselessclay/gos65/info.json
+++ b/keyboards/senselessclay/gos65/info.json
@@ -8,6 +8,11 @@
       "pid": "0x0650",
       "device_version": "0.0.1"
     },
+    "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/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..fe49e0c521 100644
--- a/keyboards/sentraq/number_pad/config.h
+++ b/keyboards/sentraq/number_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 { 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
diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json
index 5b7af3fb0f..a5db65d78b 100644
--- a/keyboards/sentraq/number_pad/info.json
+++ b/keyboards/sentraq/number_pad/info.json
@@ -7,6 +7,11 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C7", "D5", "D1", "D0"],
+    "rows": ["F5", "F0", "B5", "D6", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B7"
   },
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/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..85f6271c32 100644
--- a/keyboards/sentraq/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
@@ -1,19 +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
diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json
index 6420a8069a..0c6aba4ac6 100644
--- a/keyboards/sentraq/s60_x/rgb/info.json
+++ b/keyboards/sentraq/s60_x/rgb/info.json
@@ -1,5 +1,10 @@
 {
     "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
diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index 3b8323074f..ea97d48f84 100644
--- a/keyboards/sentraq/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
@@ -1,10 +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
@@ -22,9 +17,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..b19bffd207 100644
--- a/keyboards/sentraq/s65_plus/info.json
+++ b/keyboards/sentraq/s65_plus/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h
index e8d1cb933d..c4678115db 100644
--- a/keyboards/sentraq/s65_x/config.h
+++ b/keyboards/sentraq/s65_x/config.h
@@ -1,10 +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
@@ -23,9 +18,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..0ef809d1fe 100644
--- a/keyboards/sentraq/s65_x/info.json
+++ b/keyboards/sentraq/s65_x/info.json
@@ -8,6 +8,11 @@
     "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,
diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h
index bd71fdfc2f..b360e531a8 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
 
diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json
index d4132bf736..4705096576 100644
--- a/keyboards/sets3n/kk980/info.json
+++ b/keyboards/sets3n/kk980/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "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/shambles/config.h b/keyboards/shambles/config.h
index 95acbd4600..db73ba34a9 100644
--- a/keyboards/shambles/config.h
+++ b/keyboards/shambles/config.h
@@ -1,13 +1,5 @@
 #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
 
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/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/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..919cce0741 100644
--- a/keyboards/shiro/info.json
+++ b/keyboards/shiro/info.json
@@ -8,6 +8,11 @@
     "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": {
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..fdb20b9a4d 100644
--- a/keyboards/shk9/info.json
+++ b/keyboards/shk9/info.json
@@ -8,6 +8,11 @@
       "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": {
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/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/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/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/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..70f72f1d00 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/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
-
 #define MASTER_RIGHT
 
 #define RGB_DI_PIN D3
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index 18d9889666..3458bfe1f5 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -8,6 +8,11 @@
         "pid": "0x27DB",
         "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"
     },
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..4302010a1e 100644
--- a/keyboards/singa/info.json
+++ b/keyboards/singa/info.json
@@ -8,6 +8,11 @@
       "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"
     },
@@ -18,7 +23,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/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h
index 5307bcd65a..7af4feb363 100644
--- a/keyboards/skeletn87/hotswap/config.h
+++ b/keyboards/skeletn87/hotswap/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 { 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
diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json
index 39b296a679..31aebd5e90 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,
diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h
index 095b95d13c..698eecb6fc 100644
--- a/keyboards/skeletn87/soldered/config.h
+++ b/keyboards/skeletn87/soldered/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 { 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
diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json
index 32ed0e6f0e..e7afa01eba 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,
diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h
index 7814933e42..c8ed85b89e 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/config.h
+++ b/keyboards/skeletonkbd/skeletonnumpad/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, 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
diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json
index c637cbfffc..82f7c4cee1 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/info.json
+++ b/keyboards/skeletonkbd/skeletonnumpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6E70",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5"],
+        "rows": ["B6", "C6", "C7", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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..944516fecd 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": {
diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
index 2f32ae1375..f8b5ae2db6 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
+++ b/keyboards/skippys_custom_pcs/rooboard65/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 { 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 */
diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json
index 497b5a0e7f..dada0aec1f 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/info.json
+++ b/keyboards/skippys_custom_pcs/rooboard65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi"],
diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h
index 7c4946f423..e912cc50ea 100644
--- a/keyboards/skippys_custom_pcs/roopad/config.h
+++ b/keyboards/skippys_custom_pcs/roopad/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, 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..e0110579f8 100644
--- a/keyboards/skippys_custom_pcs/roopad/info.json
+++ b/keyboards/skippys_custom_pcs/roopad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "B4", "D7", "D6", "D4"],
+        "rows": ["B5", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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..788fe1db95 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": {
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..16c79cf6ad 100644
--- a/keyboards/smallkeyboard/info.json
+++ b/keyboards/smallkeyboard/info.json
@@ -8,6 +8,11 @@
     "pid": "0x736B",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "debounce": 3,
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/info.json b/keyboards/smithrune/iron165r2/info.json
index ed24e0e63c..35a2a0c4bd 100644
--- a/keyboards/smithrune/iron165r2/info.json
+++ b/keyboards/smithrune/iron165r2/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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/smk60/config.h b/keyboards/smk60/config.h
index a4aa26d5d5..622495f6d0 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.
diff --git a/keyboards/smk60/info.json b/keyboards/smk60/info.json
index 9e356ef6c8..bc32109a17 100644
--- a/keyboards/smk60/info.json
+++ b/keyboards/smk60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6585",
         "device_version": "0.0.1"
     },
+    "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/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..a8a9222d67 100644
--- a/keyboards/snampad/info.json
+++ b/keyboards/snampad/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h
index cae120ac7e..31e6bd43c8 100644
--- a/keyboards/sneakbox/aliceclone/config.h
+++ b/keyboards/sneakbox/aliceclone/config.h
@@ -17,13 +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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json
index 6890765f7f..fb2b7c56cd 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}
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
index 26bddb382a..6a7dcff5ed 100644
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -17,13 +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
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
index cb7226ae81..a138d5d276 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}
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
index 23a0132305..a936b135f9 100644
--- a/keyboards/sneakbox/ava/config.h
+++ b/keyboards/sneakbox/ava/config.h
@@ -17,13 +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
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 723fe70fb9..068806ca33 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}
@@ -34,7 +39,7 @@
               {"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}
+              {"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}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25}
 			]
       },
       "LAYOUT_alice": {
@@ -43,7 +48,7 @@
               {"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}
+              {"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}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25}
             ]
       }
   }
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index 78b024604c..f71cc2ebbb 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -17,13 +17,6 @@ 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
 
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/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index 486442bcf1..f71cc2ebbb 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -17,13 +17,6 @@ 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
 
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/soda/cherish/config.h b/keyboards/soda/cherish/config.h
index 95d332cf95..fdcd9d801b 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 */
diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json
index 713356f944..446fda090b 100644
--- a/keyboards/soda/cherish/info.json
+++ b/keyboards/soda/cherish/info.json
@@ -8,6 +8,11 @@
         "pid": "0xEB52",
         "device_version": "0.0.1"
     },
+    "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..89571c505f 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 */
diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json
index b91f795b04..16374bc9d8 100644
--- a/keyboards/soda/pocket/info.json
+++ b/keyboards/soda/pocket/info.json
@@ -8,184 +8,60 @@
         "pid": "0x4F51",
         "device_version": "1.0.2"
     },
+    "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/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index c65caad1de..0f02ae7cfb 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
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index f1d76cb788..5bfc312cf2 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -6,6 +6,11 @@
         "pid": "0x1287",
         "device_version": "0.0.2"
     },
+    "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 +24,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/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..df601d4012 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]
     },
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h
index 265cb24f07..5f01daec82 100644
--- a/keyboards/sowbug/68keys/config.h
+++ b/keyboards/sowbug/68keys/config.h
@@ -18,14 +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
diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json
index fef199e6cd..8da6bdc825 100644
--- a/keyboards/sowbug/68keys/info.json
+++ b/keyboards/sowbug/68keys/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8888",
         "device_version": "0.0.1"
     },
+    "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",
     "layouts": {
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
index 770a48b14d..7c520910bc 100644
--- a/keyboards/sowbug/ansi_tkl/config.h
+++ b/keyboards/sowbug/ansi_tkl/config.h
@@ -18,16 +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
diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json
index 30cef14f70..a1c19c60aa 100644
--- a/keyboards/sowbug/ansi_tkl/info.json
+++ b/keyboards/sowbug/ansi_tkl/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8889",
         "device_version": "0.0.1"
     },
+    "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",
     "layouts": {
diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h
index 19ca0d46e5..6e73672c8d 100644
--- a/keyboards/soy20/config.h
+++ b/keyboards/soy20/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 { 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
 
diff --git a/keyboards/soy20/info.json b/keyboards/soy20/info.json
index 4add710d13..069427beed 100644
--- a/keyboards/soy20/info.json
+++ b/keyboards/soy20/info.json
@@ -8,6 +8,11 @@
         "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"],
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index fb56b1ddda..8199836860 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
 
diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
index fac12196b1..898a6ea11e 100755
--- a/keyboards/spaceholdings/nebula12/info.json
+++ b/keyboards/spaceholdings/nebula12/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5337",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A9", "C13", "C14"],
+        "rows": ["A8", "C15", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h
index 9c44c01b7a..0928d190df 100755
--- a/keyboards/spaceholdings/nebula12b/config.h
+++ b/keyboards/spaceholdings/nebula12b/config.h
@@ -17,13 +17,6 @@ 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
diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json
index 400e5790c9..8d5af9da50 100755
--- a/keyboards/spaceholdings/nebula12b/info.json
+++ b/keyboards/spaceholdings/nebula12b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5332",
         "device_version": "0.0.1"
     },
+    "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/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index 5e9d0a58e5..a3b44e4afe 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/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
-
 #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
diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json
index 77bda023d3..9ee3469f0d 100755
--- a/keyboards/spaceholdings/nebula68/info.json
+++ b/keyboards/spaceholdings/nebula68/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5336",
         "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",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h
index ee00fb233c..08ce4cb92d 100755
--- a/keyboards/spaceholdings/nebula68b/config.h
+++ b/keyboards/spaceholdings/nebula68b/config.h
@@ -17,13 +17,6 @@ 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
diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json
index b1ca0f0fd0..ef5d1b6b9c 100755
--- a/keyboards/spaceholdings/nebula68b/info.json
+++ b/keyboards/spaceholdings/nebula68b/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5338",
         "device_version": "0.0.1"
     },
+    "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": {
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..31cd3640c1 100644
--- a/keyboards/spaceman/pancake/rev1/info.json
+++ b/keyboards/spaceman/pancake/rev1/info.json
@@ -14,104 +14,104 @@
   "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 }, 
+        { "x": 0, "y": 0 }, 
+        { "x": 1, "y": 0 }, 
+        { "x": 2, "y": 0 }, 
+        { "x": 3, "y": 0 }, 
+        { "x": 4, "y": 0 }, 
+        { "x": 5, "y": 0 }, 
+        { "x": 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": 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 } ]
+        { "x": 7, "y": 3 }, 
+        { "x": 8, "y": 3 }, 
+        { "x": 9, "y": 3 }, 
+        { "x": 10, "y": 3 }, 
+        { "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 } ]
+        { "x": 0, "y": 0 }, 
+        { "x": 1, "y": 0 }, 
+        { "x": 2, "y": 0 }, 
+        { "x": 3, "y": 0 }, 
+        { "x": 4, "y": 0 }, 
+        { "x": 5, "y": 0 }, 
+        { "x": 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 } ]
     }
   }
 }
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/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..49c12d20e0 100644
--- a/keyboards/spaceman/pancake/rev2/info.json
+++ b/keyboards/spaceman/pancake/rev2/info.json
@@ -8,6 +8,11 @@
     "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"],
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/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/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/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..ab08aaef3d 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
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/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/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 8ca0d50ea6..dc83cf6b86 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.
  */
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 895f9283ac..3a2b853eac 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -4,6 +4,11 @@
         "pid": "0x9D9D",
         "device_version": "0.0.1"
     },
+    "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"}
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/rev1.h b/keyboards/splitkb/kyria/rev1/rev1.h
index 8a5fbeb21d..9b5ea58ead 100644
--- a/keyboards/splitkb/kyria/rev1/rev1.h
+++ b/keyboards/splitkb/kyria/rev1/rev1.h
@@ -15,10 +15,7 @@
  */
 #pragma once
 
-#include "kyria.h"
-#ifdef KEYBOARD_splitkb_kyria_rev1_proton_c
-#    include "proton_c.h"
-#endif
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 1799c6aa49..8b878739fe 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
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index d21d820804..c0aa1047c5 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -4,6 +4,11 @@
         "pid": "0x9D9D",
         "device_version": "0.0.2"
     },
+    "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,6 +21,12 @@
                     {"pin_a": "F5", "pin_b": "F4"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
+                "rows": ["D4", "C6", "D7", "E6"]
+            }
         }
     },
     "layouts": {
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/rev2.h b/keyboards/splitkb/kyria/rev2/rev2.h
index ed4169b0ed..89d69abc9a 100644
--- a/keyboards/splitkb/kyria/rev2/rev2.h
+++ b/keyboards/splitkb/kyria/rev2/rev2.h
@@ -15,10 +15,7 @@
  */
 #pragma once
 
-#include "kyria.h"
-#ifdef KEYBOARD_splitkb_kyria_rev2_proton_c
-#    include "proton_c.h"
-#endif
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your 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/info.json b/keyboards/splitkb/zima/info.json
index 077421904c..e73ba2775c 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -26,18 +26,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/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/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..726aef3e28 100644
--- a/keyboards/sporewoh/banime40/info.json
+++ b/keyboards/sporewoh/banime40/info.json
@@ -8,52 +8,57 @@
      	"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}]
+				{"x":0, "y":0},
+				{"x":1, "y":0}, 
+				{"x":2, "y":0}, 
+				{"x":3, "y":0}, 
+				{"x":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}]
         }
     }
 }
diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h
index e616210705..a9e98683c5 100644
--- a/keyboards/star75/config.h
+++ b/keyboards/star75/config.h
@@ -3,14 +3,6 @@ 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
 
diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json
index 4bf206e4e5..1f28a20819 100644
--- a/keyboards/star75/info.json
+++ b/keyboards/star75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "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/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/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..6511724728 100644
--- a/keyboards/stello65/hs_rev1/config.h
+++ b/keyboards/stello65/hs_rev1/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 { 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
diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json
index 218f2657ad..17f48c644f 100644
--- a/keyboards/stello65/hs_rev1/info.json
+++ b/keyboards/stello65/hs_rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "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..0247bae3a1 100644
--- a/keyboards/stello65/sl_rev1/config.h
+++ b/keyboards/stello65/sl_rev1/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, 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
diff --git a/keyboards/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json
index 647afe2e9c..6d36772839 100644
--- a/keyboards/stello65/sl_rev1/info.json
+++ b/keyboards/stello65/sl_rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "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/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/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/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/stratos/config.h b/keyboards/stratos/config.h
index 6cec383ec9..0f48233bf1 100644
--- a/keyboards/stratos/config.h
+++ b/keyboards/stratos/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, 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
diff --git a/keyboards/stratos/info.json b/keyboards/stratos/info.json
index 2f278e18e7..c7a490036c 100644
--- a/keyboards/stratos/info.json
+++ b/keyboards/stratos/info.json
@@ -8,6 +8,11 @@
         "pid": "0x992D",
         "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",
     "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/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h
index 45c78b063f..e17664611c 100644
--- a/keyboards/studiokestra/bourgeau/config.h
+++ b/keyboards/studiokestra/bourgeau/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, 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
diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json
index 0cde6da684..6f19e91dd7 100644
--- a/keyboards/studiokestra/bourgeau/info.json
+++ b/keyboards/studiokestra/bourgeau/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7501",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h
index 1ef5926c8e..d48b336fe7 100644
--- a/keyboards/studiokestra/cascade/config.h
+++ b/keyboards/studiokestra/cascade/config.h
@@ -17,14 +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
diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json
index 096e20a27b..1cda31cab7 100644
--- a/keyboards/studiokestra/cascade/info.json
+++ b/keyboards/studiokestra/cascade/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "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/galatea/config.h b/keyboards/studiokestra/galatea/config.h
index 7c5b4dbb29..e95d41f6de 100644
--- a/keyboards/studiokestra/galatea/config.h
+++ b/keyboards/studiokestra/galatea/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, F1, F4, F5, F6, F7, C7, B2, D5 }
-#define MATRIX_ROW_PINS { D1, D0, B0, B7, E6, B3, B6, C6, D6, D7, B4, D3 }
-#define DIODE_DIRECTION COL2ROW
-
 #if defined(KEYBOARD_studiokestra_galatea_rev2)
   #define RGB_DI_PIN D4
   #define RGBLED_NUM 24
diff --git a/keyboards/studiokestra/galatea/galatea.c b/keyboards/studiokestra/galatea/galatea.c
deleted file mode 100644
index 30e7939159..0000000000
--- a/keyboards/studiokestra/galatea/galatea.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 "galatea.h"
diff --git a/keyboards/studiokestra/galatea/galatea.h b/keyboards/studiokestra/galatea/galatea.h
deleted file mode 100644
index a1f2aa77b5..0000000000
--- a/keyboards/studiokestra/galatea/galatea.h
+++ /dev/null
@@ -1,25 +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"
-
-#if defined(KEYBOARD_studiokestra_galatea_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_studiokestra_galatea_rev2)
-    #include "rev2.h"
-#endif
diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json
index ce1b7f5816..e6a1899e55 100644
--- a/keyboards/studiokestra/galatea/rev1/info.json
+++ b/keyboards/studiokestra/galatea/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8801",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B2", "D5"],
+        "rows": ["D1", "D0", "B0", "B7", "E6", "B3", "B6", "C6", "D6", "D7", "B4", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B5",
         "scroll_lock": "D2",
diff --git a/keyboards/studiokestra/galatea/rev1/rev1.c b/keyboards/studiokestra/galatea/rev1/rev1.c
deleted file mode 100644
index f34f9f9200..0000000000
--- a/keyboards/studiokestra/galatea/rev1/rev1.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 "rev1.h"
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index dc3865c584..ae1dee5aa0 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8802",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B2", "D5"],
+        "rows": ["D1", "D0", "B0", "B7", "E6", "B3", "B6", "C6", "D6", "D7", "B4", "D3"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B5",
         "scroll_lock": "D2",
diff --git a/keyboards/studiokestra/galatea/rev2/rev2.c b/keyboards/studiokestra/galatea/rev2/rev2.c
deleted file mode 100644
index 5e7125b0b6..0000000000
--- a/keyboards/studiokestra/galatea/rev2/rev2.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 "rev2.h"
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..69d74f9fca 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
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/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/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..483d7689f1 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"
   },
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/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/info.json b/keyboards/superuser/frl/info.json
index 14c7b1e54f..e4c752140e 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"
     },
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..1469c7c95a 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"
     },
diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h
index f963856c97..66a3ef6740 100644
--- a/keyboards/swiftrax/retropad/config.h
+++ b/keyboards/swiftrax/retropad/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 { 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
diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json
index ea43a71b12..96f523fb4b 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"}
diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h
index 598ac367b3..12b18b0cba 100644
--- a/keyboards/switchplate/southpaw_65/config.h
+++ b/keyboards/switchplate/southpaw_65/config.h
@@ -21,22 +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
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/sx60/info.json b/keyboards/sx60/info.json
index 9c0b6bcf9a..86efe2239c 100644
--- a/keyboards/sx60/info.json
+++ b/keyboards/sx60/info.json
@@ -20,19 +20,19 @@
     "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": [{"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}, {"label":"`~", "x":16.25, "y":0}, {"label":"M1", "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":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}, {"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}, {"label":"ISOEnter", "x":16, "y":2, "w":1.25}, {"label":"M3", "x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":1.25}, {"label":"\\|", "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":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}, {"label":"M4", "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":2}, {"x":7, "y":4}, {"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}, {"label":"Ctrl", "x":15.25, "y":4}, {"label":"Fn2", "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": [{"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}, {"label":"`~", "x":16.25, "y":0}, {"label":"M1", "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":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}, {"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}, {"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}, {"label":"M4", "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":2}, {"x":7, "y":4}, {"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}, {"label":"Ctrl", "x":15.25, "y":4}, {"label":"Fn2", "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": [{"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}, {"label":"`~", "x":16.25, "y":0}, {"label":"M1", "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":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}, {"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}, {"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}, {"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}, {"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}, {"label":"Ctrl", "x":15.25, "y":4}, {"label":"Fn", "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": [{"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}, {"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}, {"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}, {"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}, {"label":"M4", "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":2}, {"x":7, "y":4}, {"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}, {"label":"Ctrl", "x":15.25, "y":4}, {"label":"Fn2", "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/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..8f207c975b 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"},
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 886b5e2b78..10b1036c72 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -17,22 +17,6 @@
 
 #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
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
index e61caec07c..e6c8743541 100644
--- a/keyboards/system76/launch_1/info.json
+++ b/keyboards/system76/launch_1/info.json
@@ -7,6 +7,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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/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..c8eae73857 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,
diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h
index f77a42f59f..b2ec9d3895 100644
--- a/keyboards/takashicompany/center_enter/config.h
+++ b/keyboards/takashicompany/center_enter/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 { 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
diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json
index 7c268e3f63..d0e819f097 100644
--- a/keyboards/takashicompany/center_enter/info.json
+++ b/keyboards/takashicompany/center_enter/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0012",
         "device_version": "0.0.1"
     },
+    "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..7ecb336fa1 100644
--- a/keyboards/takashicompany/compacx/config.h
+++ b/keyboards/takashicompany/compacx/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 { 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
diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json
index bcd4489a98..f8c84acb46 100644
--- a/keyboards/takashicompany/compacx/info.json
+++ b/keyboards/takashicompany/compacx/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0014",
         "device_version": "0.0.1"
     },
+    "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..2bb3073b6f 100644
--- a/keyboards/takashicompany/dogtag/config.h
+++ b/keyboards/takashicompany/dogtag/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, 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
diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json
index caa007fcc5..7da4dd5257 100644
--- a/keyboards/takashicompany/dogtag/info.json
+++ b/keyboards/takashicompany/dogtag/info.json
@@ -8,13 +8,24 @@
         "pid": "0x0018",
         "device_version": "0.0.1"
     },
+    "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..48f3f2c1e4 100644
--- a/keyboards/takashicompany/endzone34/config.h
+++ b/keyboards/takashicompany/endzone34/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, 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
diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json
index 60ca453e13..492e854664 100644
--- a/keyboards/takashicompany/endzone34/info.json
+++ b/keyboards/takashicompany/endzone34/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "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/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index 5bdc664832..1b1e657583 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/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, 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
diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json
index 2fa8ac7a05..8280a9e6b1 100644
--- a/keyboards/takashicompany/heavy_left/info.json
+++ b/keyboards/takashicompany/heavy_left/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0015",
         "device_version": "0.0.1"
     },
+    "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..70c5c58f02 100644
--- a/keyboards/takashicompany/minizone/config.h
+++ b/keyboards/takashicompany/minizone/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, 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
diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json
index 882a8ebdd5..76df78895d 100644
--- a/keyboards/takashicompany/minizone/info.json
+++ b/keyboards/takashicompany/minizone/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0021",
         "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",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h
index 726f4507c8..b2ec9d3895 100644
--- a/keyboards/takashicompany/qoolee/config.h
+++ b/keyboards/takashicompany/qoolee/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 { 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
diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json
index 6f92e86c88..f8df8f16c4 100644
--- a/keyboards/takashicompany/qoolee/info.json
+++ b/keyboards/takashicompany/qoolee/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0013",
         "device_version": "0.0.1"
     },
+    "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/radialex/config.h b/keyboards/takashicompany/radialex/config.h
index 8843ff81f0..28ef095000 100644
--- a/keyboards/takashicompany/radialex/config.h
+++ b/keyboards/takashicompany/radialex/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, 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
diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json
index 1ed37283e7..043325531d 100644
--- a/keyboards/takashicompany/radialex/info.json
+++ b/keyboards/takashicompany/radialex/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0019",
         "device_version": "0.0.1"
     },
+    "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/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
index ff769451d2..82e2bd70d6 100644
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ b/keyboards/takashiski/hecomi/alpha/config.h
@@ -17,25 +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 
diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
index 040e26dcd0..4ef1c2c554 100644
--- a/keyboards/takashiski/hecomi/alpha/info.json
+++ b/keyboards/takashiski/hecomi/alpha/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
index 39b488c42a..3505ff3cc1 100644
--- a/keyboards/takashiski/namecard2x4/rev1/config.h
+++ b/keyboards/takashiski/namecard2x4/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 { 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
diff --git a/keyboards/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/info.json
new file mode 100644
index 0000000000..e5c68e101d
--- /dev/null
+++ b/keyboards/takashiski/namecard2x4/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "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..99560988d8 100644
--- a/keyboards/takashiski/namecard2x4/rev2/config.h
+++ b/keyboards/takashiski/namecard2x4/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 { 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
diff --git a/keyboards/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/info.json
new file mode 100644
index 0000000000..24ae3ff5f0
--- /dev/null
+++ b/keyboards/takashiski/namecard2x4/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h
index ac0ea7c338..d8fe1a3f66 100644
--- a/keyboards/taleguers/taleguers75/config.h
+++ b/keyboards/taleguers/taleguers75/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/taleguers/taleguers75/info.json b/keyboards/taleguers/taleguers75/info.json
index 936086beb3..d736d0f18f 100644
--- a/keyboards/taleguers/taleguers75/info.json
+++ b/keyboards/taleguers/taleguers75/info.json
@@ -8,6 +8,11 @@
         "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"}
diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
index 0e6121ec48..abc8f0f6e0 100644
--- a/keyboards/tanuki/config.h
+++ b/keyboards/tanuki/config.h
@@ -17,12 +17,6 @@ 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 */
diff --git a/keyboards/tanuki/info.json b/keyboards/tanuki/info.json
index 6dbc793b7f..aa8a24bbd1 100644
--- a/keyboards/tanuki/info.json
+++ b/keyboards/tanuki/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6464",
     "device_version": "0.0.1"
   },
+  "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/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h
index fc5c288264..81132526c5 100644
--- a/keyboards/team0110/p1800fl/config.h
+++ b/keyboards/team0110/p1800fl/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 }
-#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
diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json
index 118299101b..ae17356c81 100644
--- a/keyboards/team0110/p1800fl/info.json
+++ b/keyboards/team0110/p1800fl/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h
index d1666ec15b..ca094965d0 100644
--- a/keyboards/technika/config.h
+++ b/keyboards/technika/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 , 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 */
diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json
index b20ebe6c7c..0eb1e83fea 100644
--- a/keyboards/technika/info.json
+++ b/keyboards/technika/info.json
@@ -8,6 +8,11 @@
         "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",
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..e1ccc3dc3e 100644
--- a/keyboards/teleport/numpad/info.json
+++ b/keyboards/teleport/numpad/info.json
@@ -7,6 +7,11 @@
     "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"],
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..e6677abc7b 100644
--- a/keyboards/tender/macrowo_pad/info.json
+++ b/keyboards/tender/macrowo_pad/info.json
@@ -8,6 +8,11 @@
         "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": {
diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h
index fef051fb71..0a7878337c 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
 
diff --git a/keyboards/tenki/info.json b/keyboards/tenki/info.json
index 560adac6b6..6db38bd26d 100644
--- a/keyboards/tenki/info.json
+++ b/keyboards/tenki/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5445",
         "device_version": "10.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "D4", "D0"],
+        "rows": ["B1", "B4", "F6", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x4"],
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..6a161c0db0 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},
diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h
index 5cb9e23c57..f54408c1be 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
 
diff --git a/keyboards/tetris/info.json b/keyboards/tetris/info.json
index 382c4b2861..cf506e51c5 100644
--- a/keyboards/tetris/info.json
+++ b/keyboards/tetris/info.json
@@ -8,6 +8,11 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "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/tg4x/config.h b/keyboards/tg4x/config.h
index 2002014617..83352fd922 100644
--- a/keyboards/tg4x/config.h
+++ b/keyboards/tg4x/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   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
diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/info.json
index 775367c426..33c45b68b8 100644
--- a/keyboards/tg4x/info.json
+++ b/keyboards/tg4x/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0458",
         "device_version": "0.2.1"
     },
+    "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/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..45746435a7 100644
--- a/keyboards/tgr/910/info.json
+++ b/keyboards/tgr/910/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..2d11bea2e5 100644
--- a/keyboards/tgr/910ce/info.json
+++ b/keyboards/tgr/910ce/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..ae608bcaff 100644
--- a/keyboards/tgr/alice/info.json
+++ b/keyboards/tgr/alice/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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..1f6ec8abc4 100644
--- a/keyboards/tgr/jane/v2/info.json
+++ b/keyboards/tgr/jane/v2/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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..71d9143ab8 100644
--- a/keyboards/tgr/jane/v2ce/info.json
+++ b/keyboards/tgr/jane/v2ce/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..b991fec6c1 100644
--- a/keyboards/tgr/tris/info.json
+++ b/keyboards/tgr/tris/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h
index 351589a086..f752e60fcd 100644
--- a/keyboards/the_royal/liminal/config.h
+++ b/keyboards/the_royal/liminal/config.h
@@ -1,12 +1,5 @@
 #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 */
diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json
index a1480dc5ff..45d26bf4e7 100644
--- a/keyboards/the_royal/liminal/info.json
+++ b/keyboards/the_royal/liminal/info.json
@@ -8,54 +8,59 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "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/schwann/config.h b/keyboards/the_royal/schwann/config.h
index 0c6341af0f..600797d1ee 100644
--- a/keyboards/the_royal/schwann/config.h
+++ b/keyboards/the_royal/schwann/config.h
@@ -1,12 +1,5 @@
 #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 */
diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json
index 97d10f6edc..db132721eb 100644
--- a/keyboards/the_royal/schwann/info.json
+++ b/keyboards/the_royal/schwann/info.json
@@ -8,6 +8,11 @@
       "pid": "0x3521",
       "device_version": "0.0.1"
   },
+  "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/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h
index a9b6cfc37d..3b3edb01bd 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/config.h
+++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h
@@ -17,11 +17,6 @@ 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
@@ -36,6 +31,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..7b7cf7a27d 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/info.json
+++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json
@@ -8,6 +8,11 @@
     "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"}
diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h
index a9b6cfc37d..3b3edb01bd 100644
--- a/keyboards/themadnoodle/noodlepad/config.h
+++ b/keyboards/themadnoodle/noodlepad/config.h
@@ -17,11 +17,6 @@ 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
@@ -36,6 +31,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..c5f64fd267 100644
--- a/keyboards/themadnoodle/noodlepad/info.json
+++ b/keyboards/themadnoodle/noodlepad/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",
   "encoder": {
     "rotary": [
       {"pin_a": "D0", "pin_b": "D1"}
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/info.json b/keyboards/thepanduuh/degenpad/info.json
index 999de9648c..e0988de17d 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"}
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/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..48658a617e 100644
--- a/keyboards/thevankeyboards/jetvan/config.h
+++ b/keyboards/thevankeyboards/jetvan/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 { 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 */
diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json
index 022ac65f5c..34f4dfa027 100644
--- a/keyboards/thevankeyboards/jetvan/info.json
+++ b/keyboards/thevankeyboards/jetvan/info.json
@@ -8,8 +8,13 @@
         "pid": "0x8858",
         "device_version": "0.0.1"
     },
+    "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/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h
index f75e8e7ced..b05e792407 100644
--- a/keyboards/thevankeyboards/minivan/config.h
+++ b/keyboards/thevankeyboards/minivan/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, 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 */
diff --git a/keyboards/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/info.json
index 563bcc73ed..d21c1e6e3f 100644
--- a/keyboards/thevankeyboards/minivan/info.json
+++ b/keyboards/thevankeyboards/minivan/info.json
@@ -8,6 +8,11 @@
     "pid": "0x8844",
     "device_version": "0.0.2"
   },
+  "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/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/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..a889fb029e 100644
--- a/keyboards/thevankeyboards/roadkit/info.json
+++ b/keyboards/thevankeyboards/roadkit/info.json
@@ -8,6 +8,11 @@
     "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"],
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_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/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_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/godspeed75/config.h b/keyboards/tkc/godspeed75/config.h
index 9fb6aa69dd..ef3a9d3cbb 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.
diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json
index f892202a39..3a223f55dc 100644
--- a/keyboards/tkc/godspeed75/info.json
+++ b/keyboards/tkc/godspeed75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0006",
         "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": {
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index 7c09119e17..47d5d0c2dc 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/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 { 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
diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json
index 8f6d63a74d..a59a574da1 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
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h
index b8f2806ef1..eec83e8dc0 100644
--- a/keyboards/tkc/osav2/config.h
+++ b/keyboards/tkc/osav2/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, 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
diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json
index ed842b4b51..484d3dea0a 100644
--- a/keyboards/tkc/osav2/info.json
+++ b/keyboards/tkc/osav2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0005",
         "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",
     "backlight": {
         "pin": "D6",
         "breathing": true
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..659ac41bd9 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "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,
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..72bee7e4f3 100644
--- a/keyboards/tkc/portico68v2/info.json
+++ b/keyboards/tkc/portico68v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0012",
         "device_version": "0.0.1"
     },
+    "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,
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..47307167d5 100644
--- a/keyboards/tkc/portico75/info.json
+++ b/keyboards/tkc/portico75/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", "B3", "B7"],
+        "rows": ["B0", "E6", "F0", "F1", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B2", "resolution": 2}
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index 747db6bf03..11fcf61626 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -17,18 +17,6 @@ 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
diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json
index ad57eb1aa5..a8db70fa75 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
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index ed701d2aa1..dc3cfae9e6 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/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 { 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
diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json
index 6c610a6007..6b1263429a 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
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index 16d91b69a2..9db69dcf3a 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -15,14 +15,6 @@
  */
 #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
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index 4d91a00c84..2e598c5b3b 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -6,13 +6,24 @@
         "vid": "0xFEED",
         "pid": "0x7812"
     },
+    "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/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..038fbc3ca5 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"},
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index 8161a873e5..a102a34946 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -15,12 +15,6 @@
  */
 #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
 
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index 0b0877b38b..0b107f335c 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7811",
         "device_version": "0.0.2"
     },
+    "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"},
diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h
index 1aac9574f8..267b5a65ac 100644
--- a/keyboards/tmo50/config.h
+++ b/keyboards/tmo50/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, 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
diff --git a/keyboards/tmo50/info.json b/keyboards/tmo50/info.json
index 29b19aa513..680f770469 100644
--- a/keyboards/tmo50/info.json
+++ b/keyboards/tmo50/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h
index a77e6beece..b44dfaac52 100644
--- a/keyboards/toad/config.h
+++ b/keyboards/toad/config.h
@@ -1,13 +1,5 @@
 #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
 
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/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h
index 26736637cb..d56a8a1a55 100644
--- a/keyboards/tokyokeyboard/alix40/config.h
+++ b/keyboards/tokyokeyboard/alix40/config.h
@@ -14,13 +14,6 @@ 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
 
diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json
index 513a883d8e..b839c147dc 100644
--- a/keyboards/tokyokeyboard/alix40/info.json
+++ b/keyboards/tokyokeyboard/alix40/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h
index 8ba921eaeb..bf86645ce5 100644
--- a/keyboards/tokyokeyboard/tokyo60/config.h
+++ b/keyboards/tokyokeyboard/tokyo60/config.h
@@ -1,15 +1,8 @@
 #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
 
diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json
index dd16c3f4c2..f7bba46b46 100644
--- a/keyboards/tokyokeyboard/tokyo60/info.json
+++ b/keyboards/tokyokeyboard/tokyo60/info.json
@@ -8,6 +8,11 @@
         "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
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/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
index f6193c3581..846ed4216d 100644
--- a/keyboards/tominabox1/le_chiffre/he/config.h
+++ b/keyboards/tominabox1/le_chiffre/he/config.h
@@ -15,14 +15,6 @@
  */
 #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
  */
diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json
index 8f667298f8..c43a7d9062 100644
--- a/keyboards/tominabox1/le_chiffre/he/info.json
+++ b/keyboards/tominabox1/le_chiffre/he/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "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"}
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/rev1/config.h b/keyboards/tominabox1/le_chiffre/rev1/config.h
index db5d26d665..1b69991220 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/config.h
+++ b/keyboards/tominabox1/le_chiffre/rev1/config.h
@@ -15,20 +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 { B3, D4, F1, C6 }
-#define MATRIX_COL_PINS { F4, F5, B0, B2, B1, B4, D7, C7, D2, F7 }
-
 /*
  * WS2812 Underglow Matrix options
  */
diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json
index ce90b22975..962811500a 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev1/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "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"}
diff --git a/keyboards/tominabox1/le_chiffre/rev2/config.h b/keyboards/tominabox1/le_chiffre/rev2/config.h
index edde93be3e..7d5f3db99e 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/config.h
+++ b/keyboards/tominabox1/le_chiffre/rev2/config.h
@@ -15,20 +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 { B3, F6, F7, C7 }
-#define MATRIX_COL_PINS { B2, F0, F1, F4, F5, B5, B4, D7, D6, D4 }
-
 /*
  * WS2812 Underglow Matrix options
  */
diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json
index 3c20e5162e..e91472ff3f 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev2/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "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"}
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/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/qaz/config.h b/keyboards/tominabox1/qaz/config.h
index bedbc5a2f3..e842bb0714 100644
--- a/keyboards/tominabox1/qaz/config.h
+++ b/keyboards/tominabox1/qaz/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 { 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 */
diff --git a/keyboards/tominabox1/qaz/info.json b/keyboards/tominabox1/qaz/info.json
index 8e9ce395cd..d2cd29a850 100644
--- a/keyboards/tominabox1/qaz/info.json
+++ b/keyboards/tominabox1/qaz/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "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/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h
index 5e66f96089..e1dbb54940 100644
--- a/keyboards/tominabox1/underscore33/rev1/config.h
+++ b/keyboards/tominabox1/underscore33/rev1/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, 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 */
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/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
index 1565904cfd..332120053c 100644
--- a/keyboards/tominabox1/underscore33/rev2/config.h
+++ b/keyboards/tominabox1/underscore33/rev2/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 { 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 */
diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json
index d6b5b04b2a..8841b633b3 100644
--- a/keyboards/tominabox1/underscore33/rev2/info.json
+++ b/keyboards/tominabox1/underscore33/rev2/info.json
@@ -8,6 +8,11 @@
     "pid": "0x3302",
     "device_version": "0.0.2"
   },
+  "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 +21,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/tr60w/config.h b/keyboards/tr60w/config.h
index 39f21310ca..57fac54322 100644
--- a/keyboards/tr60w/config.h
+++ b/keyboards/tr60w/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json
index 15025926ce..16d4be92aa 100644
--- a/keyboards/tr60w/info.json
+++ b/keyboards/tr60w/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h
index 4889ef5c18..f1e3c21e7c 100644
--- a/keyboards/trashman/ketch/config.h
+++ b/keyboards/trashman/ketch/config.h
@@ -22,10 +22,6 @@ 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
diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json
index 57c6289d0d..e624507210 100644
--- a/keyboards/trashman/ketch/info.json
+++ b/keyboards/trashman/ketch/info.json
@@ -8,6 +8,11 @@
     "pid": "0x8947",
     "device_version": "0.0.1"
   },
+  "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/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..95cb977fb0 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
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..56b6272ccf 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"
     },
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/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..ed4b55a483 100644
--- a/keyboards/tszaboo/ortho4exent/config.h
+++ b/keyboards/tszaboo/ortho4exent/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, 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
diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json
index 2bc233fcee..d20477b615 100644
--- a/keyboards/tszaboo/ortho4exent/info.json
+++ b/keyboards/tszaboo/ortho4exent/info.json
@@ -8,6 +8,11 @@
     	"pid": "0x7934",
     	"device_version": "0.0.1"
     },
+    "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/tunks/ergo33/config.h b/keyboards/tunks/ergo33/config.h
index 04db2f1665..a1ffa98f25 100644
--- a/keyboards/tunks/ergo33/config.h
+++ b/keyboards/tunks/ergo33/config.h
@@ -16,17 +16,6 @@
 
 #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
diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json
index 1495d5137a..cdf10962dc 100644
--- a/keyboards/tunks/ergo33/info.json
+++ b/keyboards/tunks/ergo33/info.json
@@ -7,6 +7,11 @@
     "pid": "0xA0A1",
     "device_version": "0.0.1"
   },
+  "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..6ddb568f89 100644
--- a/keyboards/tw40/config.h
+++ b/keyboards/tw40/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, 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
diff --git a/keyboards/tw40/info.json b/keyboards/tw40/info.json
index 86cba9bbfe..699f5ca2ac 100644
--- a/keyboards/tw40/info.json
+++ b/keyboards/tw40/info.json
@@ -8,6 +8,11 @@
     "pid": "0x5457",
     "device_version": "0.0.1"
   },
+  "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/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/info.json
index 2f194d658b..85eaa67060 100644
--- a/keyboards/tweetydabird/lbs4/info.json
+++ b/keyboards/tweetydabird/lbs4/info.json
@@ -65,11 +65,11 @@
             "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..18edcce9b9 100644
--- a/keyboards/tweetydabird/lbs6/info.json
+++ b/keyboards/tweetydabird/lbs6/info.json
@@ -62,15 +62,15 @@
     "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/ghoul/info.json b/keyboards/tzarc/ghoul/info.json
index 14e833c5b2..58c5175cb2 100644
--- a/keyboards/tzarc/ghoul/info.json
+++ b/keyboards/tzarc/ghoul/info.json
@@ -26,47 +26,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/ubest/vn/config.h b/keyboards/ubest/vn/config.h
index 75551832f1..3922bd8251 100644
--- a/keyboards/ubest/vn/config.h
+++ b/keyboards/ubest/vn/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 { 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
diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json
index 348a51fc7a..aef7138b64 100644
--- a/keyboards/ubest/vn/info.json
+++ b/keyboards/ubest/vn/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h
index 3a9e21ea60..da31c3d933 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
 
diff --git a/keyboards/uk78/info.json b/keyboards/uk78/info.json
index fbbc15609c..a33a558b25 100644
--- a/keyboards/uk78/info.json
+++ b/keyboards/uk78/info.json
@@ -8,6 +8,11 @@
     "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"
   },
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index dc63dc77bd..d72a8fd06d 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -15,16 +15,6 @@
  */
 #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
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
index a6e12f3374..e3634bcad0 100644
--- a/keyboards/ungodly/launch_pad/info.json
+++ b/keyboards/ungodly/launch_pad/info.json
@@ -8,6 +8,11 @@
     "pid": "0x4C50",
     "device_version": "99.9.9"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3"],
+    "rows": ["D4", "D6", "D7", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "encoder": {
     "rotary": [
       {"pin_a": "C6", "pin_b": "B6", "resolution": 2}
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json
index dee9f85acc..4535371186 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json
@@ -8,6 +8,11 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C11",
         "num_lock": "C12",
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
index 88eb8c2c51..c02ea1f913 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
@@ -18,30 +18,6 @@
 
 #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-// All pins in order from left-to-right, as seen on the keyboard:
-// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, 
-// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible.
-
-// On this keyboard the right-most pin is not used, so that is A10.
-// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom.
-
-#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
-#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 #define MATRIX_HAS_GHOST
 
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
index aa28ce85c8..44262e071c 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
@@ -8,6 +8,11 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C11",
         "num_lock": "C12",
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
index 88eb8c2c51..c02ea1f913 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
@@ -18,30 +18,6 @@
 
 #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-// All pins in order from left-to-right, as seen on the keyboard:
-// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, 
-// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible.
-
-// On this keyboard the right-most pin is not used, so that is A10.
-// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom.
-
-#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
-#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 #define MATRIX_HAS_GHOST
 
diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json
index f1d47ef1b0..6b8a6cf9c7 100644
--- a/keyboards/unicomp/pc122/info.json
+++ b/keyboards/unicomp/pc122/info.json
@@ -8,6 +8,11 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C11",
         "num_lock": "C12",
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/config.h b/keyboards/unicomp/pc122/overnumpad_1xb/config.h
index 88eb8c2c51..c02ea1f913 100644
--- a/keyboards/unicomp/pc122/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/config.h
@@ -18,30 +18,6 @@
 
 #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-// All pins in order from left-to-right, as seen on the keyboard:
-// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, 
-// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible.
-
-// On this keyboard the right-most pin is not used, so that is A10.
-// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom.
-
-#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
-#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 #define MATRIX_HAS_GHOST
 
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json
index c484553e89..7afe842b8a 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json
@@ -8,6 +8,11 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C12"
     },
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
index 88eb8c2c51..c02ea1f913 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
@@ -18,30 +18,6 @@
 
 #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-// All pins in order from left-to-right, as seen on the keyboard:
-// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, 
-// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible.
-
-// On this keyboard the right-most pin is not used, so that is A10.
-// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom.
-
-#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
-#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 #define MATRIX_HAS_GHOST
 
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
index 249b33fdd2..52d2849e8a 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
@@ -8,6 +8,11 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+        "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "C12"
     },
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
index 88eb8c2c51..c02ea1f913 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
@@ -18,30 +18,6 @@
 
 #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-// All pins in order from left-to-right, as seen on the keyboard:
-// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, 
-// On this chip A10, B10 have stronger pull-ups, so it's better to avoid them if possible.
-
-// On this keyboard the right-most pin is not used, so that is A10.
-// On this keyboard the right-most 8 pins (excluding the unused pin) are routed on the bottom.
-
-#define MATRIX_COL_PINS { C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13 }
-#define MATRIX_ROW_PINS { B14, B15, C6, C7, C8, C9, A8, A9 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 #define MATRIX_HAS_GHOST
 
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.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.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/info.json b/keyboards/unikeyboard/felix/info.json
index ee74cb134f..d3200e6ed1 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
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..e916cc7674 100644
--- a/keyboards/unikorn/info.json
+++ b/keyboards/unikorn/info.json
@@ -8,6 +8,11 @@
         "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"
     },
diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h
index 6e3ba625e2..ea285f4082 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
diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json
index a772d344d2..a402c44e35 100644
--- a/keyboards/unison/v04/info.json
+++ b/keyboards/unison/v04/info.json
@@ -8,6 +8,11 @@
         "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"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "B1"},
@@ -25,20 +30,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..5d3d081f73 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": {
diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h
index 9677a8e262..ad29207062 100644
--- a/keyboards/utd80/config.h
+++ b/keyboards/utd80/config.h
@@ -15,15 +15,6 @@
  */
 #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
 
diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json
index cf0b6530ad..ba8451a331 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
diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h
index 241418bdb7..85be8c0232 100644
--- a/keyboards/uzu42/rev1/config.h
+++ b/keyboards/uzu42/rev1/config.h
@@ -18,14 +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
 
diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
index 1e5cda2b20..1bcb6ad5f8 100644
--- a/keyboards/uzu42/rev1/info.json
+++ b/keyboards/uzu42/rev1/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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/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..56797aac22 100644
--- a/keyboards/vagrant_10/info.json
+++ b/keyboards/vagrant_10/info.json
@@ -8,6 +8,11 @@
     "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": {
diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h
index fc71e667b8..768474ba26 100644
--- a/keyboards/vertex/angler2/config.h
+++ b/keyboards/vertex/angler2/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 { 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
diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json
index 3716ddbede..ebb2609fcc 100644
--- a/keyboards/vertex/angler2/info.json
+++ b/keyboards/vertex/angler2/info.json
@@ -8,6 +8,11 @@
         "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",
diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h
index 633843021f..5cbee6426f 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
diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json
index bfb8e4fc3a..60758ac3b8 100644
--- a/keyboards/vertex/arc60/info.json
+++ b/keyboards/vertex/arc60/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h
index 1795f9b2ee..650d910089 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
 
diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json
index 9cd38dd907..1032b9880c 100644
--- a/keyboards/vertex/arc60h/info.json
+++ b/keyboards/vertex/arc60h/info.json
@@ -8,6 +8,11 @@
         "pid": "0x9770",
         "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",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "layouts": {
@@ -70,11 +75,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/viendi8l/config.h b/keyboards/viendi8l/config.h
index 3036f0ac8f..97bd940cdc 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 */
diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json
index 312f97e7f1..667798b4aa 100644
--- a/keyboards/viendi8l/info.json
+++ b/keyboards/viendi8l/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0877",
         "device_version": "0.0.1"
     },
+    "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/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/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h
index 9a399518a1..d035c79a90 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
 
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/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..c9a1d1cca3 100644
--- a/keyboards/viktus/sp_mini/config.h
+++ b/keyboards/viktus/sp_mini/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 { 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
diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
index 33cc1f6dcb..6b287e9833 100644
--- a/keyboards/viktus/sp_mini/info.json
+++ b/keyboards/viktus/sp_mini/info.json
@@ -8,11 +8,24 @@
         "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"]
+            }
+        }
+    },
     "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..7e0c7c4c03 100644
--- a/keyboards/viktus/styrka/info.json
+++ b/keyboards/viktus/styrka/info.json
@@ -8,6 +8,11 @@
     "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": {
diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h
index a3555ccd50..d035c79a90 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
 
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/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h
index cea58affaa..9d63b82b19 100644
--- a/keyboards/vitamins_included/rev1/config.h
+++ b/keyboards/vitamins_included/rev1/config.h
@@ -23,12 +23,6 @@ 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 */
diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json
index e79f940440..7561cb5851 100644
--- a/keyboards/vitamins_included/rev1/info.json
+++ b/keyboards/vitamins_included/rev1/info.json
@@ -2,6 +2,11 @@
     "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"
     },
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..0fa20e9c86 100644
--- a/keyboards/vitamins_included/rev2/config.h
+++ b/keyboards/vitamins_included/rev2/config.h
@@ -22,12 +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
 
diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json
index 894043ef98..0098b22d14 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",
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..a6429d87e8 100644
--- a/keyboards/vitamins_included/vitamins_included.c
+++ b/keyboards/vitamins_included/vitamins_included.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "vitamins_included.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/vitamins_included/vitamins_included.h b/keyboards/vitamins_included/vitamins_included.h
index 5cd03cfcf8..21509d9743 100644
--- a/keyboards/vitamins_included/vitamins_included.h
+++ b/keyboards/vitamins_included/vitamins_included.h
@@ -2,20 +2,6 @@
 
 #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, \
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..097b1818ae 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 */
diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json
index 0c85e1d8d5..6ee9b4befd 100644
--- a/keyboards/waldo/info.json
+++ b/keyboards/waldo/info.json
@@ -7,6 +7,11 @@
         "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
diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h
index 61e2d421ae..9b9506927f 100644
--- a/keyboards/walletburner/cajal/config.h
+++ b/keyboards/walletburner/cajal/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/walletburner/cajal/info.json b/keyboards/walletburner/cajal/info.json
index 7aa0563d4c..bba30bebcd 100644
--- a/keyboards/walletburner/cajal/info.json
+++ b/keyboards/walletburner/cajal/info.json
@@ -8,6 +8,11 @@
         "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"}
diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h
index 84f3444730..905e59e17e 100644
--- a/keyboards/walletburner/neuron/config.h
+++ b/keyboards/walletburner/neuron/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json
index dd746f4c4b..0b7ee467f6 100644
--- a/keyboards/walletburner/neuron/info.json
+++ b/keyboards/walletburner/neuron/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6E75",
         "device_version": "0.0.1"
     },
+    "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/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..91ce68b938 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/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 { 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
diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json
index 36153f2bca..3b770ae352 100644
--- a/keyboards/wavtype/foundation/info.json
+++ b/keyboards/wavtype/foundation/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "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..534b0f83da 100644
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/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, 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
diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json
index d88ac83836..1c27944c76 100644
--- a/keyboards/wavtype/p01_ultra/info.json
+++ b/keyboards/wavtype/p01_ultra/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "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": {
diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h
index f187c1b234..fd3f070d35 100644
--- a/keyboards/weirdo/geminate60/config.h
+++ b/keyboards/weirdo/geminate60/config.h
@@ -15,10 +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/info.json b/keyboards/weirdo/geminate60/info.json
index 890a017867..76de73c51e 100644
--- a/keyboards/weirdo/geminate60/info.json
+++ b/keyboards/weirdo/geminate60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x676D",
         "device_version": "0.0.1"
     },
+    "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..e3e65a074b 100644
--- a/keyboards/weirdo/kelowna/rgb64/config.h
+++ b/keyboards/weirdo/kelowna/rgb64/config.h
@@ -15,10 +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..ff6b6b0f85 100644
--- a/keyboards/weirdo/kelowna/rgb64/info.json
+++ b/keyboards/weirdo/kelowna/rgb64/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4C64",
         "device_version": "0.0.1"
     },
+    "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/ls_60/config.h b/keyboards/weirdo/ls_60/config.h
index 46340f7833..93b7d5c69e 100644
--- a/keyboards/weirdo/ls_60/config.h
+++ b/keyboards/weirdo/ls_60/config.h
@@ -15,10 +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..a9247037fc 100644
--- a/keyboards/weirdo/ls_60/info.json
+++ b/keyboards/weirdo/ls_60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4C53",
         "device_version": "0.0.1"
     },
+    "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..2b4073cbd6 100644
--- a/keyboards/weirdo/naiping/np64/config.h
+++ b/keyboards/weirdo/naiping/np64/config.h
@@ -15,10 +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..0c1bf74f3c 100644
--- a/keyboards/weirdo/naiping/np64/info.json
+++ b/keyboards/weirdo/naiping/np64/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7064",
         "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": "ROW2COL",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h
index 43b8d1c32e..683ba29edc 100644
--- a/keyboards/weirdo/naiping/nphhkb/config.h
+++ b/keyboards/weirdo/naiping/nphhkb/config.h
@@ -15,10 +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..c0df6fb453 100644
--- a/keyboards/weirdo/naiping/nphhkb/info.json
+++ b/keyboards/weirdo/naiping/nphhkb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7068",
         "device_version": "0.0.1"
     },
+    "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/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h
index 265ae2e207..fd2dcbdde1 100644
--- a/keyboards/weirdo/naiping/npminila/config.h
+++ b/keyboards/weirdo/naiping/npminila/config.h
@@ -15,10 +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..7c489e378c 100644
--- a/keyboards/weirdo/naiping/npminila/info.json
+++ b/keyboards/weirdo/naiping/npminila/info.json
@@ -8,6 +8,11 @@
         "pid": "0x706D",
         "device_version": "0.0.1"
     },
+    "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/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/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/we27/config.h b/keyboards/wekey/we27/config.h
index c720fc2103..86f2ffb3ee 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/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, 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
diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json
index 0a114ad548..736b7f5d70 100644
--- a/keyboards/wekey/we27/info.json
+++ b/keyboards/wekey/we27/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "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}
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index 70f820c25e..c1e79e7699 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/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
-
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 9
diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json
index 4c3e9bf058..a2b5f6b49c 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,
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/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/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index 61604a74a9..050bb413f7 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 */
diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json
index 17bc326890..3725b4e3c9 100644
--- a/keyboards/westfoxtrot/cypher/rev5/info.json
+++ b/keyboards/westfoxtrot/cypher/rev5/info.json
@@ -6,6 +6,11 @@
       "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,
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..46138869fc 100644
--- a/keyboards/westm/westm68/info.json
+++ b/keyboards/westm/westm68/info.json
@@ -7,6 +7,11 @@
         "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": {
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/westmergo/config.h b/keyboards/westm/westmergo/config.h
index fd10220d9f..7b6f2e2120 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
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index a50da579e3..edfc012c28 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0201",
         "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",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
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..0133776586 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"
   },
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..6b6bd3d61b 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/info.json
+++ b/keyboards/wilba_tech/rama_works_m10_c/info.json
@@ -8,6 +8,11 @@
     "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": {
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_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..5158e7e06f 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_a/info.json
@@ -8,6 +8,11 @@
     "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": {
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..3a3b32d1df 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_b/info.json
@@ -8,6 +8,11 @@
     "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": {
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/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_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_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_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_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_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_h1/config.h b/keyboards/wilba_tech/wt60_h1/config.h
index 3264526694..9541b1df12 100644
--- a/keyboards/wilba_tech/wt60_h1/config.h
+++ b/keyboards/wilba_tech/wt60_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/wt60_h1/info.json b/keyboards/wilba_tech/wt60_h1/info.json
index 928ea8ba8a..4ef210f05f 100644
--- a/keyboards/wilba_tech/wt60_h1/info.json
+++ b/keyboards/wilba_tech/wt60_h1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0024",
         "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_tsangan_hhkb"],
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_h3/config.h b/keyboards/wilba_tech/wt60_h3/config.h
index 3264526694..9541b1df12 100644
--- a/keyboards/wilba_tech/wt60_h3/config.h
+++ b/keyboards/wilba_tech/wt60_h3/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_h3/info.json b/keyboards/wilba_tech/wt60_h3/info.json
index df002063a3..f4cb4bedbc 100644
--- a/keyboards/wilba_tech/wt60_h3/info.json
+++ b/keyboards/wilba_tech/wt60_h3/info.json
@@ -8,6 +8,11 @@
         "pid": "0x002C",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
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_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_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..dec1e89e95 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"
     },
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_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_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_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_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..65e8c39016 100644
--- a/keyboards/wilba_tech/wt65_h1/info.json
+++ b/keyboards/wilba_tech/wt65_h1/info.json
@@ -8,6 +8,11 @@
         "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"],
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_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/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..afc09fb5fe 100644
--- a/keyboards/wilba_tech/wt70_jb/config.h
+++ b/keyboards/wilba_tech/wt70_jb/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, 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 */
diff --git a/keyboards/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/info.json
index a004bb43a0..a913e0b225 100644
--- a/keyboards/wilba_tech/wt70_jb/info.json
+++ b/keyboards/wilba_tech/wt70_jb/info.json
@@ -8,6 +8,11 @@
         "pid": "0x001F",
         "device_version": "0.0.1"
     },
+    "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_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_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/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_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_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/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..b462b05eeb 100644
--- a/keyboards/wilba_tech/wt8_a/info.json
+++ b/keyboards/wilba_tech/wt8_a/info.json
@@ -8,6 +8,11 @@
         "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": {
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/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..0918277e81 100644
--- a/keyboards/wilba_tech/zeal65/info.json
+++ b/keyboards/wilba_tech/zeal65/info.json
@@ -8,6 +8,11 @@
         "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": {
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..506ddf78ec 100644
--- a/keyboards/winkeyless/b87/info.json
+++ b/keyboards/winkeyless/b87/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..fc3b3c45d3 100644
--- a/keyboards/winkeyless/bface/info.json
+++ b/keyboards/winkeyless/bface/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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..add6deafad 100644
--- a/keyboards/winkeyless/bmini/info.json
+++ b/keyboards/winkeyless/bmini/info.json
@@ -8,6 +8,11 @@
     "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"
   },
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..c60a38fe2f 100644
--- a/keyboards/winkeyless/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
@@ -8,6 +8,11 @@
     "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
diff --git a/keyboards/winry/winry25tc/config.h b/keyboards/winry/winry25tc/config.h
index f67f725ef6..90e70999b6 100644
--- a/keyboards/winry/winry25tc/config.h
+++ b/keyboards/winry/winry25tc/config.h
@@ -16,12 +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
diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json
index 4cbb746408..0391d278b9 100644
--- a/keyboards/winry/winry25tc/info.json
+++ b/keyboards/winry/winry25tc/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "C7", "B7", "B2", "B4"],
+        "rows": ["E6", "F0", "D6", "D2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/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/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/ts60/config.h b/keyboards/wolf/ts60/config.h
index 7664e747c7..cfc1ef79bc 100644
--- a/keyboards/wolf/ts60/config.h
+++ b/keyboards/wolf/ts60/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 { 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
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json
index 8b40cd6ff2..a8b8e91268 100644
--- a/keyboards/wolf/ts60/info.json
+++ b/keyboards/wolf/ts60/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
index f9802c89f3..93b0d14a3a 100644
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ b/keyboards/wolfmarkclub/wm1/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 { 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
diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json
index 3eef787a74..ac1827daf6 100644
--- a/keyboards/wolfmarkclub/wm1/info.json
+++ b/keyboards/wolfmarkclub/wm1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x2B29",
         "device_version": "0.0.1"
     },
+    "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/config.h b/keyboards/woodkeys/bigseries/1key/config.h
index 32263155ff..643a094f44 100755
--- a/keyboards/woodkeys/bigseries/1key/config.h
+++ b/keyboards/woodkeys/bigseries/1key/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 }
-#define MATRIX_COL_PINS { B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json
index f2f93b63ea..1d0a787d9a 100644
--- a/keyboards/woodkeys/bigseries/1key/info.json
+++ b/keyboards/woodkeys/bigseries/1key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6071",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B4"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "debounce": 50,
diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h
index 6b40065765..62734fc947 100755
--- a/keyboards/woodkeys/bigseries/2key/config.h
+++ b/keyboards/woodkeys/bigseries/2key/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 }
-#define MATRIX_COL_PINS { B4, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json
index 5137f4f1d1..c3a2b62eb8 100644
--- a/keyboards/woodkeys/bigseries/2key/info.json
+++ b/keyboards/woodkeys/bigseries/2key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6071",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B3"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "debounce": 50,
diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h
index 9c81df0835..592aae3c88 100755
--- a/keyboards/woodkeys/bigseries/3key/config.h
+++ b/keyboards/woodkeys/bigseries/3key/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 }
-#define MATRIX_COL_PINS { B4, B3, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json
index af1c85f925..43b99312db 100644
--- a/keyboards/woodkeys/bigseries/3key/info.json
+++ b/keyboards/woodkeys/bigseries/3key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6073",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B3", "B5"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 50,
diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h
index 9b1f699ce1..53e1242c88 100755
--- a/keyboards/woodkeys/bigseries/4key/config.h
+++ b/keyboards/woodkeys/bigseries/4key/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, B5 }
-#define MATRIX_COL_PINS { B4, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     false \
diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json
index b6e02aa987..8fb9a9071a 100644
--- a/keyboards/woodkeys/bigseries/4key/info.json
+++ b/keyboards/woodkeys/bigseries/4key/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6074",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B3"],
+        "rows": ["B0", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "debounce": 50,
diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h
index fac7647ab8..c640c6254f 100644
--- a/keyboards/woodkeys/scarletbandana/config.h
+++ b/keyboards/woodkeys/scarletbandana/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 ROW2COL
-
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
@@ -36,9 +32,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..7550db40c8 100644
--- a/keyboards/woodkeys/scarletbandana/info.json
+++ b/keyboards/woodkeys/scarletbandana/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6969",
         "device_version": "0.0.1"
     },
+    "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/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index 1e17946cef..020b95da17 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
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index df4a5c1be0..00e70ab0db 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -7,6 +7,11 @@
         "vid": "0x574C",
         "pid": "0x1DF9"
     },
+    "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"},
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 9148cf1abf..add9608eb4 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
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 3eb050b92a..798127b4c0 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -8,6 +8,11 @@
         "pid": "0xE6F0",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6"],
+        "rows": ["F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "B4"}
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index d9da63eb50..de4cf74bad 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
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index 5e934e90e0..6826f123a9 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -7,6 +7,11 @@
       "vid": "0x574C",
       "pid": "0xDCD1"
     },
+    "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"}
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/config.h b/keyboards/wsk/alpha9/config.h
index 19943cdb98..9796f37b97 100644
--- a/keyboards/wsk/alpha9/config.h
+++ b/keyboards/wsk/alpha9/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json
index 65d1bec3f7..bb5415b022 100644
--- a/keyboards/wsk/alpha9/info.json
+++ b/keyboards/wsk/alpha9/info.json
@@ -8,6 +8,11 @@
     "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
diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h
index fb101db58f..98d3d12d3d 100644
--- a/keyboards/wsk/g4m3ralpha/config.h
+++ b/keyboards/wsk/g4m3ralpha/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json
index a55225c0bc..37672ede0a 100644
--- a/keyboards/wsk/g4m3ralpha/info.json
+++ b/keyboards/wsk/g4m3ralpha/info.json
@@ -8,6 +8,11 @@
     "pid": "0x56D9",
     "device_version": "0.0.1"
   },
+  "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..b893b35e69 100644
--- a/keyboards/wsk/gothic50/config.h
+++ b/keyboards/wsk/gothic50/config.h
@@ -1,15 +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
diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json
index bce25f3934..f773ebf193 100644
--- a/keyboards/wsk/gothic50/info.json
+++ b/keyboards/wsk/gothic50/info.json
@@ -8,6 +8,11 @@
         "pid": "0x04EF",
         "device_version": "0.0.1"
     },
+    "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..de29eadb14 100644
--- a/keyboards/wsk/gothic70/config.h
+++ b/keyboards/wsk/gothic70/config.h
@@ -1,14 +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
diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json
index f7baad64c1..0fd4a6018d 100644
--- a/keyboards/wsk/gothic70/info.json
+++ b/keyboards/wsk/gothic70/info.json
@@ -8,6 +8,11 @@
         "pid": "0x63CC",
         "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/wsk/houndstooth/config.h b/keyboards/wsk/houndstooth/config.h
index b9cc1722c3..08f6b873c5 100644
--- a/keyboards/wsk/houndstooth/config.h
+++ b/keyboards/wsk/houndstooth/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/info.json
index 490088543c..e383e46b3c 100644
--- a/keyboards/wsk/houndstooth/info.json
+++ b/keyboards/wsk/houndstooth/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFA9C",
         "device_version": "0.0.1"
     },
+    "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..68d4a8fef7 100644
--- a/keyboards/wsk/jerkin/config.h
+++ b/keyboards/wsk/jerkin/config.h
@@ -1,13 +1,5 @@
 #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
 
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/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h
index 8f965e4b09..eecc8ba082 100644
--- a/keyboards/wsk/kodachi50/config.h
+++ b/keyboards/wsk/kodachi50/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json
index 713c1f064f..29f17cc225 100644
--- a/keyboards/wsk/kodachi50/info.json
+++ b/keyboards/wsk/kodachi50/info.json
@@ -8,6 +8,11 @@
         "pid": "0x72D4",
         "device_version": "0.0.1"
     },
+    "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/pain27/config.h b/keyboards/wsk/pain27/config.h
index 593192dfb5..5ddf06145f 100644
--- a/keyboards/wsk/pain27/config.h
+++ b/keyboards/wsk/pain27/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json
index ee3d584873..ce8a292a64 100644
--- a/keyboards/wsk/pain27/info.json
+++ b/keyboards/wsk/pain27/info.json
@@ -8,11 +8,47 @@
         "pid": "0x9E8C",
         "device_version": "0.0.1"
     },
+    "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/sl40/config.h b/keyboards/wsk/sl40/config.h
index 2dca1b6d6d..ed32129b59 100644
--- a/keyboards/wsk/sl40/config.h
+++ b/keyboards/wsk/sl40/config.h
@@ -16,14 +16,6 @@
 
 #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
 
diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/info.json
index f9f700e42c..713987382f 100644
--- a/keyboards/wsk/sl40/info.json
+++ b/keyboards/wsk/sl40/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC456",
         "device_version": "0.0.1"
     },
+    "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/tkl30/config.h b/keyboards/wsk/tkl30/config.h
index 8b12e346b6..4cb0e034be 100644
--- a/keyboards/wsk/tkl30/config.h
+++ b/keyboards/wsk/tkl30/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/wsk/tkl30/info.json b/keyboards/wsk/tkl30/info.json
index b210528ba0..0b1dac4028 100644
--- a/keyboards/wsk/tkl30/info.json
+++ b/keyboards/wsk/tkl30/info.json
@@ -8,11 +8,65 @@
         "pid": "0x0B7F",
         "device_version": "0.0.1"
     },
+    "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/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h
index 45f7843698..53b2870640 100644
--- a/keyboards/wuque/ikki68/config.h
+++ b/keyboards/wuque/ikki68/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, 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
 
diff --git a/keyboards/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json
index 4cdf46a99a..fd1cb7f9ba 100644
--- a/keyboards/wuque/ikki68/info.json
+++ b/keyboards/wuque/ikki68/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
index 85a6ecf974..496e22c07a 100644
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ b/keyboards/wuque/ikki68_aurora/config.h
@@ -17,12 +17,6 @@ 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
 
diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json
index bf47f85a75..d9157dc5d6 100644
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ b/keyboards/wuque/ikki68_aurora/info.json
@@ -8,6 +8,11 @@
         "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
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..e348f8af5a 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}
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..bacdeef0e4 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}
diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h
index e609117661..814dbd2d02 100644
--- a/keyboards/wuque/promise87/ansi/config.h
+++ b/keyboards/wuque/promise87/ansi/config.h
@@ -16,12 +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
diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json
index cd9b8b4d63..d6cfb88bb2 100644
--- a/keyboards/wuque/promise87/ansi/info.json
+++ b/keyboards/wuque/promise87/ansi/info.json
@@ -8,6 +8,11 @@
     "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
@@ -115,13 +120,13 @@
         { "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": "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": 3 },
-        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
+        { "label": "Space", "x": 7, "y": 5.25 },
         { "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": "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 },
@@ -213,11 +218,11 @@
         { "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": "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, "w": 1 },
+        { "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 },
@@ -291,7 +296,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": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
 
         { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
@@ -310,11 +315,11 @@
         { "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": "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, "w": 1 },
+        { "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 },
@@ -406,13 +411,13 @@
         { "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": "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": 3 },
-        { "label": "Space", "x": 7, "y": 5.25, "w": 1 },
+        { "label": "Space", "x": 7, "y": 5.25 },
         { "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": "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 },
@@ -505,11 +510,11 @@
         { "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": "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, "w": 1 },
+        { "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 },
@@ -602,11 +607,11 @@
         { "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": "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, "w": 1 },
+        { "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 },
@@ -699,11 +704,11 @@
         { "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": "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, "w": 1 },
+        { "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 },
@@ -797,11 +802,11 @@
         { "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": "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, "w": 1 },
+        { "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 },
diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h
index e609117661..814dbd2d02 100644
--- a/keyboards/wuque/promise87/wkl/config.h
+++ b/keyboards/wuque/promise87/wkl/config.h
@@ -16,12 +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
diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json
index 0a0e3b0bc5..1b8876686b 100644
--- a/keyboards/wuque/promise87/wkl/info.json
+++ b/keyboards/wuque/promise87/wkl/info.json
@@ -8,6 +8,11 @@
     "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
@@ -114,7 +119,7 @@
         { "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": 7, "y": 5.25 },
         { "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 },
@@ -284,7 +289,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": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
 
         { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
@@ -399,7 +404,7 @@
         { "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": 7, "y": 5.25 },
         { "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 },
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..4d295b0f75 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"}
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/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 c23c8dd856..47089bf7a1 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/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..d1a900d7f5 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
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..147a69861f 100644
--- a/keyboards/xbows/knight/info.json
+++ b/keyboards/xbows/knight/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B6E",
         "device_version": "0.0.1"
     },
+    "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/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..34ef43bba0 100644
--- a/keyboards/xbows/knight_plus/info.json
+++ b/keyboards/xbows/knight_plus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4B50",
         "device_version": "0.0.1"
     },
+    "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/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..96e559c365 100644
--- a/keyboards/xbows/nature/info.json
+++ b/keyboards/xbows/nature/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E61",
         "device_version": "0.0.1"
     },
+    "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/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..6ec3f15d62 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E75",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "B2", "B1"],
+        "rows": ["B5", "B4", "C6", "B6", "D7", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "debounce": 3,
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..1cf00b9b2a 100644
--- a/keyboards/xbows/ranger/info.json
+++ b/keyboards/xbows/ranger/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5261",
         "device_version": "0.0.1"
     },
+    "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,
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..0e4314e60e 100644
--- a/keyboards/xbows/woody/info.json
+++ b/keyboards/xbows/woody/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1224",
         "device_version": "0.0.1"
     },
+    "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/xelus/akis/config.h b/keyboards/xelus/akis/config.h
index b0a56cdba8..8dcff82f55 100644
--- a/keyboards/xelus/akis/config.h
+++ b/keyboards/xelus/akis/config.h
@@ -16,11 +16,6 @@
 
 #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
@@ -35,9 +30,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..074b9ca341 100644
--- a/keyboards/xelus/akis/info.json
+++ b/keyboards/xelus/akis/info.json
@@ -8,6 +8,11 @@
         "pid": "0xA04B",
         "device_version": "0.0.1"
     },
+    "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..8bec078edc 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
diff --git a/keyboards/xelus/dawn60/rev1/info.json b/keyboards/xelus/dawn60/rev1/info.json
new file mode 100644
index 0000000000..525e9d9ab0
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "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/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index b00009b44e..410093b6cf 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -15,14 +15,6 @@
  */
 #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
diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/info.json
new file mode 100644
index 0000000000..525e9d9ab0
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1_qmk/info.json
@@ -0,0 +1,7 @@
+{
+    "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/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/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..dd44daae35 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
 
diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json
index c37c898995..48cdf901e4 100644
--- a/keyboards/xelus/la_plus/info.json
+++ b/keyboards/xelus/la_plus/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4C50",
         "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", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index 2e6a07df5a..19da636e13 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/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, 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
diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json
index bbac38b051..247ce43eca 100644
--- a/keyboards/xelus/ninjin/info.json
+++ b/keyboards/xelus/ninjin/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4E4A",
         "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"],
+        "rows": ["B4", "B3", "A15", "A3", "B9", "B8"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A2",
         "scroll_lock": "A13"
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/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/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..5bc0668be3 100644
--- a/keyboards/xelus/pachi/rgb/rev1/info.json
+++ b/keyboards/xelus/pachi/rgb/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5052",
         "device_version": "0.0.1"
     },
+    "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": {
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..d06007b142 100644
--- a/keyboards/xelus/pachi/rgb/rev2/info.json
+++ b/keyboards/xelus/pachi/rgb/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5053",
         "device_version": "0.0.2"
     },
+    "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": {
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/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/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..36608599e2 100644
--- a/keyboards/xelus/valor/rev1/config.h
+++ b/keyboards/xelus/valor/rev1/config.h
@@ -16,11 +16,6 @@
 
 #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
@@ -36,9 +31,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..bf611c5811 100644
--- a/keyboards/xelus/valor/rev1/info.json
+++ b/keyboards/xelus/valor/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5652",
         "device_version": "0.0.1"
     },
+    "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"],
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index 2dba975d78..f7bbd338fa 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
 
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
index f77f18dda3..226e61d3b4 100644
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5653",
         "device_version": "0.0.1"
     },
+    "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"],
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/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/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..97baa39f5f 100644
--- a/keyboards/xiaomi/mk02/info.json
+++ b/keyboards/xiaomi/mk02/info.json
@@ -8,6 +8,11 @@
         "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": [
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..adf33530e8 100644
--- a/keyboards/xiudi/xd60/rev2/config.h
+++ b/keyboards/xiudi/xd60/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 { 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
  */
diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json
index 1951e52dfe..eaf7f9f7e4 100644
--- a/keyboards/xiudi/xd60/rev2/info.json
+++ b/keyboards/xiudi/xd60/rev2/info.json
@@ -3,6 +3,11 @@
     "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,
diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
index 617d77b1de..cb3c91b202 100644
--- a/keyboards/xiudi/xd60/rev3/config.h
+++ b/keyboards/xiudi/xd60/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 { 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
  */
diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json
index 1b03e6c6e3..66bcb7be81 100644
--- a/keyboards/xiudi/xd60/rev3/info.json
+++ b/keyboards/xiudi/xd60/rev3/info.json
@@ -3,6 +3,11 @@
     "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,
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index 93181b668b..8759e7ff2e 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 */
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json
index 8b1169474c..a650b39918 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index e4a2e0139e..644c29d1fd 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/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, B0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN F6
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6
diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json
index 54b1dc718b..b99fe9e948 100644
--- a/keyboards/xiudi/xd75/info.json
+++ b/keyboards/xiudi/xd75/info.json
@@ -8,6 +8,11 @@
         "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,
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/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 5908cc6d24..344c5c6c2b 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -21,22 +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
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index 7390a6cd0a..ed2af55ce6 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -16,12 +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
diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
index 88968b933f..8648baa927 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,
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index 42a49372ce..29c8abfb23 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/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, 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
diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json
index 52d010ada5..992fc07dac 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
diff --git a/keyboards/xiudi/xd87/xd87.h b/keyboards/xiudi/xd87/xd87.h
index 2d700d7ba4..af6adea5bb 100644
--- a/keyboards/xiudi/xd87/xd87.h
+++ b/keyboards/xiudi/xd87/xd87.h
@@ -31,7 +31,7 @@
     { 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 }, \
+    { 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, k4E, k4F, k4G }, \
     { k50, k51, k52, XXX, XXX, k55, 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..8e2a50511f 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -21,22 +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
diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h
index 3e437fc1b5..b44dfaac52 100644
--- a/keyboards/xmmx/config.h
+++ b/keyboards/xmmx/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/xmmx/info.json b/keyboards/xmmx/info.json
index 26e1b933b9..8f4897b794 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",
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/yampad/config.h b/keyboards/yampad/config.h
index 00ddc347db..8aedbcf715 100644
--- a/keyboards/yampad/config.h
+++ b/keyboards/yampad/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, 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
diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json
index 753c952b1d..d0e4b42329 100644
--- a/keyboards/yampad/info.json
+++ b/keyboards/yampad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8369",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "debounce": 2,
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index fe7045efad..22610f4518 100644
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -15,14 +15,6 @@
  */
 #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
diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json
index 07f7dbbe30..6178272b17 100644
--- a/keyboards/yandrstudio/buff67v3/info.json
+++ b/keyboards/yandrstudio/buff67v3/info.json
@@ -6,6 +6,11 @@
         "pid": "0xAA88",
         "device_version": "1.0.0"
     },
+    "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/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/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..878ac47bbc 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -15,12 +15,6 @@
  */
 #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
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
index 74f5dd6e86..4865cecb0b 100644
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -6,6 +6,11 @@
         "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",
     "debounce": 8,
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index 79f37b9bde..0c091e17af 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -15,12 +15,6 @@
  */
 #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
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
index 4f8105fae8..9c0195618d 100644
--- a/keyboards/yandrstudio/nightstar75/info.json
+++ b/keyboards/yandrstudio/nightstar75/info.json
@@ -6,6 +6,11 @@
         "pid": "0xAA87",
         "device_version": "1.0.0"
     },
+    "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/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 06de2f5680..b3bb28e7ae 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -15,13 +15,6 @@
  */
 #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
 
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index 5aa0c2ae68..c924055e4e 100644
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -4,6 +4,11 @@
         "pid": "0xAAAF",
         "device_version": "1.0.0"
     },
+    "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/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index a3d9bb74c5..9a23a64ae2 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -16,14 +16,6 @@
 
 #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 */
diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
index ed06374976..90ef04d125 100644
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ b/keyboards/yandrstudio/nz67v2/info.json
@@ -6,6 +6,11 @@
         "pid": "0xAA83",
         "device_version": "1.0.0"
     },
+    "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"}
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index d52452e0a2..84c1c2ae8f 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -15,13 +15,6 @@
  */
 #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
 
diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json
index d48809128f..7bc7ea4142 100644
--- a/keyboards/yandrstudio/tg67/info.json
+++ b/keyboards/yandrstudio/tg67/info.json
@@ -6,6 +6,11 @@
         "pid": "0xAA8D",
         "device_version": "1.0.0"
     },
+    "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/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index ec02b66c19..46c0d6005d 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -15,13 +15,6 @@
  */
 #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
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
index 20a1e86cf4..5fbc7ecf33 100644
--- a/keyboards/yandrstudio/yr6095/info.json
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -6,6 +6,11 @@
         "pid": "0xAA0C",
         "device_version": "1.0.0"
     },
+    "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/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/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h
index e53141a772..5e34888c14 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
diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json
index 85b39abe9b..017f4445b8 100644
--- a/keyboards/yanghu/unicorne/info.json
+++ b/keyboards/yanghu/unicorne/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0204",
     "device_version": "0.0.1"
   },
+  "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"},
diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h
index a3fcde472f..305f37ad19 100644
--- a/keyboards/ydkb/chili/config.h
+++ b/keyboards/ydkb/chili/config.h
@@ -17,18 +17,6 @@ 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
diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json
index 1ef666e69f..2516744ef0 100644
--- a/keyboards/ydkb/chili/info.json
+++ b/keyboards/ydkb/chili/info.json
@@ -8,6 +8,11 @@
         "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
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..788e0e02fe 100644
--- a/keyboards/ydkb/yd68/config.h
+++ b/keyboards/ydkb/yd68/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, 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
diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json
index d8f1439a3f..7b15598735 100644
--- a/keyboards/ydkb/yd68/info.json
+++ b/keyboards/ydkb/yd68/info.json
@@ -8,6 +8,11 @@
     "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
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..4cd6356298 100644
--- a/keyboards/ymdk/bface/info.json
+++ b/keyboards/ymdk/bface/info.json
@@ -8,6 +8,11 @@
     "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
diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h
index 1420387adb..782e711cfd 100644
--- a/keyboards/ymdk/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json
index 074e6c0485..4688aee3a2 100644
--- a/keyboards/ymdk/melody96/info.json
+++ b/keyboards/ymdk/melody96/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/ymdk/melody96/melody96.h b/keyboards/ymdk/melody96/melody96.h
index 3d3bc6070c..8edbca1135 100644
--- a/keyboards/ymdk/melody96/melody96.h
+++ b/keyboards/ymdk/melody96/melody96.h
@@ -118,7 +118,7 @@
     { 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 }, \
+    { kA0, kA1, kA2, kA3, 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..2a191a4a24 100644
--- a/keyboards/ymdk/np21/info.json
+++ b/keyboards/ymdk/np21/info.json
@@ -7,6 +7,11 @@
         "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,
diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h
index 0524cfd563..cbb4974c09 100644
--- a/keyboards/ymdk/np24/u4rgb6/config.h
+++ b/keyboards/ymdk/np24/u4rgb6/config.h
@@ -15,14 +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
diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
index dd4b532538..98d881cd4d 100644
--- a/keyboards/ymdk/np24/u4rgb6/info.json
+++ b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -7,6 +7,11 @@
         "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
diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
index 3b21cea4a6..013df9fa12 100644
--- a/keyboards/ymdk/wings/config.h
+++ b/keyboards/ymdk/wings/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 { 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
diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json
index 92f019bacb..25a04a5158 100644
--- a/keyboards/ymdk/wings/info.json
+++ b/keyboards/ymdk/wings/info.json
@@ -8,6 +8,11 @@
         "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
@@ -21,79 +26,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/wingshs/config.h b/keyboards/ymdk/wingshs/config.h
index 055c93b327..034d338d35 100644
--- a/keyboards/ymdk/wingshs/config.h
+++ b/keyboards/ymdk/wingshs/config.h
@@ -13,23 +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
diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json
index 8e72d4093a..5e3099d1a3 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
@@ -21,78 +26,84 @@
     "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/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h
index 82d7484aa8..4b44082d9f 100644
--- a/keyboards/ymdk/yd60mq/config.h
+++ b/keyboards/ymdk/yd60mq/config.h
@@ -1,13 +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, 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
 
diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json
index 84b42905c7..60ff8f7fe2 100644
--- a/keyboards/ymdk/yd60mq/info.json
+++ b/keyboards/ymdk/yd60mq/info.json
@@ -7,6 +7,11 @@
         "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
diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h
index d07a8917df..c55883abd3 100644
--- a/keyboards/ymdk/ym68/config.h
+++ b/keyboards/ymdk/ym68/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 { 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
diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json
index 5d4d3913f8..e3ec6538f8 100644
--- a/keyboards/ymdk/ym68/info.json
+++ b/keyboards/ymdk/ym68/info.json
@@ -8,6 +8,11 @@
         "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,
diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h
index 4c4ca90583..daf340e4b8 100644
--- a/keyboards/ymdk/ymd09/config.h
+++ b/keyboards/ymdk/ymd09/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 { F5, F4, F1 }
-#define MATRIX_COL_PINS { D6, D2, D1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
  #define RGBLED_NUM 9
diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/info.json
index 0e3aaba46b..8d456b3ab7 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",
     "layouts": {
diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h
index 36cbd93891..5f0ff7b52d 100644
--- a/keyboards/ymdk/ymd21/v2/config.h
+++ b/keyboards/ymdk/ymd21/v2/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 { 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
diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json
index 84badccc5a..11e85c1e2b 100644
--- a/keyboards/ymdk/ymd21/v2/info.json
+++ b/keyboards/ymdk/ymd21/v2/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/ymdk/ymd40/air40/config.h b/keyboards/ymdk/ymd40/air40/config.h
index db792118da..4fcbc8421c 100644
--- a/keyboards/ymdk/ymd40/air40/config.h
+++ b/keyboards/ymdk/ymd40/air40/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 { 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
diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json
index 3920ff6a29..b334b81717 100644
--- a/keyboards/ymdk/ymd40/air40/info.json
+++ b/keyboards/ymdk/ymd40/air40/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0911",
         "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",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h
index 21a027eab4..a0b2e37f8f 100644
--- a/keyboards/ymdk/ymd40/v2/config.h
+++ b/keyboards/ymdk/ymd40/v2/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 { 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
diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json
index 375f8c8480..37c51da1a5 100644
--- a/keyboards/ymdk/ymd40/v2/info.json
+++ b/keyboards/ymdk/ymd40/v2/info.json
@@ -8,6 +8,11 @@
         "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
diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h
index 90f4ffed24..dc7ebdc8bc 100644
--- a/keyboards/ymdk/ymd67/config.h
+++ b/keyboards/ymdk/ymd67/config.h
@@ -1,13 +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, 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
 
diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json
index f66e1533dd..89cdd6b258 100644
--- a/keyboards/ymdk/ymd67/info.json
+++ b/keyboards/ymdk/ymd67/info.json
@@ -8,6 +8,11 @@
         "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
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..e1c728c19d 100644
--- a/keyboards/ymdk/ymd75/rev1/info.json
+++ b/keyboards/ymdk/ymd75/rev1/info.json
@@ -2,6 +2,11 @@
     "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
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/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..8d71880689 100644
--- a/keyboards/ymdk/ymd75/rev2/info.json
+++ b/keyboards/ymdk/ymd75/rev2/info.json
@@ -2,6 +2,11 @@
     "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
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/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..d4abcdd4e1 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
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/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..cc4cd0d147 100644
--- a/keyboards/ymdk/ymd96/config.h
+++ b/keyboards/ymdk/ymd96/config.h
@@ -19,12 +19,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 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TOGGLE 3
 
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json
index 7541e62019..f48314cfa5 100644
--- a/keyboards/ymdk/ymd96/info.json
+++ b/keyboards/ymdk/ymd96/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", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "D4",
         "levels": 12,
diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h
index fb4155c48d..b8bcd08e27 100644
--- a/keyboards/yncognito/batpad/config.h
+++ b/keyboards/yncognito/batpad/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 { 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
diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json
index 01d2032d2e..fa1efd40eb 100644
--- a/keyboards/yncognito/batpad/info.json
+++ b/keyboards/yncognito/batpad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6602",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "D5", "D3"],
+        "rows": ["F4", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h
index 73de0d6c42..504d6ba541 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
 
diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json
index f7d032a1d2..ef1402a41e 100644
--- a/keyboards/yoichiro/lunakey_macro/info.json
+++ b/keyboards/yoichiro/lunakey_macro/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1"],
+        "rows": ["E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h
index a4ddefb53c..b674473983 100644
--- a/keyboards/yoichiro/lunakey_mini/config.h
+++ b/keyboards/yoichiro/lunakey_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 { 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
diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json
index 4baa40bda4..d32b1490d1 100644
--- a/keyboards/yoichiro/lunakey_mini/info.json
+++ b/keyboards/yoichiro/lunakey_mini/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..2dec336b86 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 <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/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..c17ec90d8e 100644
--- a/keyboards/yosino58/rev1/config.h
+++ b/keyboards/yosino58/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 }
-#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..597c4a442e 100644
--- a/keyboards/yosino58/rev1/info.json
+++ b/keyboards/yosino58/rev1/info.json
@@ -8,6 +8,11 @@
         "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"
     },
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..4a567f22b1 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -17,9 +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
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..4c69a35dea 100644
--- a/keyboards/yushakobo/navpad/10/rev1/config.h
+++ b/keyboards/yushakobo/navpad/10/rev1/config.h
@@ -17,20 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top 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..ae49a16f3b 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/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, 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
@@ -44,9 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                               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
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
index 19b8c31efb..5bc055b381 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,6 +26,12 @@
                     {"pin_a": "B6", "pin_b": "B5"}
                 ]
             }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+                "rows": ["D4", "C6", "D7", "E6", "B4"]
+            }
         }
     },
     "processor": "atmega32u4",
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index 3df5c25081..1e45541119 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/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, 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
 
diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json
index 7d062aef16..e5eb64db84 100644
--- a/keyboards/yushakobo/quick17/info.json
+++ b/keyboards/yushakobo/quick17/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "D4", "E6", "F7", "C6", "D7"],
+        "rows": ["F4", "B3", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B4", "pin_b": "B5"}
diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h
index 4ca22e9b5d..4994ead6bc 100644
--- a/keyboards/yynmt/dozen0/config.h
+++ b/keyboards/yynmt/dozen0/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 }
-#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
diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json
index b32291b052..0c73591326 100644
--- a/keyboards/yynmt/dozen0/info.json
+++ b/keyboards/yynmt/dozen0/info.json
@@ -8,6 +8,11 @@
     "pid": "0xEA4F",
     "device_version": "0.0.1"
   },
+  "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": {
diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h
index 4d2fab5ace..e2bf97645b 100644
--- a/keyboards/yynmt/kagamidget/config.h
+++ b/keyboards/yynmt/kagamidget/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, 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
diff --git a/keyboards/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json
index 7ffbddfd25..983b09aa79 100644
--- a/keyboards/yynmt/kagamidget/info.json
+++ b/keyboards/yynmt/kagamidget/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": ["D1", "D0", "F4", "F5"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h
index 27ef3bfb87..0167811c6a 100644
--- a/keyboards/zfrontier/big_switch/config.h
+++ b/keyboards/zfrontier/big_switch/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 }
-#define MATRIX_COL_PINS { F1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* RGB light config */
 #define RGB_DI_PIN B6
 #define RGBLED_NUM 4
diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json
index aaf72f61b3..0e52f3a29d 100644
--- a/keyboards/zfrontier/big_switch/info.json
+++ b/keyboards/zfrontier/big_switch/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0A01",
         "device_version": "0.0.5"
     },
+    "matrix_pins": {
+        "cols": ["F1"],
+        "rows": ["F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
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/zj68/config.h b/keyboards/zj68/config.h
index efbdb02f81..2df5b9daaf 100644
--- a/keyboards/zj68/config.h
+++ b/keyboards/zj68/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, 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
 
diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json
index 0c902f2468..70bba664ec 100644
--- a/keyboards/zj68/info.json
+++ b/keyboards/zj68/info.json
@@ -7,6 +7,11 @@
         "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
diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h
index 231ad6d92e..f6311ba013 100755
--- a/keyboards/zlant/config.h
+++ b/keyboards/zlant/config.h
@@ -1,13 +1,5 @@
 #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
 
diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json
index e69956a96d..9bee3a5016 100644
--- a/keyboards/zlant/info.json
+++ b/keyboards/zlant/info.json
@@ -8,6 +8,11 @@
         "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"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12", "planck_mit"],
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h
index 739358f693..8437e42144 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
diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json
index 74bf17b603..a3693fdad2 100644
--- a/keyboards/zoo/wampus/info.json
+++ b/keyboards/zoo/wampus/info.json
@@ -8,6 +8,11 @@
         "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
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/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index 2f8984f51a..cda1688944 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/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_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
diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json
index d8245be308..dff0282f16 100644
--- a/keyboards/zvecr/split_blackpill/info.json
+++ b/keyboards/zvecr/split_blackpill/info.json
@@ -8,10 +8,21 @@
         "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"]
+            }
         }
     },
     "processor": "STM32F103",
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index 97b0393aab..c643ca5d31 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/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_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
diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json
index f3519b94f4..4206a3fa6e 100644
--- a/keyboards/zvecr/zv48/info.json
+++ b/keyboards/zvecr/zv48/info.json
@@ -8,6 +8,11 @@
         "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"}
@@ -17,6 +22,12 @@
         "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"],
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/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py
index 83ab1d1e6d..663688e240 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')
@@ -213,10 +213,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)):
@@ -230,13 +233,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':
@@ -250,12 +256,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:
@@ -265,16 +275,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/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/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/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/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/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/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_util.h b/quantum/action_util.h
index 6f1f09c4bd..0ecf15ae4b 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" {
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/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/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/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..1263ef188b 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -30,8 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum_keycodes.h"
 
-// translates key to keycode
-uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
+#include "keymap_common.h"
 
 #ifdef ENCODER_MAP_ENABLE
 // Ensure we have a forward declaration for the encoder map
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h
new file mode 100644
index 0000000000..20e70263f3
--- /dev/null
+++ b/quantum/keymap_common.h
@@ -0,0 +1,9 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.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/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/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/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/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/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/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