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

8 files changed, 363 insertions, 421 deletions

diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json
index 3d99357320..345fdba511 100644
--- a/keyboards/kabedon/kabedon78s/info.json
+++ b/keyboards/kabedon/kabedon78s/info.json
@@ -21,111 +21,134 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"label":"Esc", "x":1.5, "y":0}, 
-			{"label":"F1", "x":3.5, "y":0}, 
-			{"label":"F2", "x":4.5, "y":0}, 
-			{"label":"F3", "x":5.5, "y":0}, 
-			{"label":"F4", "x":6.5, "y":0}, 
-			{"label":"F5", "x":8, "y":0}, 
-			{"label":"F6", "x":10, "y":0}, 
-			{"label":"F7", "x":11, "y":0}, 
-			{"label":"F8", "x":12, "y":0}, 
-			{"label":"F9", "x":13.5, "y":0},
-			{"label":"F10", "x":14.5, "y":0},
-			{"label":"F11", "x":15.5, "y":0}, 
-			{"label":"F12", "x":16.5, "y":0}, 
-			{"label":"Delete", "x":18.25, "y":0},
-			{"label":"Home", "x":19.25, "y":0},
-			{"label":"PgUp", "x":20.25, "y":0}, 
-			{"label":"PgDn", "x":21.25, "y":0}, 
-			{"label":"Insert", "x":0, "y":1.25},
-			{"label":"~", "x":1.5, "y":1.25}, 
-			{"label":"!", "x":2.5, "y":1.25}, 
-			{"label":"@", "x":3.5, "y":1.25}, 
-			{"label":"#", "x":4.5, "y":1.25}, 
-			{"label":"$", "x":5.5, "y":1.25}, 
-			{"label":"%", "x":6.5, "y":1.25}, 
-			{"label":"^", "x":7.5, "y":1.25}, 
-			{"label":"&", "x":9.5, "y":1.25}, 
-			{"label":"*", "x":10.5, "y":1.25}, 
-			{"label":"(", "x":11.5, "y":1.25}, 
-			{"label":")", "x":12.5, "y":1.25}, 
-			{"label":"_", "x":13.5, "y":1.25}, 
-			{"label":"+", "x":14.5, "y":1.25}, 
-			{"label":"Backspace", "x":15.5, "y":1.25, "w":2}, 
-			{"label":"Num Lock", "x":18.25, "y":1.25}, 
-			{"label":"/", "x":19.25, "y":1.25}, 
-			{"label":"*", "x":20.25, "y":1.25}, 
-			{"label":"-", "x":21.25, "y":1.25}, 
-			{"label":"Pause", "x":0, "y":2.25}, 
-			{"label":"Tab", "x":1.5, "y":2.25, "w":1.5}, 
-			{"label":"Q", "x":3, "y":2.25}, 
-			{"label":"W", "x":4, "y":2.25}, 
-			{"label":"E", "x":5, "y":2.25}, 
-			{"label":"R", "x":6, "y":2.25}, 
-			{"label":"T", "x":7, "y":2.25}, 
-			{"label":"Y", "x":9, "y":2.25}, 
-			{"label":"U", "x":10, "y":2.25}, 
-			{"label":"I", "x":11, "y":2.25}, 
-			{"label":"O", "x":12, "y":2.25}, 
-			{"label":"P", "x":13, "y":2.25}, 
-			{"label":"{", "x":14, "y":2.25}, 
-			{"label":"}", "x":15, "y":2.25}, 
-			{"label":"|", "x":16, "y":2.25, "w":1.5}, 
-			{"label":"7", "x":18.25, "y":2.25}, 
-			{"label":"8", "x":19.25, "y":2.25}, 
-			{"label":"9", "x":20.25, "y":2.25}, 
-			{"label":"+", "x":21.25, "y":2.25, "h":2}, 
-			{"label":"ScrLk", "x":0, "y":3.25}, 
-			{"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75}, 
-			{"label":"A", "x":3.25, "y":3.25}, 
-			{"label":"S", "x":4.25, "y":3.25}, 
-			{"label":"D", "x":5.25, "y":3.25}, 
-			{"label":"F", "x":6.25, "y":3.25}, 
-			{"label":"G", "x":7.25, "y":3.25}, 
-			{"label":"H", "x":9.25, "y":3.25}, 
-			{"label":"J", "x":10.25, "y":3.25}, 
-			{"label":"K", "x":11.25, "y":3.25}, 
-			{"label":"L", "x":12.25, "y":3.25}, 
-			{"label":":", "x":13.25, "y":3.25}, 
-			{"label":"\"", "x":14.25, "y":3.25}, 
-			{"label":"Enter", "x":15.25, "y":3.25, "w":2.25}, 
-			{"label":"4", "x":18.25, "y":3.25}, 
-			{"label":"5", "x":19.25, "y":3.25}, 
-			{"label":"6", "x":20.25, "y":3.25}, 
-			{"label":"PrtSc", "x":0, "y":4.25}, 
-			{"label":"Shift", "x":1.5, "y":4.25, "w":2.25}, 
-			{"label":"Z", "x":3.75, "y":4.25}, 
-			{"label":"X", "x":4.75, "y":4.25}, 
-			{"label":"C", "x":5.75, "y":4.25}, 
-			{"label":"V", "x":6.75, "y":4.25}, 
-			{"label":"B", "x":7.75, "y":4.25}, 
-			{"label":"N", "x":9.75, "y":4.25}, 
-			{"label":"M", "x":10.75, "y":4.25}, 
-			{"label":"<", "x":11.75, "y":4.25}, 
-			{"label":">", "x":12.75, "y":4.25}, 
-			{"label":"Shift", "x":13.75, "y":4.25, "w":1.75}, 
-			{"label":"UP", "x":15.5, "y":4.25}, 
-			{"label":"?", "x":16.5, "y":4.25}, 
-			{"label":"1", "x":18.25, "y":4.25}, 
-			{"label":"2", "x":19.25, "y":4.25}, 
-			{"label":"3", "x":20.25, "y":4.25}, 
-			{"label":"Enter", "x":21.25, "y":4.25, "h":2}, 
-			{"label":"NmLk", "x":0, "y":5.25}, 
-			{"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25}, 
-			{"label":"Win", "x":2.75, "y":5.25}, 
-			{"label":"Fn", "x":3.75, "y":5.25}, 
-			{"label":"Alt", "x":4.75, "y":5.25, "w":1.25}, 
-			{"label":"space", "x":6, "y":5.25, "w":2.75}, 
-			{"label":"space", "x":9.75, "y":5.25, "w":2.25}, 
-			{"label":"Alt", "x":12, "y":5.25, "w":1.25}, 
-			{"label":"Ctrl", "x":13.25, "y":5.25, "w":1.25}, 
-			{"label":"LEFT", "x":14.5, "y":5.25}, 
-			{"label":"Down", "x":15.5, "y":5.25}, 
-			{"label":"Right", "x":16.5, "y":5.25}, 
-			{"label":"0", "x":18.25, "y":5.25, "w":2}, 
-			{"label":".", "x":20.25, "y":5.25}
-		    ]
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 18.25, "y": 0},
+                {"matrix": [0, 15], "x": 19.25, "y": 0},
+                {"matrix": [0, 16], "x": 20.25, "y": 0},
+                {"matrix": [0, 17], "x": 21.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+                {"matrix": [5, 5], "x": 7.5, "y": 1.25},
+
+                {"matrix": [1, 7], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 18.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 19.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 20.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 21.25, "y": 1.25},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 2.25},
+                {"matrix": [2, 2], "x": 4, "y": 2.25},
+                {"matrix": [2, 3], "x": 5, "y": 2.25},
+                {"matrix": [2, 4], "x": 6, "y": 2.25},
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 9, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15, "y": 2.25},
+                {"matrix": [2, 13], "x": 16, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 18.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 20.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 21.25, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 7], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 18.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 19.25, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.25, "y": 3.25},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 4], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 7.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 9.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 10.75, "y": 4.25},
+                {"matrix": [4, 9], "x": 11.75, "y": 4.25},
+                {"matrix": [4, 10], "x": 12.75, "y": 4.25},
+                {"matrix": [4, 11], "x": 13.75, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 12], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.5, "y": 4.25},
+
+                {"matrix": [4, 14], "x": 18.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 19.25, "y": 4.25},
+                {"matrix": [4, 16], "x": 20.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 21.25, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.25},
+
+                {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 2.75, "y": 5.25},
+                {"matrix": [5, 2], "x": 3.75, "y": 5.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.75},
+
+                {"matrix": [5, 8], "x": 9.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 9], "x": 12, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 13.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 14.5, "y": 5.25},
+                {"matrix": [5, 12], "x": 15.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 16.5, "y": 5.25},
+
+                {"matrix": [5, 14], "x": 18.25, "y": 5.25, "w": 2},
+                {"matrix": [5, 16], "x": 20.25, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/kabedon/kabedon78s/kabedon78s.h b/keyboards/kabedon/kabedon78s/kabedon78s.h
deleted file mode 100644
index 64709a9bf4..0000000000
--- a/keyboards/kabedon/kabedon78s/kabedon78s.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-                KA00, KA01, KA02, KA03, KA04, KA05,         KA07, KA08, KA09, KA10, KA11, KA12, KA13,         KA14, KA15, KA16, KA17, \
-        KB06,   KB00, KB01, KB02, KB03, KB04, KB05, KF05,   KB07, KB08, KB09, KB10, KB11, KB12, KB13,         KB14, KB15, KB16, KB17, \
-        KC06,   KC00, KC01, KC02, KC03, KC04, KC05,   KF07, KC07, KC08, KC09, KC10, KC11, KC12, KC13,         KC14, KC15, KC16, KC17, \
-        KD06,   KD00, KD01, KD02, KD03, KD04, KD05,         KD07, KD08, KD09, KD10, KD11, KD12, KD13,         KD14, KD15, KD16,       \
-        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, 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}, \
-  { KE00, KE01, KE02, KE03, KE04, KE05, KE06, KE07, KE08, KE09, KE10, KE11, KE12, KE13, KE14, KE15, KE16, KE17}, \
-  { KF00, KF01, KF02, KF03, KF04, KF05, KF06, KF07, KF08, KF09, KF10, KF11, KF12, KF13, KF14,KC_NO, KF16,KC_NO}  \
-}
-
-
diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json
index 5c49682917..85edf331b9 100644
--- a/keyboards/kabedon/kabedon980/info.json
+++ b/keyboards/kabedon/kabedon980/info.json
@@ -21,105 +21,121 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"label":"ESC", "x":0, "y":0}, 
-			{"label":"F1", "x":1.6, "y":0}, 
-			{"label":"F2", "x":2.6, "y":0}, 
-			{"label":"F3", "x":3.6, "y":0}, 
-			{"label":"F4", "x":4.6, "y":0}, 
-			{"label":"F5", "x":6.3, "y":0}, 
-			{"label":"F6", "x":7.3, "y":0}, 
-			{"label":"F7", "x":8.3, "y":0}, 
-			{"label":"F8", "x":9.3, "y":0}, 
-			{"label":"F9", "x":11, "y":0}, 
-			{"label":"F10", "x":12, "y":0}, 
-			{"label":"F11", "x":13, "y":0}, 
-			{"label":"F12", "x":14, "y":0}, 
-			{"label":"DELETE", "x":15.3, "y":0}, 
-			{"label":"HOME", "x":16.3, "y":0}, 
-			{"label":"PGUP", "x":17.3, "y":0}, 
-			{"label":"PGDN", "x":18.3, "y":0}, 
-			{"label":"~", "x":0, "y":1.15}, 
-			{"label":"!", "x":1, "y":1.15}, 
-			{"label":"@", "x":2, "y":1.15}, 
-			{"label":"#", "x":3, "y":1.15}, 
-			{"label":"$", "x":4, "y":1.15}, 
-			{"label":"%", "x":5, "y":1.15}, 
-			{"label":"^", "x":6, "y":1.15}, 
-			{"label":"&", "x":7, "y":1.15}, 
-			{"label":"*", "x":8, "y":1.15}, 
-			{"label":"(", "x":9, "y":1.15}, 
-			{"label":")", "x":10, "y":1.15}, 
-			{"label":"_", "x":11, "y":1.15}, 
-			{"label":"+", "x":12, "y":1.15}, 
-			{"label":"BACK SPACE", "x":13, "y":1.15, "w":2}, 
-			{"label":"NUMLK", "x":15.3, "y":1.15}, 
-			{"label":"/", "x":16.3, "y":1.15}, 
-			{"label":"*", "x":17.3, "y":1.15}, 
-			{"label":"-", "x":18.3, "y":1.15}, 
-			{"label":"TAB", "x":0, "y":2.15, "w":1.5}, 
-			{"label":"Q", "x":1.5, "y":2.15}, 
-			{"label":"W", "x":2.5, "y":2.15}, 
-			{"label":"E", "x":3.5, "y":2.15}, 
-			{"label":"R", "x":4.5, "y":2.15}, 
-			{"label":"T", "x":5.5, "y":2.15}, 
-			{"label":"Y", "x":6.5, "y":2.15}, 
-			{"label":"U", "x":7.5, "y":2.15}, 
-			{"label":"I", "x":8.5, "y":2.15}, 
-			{"label":"O", "x":9.5, "y":2.15}, 
-			{"label":"P", "x":10.5, "y":2.15}, 
-			{"label":"[", "x":11.5, "y":2.15}, 
-			{"label":"]", "x":12.5, "y":2.15}, 
-			{"label":"|", "x":13.5, "y":2.15, "w":1.5}, 
-			{"label":"7", "x":15.3, "y":2.15}, 
-			{"label":"8", "x":16.3, "y":2.15}, 
-			{"label":"9", "x":17.3, "y":2.15}, 
-			{"label":"+", "x":18.3, "y":2.15, "h":2}, 
-			{"label":"CAPS LOCK", "x":0, "y":3.15, "w":1.75}, 
-			{"label":"A", "x":1.75, "y":3.15}, 
-			{"label":"S", "x":2.75, "y":3.15}, 
-			{"label":"D", "x":3.75, "y":3.15}, 
-			{"label":"F", "x":4.75, "y":3.15}, 
-			{"label":"G", "x":5.75, "y":3.15}, 
-			{"label":"H", "x":6.75, "y":3.15}, 
-			{"label":"J", "x":7.75, "y":3.15}, 
-			{"label":"K", "x":8.75, "y":3.15}, 
-			{"label":"L", "x":9.75, "y":3.15}, 
-			{"label":":", "x":10.75, "y":3.15}, 
-			{"label":"\"", "x":11.75, "y":3.15}, 
-			{"label":"ENTER", "x":12.75, "y":3.15, "w":2.25}, 
-			{"label":"4", "x":15.3, "y":3.15}, 
-			{"label":"5", "x":16.3, "y":3.15}, 
-			{"label":"6", "x":17.3, "y":3.15}, 
-			{"label":"SHIFT", "x":0, "y":4.15, "w":2.25}, 
-			{"label":"Z", "x":2.25, "y":4.15}, 
-			{"label":"X", "x":3.25, "y":4.15}, 
-			{"label":"C", "x":4.25, "y":4.15}, 
-			{"label":"V", "x":5.25, "y":4.15}, 
-			{"label":"B", "x":6.25, "y":4.15}, 
-			{"label":"N", "x":7.25, "y":4.15}, 
-			{"label":"M", "x":8.25, "y":4.15}, 
-			{"label":"<", "x":9.25, "y":4.15}, 
-			{"label":">", "x":10.25, "y":4.15}, 
-			{"label":"?", "x":11.25, "y":4.15}, 
-			{"label":"SHIFT", "x":12.25, "y":4.15, "w":1.75}, 
-			{"label":"Up", "x":14.15, "y":4.3}, 
-			{"label":"1", "x":15.3, "y":4.15}, 
-			{"label":"2", "x":16.3, "y":4.15}, 
-			{"label":"3", "x":17.3, "y":4.15}, 
-			{"label":"ENTER", "x":18.3, "y":4.15, "h":2}, 
-			{"label":"CTRL", "x":0, "y":5.15, "w":1.25}, 
-			{"label":"WIN", "x":1.25, "y":5.15, "w":1.25}, 
-			{"label":"ALT", "x":2.5, "y":5.15, "w":1.25}, 
-			{"label":"Space", "x":3.75, "y":5.15, "w":6.25}, 
-			{"label":"ALT", "x":10, "y":5.15}, 
-			{"label":"FN", "x":11, "y":5.15}, 
-			{"label":"CTRL", "x":12, "y":5.15}, 
-			{"label":"Left", "x":13.15, "y":5.3}, 
-			{"label":"Down", "x":14.15, "y":5.3}, 
-			{"label":"Right", "x":15.15, "y":5.3}, 
-			{"label":"0", "x":16.3, "y":5.15}, 
-			{"label":".", "x":17.3, "y":5.15} 
-			]
+                {"matrix": [8, 6], "x": 0, "y": 0},
+
+                {"matrix": [2, 4], "x": 1.6, "y": 0},
+                {"matrix": [3, 4], "x": 2.6, "y": 0},
+                {"matrix": [1, 10], "x": 3.6, "y": 0},
+                {"matrix": [0, 5], "x": 4.6, "y": 0},
+
+                {"matrix": [0, 11], "x": 6.3, "y": 0},
+                {"matrix": [0, 2], "x": 7.3, "y": 0},
+                {"matrix": [2, 1], "x": 8.3, "y": 0},
+                {"matrix": [0, 4], "x": 9.3, "y": 0},
+
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [2, 2], "x": 12, "y": 0},
+                {"matrix": [9, 5], "x": 13, "y": 0},
+                {"matrix": [4, 6], "x": 14, "y": 0},
+
+                {"matrix": [7, 3], "x": 15.3, "y": 0},
+                {"matrix": [9, 1], "x": 16.3, "y": 0},
+                {"matrix": [8, 1], "x": 17.3, "y": 0},
+                {"matrix": [8, 0], "x": 18.3, "y": 0},
+
+                {"matrix": [9, 7], "x": 0, "y": 1.15},
+                {"matrix": [2, 5], "x": 1, "y": 1.15},
+                {"matrix": [2, 6], "x": 2, "y": 1.15},
+                {"matrix": [0, 3], "x": 3, "y": 1.15},
+                {"matrix": [7, 7], "x": 4, "y": 1.15},
+                {"matrix": [9, 6], "x": 5, "y": 1.15},
+                {"matrix": [8, 2], "x": 6, "y": 1.15},
+                {"matrix": [1, 7], "x": 7, "y": 1.15},
+                {"matrix": [6, 3], "x": 8, "y": 1.15},
+                {"matrix": [8, 5], "x": 9, "y": 1.15},
+                {"matrix": [6, 5], "x": 10, "y": 1.15},
+                {"matrix": [6, 6], "x": 11, "y": 1.15},
+                {"matrix": [0, 6], "x": 12, "y": 1.15},
+                {"matrix": [3, 2], "x": 13, "y": 1.15, "w": 2},
+
+                {"matrix": [0, 8], "x": 15.3, "y": 1.15},
+                {"matrix": [5, 1], "x": 16.3, "y": 1.15},
+                {"matrix": [7, 1], "x": 17.3, "y": 1.15},
+                {"matrix": [6, 1], "x": 18.3, "y": 1.15},
+
+                {"matrix": [8, 3], "x": 0, "y": 2.15, "w": 1.5},
+                {"matrix": [9, 2], "x": 1.5, "y": 2.15},
+                {"matrix": [3, 6], "x": 2.5, "y": 2.15},
+                {"matrix": [3, 5], "x": 3.5, "y": 2.15},
+                {"matrix": [1, 4], "x": 4.5, "y": 2.15},
+                {"matrix": [2, 3], "x": 5.5, "y": 2.15},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.15},
+                {"matrix": [5, 7], "x": 7.5, "y": 2.15},
+                {"matrix": [1, 8], "x": 8.5, "y": 2.15},
+                {"matrix": [6, 2], "x": 9.5, "y": 2.15},
+                {"matrix": [1, 11], "x": 10.5, "y": 2.15},
+                {"matrix": [1, 2], "x": 11.5, "y": 2.15},
+                {"matrix": [5, 5], "x": 12.5, "y": 2.15},
+                {"matrix": [4, 1], "x": 13.5, "y": 2.15, "w": 1.5},
+
+                {"matrix": [6, 0], "x": 15.3, "y": 2.15},
+                {"matrix": [0, 1], "x": 16.3, "y": 2.15},
+                {"matrix": [5, 8], "x": 17.3, "y": 2.15},
+                {"matrix": [5, 0], "x": 18.3, "y": 2.15, "h": 2},
+
+                {"matrix": [1, 3], "x": 0, "y": 3.15, "w": 1.75},
+                {"matrix": [1, 0], "x": 1.75, "y": 3.15},
+                {"matrix": [7, 2], "x": 2.75, "y": 3.15},
+                {"matrix": [5, 3], "x": 3.75, "y": 3.15},
+                {"matrix": [1, 1], "x": 4.75, "y": 3.15},
+                {"matrix": [0, 9], "x": 5.75, "y": 3.15},
+                {"matrix": [7, 4], "x": 6.75, "y": 3.15},
+                {"matrix": [7, 5], "x": 7.75, "y": 3.15},
+                {"matrix": [7, 6], "x": 8.75, "y": 3.15},
+                {"matrix": [5, 4], "x": 9.75, "y": 3.15},
+                {"matrix": [1, 6], "x": 10.75, "y": 3.15},
+                {"matrix": [5, 6], "x": 11.75, "y": 3.15},
+                {"matrix": [5, 2], "x": 12.75, "y": 3.15, "w": 2.25},
+
+                {"matrix": [1, 12], "x": 15.3, "y": 3.15},
+                {"matrix": [0, 0], "x": 16.3, "y": 3.15},
+                {"matrix": [6, 8], "x": 17.3, "y": 3.15},
+
+                {"matrix": [9, 12], "x": 0, "y": 4.15, "w": 2.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.15},
+                {"matrix": [9, 4], "x": 3.25, "y": 4.15},
+                {"matrix": [0, 10], "x": 4.25, "y": 4.15},
+                {"matrix": [4, 2], "x": 5.25, "y": 4.15},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.15},
+                {"matrix": [3, 7], "x": 7.25, "y": 4.15},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.15},
+                {"matrix": [3, 3], "x": 9.25, "y": 4.15},
+                {"matrix": [1, 5], "x": 10.25, "y": 4.15},
+                {"matrix": [4, 4], "x": 11.25, "y": 4.15},
+                {"matrix": [8, 12], "x": 12.25, "y": 4.15, "w": 1.75},
+
+                {"matrix": [8, 7], "x": 14.15, "y": 4.3},
+
+                {"matrix": [3, 1], "x": 15.3, "y": 4.15},
+                {"matrix": [8, 8], "x": 16.3, "y": 4.15},
+                {"matrix": [7, 8], "x": 17.3, "y": 4.15},
+                {"matrix": [2, 0], "x": 18.3, "y": 4.15, "h": 2},
+
+                {"matrix": [5, 10], "x": 0, "y": 5.15, "w": 1.25},
+                {"matrix": [3, 9], "x": 1.25, "y": 5.15, "w": 1.25},
+                {"matrix": [7, 11], "x": 2.5, "y": 5.15, "w": 1.25},
+                {"matrix": [0, 12], "x": 3.75, "y": 5.15, "w": 6.25},
+                {"matrix": [6, 11], "x": 10, "y": 5.15},
+                {"matrix": [2, 8], "x": 11, "y": 5.15},
+                {"matrix": [4, 10], "x": 12, "y": 5.15},
+
+                {"matrix": [4, 7], "x": 13.15, "y": 5.3},
+                {"matrix": [6, 7], "x": 14.15, "y": 5.3},
+                {"matrix": [2, 7], "x": 15.15, "y": 5.3},
+
+                {"matrix": [3, 0], "x": 16.3, "y": 5.15},
+                {"matrix": [7, 0], "x": 17.3, "y": 5.15}
+            ]
         }
     }
 }
