Move single `LAYOUT`s to data driven (#20365)

12 files changed, 387 insertions, 393 deletions

diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json
index 9cce952dd7..3d507b38a9 100644
--- a/keyboards/xbows/knight/info.json
+++ b/keyboards/xbows/knight/info.json
@@ -22,98 +22,111 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0, "w":2},
-                {"label":"Print Screen", "x":16, "y":0, "w":2},
-
-                {"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":9, "y":1.5},
-                {"label":"&", "x":10, "y":1.5},
-                {"label":"*", "x":11, "y":1.5},
-                {"label":"(", "x":12, "y":1.5},
-                {"label":")", "x":13, "y":1.5},
-                {"label":"_", "x":14, "y":1.5},
-                {"label":"+", "x":15, "y":1.5},
-                {"label":"Backspace", "x":16, "y":1.5, "w":2},
-
-                {"label":"Tab", "x":0, "y":2.5},
-                {"label":"Q", "x":1, "y":2.5},
-                {"label":"W", "x":2, "y":2.5},
-                {"label":"E", "x":3, "y":2.5},
-                {"label":"R", "x":4, "y":2.5},
-                {"label":"T", "x":5, "y":2.5},
-                {"label":"Y", "x":9, "y":2.5},
-                {"label":"U", "x":10, "y":2.5},
-                {"label":"I", "x":11, "y":2.5},
-                {"label":"O", "x":12, "y":2.5},
-                {"label":"P", "x":13, "y":2.5},
-                {"label":"{", "x":14, "y":2.5},
-                {"label":"}", "x":15, "y":2.5},
-                {"label":"|", "x":16, "y":2.5},
-                {"label":"Page Up", "x":17, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5},
-                {"label":"A", "x":1, "y":3.5},
-                {"label":"S", "x":2, "y":3.5},
-                {"label":"D", "x":3, "y":3.5},
-                {"label":"F", "x":4, "y":3.5},
-                {"label":"G", "x":5, "y":3.5},
-                {"label":"Backspace", "x":6.75, "y":3.5, "w":1.5},
-                {"label":"H", "x":9, "y":3.5},
-                {"label":"J", "x":10, "y":3.5},
-                {"label":"K", "x":11, "y":3.5},
-                {"label":"L", "x":12, "y":3.5},
-                {"label":":", "x":13, "y":3.5},
-                {"label":"\"", "x":14, "y":3.5},
-                {"label":"Enter", "x":15, "y":3.5, "w":2},
-                {"label":"Page Down", "x":17, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5},
-                {"label":"Z", "x":1, "y":4.5},
-                {"label":"X", "x":2, "y":4.5},
-                {"label":"C", "x":3, "y":4.5},
-                {"label":"V", "x":4, "y":4.5},
-                {"label":"B", "x":5, "y":4.5},
-                {"label":"Enter", "x":6.5, "y":4.5, "w":2},
-                {"label":"N", "x":9, "y":4.5},
-                {"label":"M", "x":10, "y":4.5},
-                {"label":"<", "x":11, "y":4.5},
-                {"label":">", "x":12, "y":4.5},
-                {"label":"?", "x":13, "y":4.5},
-                {"label":"Shift", "x":14, "y":4.5},
-                {"label":"Up", "x":16, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5},
-                {"label":"Win", "x":1, "y":5.5},
-                {"label":"Alt", "x":2, "y":5.5, "w":2},
-                {"label":"Space", "x":4, "y":5.5, "w":2},
-                {"label":"Ctrl", "x":6, "y":5.5, "w":1.5},
-                {"label":"Shift", "x":7.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":9, "y":5.5, "w":2},
-                {"label":"Alt", "x":11, "y":5.5, "w":2},
-                {"label":"Fn", "x":13, "y":5.5},
-                {"label":"Ctrl", "x":14, "y":5.5},
-                {"label":"Left", "x":15, "y":5.5},
-                {"label":"Down", "x":16, "y":5.5},
-                {"label":"Right", "x":17, "y":5.5}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
 
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 16, "y": 0, "w": 2},
+
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"label": "^", "matrix": [1, 7], "x": 9, "y": 1.5},
+                {"label": "&", "matrix": [1, 8], "x": 10, "y": 1.5},
+                {"label": "*", "matrix": [1, 9], "x": 11, "y": 1.5},
+                {"label": "(", "matrix": [1, 10], "x": 12, "y": 1.5},
+                {"label": ")", "matrix": [1, 11], "x": 13, "y": 1.5},
+                {"label": "_", "matrix": [1, 12], "x": 14, "y": 1.5},
+                {"label": "+", "matrix": [1, 13], "x": 15, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 14], "x": 16, "y": 1.5, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"label": "Y", "matrix": [2, 7], "x": 9, "y": 2.5},
+                {"label": "U", "matrix": [2, 8], "x": 10, "y": 2.5},
+                {"label": "I", "matrix": [2, 9], "x": 11, "y": 2.5},
+                {"label": "O", "matrix": [2, 10], "x": 12, "y": 2.5},
+                {"label": "P", "matrix": [2, 11], "x": 13, "y": 2.5},
+                {"label": "{", "matrix": [2, 12], "x": 14, "y": 2.5},
+                {"label": "}", "matrix": [2, 13], "x": 15, "y": 2.5},
+                {"label": "|", "matrix": [2, 14], "x": 16, "y": 2.5},
+                {"label": "Page Up", "matrix": [2, 6], "x": 17, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "A", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5, "y": 3.5},
+
+                {"label": "Backspace", "matrix": [3, 6], "x": 6.75, "y": 3.5, "w": 1.5},
+
+                {"label": "H", "matrix": [3, 7], "x": 9, "y": 3.5},
+                {"label": "J", "matrix": [3, 8], "x": 10, "y": 3.5},
+                {"label": "K", "matrix": [3, 9], "x": 11, "y": 3.5},
+                {"label": "L", "matrix": [3, 10], "x": 12, "y": 3.5},
+                {"label": ":", "matrix": [3, 11], "x": 13, "y": 3.5},
+                {"label": "\"", "matrix": [3, 12], "x": 14, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 15, "y": 3.5, "w": 2},
+
+                {"label": "Page Down", "matrix": [3, 14], "x": 17, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "Z", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "X", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "C", "matrix": [4, 3], "x": 3, "y": 4.5},
+                {"label": "V", "matrix": [4, 4], "x": 4, "y": 4.5},
+                {"label": "B", "matrix": [4, 5], "x": 5, "y": 4.5},
+
+                {"label": "Enter", "matrix": [4, 6], "x": 6.5, "y": 4.5, "w": 2},
+
+                {"label": "N", "matrix": [4, 7], "x": 9, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 10, "y": 4.5},
+                {"label": "<", "matrix": [4, 9], "x": 11, "y": 4.5},
+                {"label": ">", "matrix": [4, 10], "x": 12, "y": 4.5},
+                {"label": "?", "matrix": [4, 11], "x": 13, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 14, "y": 4.5},
+
+                {"label": "Up", "matrix": [4, 13], "x": 16, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "Win", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2, "y": 5.5, "w": 2},
+                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 5.5, "w": 2},
+                {"label": "Ctrl", "matrix": [5, 5], "x": 6, "y": 5.5, "w": 1.5},
+                {"label": "Shift", "matrix": [5, 6], "x": 7.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 7], "x": 9, "y": 5.5, "w": 2},
+
+                {"label": "Alt", "matrix": [5, 9], "x": 11, "y": 5.5, "w": 2},
+                {"label": "Fn", "matrix": [5, 10], "x": 13, "y": 5.5},
+                {"label": "Ctrl", "matrix": [5, 11], "x": 14, "y": 5.5},
+                {"label": "Left", "matrix": [5, 12], "x": 15, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 16, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 17, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/xbows/knight/knight.c b/keyboards/xbows/knight/knight.c
index 377c79555d..5be49f9d6f 100644
--- a/keyboards/xbows/knight/knight.c
+++ b/keyboards/xbows/knight/knight.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 "knight.h"
+ #include "quantum.h"
  #ifdef RGB_MATRIX_ENABLE
  const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
diff --git a/keyboards/xbows/knight/knight.h b/keyboards/xbows/knight/knight.h
deleted file mode 100644
index a6497119ba..0000000000
--- a/keyboards/xbows/knight/knight.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Shulin Huang <mumu@x-bows.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,  \
-	K100, K101, K102, K103, K104, K105,       K107, K108, K109, K110, K111, K112, K113, K114,  \
-	K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, K213, K214, K206,  \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,  \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,        \
-	K500, K501, K502,       K504, K505, K506, K507,       K509, K510, K511, K512, K513, K514   \
-) \
-	{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, KC_NO,K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO}, \
-    { K500, K501, K502, KC_NO,K504, K505, K506, K507, KC_NO,K509, K510, K511, K512, K513, K514 }  \
-}
diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/info.json
index 837d292932..7aa1fe74f5 100644
--- a/keyboards/xbows/knight_plus/info.json
+++ b/keyboards/xbows/knight_plus/info.json
@@ -22,98 +22,111 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0, "w":2},
-                {"label":"Print Screen", "x":16, "y":0, "w":2},
-
-                {"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":9, "y":1.5},
-                {"label":"&", "x":10, "y":1.5},
-                {"label":"*", "x":11, "y":1.5},
-                {"label":"(", "x":12, "y":1.5},
-                {"label":")", "x":13, "y":1.5},
-                {"label":"_", "x":14, "y":1.5},
-                {"label":"+", "x":15, "y":1.5},
-                {"label":"Backspace", "x":16, "y":1.5, "w":2},
-
-                {"label":"Tab", "x":0, "y":2.5},
-                {"label":"Q", "x":1, "y":2.5},
-                {"label":"W", "x":2, "y":2.5},
-                {"label":"E", "x":3, "y":2.5},
-                {"label":"R", "x":4, "y":2.5},
-                {"label":"T", "x":5, "y":2.5},
-                {"label":"Y", "x":9, "y":2.5},
-                {"label":"U", "x":10, "y":2.5},
-                {"label":"I", "x":11, "y":2.5},
-                {"label":"O", "x":12, "y":2.5},
-                {"label":"P", "x":13, "y":2.5},
-                {"label":"{", "x":14, "y":2.5},
-                {"label":"}", "x":15, "y":2.5},
-                {"label":"|", "x":16, "y":2.5},
-                {"label":"Page Up", "x":17, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5},
-                {"label":"A", "x":1, "y":3.5},
-                {"label":"S", "x":2, "y":3.5},
-                {"label":"D", "x":3, "y":3.5},
-                {"label":"F", "x":4, "y":3.5},
-                {"label":"G", "x":5, "y":3.5},
-                {"label":"Backspace", "x":6.75, "y":3.5, "w":1.5},
-                {"label":"H", "x":9, "y":3.5},
-                {"label":"J", "x":10, "y":3.5},
-                {"label":"K", "x":11, "y":3.5},
-                {"label":"L", "x":12, "y":3.5},
-                {"label":":", "x":13, "y":3.5},
-                {"label":"\"", "x":14, "y":3.5},
-                {"label":"Enter", "x":15, "y":3.5, "w":2},
-                {"label":"Page Down", "x":17, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5},
-                {"label":"Z", "x":1, "y":4.5},
-                {"label":"X", "x":2, "y":4.5},
-                {"label":"C", "x":3, "y":4.5},
-                {"label":"V", "x":4, "y":4.5},
-                {"label":"B", "x":5, "y":4.5},
-                {"label":"Enter", "x":6.5, "y":4.5, "w":2},
-                {"label":"N", "x":9, "y":4.5},
-                {"label":"M", "x":10, "y":4.5},
-                {"label":"<", "x":11, "y":4.5},
-                {"label":">", "x":12, "y":4.5},
-                {"label":"?", "x":13, "y":4.5},
-                {"label":"Shift", "x":14, "y":4.5},
-                {"label":"Up", "x":16, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5},
-                {"label":"Win", "x":1, "y":5.5},
-                {"label":"Alt", "x":2, "y":5.5, "w":2},
-                {"label":"Space", "x":4, "y":5.5, "w":2},
-                {"label":"Ctrl", "x":6, "y":5.5, "w":1.5},
-                {"label":"Shift", "x":7.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":9, "y":5.5, "w":2},
-                {"label":"Alt", "x":11, "y":5.5, "w":2},
-                {"label":"Fn", "x":13, "y":5.5},
-                {"label":"Ctrl", "x":14, "y":5.5},
-                {"label":"Left", "x":15, "y":5.5},
-                {"label":"Down", "x":16, "y":5.5},
-                {"label":"Right", "x":17, "y":5.5}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
 
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 16, "y": 0, "w": 2},
+
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"label": "^", "matrix": [1, 7], "x": 9, "y": 1.5},
+                {"label": "&", "matrix": [1, 8], "x": 10, "y": 1.5},
+                {"label": "*", "matrix": [1, 9], "x": 11, "y": 1.5},
+                {"label": "(", "matrix": [1, 10], "x": 12, "y": 1.5},
+                {"label": ")", "matrix": [1, 11], "x": 13, "y": 1.5},
+                {"label": "_", "matrix": [1, 12], "x": 14, "y": 1.5},
+                {"label": "+", "matrix": [1, 13], "x": 15, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 14], "x": 16, "y": 1.5, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"label": "Y", "matrix": [2, 6], "x": 9, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 10, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 11, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 12, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 13, "y": 2.5},
+                {"label": "{", "matrix": [2, 11], "x": 14, "y": 2.5},
+                {"label": "}", "matrix": [2, 12], "x": 15, "y": 2.5},
+                {"label": "|", "matrix": [2, 13], "x": 16, "y": 2.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 17, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "A", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5, "y": 3.5},
+
+                {"label": "Backspace", "matrix": [3, 6], "x": 6.75, "y": 3.5, "w": 1.5},
+
+                {"label": "H", "matrix": [3, 7], "x": 9, "y": 3.5},
+                {"label": "J", "matrix": [3, 8], "x": 10, "y": 3.5},
+                {"label": "K", "matrix": [3, 9], "x": 11, "y": 3.5},
+                {"label": "L", "matrix": [3, 10], "x": 12, "y": 3.5},
+                {"label": ":", "matrix": [3, 11], "x": 13, "y": 3.5},
+                {"label": "\"", "matrix": [3, 12], "x": 14, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 15, "y": 3.5, "w": 2},
+
+                {"label": "Page Down", "matrix": [3, 14], "x": 17, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "Z", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "X", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "C", "matrix": [4, 3], "x": 3, "y": 4.5},
+                {"label": "V", "matrix": [4, 4], "x": 4, "y": 4.5},
+                {"label": "B", "matrix": [4, 5], "x": 5, "y": 4.5},
+
+                {"label": "Enter", "matrix": [4, 6], "x": 6.5, "y": 4.5, "w": 2},
+
+                {"label": "N", "matrix": [4, 7], "x": 9, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 10, "y": 4.5},
+                {"label": "<", "matrix": [4, 9], "x": 11, "y": 4.5},
+                {"label": ">", "matrix": [4, 10], "x": 12, "y": 4.5},
+                {"label": "?", "matrix": [4, 11], "x": 13, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 14, "y": 4.5},
+
+                {"label": "Up", "matrix": [4, 13], "x": 16, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "Win", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2, "y": 5.5, "w": 2},
+                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 5.5, "w": 2},
+                {"label": "Ctrl", "matrix": [5, 5], "x": 6, "y": 5.5, "w": 1.5},
+                {"label": "Shift", "matrix": [5, 6], "x": 7.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 7], "x": 9, "y": 5.5, "w": 2},
+
+                {"label": "Alt", "matrix": [5, 9], "x": 11, "y": 5.5, "w": 2},
+                {"label": "Fn", "matrix": [5, 10], "x": 13, "y": 5.5},
+                {"label": "Ctrl", "matrix": [5, 11], "x": 14, "y": 5.5},
+                {"label": "Left", "matrix": [5, 12], "x": 15, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 16, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 17, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/xbows/knight_plus/knight_plus.c b/keyboards/xbows/knight_plus/knight_plus.c
index 2c377aaf51..ce718d22a5 100644
--- a/keyboards/xbows/knight_plus/knight_plus.c
+++ b/keyboards/xbows/knight_plus/knight_plus.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 "knight_plus.h"
+ #include "quantum.h"
  #ifdef RGB_MATRIX_ENABLE
  const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
diff --git a/keyboards/xbows/knight_plus/knight_plus.h b/keyboards/xbows/knight_plus/knight_plus.h
deleted file mode 100644
index 735c3d051e..0000000000
--- a/keyboards/xbows/knight_plus/knight_plus.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Shulin Huang <mumu@x-bows.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,  \
-	K100, K101, K102, K103, K104, K105,       K107, K108, K109, K110, K111, K112, K113, K114,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,  \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,  \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,        \
-	K500, K501, K502,       K504, K505, K506, K507,       K509, K510, K511, K512, K513, K514   \
-) \
-	{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, KC_NO,K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO}, \
-    { K500, K501, K502, KC_NO,K504, K505, K506, K507, KC_NO,K509, K510, K511, K512, K513, K514 }  \
-}
diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/info.json
index fdabd72f32..0287c13ee4 100644
--- a/keyboards/xbows/nature/info.json
+++ b/keyboards/xbows/nature/info.json
@@ -22,98 +22,109 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0, "w":2},
-                {"label":"Print Screen", "x":16, "y":0, "w":2},
-
-                {"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":9, "y":1.5},
-                {"label":"&", "x":10, "y":1.5},
-                {"label":"*", "x":11, "y":1.5},
-                {"label":"(", "x":12, "y":1.5},
-                {"label":")", "x":13, "y":1.5},
-                {"label":"_", "x":14, "y":1.5},
-                {"label":"+", "x":15, "y":1.5},
-                {"label":"Backspace", "x":16, "y":1.5, "w":2},
-
-                {"label":"Tab", "x":0, "y":2.5},
-                {"label":"Q", "x":1, "y":2.5},
-                {"label":"W", "x":2, "y":2.5},
-                {"label":"E", "x":3, "y":2.5},
-                {"label":"R", "x":4, "y":2.5},
-                {"label":"T", "x":5, "y":2.5},
-                {"label":"Y", "x":9, "y":2.5},
-                {"label":"U", "x":10, "y":2.5},
-                {"label":"I", "x":11, "y":2.5},
-                {"label":"O", "x":12, "y":2.5},
-                {"label":"P", "x":13, "y":2.5},
-                {"label":"{", "x":14, "y":2.5},
-                {"label":"}", "x":15, "y":2.5},
-                {"label":"|", "x":16, "y":2.5},
-                {"label":"Page Up", "x":17, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5},
-                {"label":"A", "x":1, "y":3.5},
-                {"label":"S", "x":2, "y":3.5},
-                {"label":"D", "x":3, "y":3.5},
-                {"label":"F", "x":4, "y":3.5},
-                {"label":"G", "x":5, "y":3.5},
-                {"label":"Backspace", "x":6, "y":3.5, "w":3},
-                {"label":"H", "x":9, "y":3.5},
-                {"label":"J", "x":10, "y":3.5},
-                {"label":"K", "x":11, "y":3.5},
-                {"label":"L", "x":12, "y":3.5},
-                {"label":":", "x":13, "y":3.5},
-                {"label":"\"", "x":14, "y":3.5},
-                {"label":"Enter", "x":15, "y":3.5, "w":2},
-                {"label":"Page Down", "x":17, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5},
-                {"label":"Z", "x":1, "y":4.5},
-                {"label":"X", "x":2, "y":4.5},
-                {"label":"C", "x":3, "y":4.5},
-                {"label":"V", "x":4, "y":4.5},
-                {"label":"B", "x":5, "y":4.5},
-                {"label":"Enter", "x":6, "y":4.5, "w":3},
-                {"label":"N", "x":9, "y":4.5},
-                {"label":"M", "x":10, "y":4.5},
-                {"label":"<", "x":11, "y":4.5},
-                {"label":">", "x":12, "y":4.5},
-                {"label":"?", "x":13, "y":4.5},
-                {"label":"Shift", "x":14, "y":4.5},
-                {"label":"Up", "x":16, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5},
-                {"label":"Win", "x":1, "y":5.5},
-                {"label":"Alt", "x":2, "y":5.5, "w":2},
-                {"label":"Space", "x":4, "y":5.5, "w":2},
-                {"label":"Ctrl", "x":6, "y":5.5, "w":1.5},
-                {"label":"Shift", "x":7.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":9, "y":5.5, "w":2},
-                {"label":"Alt", "x":11, "y":5.5, "w":2},
-                {"label":"Fn", "x":13, "y":5.5},
-                {"label":"Ctrl", "x":14, "y":5.5},
-                {"label":"Left", "x":15, "y":5.5},
-                {"label":"Down", "x":16, "y":5.5},
-                {"label":"Right", "x":17, "y":5.5}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
 
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 16, "y": 0, "w": 2},
+
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"label": "^", "matrix": [1, 7], "x": 9, "y": 1.5},
+                {"label": "&", "matrix": [1, 8], "x": 10, "y": 1.5},
+                {"label": "*", "matrix": [1, 9], "x": 11, "y": 1.5},
+                {"label": "(", "matrix": [1, 10], "x": 12, "y": 1.5},
+                {"label": ")", "matrix": [1, 11], "x": 13, "y": 1.5},
+                {"label": "_", "matrix": [1, 12], "x": 14, "y": 1.5},
+                {"label": "+", "matrix": [1, 13], "x": 15, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 14], "x": 16, "y": 1.5, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"label": "Y", "matrix": [2, 7], "x": 9, "y": 2.5},
+                {"label": "U", "matrix": [2, 8], "x": 10, "y": 2.5},
+                {"label": "I", "matrix": [2, 9], "x": 11, "y": 2.5},
+                {"label": "O", "matrix": [2, 10], "x": 12, "y": 2.5},
+                {"label": "P", "matrix": [2, 11], "x": 13, "y": 2.5},
+                {"label": "{", "matrix": [2, 12], "x": 14, "y": 2.5},
+                {"label": "}", "matrix": [2, 13], "x": 15, "y": 2.5},
+                {"label": "|", "matrix": [2, 14], "x": 16, "y": 2.5},
+                {"label": "Page Up", "matrix": [2, 6], "x": 17, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "A", "matrix": [3, 1], "x": 1, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5, "y": 3.5},
+                {"label": "Backspace", "matrix": [3, 6], "x": 6, "y": 3.5, "w": 3},
+
+                {"label": "H", "matrix": [3, 7], "x": 9, "y": 3.5},
+                {"label": "J", "matrix": [3, 8], "x": 10, "y": 3.5},
+                {"label": "K", "matrix": [3, 9], "x": 11, "y": 3.5},
+                {"label": "L", "matrix": [3, 10], "x": 12, "y": 3.5},
+                {"label": ":", "matrix": [3, 11], "x": 13, "y": 3.5},
+                {"label": "\"", "matrix": [3, 12], "x": 14, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 13], "x": 15, "y": 3.5, "w": 2},
+
+                {"label": "Page Down", "matrix": [3, 14], "x": 17, "y": 3.5},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5},
+                {"label": "Z", "matrix": [4, 1], "x": 1, "y": 4.5},
+                {"label": "X", "matrix": [4, 2], "x": 2, "y": 4.5},
+                {"label": "C", "matrix": [4, 3], "x": 3, "y": 4.5},
+                {"label": "V", "matrix": [4, 4], "x": 4, "y": 4.5},
+                {"label": "B", "matrix": [4, 5], "x": 5, "y": 4.5},
+                {"label": "Enter", "matrix": [4, 6], "x": 6, "y": 4.5, "w": 3},
+
+                {"label": "N", "matrix": [4, 7], "x": 9, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 10, "y": 4.5},
+                {"label": "<", "matrix": [4, 9], "x": 11, "y": 4.5},
+                {"label": ">", "matrix": [4, 10], "x": 12, "y": 4.5},
+                {"label": "?", "matrix": [4, 11], "x": 13, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 14, "y": 4.5},
+
+                {"label": "Up", "matrix": [4, 13], "x": 16, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5},
+                {"label": "Win", "matrix": [5, 1], "x": 1, "y": 5.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2, "y": 5.5, "w": 2},
+                {"label": "Space", "matrix": [5, 4], "x": 4, "y": 5.5, "w": 2},
+                {"label": "Ctrl", "matrix": [5, 5], "x": 6, "y": 5.5, "w": 1.5},
+                {"label": "Shift", "matrix": [5, 6], "x": 7.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 7], "x": 9, "y": 5.5, "w": 2},
+
+                {"label": "Alt", "matrix": [5, 9], "x": 11, "y": 5.5, "w": 2},
+                {"label": "Fn", "matrix": [5, 10], "x": 13, "y": 5.5},
+                {"label": "Ctrl", "matrix": [5, 11], "x": 14, "y": 5.5},
+                {"label": "Left", "matrix": [5, 12], "x": 15, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 16, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 17, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/xbows/nature/nature.c b/keyboards/xbows/nature/nature.c
index faa8492123..da0cb54a60 100644
--- a/keyboards/xbows/nature/nature.c
+++ b/keyboards/xbows/nature/nature.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 "nature.h"
+ #include "quantum.h"
  #ifdef RGB_MATRIX_ENABLE
  const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
diff --git a/keyboards/xbows/nature/nature.h b/keyboards/xbows/nature/nature.h
deleted file mode 100644
index 02e1af5205..0000000000
--- a/keyboards/xbows/nature/nature.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 Shulin Huang <mumu@x-bows.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,  \
-	K100, K101, K102, K103, K104, K105,       K107, K108, K109, K110, K111, K112, K113, K114,  \
-	K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, K213, K214, K206,  \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,  \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,        \
-	K500, K501, K502,       K504, K505, K506, K507,       K509, K510, K511, K512, K513, K514   \
-) \
-	{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, KC_NO,K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO}, \
-    { K500, K501, K502, KC_NO,K504, K505, K506, K507, KC_NO,K509, K510, K511, K512, K513, K514 }  \
-}
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
index add3a33014..437563ac99 100644
--- a/keyboards/xbows/woody/info.json
+++ b/keyboards/xbows/woody/info.json
@@ -21,7 +21,79 @@
     "debounce": 3,
     "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, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":6.25}, {"x":10.25, "y":4, "w":1.5}, {"x":11.75, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c
index 1f85907f95..9757bde9c9 100644
--- a/keyboards/xbows/woody/woody.c
+++ b/keyboards/xbows/woody/woody.c
@@ -1,4 +1,4 @@
-#include "woody.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
diff --git a/keyboards/xbows/woody/woody.h b/keyboards/xbows/woody/woody.h
deleted file mode 100644
index 48eab82a68..0000000000
--- a/keyboards/xbows/woody/woody.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#define XXX KC_NO
-#include "quantum.h"
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D, K3E, \
-    K40, K41, K42,                K46,           K49,      K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E }  \
-}