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

8 files changed, 298 insertions, 354 deletions

diff --git a/keyboards/kudox/columner/columner.h b/keyboards/kudox/columner/columner.h
deleted file mode 100644
index dcc745ddb7..0000000000
--- a/keyboards/kudox/columner/columner.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06,            R06, R05, R04, R03, R02, R01, R00, \
-  L10, L11, L12, L13, L14, L15, L16,            R16, R15, R14, R13, R12, R11, R10, \
-  L20, L21, L22, L23, L24, L25,                      R25, R24, R23, R22, R21, R20, \
-  L30, L31, L32, L33, L34, L35,                      R35, R34, R33, R32, R31, R30, \
-  L40, L41, L42, L43, L44, L45, L46,            R46, R45, R44, R43, R42, R41, R40  \
-) \
-{ \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { R00, R01, R02, R03, R04, R05, R06 }, \
-    { R10, R11, R12, R13, R14, R15, R16 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, R43, R44, R45, R46 } \
-}
diff --git a/keyboards/kudox/columner/info.json b/keyboards/kudox/columner/info.json
index 75d5c77bc8..7c106b1448 100644
--- a/keyboards/kudox/columner/info.json
+++ b/keyboards/kudox/columner/info.json
@@ -24,72 +24,81 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0.5, "w":1.25},
-                {"label":"1", "x":1.25, "y":0.5},
-                {"label":"2", "x":2.25, "y":0.25},
-                {"label":"3", "x":3.25, "y":0},
-                {"label":"4", "x":4.25, "y":0.25},
-                {"label":"5", "x":5.25, "y":0.5},
-                {"label":"{", "x":6.25, "y":1.25, "h":1.25},
-                {"label":"}", "x":10, "y":1.25, "h":1.25},
-                {"label":"6", "x":11, "y":0.5},
-                {"label":"7", "x":12, "y":0.25},
-                {"label":"8", "x":13, "y":0},
-                {"label":"9", "x":14, "y":0.25},
-                {"label":"0", "x":15, "y":0.5},
-                {"label":"\u2190", "x":16, "y":0.5, "w":1.25},
-                {"label":"Tab", "x":0, "y":1.5, "w":1.25},
-                {"label":"Q", "x":1.25, "y":1.5},
-                {"label":"W", "x":2.25, "y":1.25},
-                {"label":"E", "x":3.25, "y":1},
-                {"label":"R", "x":4.25, "y":1.25},
-                {"label":"T", "x":5.25, "y":1.5},
-                {"label":"-", "x":6.25, "y":2.5, "h":1.25},
-                {"label":"=", "x":10, "y":2.5, "h":1.25},
-                {"label":"Y", "x":11, "y":1.5},
-                {"label":"U", "x":12, "y":1.25},
-                {"label":"I", "x":13, "y":1},
-                {"label":"O", "x":14, "y":1.25},
-                {"label":"P", "x":15, "y":1.5},
-                {"label":"\\", "x":16, "y":1.5, "w":1.25},
-                {"label":"Ctrl", "x":0, "y":2.5, "w":1.25},
-                {"label":"A", "x":1.25, "y":2.5},
-                {"label":"S", "x":2.25, "y":2.25},
-                {"label":"D", "x":3.25, "y":2},
-                {"label":"F", "x":4.25, "y":2.25},
-                {"label":"G", "x":5.25, "y":2.5},
-                {"label":"H", "x":11, "y":2.5},
-                {"label":"J", "x":12, "y":2.25},
-                {"label":"K", "x":13, "y":2},
-                {"label":"L", "x":14, "y":2.25},
-                {"label":";", "x":15, "y":2.5},
-                {"label":"Enter", "x":16, "y":2.5, "w":1.25},
-                {"label":"Shift", "x":0, "y":3.5, "w":1.25},
-                {"label":"Z", "x":1.25, "y":3.5},
-                {"label":"X", "x":2.25, "y":3.25},
-                {"label":"C", "x":3.25, "y":3},
-                {"label":"V", "x":4.25, "y":3.25},
-                {"label":"B", "x":5.25, "y":3.5},
-                {"label":"N", "x":11, "y":3.5},
-                {"label":"M", "x":12, "y":3.25},
-                {"label":",", "x":13, "y":3},
-                {"label":".", "x":14, "y":3.25},
-                {"label":"/", "x":15, "y":3.5},
-                {"label":"Shift", "x":16, "y":3.5, "w":1.25},
-                {"label":"Alt", "x":0, "y":4.5, "w":1.25},
-                {"label":"'", "x":1.25, "y":4.5},
-                {"label":"~", "x":2.25, "y":4.25},
-                {"label":"Del", "x":3.25, "y":4},
-                {"label":"LANG2", "x":4.25, "y":4.5},
-                {"label":"GUI", "x":5.25, "y":4.75},
-                {"label":"Space", "x":6.25, "y":5},
-                {"label":"Space", "x":10, "y":5},
-                {"label":"GUI", "x":11, "y":4.75},
-                {"label":"LANG1", "x":12, "y":4.5},
-                {"label":"\u2190", "x":13, "y":4},
-                {"label":"\u2193", "x":14, "y":4.25},
-                {"label":"\u2191", "x":15, "y":4.5},
-                {"label":"\u2192", "x":16, "y":4.5, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0.5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0.5},
+                {"matrix": [0, 2], "x": 2.25, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 0.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25, "h": 1.25},
+
+                {"matrix": [5, 6], "x": 10, "y": 1.25, "h": 1.25},
+                {"matrix": [5, 5], "x": 11, "y": 0.5},
+                {"matrix": [5, 4], "x": 12, "y": 0.25},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0.25},
+                {"matrix": [5, 1], "x": 15, "y": 0.5},
+                {"matrix": [5, 0], "x": 16, "y": 0.5, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.25, "y": 2.5, "h": 1.25},
+
+                {"matrix": [6, 6], "x": 10, "y": 2.5, "h": 1.25},
+                {"matrix": [6, 5], "x": 11, "y": 1.5},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1.25},
+                {"matrix": [6, 1], "x": 15, "y": 1.5},
+                {"matrix": [6, 0], "x": 16, "y": 1.5, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.5},
+
+                {"matrix": [7, 5], "x": 11, "y": 2.5},
+                {"matrix": [7, 4], "x": 12, "y": 2.25},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2.25},
+                {"matrix": [7, 1], "x": 15, "y": 2.5},
+                {"matrix": [7, 0], "x": 16, "y": 2.5, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.5},
+
+                {"matrix": [8, 5], "x": 11, "y": 3.5},
+                {"matrix": [8, 4], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3.25},
+                {"matrix": [8, 1], "x": 15, "y": 3.5},
+                {"matrix": [8, 0], "x": 16, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.75},
+                {"matrix": [4, 6], "x": 6.25, "y": 5},
+
+                {"matrix": [9, 6], "x": 10, "y": 5},
+                {"matrix": [9, 5], "x": 11, "y": 4.75},
+                {"matrix": [9, 4], "x": 12, "y": 4.5},
+                {"matrix": [9, 3], "x": 13, "y": 4},
+                {"matrix": [9, 2], "x": 14, "y": 4.25},
+                {"matrix": [9, 1], "x": 15, "y": 4.5},
+                {"matrix": [9, 0], "x": 16, "y": 4.5, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kudox/rev1/info.json
index c5a9427933..efb55bb989 100644
--- a/keyboards/kudox/rev1/info.json
+++ b/keyboards/kudox/rev1/info.json
@@ -24,70 +24,79 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":11, "y":0},
-                {"label":"7", "x":12, "y":0},
-                {"label":"8", "x":13, "y":0},
-                {"label":"9", "x":14, "y":0},
-                {"label":"0", "x":15, "y":0},
-                {"label":"\u2190", "x":16, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"Q", "x":1.25, "y":1},
-                {"label":"W", "x":2.25, "y":1},
-                {"label":"E", "x":3.25, "y":1},
-                {"label":"R", "x":4.25, "y":1},
-                {"label":"T", "x":5.25, "y":1},
-                {"label":"LANG2", "x":6.25, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"/", "x":14.75, "y":1},
-                {"label":"\\", "x":15.75, "y":1, "w":1.25},
-                {"label":"Ctrl", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":";", "x":14.25, "y":2},
-                {"label":"Enter", "x":15.25, "y":2, "w":1.75},
-                {"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":"LANG1", "x":9.75, "y":3},
-                {"label":"N", "x":10.75, "y":3},
-                {"label":"M", "x":11.75, "y":3},
-                {"label":",", "x":12.75, "y":3},
-                {"label":".", "x":13.75, "y":3},
-                {"label":"Shift", "x":14.75, "y":3, "w":2.25},
-                {"label":"Alt", "x":0, "y":4, "w":1.25},
-                {"label":"'", "x":1.25, "y":4},
-                {"label":"-", "x":2.25, "y":4},
-                {"label":"=", "x":3.25, "y":4},
-                {"label":"layer", "x":4.25, "y":4.33, "w":1.25},
-                {"label":"GUI", "x":5.5, "y":4.67},
-                {"label":"Space", "x":6.5, "y":5},
-                {"label":"Enter", "x":9.5, "y":5},
-                {"label":"Del", "x":10.5, "y":4.67},
-                {"label":"layer", "x":11.5, "y":4.33, "w":1.25},
-                {"label":"\u2190", "x":12.75, "y":4},
-                {"label":"\u2193", "x":13.75, "y":4},
-                {"label":"\u2191", "x":14.75, "y":4},
-                {"label":"\u2192", "x":15.75, "y":4, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 1], "x": 15, "y": 0},
+                {"matrix": [5, 0], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 5], "x": 10.25, "y": 2},
+                {"matrix": [7, 4], "x": 11.25, "y": 2},
+                {"matrix": [7, 3], "x": 12.25, "y": 2},
+                {"matrix": [7, 2], "x": 13.25, "y": 2},
+                {"matrix": [7, 1], "x": 14.25, "y": 2},
+                {"matrix": [7, 0], "x": 15.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 5], "x": 9.75, "y": 3},
+                {"matrix": [8, 4], "x": 10.75, "y": 3},
+                {"matrix": [8, 3], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 1], "x": 13.75, "y": 3},
+                {"matrix": [8, 0], "x": 14.75, "y": 3, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.33, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.67},
+                {"matrix": [4, 6], "x": 6.5, "y": 5},
+
+                {"matrix": [9, 6], "x": 9.5, "y": 5},
+                {"matrix": [9, 5], "x": 10.5, "y": 4.67},
+                {"matrix": [9, 4], "x": 11.5, "y": 4.33, "w": 1.25},
+                {"matrix": [9, 3], "x": 12.75, "y": 4},
+                {"matrix": [9, 2], "x": 13.75, "y": 4},
+                {"matrix": [9, 1], "x": 14.75, "y": 4},
+                {"matrix": [9, 0], "x": 15.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/kudox/rev1/rev1.h b/keyboards/kudox/rev1/rev1.h
deleted file mode 100644
index 82373daa6f..0000000000
--- a/keyboards/kudox/rev1/rev1.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05,                      R05, R04, R03, R02, R01, R00, \
-  L10, L11, L12, L13, L14, L15, L16,            R16, R15, R14, R13, R12, R11, R10, \
-  L20, L21, L22, L23, L24, L25,                      R25, R24, R23, R22, R21, R20, \
-  L30, L31, L32, L33, L34, L35,                      R35, R34, R33, R32, R31, R30, \
-  L40, L41, L42, L43, L44, L45, L46,            R46, R45, R44, R43, R42, R41, R40  \
-) \
-{ \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15, R16 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, R43, R44, R45, R46 } \
-}
diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kudox/rev2/info.json
index 858f28988d..9dab738c38 100644
--- a/keyboards/kudox/rev2/info.json
+++ b/keyboards/kudox/rev2/info.json
@@ -24,72 +24,81 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"`", "x":6, "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":"\u2190", "x":16, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"Q", "x":1.25, "y":1},
-                {"label":"W", "x":2.25, "y":1},
-                {"label":"E", "x":3.25, "y":1},
-                {"label":"R", "x":4.25, "y":1},
-                {"label":"T", "x":5.25, "y":1},
-                {"label":"LANG2", "x":6.25, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"/", "x":14.75, "y":1},
-                {"label":"\\", "x":15.75, "y":1, "w":1.25},
-                {"label":"Ctrl", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":";", "x":14.25, "y":2},
-                {"label":"Enter", "x":15.25, "y":2, "w":1.75},
-                {"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":"LANG1", "x":9.75, "y":3},
-                {"label":"N", "x":10.75, "y":3},
-                {"label":"M", "x":11.75, "y":3},
-                {"label":",", "x":12.75, "y":3},
-                {"label":".", "x":13.75, "y":3},
-                {"label":"Shift", "x":14.75, "y":3, "w":2.25},
-                {"label":"Alt", "x":0, "y":4, "w":1.25},
-                {"label":"'", "x":1.25, "y":4},
-                {"label":"-", "x":2.25, "y":4},
-                {"label":"=", "x":3.25, "y":4},
-                {"label":"layer", "x":4.25, "y":4.33, "w":1.25},
-                {"label":"GUI", "x":5.5, "y":4.67},
-                {"label":"Space", "x":6.5, "y":5},
-                {"label":"Enter", "x":9.5, "y":5},
-                {"label":"Del", "x":10.5, "y":4.67},
-                {"label":"layer", "x":11.5, "y":4.33, "w":1.25},
-                {"label":"\u2190", "x":12.75, "y":4},
-                {"label":"\u2193", "x":13.75, "y":4},
-                {"label":"\u2191", "x":14.75, "y":4},
-                {"label":"\u2192", "x":15.75, "y":4, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [5, 6], "x": 10, "y": 0},
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 1], "x": 15, "y": 0},
+                {"matrix": [5, 0], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 5], "x": 10.25, "y": 2},
+                {"matrix": [7, 4], "x": 11.25, "y": 2},
+                {"matrix": [7, 3], "x": 12.25, "y": 2},
+                {"matrix": [7, 2], "x": 13.25, "y": 2},
+                {"matrix": [7, 1], "x": 14.25, "y": 2},
+                {"matrix": [7, 0], "x": 15.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 5], "x": 9.75, "y": 3},
+                {"matrix": [8, 4], "x": 10.75, "y": 3},
+                {"matrix": [8, 3], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 1], "x": 13.75, "y": 3},
+                {"matrix": [8, 0], "x": 14.75, "y": 3, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.33, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.67},
+                {"matrix": [4, 6], "x": 6.5, "y": 5},
+
+                {"matrix": [9, 6], "x": 9.5, "y": 5},
+                {"matrix": [9, 5], "x": 10.5, "y": 4.67},
+                {"matrix": [9, 4], "x": 11.5, "y": 4.33, "w": 1.25},
+                {"matrix": [9, 3], "x": 12.75, "y": 4},
+                {"matrix": [9, 2], "x": 13.75, "y": 4},
+                {"matrix": [9, 1], "x": 14.75, "y": 4},
+                {"matrix": [9, 0], "x": 15.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/kudox/rev2/rev2.h b/keyboards/kudox/rev2/rev2.h
deleted file mode 100644
index dcc745ddb7..0000000000
--- a/keyboards/kudox/rev2/rev2.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06,            R06, R05, R04, R03, R02, R01, R00, \
-  L10, L11, L12, L13, L14, L15, L16,            R16, R15, R14, R13, R12, R11, R10, \
-  L20, L21, L22, L23, L24, L25,                      R25, R24, R23, R22, R21, R20, \
-  L30, L31, L32, L33, L34, L35,                      R35, R34, R33, R32, R31, R30, \
-  L40, L41, L42, L43, L44, L45, L46,            R46, R45, R44, R43, R42, R41, R40  \
-) \
-{ \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { R00, R01, R02, R03, R04, R05, R06 }, \
-    { R10, R11, R12, R13, R14, R15, R16 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, R43, R44, R45, R46 } \
-}
diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kudox/rev3/info.json
index d3abd78b62..a7e73c84ae 100644
--- a/keyboards/kudox/rev3/info.json
+++ b/keyboards/kudox/rev3/info.json
@@ -24,72 +24,81 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"`", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":10, "y":0},
-                {"label":"8", "x":11, "y":0},
-                {"label":"9", "x":12, "y":0},
-                {"label":"0", "x":13, "y":0},
-                {"label":"-", "x":14, "y":0},
-                {"label":"=", "x":15, "y":0},
-                {"label":"\u2190", "x":16, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"Q", "x":1.25, "y":1},
-                {"label":"W", "x":2.25, "y":1},
-                {"label":"E", "x":3.25, "y":1},
-                {"label":"R", "x":4.25, "y":1},
-                {"label":"T", "x":5.25, "y":1},
-                {"label":"Esc", "x":6.25, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"'", "x":14.75, "y":1},
-                {"label":"\\", "x":15.75, "y":1, "w":1.25},
-                {"label":"Ctrl", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":";", "x":14.25, "y":2},
-                {"label":"Enter", "x":15.25, "y":2, "w":1.75},
-                {"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":9.75, "y":3},
-                {"label":"M", "x":10.75, "y":3},
-                {"label":",", "x":11.75, "y":3},
-                {"label":".", "x":12.75, "y":3},
-                {"label":"/", "x":13.75, "y":3},
-                {"label":"Shift", "x":14.75, "y":3, "w":2.25},
-                {"label":"Alt", "x":0, "y":4, "w":1.25},
-                {"label":"[", "x":1.25, "y":4},
-                {"label":"]", "x":2.25, "y":4},
-                {"label":"LANG2", "x":3.25, "y":4},
-                {"label":"Enter", "x":4.25, "y":4.33, "w":1.25},
-                {"label":"GUI", "x":5.5, "y":4.67},
-                {"label":"Space", "x":6.5, "y":5},
-                {"label":"Space", "x":9.5, "y":5},
-                {"label":"GUI", "x":10.5, "y":4.67},
-                {"label":"LANG1", "x":11.5, "y":4.33, "w":1.25},
-                {"label":"\u2190", "x":12.75, "y":4},
-                {"label":"\u2193", "x":13.75, "y":4},
-                {"label":"\u2191", "x":14.75, "y":4},
-                {"label":"\u2192", "x":15.75, "y":4, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [5, 6], "x": 10, "y": 0},
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 1], "x": 15, "y": 0},
+                {"matrix": [5, 0], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+
+                {"matrix": [6, 6], "x": 9.75, "y": 1},
+                {"matrix": [6, 5], "x": 10.75, "y": 1},
+                {"matrix": [6, 4], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1},
+                {"matrix": [6, 1], "x": 14.75, "y": 1},
+                {"matrix": [6, 0], "x": 15.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [7, 5], "x": 10.25, "y": 2},
+                {"matrix": [7, 4], "x": 11.25, "y": 2},
+                {"matrix": [7, 3], "x": 12.25, "y": 2},
+                {"matrix": [7, 2], "x": 13.25, "y": 2},
+                {"matrix": [7, 1], "x": 14.25, "y": 2},
+                {"matrix": [7, 0], "x": 15.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 5], "x": 9.75, "y": 3},
+                {"matrix": [8, 4], "x": 10.75, "y": 3},
+                {"matrix": [8, 3], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 1], "x": 13.75, "y": 3},
+                {"matrix": [8, 0], "x": 14.75, "y": 3, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.33, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.67},
+                {"matrix": [4, 6], "x": 6.5, "y": 5},
+
+                {"matrix": [9, 6], "x": 9.5, "y": 5},
+                {"matrix": [9, 5], "x": 10.5, "y": 4.67},
+                {"matrix": [9, 4], "x": 11.5, "y": 4.33, "w": 1.25},
+                {"matrix": [9, 3], "x": 12.75, "y": 4},
+                {"matrix": [9, 2], "x": 13.75, "y": 4},
+                {"matrix": [9, 1], "x": 14.75, "y": 4},
+                {"matrix": [9, 0], "x": 15.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/kudox/rev3/rev3.h b/keyboards/kudox/rev3/rev3.h
deleted file mode 100644
index dcc745ddb7..0000000000
--- a/keyboards/kudox/rev3/rev3.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06,            R06, R05, R04, R03, R02, R01, R00, \
-  L10, L11, L12, L13, L14, L15, L16,            R16, R15, R14, R13, R12, R11, R10, \
-  L20, L21, L22, L23, L24, L25,                      R25, R24, R23, R22, R21, R20, \
-  L30, L31, L32, L33, L34, L35,                      R35, R34, R33, R32, R31, R30, \
-  L40, L41, L42, L43, L44, L45, L46,            R46, R45, R44, R43, R42, R41, R40  \
-) \
-{ \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { R00, R01, R02, R03, R04, R05, R06 }, \
-    { R10, R11, R12, R13, R14, R15, R16 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, R41, R42, R43, R44, R45, R46 } \
-}