diff --git a/keyboards/kabedon/kabedon980/kabedon980.c b/keyboards/kabedon/kabedon980/kabedon980.c
index f0c8382d66..0614972f5e 100644
--- a/keyboards/kabedon/kabedon980/kabedon980.c
+++ b/keyboards/kabedon/kabedon980/kabedon980.c
@@ -1,4 +1,4 @@
-#include "kabedon980.h"
+#include "quantum.h"
 
  bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
diff --git a/keyboards/kabedon/kabedon980/kabedon980.h b/keyboards/kabedon/kabedon980/kabedon980.h
deleted file mode 100644
index 0355955b66..0000000000
--- a/keyboards/kabedon/kabedon980/kabedon980.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-        KI06,   KC04, KD04, KB10, KA05,   KA11, KA02, KC01, KA04,   KA07, KC02, KJ05, KE06,   KH03, KJ01, KI01, KI00, \
-        KJ07, KC05, KC06, KA03, KH07, KJ06, KI02, KB07, KG03, KI05, KG05, KG06, KA06, KD02,   KA08, KF01, KH01, KG01, \
-        KI03, KJ02, KD06, KD05, KB04, KC03, KE03, KF07, KB08, KG02, KB11, KB02, KF05, KE01,   KG00, KA01, KF08, KF00, \
-        KB03, KB00, KH02, KF03, KB01, KA09, KH04, KH05, KH06, KF04, KB06, KF06,    KF02,      KB12, KA00, KG08,       \
-        KJ12, KB09, KJ04, KA10, KE02, KJ03, KD07, KI04, KD03, KB05, KE04, KI12,       KI07,   KD01, KI08, KH08, KC00, \
-        KF10, KD09, KH11,                KA12,                KG11, KC08, KE10, KE07, KG07, KC07,   KD00, KH00       \
-) { \
-  { KA00,  KA01,  KA02,  KA03,  KA04,  KA05,  KA06,  KA07,  KA08,  KA09,  KA10,  KA11,  KA12 }, \
-  { KB00,  KB01,  KB02,  KB03,  KB04,  KB05,  KB06,  KB07,  KB08,  KB09,  KB10,  KB11,  KB12 }, \
-  { KC00,  KC01,  KC02,  KC03,  KC04,  KC05,  KC06,  KC07,  KC08, KC_NO, KC_NO, KC_NO, KC_NO }, \
-  { KD00,  KD01,  KD02,  KD03,  KD04,  KD05,  KD06,  KD07, KC_NO,  KD09, KC_NO, KC_NO, KC_NO }, \
-  { KC_NO, KE01,  KE02,  KE03,  KE04, KC_NO,  KE06,  KE07, KC_NO, KC_NO,  KE10, KC_NO, KC_NO }, \
-  { KF00,  KF01,  KF02,  KF03,  KF04,  KF05,  KF06,  KF07,  KF08, KC_NO,  KF10, KC_NO, KC_NO }, \
-  { KG00,  KG01,  KG02,  KG03, KC_NO,  KG05,  KG06,  KG07,  KG08, KC_NO, KC_NO,  KG11, KC_NO }, \
-  { KH00,  KH01,  KH02,  KH03,  KH04,  KH05,  KH06,  KH07,  KH08, KC_NO, KC_NO,  KH11, KC_NO }, \
-  { KI00,  KI01,  KI02,  KI03,  KI04,  KI05,  KI06,  KI07,  KI08, KC_NO, KC_NO, KC_NO,  KI12 }, \
-  { KC_NO, KJ01,  KJ02,  KJ03,  KJ04,  KJ05,  KJ06,  KJ07, KC_NO, KC_NO, KC_NO, KC_NO,  KJ12 }  \
-}
-
-
diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json
index 929fd1a439..d72aafd2a6 100644
--- a/keyboards/kabedon/kabedon98e/info.json
+++ b/keyboards/kabedon/kabedon98e/info.json
@@ -31,112 +31,124 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0.5},
-                {"label":"F1", "x":1.667, "y":0.5},
-                {"label":"F2", "x":2.667, "y":0.5},
-                {"label":"F3", "x":3.667, "y":0.5},
-                {"label":"F4", "x":4.667, "y":0.5},
-                {"label":"F5", "x":6.333, "y":0.5},
-                {"label":"F6", "x":7.333, "y":0.5},
-                {"label":"F7", "x":8.333, "y":0.5},
-                {"label":"F8", "x":9.333, "y":0.5},
-                {"label":"F9", "x":11, "y":0.5},
-                {"label":"F10", "x":12, "y":0.5},
-                {"label":"F11", "x":13, "y":0.5},
-                {"label":"F12", "x":14, "y":0.5},
-                {"label":"Delete", "x":15.5, "y":0.5},
-                {"label":"Home", "x":16.9, "y":0, "w":0.6, "h":0.5},
-                {"label":"Insert", "x":17, "y":0.5},
-                {"label":"End", "x":17.5, "y":0, "w":0.6, "h":0.5},
-                {"label":"PgUp", "x":18.4, "y":0, "w":0.6, "h":0.5},
-                {"label":"Mute", "x":18.5, "y":0.5},
-                {"label":"PgDn", "x":19, "y":0, "w":0.6, "h":0.5},
-
-                {"label":"~", "x":0, "y":1.75},
-                {"label":"!", "x":1, "y":1.75},
-                {"label":"@", "x":2, "y":1.75},
-                {"label":"#", "x":3, "y":1.75},
-                {"label":"$", "x":4, "y":1.75},
-                {"label":"%", "x":5, "y":1.75},
-                {"label":"^", "x":6, "y":1.75},
-                {"label":"&", "x":7, "y":1.75},
-                {"label":"*", "x":8, "y":1.75},
-                {"label":"(", "x":9, "y":1.75},
-                {"label":")", "x":10, "y":1.75},
-                {"label":"_", "x":11, "y":1.75},
-                {"label":"+", "x":12, "y":1.75},
-                {"label":"Backspace", "x":13, "y":1.75, "w":2},
-                {"label":"Num Lock", "x":15.5, "y":1.75},
-                {"label":"/", "x":16.5, "y":1.75},
-                {"label":"*", "x":17.5, "y":1.75},
-                {"label":"-", "x":18.5, "y":1.75},
-
-                {"label":"Tab", "x":0, "y":2.75, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.75},
-                {"label":"W", "x":2.5, "y":2.75},
-                {"label":"E", "x":3.5, "y":2.75},
-                {"label":"R", "x":4.5, "y":2.75},
-                {"label":"T", "x":5.5, "y":2.75},
-                {"label":"Y", "x":6.5, "y":2.75},
-                {"label":"U", "x":7.5, "y":2.75},
-                {"label":"I", "x":8.5, "y":2.75},
-                {"label":"O", "x":9.5, "y":2.75},
-                {"label":"P", "x":10.5, "y":2.75},
-                {"label":"{", "x":11.5, "y":2.75},
-                {"label":"}", "x":12.5, "y":2.75},
-                {"label":"|", "x":13.5, "y":2.75, "w":1.5},
-                {"label":"7", "x":15.5, "y":2.75},
-                {"label":"8", "x":16.5, "y":2.75},
-                {"label":"9", "x":17.5, "y":2.75},
-
-                {"label":"Caps Lock", "x":0, "y":3.75, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.75},
-                {"label":"S", "x":2.75, "y":3.75},
-                {"label":"D", "x":3.75, "y":3.75},
-                {"label":"F", "x":4.75, "y":3.75},
-                {"label":"G", "x":5.75, "y":3.75},
-                {"label":"H", "x":6.75, "y":3.75},
-                {"label":"J", "x":7.75, "y":3.75},
-                {"label":"K", "x":8.75, "y":3.75},
-                {"label":"L", "x":9.75, "y":3.75},
-                {"label":":", "x":10.75, "y":3.75},
-                {"label":"\"", "x":11.75, "y":3.75},
-                {"label":"Enter", "x":12.75, "y":3.75, "w":2.25},
-                {"label":"4", "x":15.5, "y":3.75},
-                {"label":"5", "x":16.5, "y":3.75},
-                {"label":"6", "x":17.5, "y":3.75},
-                {"label":"+", "x":18.5, "y":2.75, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.75, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.75},
-                {"label":"X", "x":3.25, "y":4.75},
-                {"label":"C", "x":4.25, "y":4.75},
-                {"label":"V", "x":5.25, "y":4.75},
-                {"label":"B", "x":6.25, "y":4.75},
-                {"label":"N", "x":7.25, "y":4.75},
-                {"label":"M", "x":8.25, "y":4.75},
-                {"label":"<", "x":9.25, "y":4.75},
-                {"label":">", "x":10.25, "y":4.75},
-                {"label":"?", "x":11.25, "y":4.75},
-                {"label":"Shift", "x":12.25, "y":4.75, "w":1.75},
-                {"label":"\u2191", "x":14.25, "y":5},
-                {"label":"1", "x":15.5, "y":4.75},
-                {"label":"2", "x":16.5, "y":4.75},
-                {"label":"3", "x":17.5, "y":4.75},
-
-                {"label":"Ctrl", "x":0, "y":5.75, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.75},
-                {"label":"Alt", "x":2.25, "y":5.75},
-                {"label":"MO(1)", "x":3.25, "y":5.75},
-                {"label":"Space", "x":4.25, "y":5.75, "w":6.25},
-                {"label":"Alt", "x":10.5, "y":5.75, "w":1.25},
-                {"label":"Ctrl", "x":11.75, "y":5.75, "w":1.25},
-                {"label":"\u2190", "x":13.25, "y":6},
-                {"label":"\u2193", "x":14.25, "y":6},
-                {"label":"\u2192", "x":15.25, "y":6},
-                {"label":"0", "x":16.5, "y":5.75},
-                {"label":".", "x":17.5, "y":5.75},
-                {"label":"Enter", "x":18.5, "y":4.75, "h":2}
+                {"matrix": [1, 0], "x": 0, "y": 0.5},
+
+                {"matrix": [0, 1], "x": 1.667, "y": 0.5},
+                {"matrix": [1, 1], "x": 2.667, "y": 0.5},
+                {"matrix": [0, 2], "x": 3.667, "y": 0.5},
+                {"matrix": [1, 2], "x": 4.667, "y": 0.5},
+
+                {"matrix": [0, 3], "x": 6.333, "y": 0.5},
+                {"matrix": [1, 3], "x": 7.333, "y": 0.5},
+                {"matrix": [0, 4], "x": 8.333, "y": 0.5},
+                {"matrix": [1, 4], "x": 9.333, "y": 0.5},
+
+                {"matrix": [0, 5], "x": 11, "y": 0.5},
+                {"matrix": [1, 5], "x": 12, "y": 0.5},
+                {"matrix": [1, 6], "x": 13, "y": 0.5},
+                {"matrix": [1, 7], "x": 14, "y": 0.5},
+
+                {"matrix": [5, 7], "x": 15.5, "y": 0.5},
+                {"matrix": [0, 0], "x": 16.9, "y": 0, "w": 0.6, "h": 0.5},
+                {"matrix": [4, 8], "x": 17, "y": 0.5},
+                {"matrix": [2, 0], "x": 17.5, "y": 0, "w": 0.6, "h": 0.5},
+                {"matrix": [6, 0], "x": 18.4, "y": 0, "w": 0.6, "h": 0.5},
+
+                {"matrix": [4, 0], "x": 18.5, "y": 0.5},
+                {"matrix": [8, 0], "x": 19, "y": 0, "w": 0.6, "h": 0.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 1.75},
+                {"matrix": [2, 1], "x": 1, "y": 1.75},
+                {"matrix": [3, 1], "x": 2, "y": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 1.75},
+                {"matrix": [3, 2], "x": 4, "y": 1.75},
+                {"matrix": [2, 3], "x": 5, "y": 1.75},
+                {"matrix": [3, 3], "x": 6, "y": 1.75},
+                {"matrix": [2, 4], "x": 7, "y": 1.75},
+                {"matrix": [3, 4], "x": 8, "y": 1.75},
+                {"matrix": [2, 5], "x": 9, "y": 1.75},
+                {"matrix": [3, 5], "x": 10, "y": 1.75},
+                {"matrix": [2, 6], "x": 11, "y": 1.75},
+                {"matrix": [3, 6], "x": 12, "y": 1.75},
+                {"matrix": [3, 7], "x": 13, "y": 1.75, "w": 2},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 1.75},
+                {"matrix": [4, 9], "x": 16.5, "y": 1.75},
+                {"matrix": [4, 10], "x": 17.5, "y": 1.75},
+                {"matrix": [5, 10], "x": 18.5, "y": 1.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 2.75, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 2.75},
+                {"matrix": [5, 1], "x": 2.5, "y": 2.75},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.75},
+                {"matrix": [5, 2], "x": 4.5, "y": 2.75},
+                {"matrix": [4, 3], "x": 5.5, "y": 2.75},
+                {"matrix": [5, 3], "x": 6.5, "y": 2.75},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.75},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.75},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.75},
+                {"matrix": [5, 5], "x": 10.5, "y": 2.75},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.75},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.75},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.75, "w": 1.5},
+
+                {"matrix": [5, 9], "x": 15.5, "y": 2.75},
+                {"matrix": [6, 9], "x": 16.5, "y": 2.75},
+                {"matrix": [6, 10], "x": 17.5, "y": 2.75},
+
+                {"matrix": [7, 0], "x": 0, "y": 3.75, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.75},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.75},
+                {"matrix": [6, 2], "x": 3.75, "y": 3.75},
+                {"matrix": [7, 2], "x": 4.75, "y": 3.75},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.75},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.75},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.75},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.75},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.75},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.75},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.75},
+                {"matrix": [7, 7], "x": 12.75, "y": 3.75, "w": 2.25},
+
+                {"matrix": [7, 9], "x": 15.5, "y": 3.75},
+                {"matrix": [8, 9], "x": 16.5, "y": 3.75},
+                {"matrix": [8, 10], "x": 17.5, "y": 3.75},
+                {"matrix": [7, 10], "x": 18.5, "y": 2.75, "h": 2},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.75, "w": 2.25},
+                {"matrix": [9, 1], "x": 2.25, "y": 4.75},
+                {"matrix": [8, 2], "x": 3.25, "y": 4.75},
+                {"matrix": [9, 2], "x": 4.25, "y": 4.75},
+                {"matrix": [8, 3], "x": 5.25, "y": 4.75},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.75},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.75},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.75},
+                {"matrix": [8, 5], "x": 9.25, "y": 4.75},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.75},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.75},
+                {"matrix": [9, 7], "x": 12.25, "y": 4.75, "w": 1.75},
+
+                {"matrix": [8, 8], "x": 14.25, "y": 5},
+
+                {"matrix": [9, 9], "x": 15.5, "y": 4.75},
+                {"matrix": [10, 9], "x": 16.5, "y": 4.75},
+                {"matrix": [9, 10], "x": 17.5, "y": 4.75},
+
+                {"matrix": [11, 0], "x": 0, "y": 5.75, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.75},
+                {"matrix": [11, 1], "x": 2.25, "y": 5.75},
+                {"matrix": [11, 3], "x": 3.25, "y": 5.75},
+                {"matrix": [11, 2], "x": 4.25, "y": 5.75, "w": 6.25},
+                {"matrix": [11, 5], "x": 10.5, "y": 5.75, "w": 1.25},
+                {"matrix": [10, 7], "x": 11.75, "y": 5.75, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 13.25, "y": 6},
+                {"matrix": [10, 8], "x": 14.25, "y": 6},
+                {"matrix": [11, 8], "x": 15.25, "y": 6},
+
+                {"matrix": [11, 9], "x": 16.5, "y": 5.75},
+                {"matrix": [10, 10], "x": 17.5, "y": 5.75},
+                {"matrix": [11, 10], "x": 18.5, "y": 4.75, "h": 2}
             ]
         }
     }
diff --git a/keyboards/kabedon/kabedon98e/kabedon98e.c b/keyboards/kabedon/kabedon98e/kabedon98e.c
index 6984790006..9fd34b58af 100644
--- a/keyboards/kabedon/kabedon98e/kabedon98e.c
+++ b/keyboards/kabedon/kabedon98e/kabedon98e.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 "kabedon98e.h"
+#include "quantum.h"
 
 static uint8_t encoder_state[NUM_ENCODERS] = {0};
 static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
diff --git a/keyboards/kabedon/kabedon98e/kabedon98e.h b/keyboards/kabedon/kabedon98e/kabedon98e.h
deleted file mode 100644
index ce4b3fa0b2..0000000000
--- a/keyboards/kabedon/kabedon98e/kabedon98e.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2021 KDon<370490639@qq.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*                                                                   ┌──┬──┐ ┌──┬──┐
- *                                                                   │00│20│ │60│80│
- *                                                                   └──┴──┘ └──┴──┘
- *                                                                    \─en1┘ └en2─/
- * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐ ┌───┐ ┌───┐
- * │10 │   │01 │11 │02 │12 │ │03 │13 │04 │14 │ │05 │15 │16 │17 │ │57 │ │48 │ │40 │
- * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘ └───┘ └───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐
- * │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │37     │ │39 │49 │4A │5A │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤
- * │50   │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 │47   │ │59 │69 │6A │   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┤   │
- * │70    │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66 │77      │ │79 │89 │8A │7A │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤
- * │90      │91 │82 │92 │83 │93 │84 │94 │85 │95 │86 │97    │┌───┐│99 │A9 │9A │   │
- * ├────┬───┼───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴──┬───┘│88 │└───┼───┼───┤   │
- * │B0  │A1 │B1 │B3 │B2                      │B5  │A7  │┌───┼───┼───┐│B9 │AA │BA │
- * └────┴───┴───┴───┴────────────────────────┴────┴────┘│B7 │A8 │B8 │└───┴───┴───┘
- *                                                      └───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K10,   K01, K11, K02, K12,    K03, K13, K04, K14,   K05, K15, K16, K17,      K57,  K00,K48,K20,  K60,K40,K80, \
-    K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K37,      K39, K49, K4A, K5A, \
-    K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,   K47,      K59, K69, K6A,      \
-    K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66,      K77,        K79, K89, K8A, K7A, \
-    K90, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86,      K97,      K88,   K99, KA9, K9A,      \
-    KB0, KA1, KB1, KB3,              KB2,             KB5,   KA7,    KB7, KA8, KB8,   KB9, KAA, KBA  \
-) { \
-  { K00,  K01,  K02,  K03,  K04,  K05,  XXX,  XXX,  XXX,  XXX,  XXX }, \
-  { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  XXX,  XXX,  XXX }, \
-  { K20,  K21,  K22,  K23,  K24,  K25,  K26,  XXX,  XXX,  XXX,  XXX }, \
-  { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  XXX,  K39,  XXX }, \
-  { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A }, \
-  { K50,  K51,  K52,  K53,  K54,  K55,  K56,  K57,  XXX,  K59,  K5A }, \
-  { K60,  K61,  K62,  K63,  K64,  K65,  K66,  XXX,  XXX,  K69,  K6A }, \
-  { K70,  K71,  K72,  K73,  K74,  K75,  XXX,  K77,  XXX,  K79,  K7A }, \
-  { K80,  XXX,  K82,  K83,  K84,  K85,  K86,  XXX,  K88,  K89,  K8A }, \
-  { K90,  K91,  K92,  K93,  K94,  K95,  XXX,  K97,  XXX,  K99,  K9A }, \
-  { XXX,  KA1,  XXX,  XXX,  XXX,  XXX,  XXX,  KA7,  KA8,  KA9,  KAA }, \
-  { KB0,  KB1,  KB2,  KB3,  XXX,  KB5,  XXX,  KB7,  KB8,  KB9,  KBA }  \
-}