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

13 files changed, 482 insertions, 323 deletions

diff --git a/keyboards/tkc/candybar/lefty/info.json b/keyboards/tkc/candybar/lefty/info.json
index cfa286972b..d1258fafad 100644
--- a/keyboards/tkc/candybar/lefty/info.json
+++ b/keyboards/tkc/candybar/lefty/info.json
@@ -18,10 +18,72 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"Q", "x":5, "y":0}, {"label":"W", "x":6, "y":0}, {"label":"E", "x":7, "y":0}, {"label":"R", "x":8, "y":0}, {"label":"T", "x":9, "y":0}, {"label":"Y", "x":10, "y":0}, {"label":"U", "x":11, "y":0}, {"label":"I", "x":12, "y":0}, {"label":"O", "x":13, "y":0}, {"label":"P", "x":14, "y":0}, {"label":"{", "x":15, "y":0}, {"label":"}", "x":16, "y":0},
-                {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.25}, {"label":"A", "x":5.25, "y":1}, {"label":"S", "x":6.25, "y":1}, {"label":"D", "x":7.25, "y":1}, {"label":"F", "x":8.25, "y":1}, {"label":"G", "x":9.25, "y":1}, {"label":"H", "x":10.25, "y":1}, {"label":"J", "x":11.25, "y":1}, {"label":"K", "x":12.25, "y":1}, {"label":"L", "x":13.25, "y":1}, {"label":":", "x":14.25, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.75},
-                {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"x":3, "y":2}, {"label":"Shift", "x":4, "y":2, "w":1.75}, {"label":"Z", "x":5.75, "y":2}, {"label":"X", "x":6.75, "y":2}, {"label":"C", "x":7.75, "y":2}, {"label":"V", "x":8.75, "y":2}, {"label":"B", "x":9.75, "y":2}, {"label":"N", "x":10.75, "y":2}, {"label":"M", "x":11.75, "y":2}, {"label":"<", "x":12.75, "y":2}, {"label":">", "x":13.75, "y":2}, {"label":"\u2191", "x":14.75, "y":2}, {"label":"Shift", "x":15.75, "y":2, "w":1.25},
-                {"label":"Fn", "x":0, "y":3}, {"label":"0", "x":1, "y":3}, {"label":".", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3, "w":1.25}, {"label":"Win", "x":5.25, "y":3, "w":1.25}, {"label":"Alt", "x":6.5, "y":3, "w":1.25}, {"x":7.75, "y":3, "w":1.75}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":2.25}, {"label":"Win", "x":12.75, "y":3, "w":1.25}, {"label":"\u2190", "x":14, "y":3}, {"label":"\u2193", "x":15, "y":3}, {"label":"\u2192", "x":16, "y":3}
+                {"matrix": [0, 13], "x": 0, "y": 0},
+                {"matrix": [0, 14], "x": 1, "y": 0},
+                {"matrix": [0, 15], "x": 2, "y": 0},
+                {"matrix": [0, 16], "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 4, "y": 0},
+                {"matrix": [0, 1], "x": 5, "y": 0},
+                {"matrix": [0, 2], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [0, 9], "x": 13, "y": 0},
+                {"matrix": [0, 10], "x": 14, "y": 0},
+                {"matrix": [0, 11], "x": 15, "y": 0},
+                {"matrix": [0, 12], "x": 16, "y": 0},
+
+                {"matrix": [1, 13], "x": 0, "y": 1},
+                {"matrix": [1, 14], "x": 1, "y": 1},
+                {"matrix": [1, 15], "x": 2, "y": 1},
+                {"matrix": [1, 16], "x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 4, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 5.25, "y": 1},
+                {"matrix": [1, 2], "x": 6.25, "y": 1},
+                {"matrix": [1, 3], "x": 7.25, "y": 1},
+                {"matrix": [1, 4], "x": 8.25, "y": 1},
+                {"matrix": [1, 5], "x": 9.25, "y": 1},
+                {"matrix": [1, 6], "x": 10.25, "y": 1},
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 12], "x": 15.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 0, "y": 2},
+                {"matrix": [2, 14], "x": 1, "y": 2},
+                {"matrix": [2, 15], "x": 2, "y": 2},
+                {"matrix": [2, 16], "x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 4, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 5.75, "y": 2},
+                {"matrix": [2, 3], "x": 6.75, "y": 2},
+                {"matrix": [2, 4], "x": 7.75, "y": 2},
+                {"matrix": [2, 5], "x": 8.75, "y": 2},
+                {"matrix": [2, 6], "x": 9.75, "y": 2},
+                {"matrix": [2, 7], "x": 10.75, "y": 2},
+                {"matrix": [2, 8], "x": 11.75, "y": 2},
+                {"matrix": [2, 9], "x": 12.75, "y": 2},
+                {"matrix": [2, 10], "x": 13.75, "y": 2},
+                {"matrix": [2, 11], "x": 14.75, "y": 2},
+                {"matrix": [2, 12], "x": 15.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 13], "x": 0, "y": 3},
+                {"matrix": [3, 14], "x": 1, "y": 3},
+                {"matrix": [3, 15], "x": 2, "y": 3},
+                {"matrix": [3, 16], "x": 3, "y": 3},
+                {"matrix": [3, 0], "x": 4, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 5.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 6.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 12.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 14, "y": 3},
+                {"matrix": [3, 11], "x": 15, "y": 3},
+                {"matrix": [3, 12], "x": 16, "y": 3}
             ]
         }
     }
diff --git a/keyboards/tkc/candybar/lefty/lefty.h b/keyboards/tkc/candybar/lefty/lefty.h
deleted file mode 100644
index 07af4b31bd..0000000000
--- a/keyboards/tkc/candybar/lefty/lefty.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-
-#define LAYOUT( \
-    k0d, k0e, k0f, k0g, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-    k1d, k1e, k1f, k1g, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-    k2d, k2e, k2f, k2g, k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-    k3d, k3e, k3f, k3g, k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c \
-) { \
-    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
-    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
-    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
-    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
-}
diff --git a/keyboards/tkc/candybar/lefty_r3/info.json b/keyboards/tkc/candybar/lefty_r3/info.json
index 678e7e60f1..77b991a8dc 100644
--- a/keyboards/tkc/candybar/lefty_r3/info.json
+++ b/keyboards/tkc/candybar/lefty_r3/info.json
@@ -18,10 +18,72 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"Q", "x":5, "y":0}, {"label":"W", "x":6, "y":0}, {"label":"E", "x":7, "y":0}, {"label":"R", "x":8, "y":0}, {"label":"T", "x":9, "y":0}, {"label":"Y", "x":10, "y":0}, {"label":"U", "x":11, "y":0}, {"label":"I", "x":12, "y":0}, {"label":"O", "x":13, "y":0}, {"label":"P", "x":14, "y":0}, {"label":"{", "x":15, "y":0}, {"label":"}", "x":16, "y":0},
-                {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.25}, {"label":"A", "x":5.25, "y":1}, {"label":"S", "x":6.25, "y":1}, {"label":"D", "x":7.25, "y":1}, {"label":"F", "x":8.25, "y":1}, {"label":"G", "x":9.25, "y":1}, {"label":"H", "x":10.25, "y":1}, {"label":"J", "x":11.25, "y":1}, {"label":"K", "x":12.25, "y":1}, {"label":"L", "x":13.25, "y":1}, {"label":":", "x":14.25, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.75},
-                {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"x":3, "y":2}, {"label":"Shift", "x":4, "y":2, "w":1.75}, {"label":"Z", "x":5.75, "y":2}, {"label":"X", "x":6.75, "y":2}, {"label":"C", "x":7.75, "y":2}, {"label":"V", "x":8.75, "y":2}, {"label":"B", "x":9.75, "y":2}, {"label":"N", "x":10.75, "y":2}, {"label":"M", "x":11.75, "y":2}, {"label":"<", "x":12.75, "y":2}, {"label":">", "x":13.75, "y":2}, {"label":"\u2191", "x":14.75, "y":2}, {"label":"Shift", "x":15.75, "y":2, "w":1.25},
-                {"label":"Fn", "x":0, "y":3}, {"label":"0", "x":1, "y":3}, {"label":".", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3, "w":1.25}, {"label":"Win", "x":5.25, "y":3, "w":1.25}, {"label":"Alt", "x":6.5, "y":3, "w":1.25}, {"x":7.75, "y":3, "w":1.75}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":2.25}, {"label":"Win", "x":12.75, "y":3, "w":1.25}, {"label":"\u2190", "x":14, "y":3}, {"label":"\u2193", "x":15, "y":3}, {"label":"\u2192", "x":16, "y":3}
+                {"matrix": [0, 13], "x": 0, "y": 0},
+                {"matrix": [0, 14], "x": 1, "y": 0},
+                {"matrix": [0, 15], "x": 2, "y": 0},
+                {"matrix": [0, 16], "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 4, "y": 0},
+                {"matrix": [0, 1], "x": 5, "y": 0},
+                {"matrix": [0, 2], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [0, 5], "x": 9, "y": 0},
+                {"matrix": [0, 6], "x": 10, "y": 0},
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [0, 9], "x": 13, "y": 0},
+                {"matrix": [0, 10], "x": 14, "y": 0},
+                {"matrix": [0, 11], "x": 15, "y": 0},
+                {"matrix": [0, 12], "x": 16, "y": 0},
+
+                {"matrix": [1, 13], "x": 0, "y": 1},
+                {"matrix": [1, 14], "x": 1, "y": 1},
+                {"matrix": [1, 15], "x": 2, "y": 1},
+                {"matrix": [1, 16], "x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 4, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 5.25, "y": 1},
+                {"matrix": [1, 2], "x": 6.25, "y": 1},
+                {"matrix": [1, 3], "x": 7.25, "y": 1},
+                {"matrix": [1, 4], "x": 8.25, "y": 1},
+                {"matrix": [1, 5], "x": 9.25, "y": 1},
+                {"matrix": [1, 6], "x": 10.25, "y": 1},
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 12], "x": 15.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 0, "y": 2},
+                {"matrix": [2, 14], "x": 1, "y": 2},
+                {"matrix": [2, 15], "x": 2, "y": 2},
+                {"matrix": [2, 16], "x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 4, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 5.75, "y": 2},
+                {"matrix": [2, 3], "x": 6.75, "y": 2},
+                {"matrix": [2, 4], "x": 7.75, "y": 2},
+                {"matrix": [2, 5], "x": 8.75, "y": 2},
+                {"matrix": [2, 6], "x": 9.75, "y": 2},
+                {"matrix": [2, 7], "x": 10.75, "y": 2},
+                {"matrix": [2, 8], "x": 11.75, "y": 2},
+                {"matrix": [2, 9], "x": 12.75, "y": 2},
+                {"matrix": [2, 10], "x": 13.75, "y": 2},
+                {"matrix": [2, 11], "x": 14.75, "y": 2},
+                {"matrix": [2, 12], "x": 15.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 13], "x": 0, "y": 3},
+                {"matrix": [3, 14], "x": 1, "y": 3},
+                {"matrix": [3, 15], "x": 2, "y": 3},
+                {"matrix": [3, 16], "x": 3, "y": 3},
+                {"matrix": [3, 0], "x": 4, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 5.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 6.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 12.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 14, "y": 3},
+                {"matrix": [3, 11], "x": 15, "y": 3},
+                {"matrix": [3, 12], "x": 16, "y": 3}
             ]
         }
     }
diff --git a/keyboards/tkc/candybar/lefty_r3/lefty_r3.h b/keyboards/tkc/candybar/lefty_r3/lefty_r3.h
deleted file mode 100644
index d367e8d241..0000000000
--- a/keyboards/tkc/candybar/lefty_r3/lefty_r3.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2021 Terry Mathews
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-
-#define LAYOUT( \
-    k0d, k0e, k0f, k0g, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-    k1d, k1e, k1f, k1g, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-    k2d, k2e, k2f, k2g, k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-    k3d, k3e, k3f, k3g, k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c \
-) { \
-    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
-    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
-    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
-    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
-}
diff --git a/keyboards/tkc/candybar/righty/info.json b/keyboards/tkc/candybar/righty/info.json
index 555b7c9cc0..9cfb7d884b 100644
--- a/keyboards/tkc/candybar/righty/info.json
+++ b/keyboards/tkc/candybar/righty/info.json
@@ -18,10 +18,73 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-				{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0},
-				{"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1},
-				{"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"&uarr;", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2},
-				{"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"&larr;", "x":11, "y":3}, {"label":"&darr;", "x":12, "y":3}, {"label":"&rarr;", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 5.5, "y": 3},
+                {"matrix": [3, 8], "x": 6.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/tkc/candybar/righty/righty.h b/keyboards/tkc/candybar/righty/righty.h
deleted file mode 100644
index 67e0238839..0000000000
--- a/keyboards/tkc/candybar/righty/righty.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, k1d, k1e, k1f, k1g, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g \
-) { \
-    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
-    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
-    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
-    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
-}
diff --git a/keyboards/tkc/candybar/righty_r3/info.json b/keyboards/tkc/candybar/righty_r3/info.json
index ca65a990b9..8fb72e1635 100644
--- a/keyboards/tkc/candybar/righty_r3/info.json
+++ b/keyboards/tkc/candybar/righty_r3/info.json
@@ -18,10 +18,73 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-				{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0},
-				{"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1},
-				{"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"&uarr;", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2},
-				{"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"&larr;", "x":11, "y":3}, {"label":"&darr;", "x":12, "y":3}, {"label":"&rarr;", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 5.5, "y": 3},
+                {"matrix": [3, 8], "x": 6.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/tkc/candybar/righty_r3/righty_r3.h b/keyboards/tkc/candybar/righty_r3/righty_r3.h
deleted file mode 100644
index faaef49394..0000000000
--- a/keyboards/tkc/candybar/righty_r3/righty_r3.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Terry Mathews
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, k1d, k1e, k1f, k1g, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g \
-) { \
-    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
-    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
-    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
-    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
-}
diff --git a/keyboards/tkc/godspeed75/godspeed75.h b/keyboards/tkc/godspeed75/godspeed75.h
deleted file mode 100644
index b2db7c876a..0000000000
--- a/keyboards/tkc/godspeed75/godspeed75.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \
-    k40,   k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,    k47, k57, \
-    k60,     k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,       k67, k77, \
-	k80,       k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,     k96, k87, k97, \
-	ka0,       ka1,                 ka3,               ka5,  kb5,    kb6, ka7, kb7  \
-) { \
-    { k00,  k01,  k02,  k03,  k04,  k05,  k06,  k07 }  , \
-	{ k10,  k11,  k12,  k13,  k14,  k15,  k16,  k17 }  , \
-	{ k20,  k21,  k22,  k23,  k24,  k25,  k26,  k27 }  , \
-	{ k30,  k31,  k32,  k33,  k34,  k35,  k36,  k37 }  , \
-	{ k40,  k41,  k42,  k43,  k44,  k45,  k46,  k47 }  , \
-	{ k50,  k51,  k52,  k53,  k54,  k55, KC_NO, k57 }  , \
-	{ k60,  k61,  k62,  k63,  k64,  k65, KC_NO, k67 }  , \
-	{ k70,  k71,  k72,  k73,  k74,  k75, KC_NO, k77 }  , \
-	{ k80,  k81,  k82,  k83,  k84,  k85, KC_NO, k87 }  , \
-	{ KC_NO,k91,  k92,  k93,  k94,  k95,  k96,  k97 }  , \
-	{ ka0,  ka1, KC_NO, ka3, KC_NO, ka5, KC_NO, ka7 }  , \
-	{ KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,kb5,  kb6,  kb7 }    \
-}
diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json
index 6aac8e45e0..9e4bcd442b 100644
--- a/keyboards/tkc/godspeed75/info.json
+++ b/keyboards/tkc/godspeed75/info.json
@@ -20,7 +20,97 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Scroll Lock", "x":14, "y":0}, {"label":"Pause", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"x":13, "y":1}, {"label":"BkSp", "x":14, "y":1}, {"label":"PgUp", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"PgDn", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Insert", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"Delete", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.25}, {"x":3.5, "y":5, "w":6.25}, {"label":"MO(1)", "x":9.75, "y":5, "w":1.25}, {"label":"Ctrl", "x":11, "y":5, "w":1.25}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [2, 7], "x": 14, "y": 1},
+                {"matrix": [3, 7], "x": 15, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2},
+                {"matrix": [4, 1], "x": 2.5, "y": 2},
+                {"matrix": [5, 1], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2},
+                {"matrix": [5, 2], "x": 5.5, "y": 2},
+                {"matrix": [4, 3], "x": 6.5, "y": 2},
+                {"matrix": [5, 3], "x": 7.5, "y": 2},
+                {"matrix": [4, 4], "x": 8.5, "y": 2},
+                {"matrix": [5, 4], "x": 9.5, "y": 2},
+                {"matrix": [4, 5], "x": 10.5, "y": 2},
+                {"matrix": [5, 5], "x": 11.5, "y": 2},
+                {"matrix": [4, 6], "x": 12.5, "y": 2},
+                {"matrix": [4, 7], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [5, 7], "x": 15, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [7, 1], "x": 3.75, "y": 3},
+                {"matrix": [6, 2], "x": 4.75, "y": 3},
+                {"matrix": [7, 2], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [7, 3], "x": 7.75, "y": 3},
+                {"matrix": [6, 4], "x": 8.75, "y": 3},
+                {"matrix": [7, 4], "x": 9.75, "y": 3},
+                {"matrix": [6, 5], "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [6, 7], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [7, 7], "x": 15, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4},
+                {"matrix": [9, 1], "x": 3.25, "y": 4},
+                {"matrix": [8, 2], "x": 4.25, "y": 4},
+                {"matrix": [9, 2], "x": 5.25, "y": 4},
+                {"matrix": [8, 3], "x": 6.25, "y": 4},
+                {"matrix": [9, 3], "x": 7.25, "y": 4},
+                {"matrix": [8, 4], "x": 8.25, "y": 4},
+                {"matrix": [9, 4], "x": 9.25, "y": 4},
+                {"matrix": [8, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 5], "x": 11.25, "y": 4},
+                {"matrix": [9, 6], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+
+                {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.25, "y": 5, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.5, "y": 5, "w": 6.25},
+                {"matrix": [10, 5], "x": 9.75, "y": 5, "w": 1.25},
+                {"matrix": [11, 5], "x": 11, "y": 5, "w": 1.25},
+
+                {"matrix": [11, 6], "x": 13, "y": 5},
+                {"matrix": [10, 7], "x": 14, "y": 5},
+                {"matrix": [11, 7], "x": 15, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json
index f9c20e4b4d..5cf8f83c80 100644
--- a/keyboards/tkc/tkc1800/info.json
+++ b/keyboards/tkc/tkc1800/info.json
@@ -35,113 +35,130 @@
   "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": "Insert", "x": 15.5, "y": 0 },
-        { "label": "Home", "x": 16.5, "y": 0 },
-        { "label": "Page Up", "x": 17.5, "y": 0 },
-        { "label": "Print Screen", "x": 18.5, "y": 0 },
-        { "label": "Delete", "x": 15.5, "y": 1 },
-        { "label": "End", "x": 16.5, "y": 1 },
-        { "label": "Page Down", "x": 17.5, "y": 1 },
-        { "label": "Scroll Lock", "x": 18.5, "y": 1 },
-        { "label": "`", "x": 0, "y": 2 },
-        { "label": "1", "x": 1, "y": 2 },
-        { "label": "2", "x": 2, "y": 2 },
-        { "label": "3", "x": 3, "y": 2 },
-        { "label": "4", "x": 4, "y": 2 },
-        { "label": "5", "x": 5, "y": 2 },
-        { "label": "6", "x": 6, "y": 2 },
-        { "label": "7", "x": 7, "y": 2 },
-        { "label": "8", "x": 8, "y": 2 },
-        { "label": "9", "x": 9, "y": 2 },
-        { "label": "0", "x": 10, "y": 2 },
-        { "label": "-", "x": 11, "y": 2 },
-        { "label": "=", "x": 12, "y": 2 },
-        { "label": "Backspace", "x": 13, "y": 2 },
-        { "label": "Backspace_Right", "x": 14, "y": 2 },
-        { "label": "Num Lock", "x": 15.5, "y": 2 },
-        { "label": "/", "x": 16.5, "y": 2 },
-        { "label": "*", "x": 17.5, "y": 2 },
-        { "label": "Pause", "x": 18.5, "y": 2 },
-        { "label": "Tab", "x": 0, "y": 3, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 3 },
-        { "label": "W", "x": 2.5, "y": 3 },
-        { "label": "E", "x": 3.5, "y": 3 },
-        { "label": "R", "x": 4.5, "y": 3 },
-        { "label": "T", "x": 5.5, "y": 3 },
-        { "label": "Y", "x": 6.5, "y": 3 },
-        { "label": "U", "x": 7.5, "y": 3 },
-        { "label": "I", "x": 8.5, "y": 3 },
-        { "label": "O", "x": 9.5, "y": 3 },
-        { "label": "P", "x": 10.5, "y": 3 },
-        { "label": "[", "x": 11.5, "y": 3 },
-        { "label": "]", "x": 12.5, "y": 3 },
-        { "label": "\\", "x": 13.5, "y": 3, "w": 1.5 },
-        { "label": "7", "x": 15.5, "y": 3 },
-        { "label": "8", "x": 16.5, "y": 3 },
-        { "label": "9", "x": 17.5, "y": 3 },
-        { "label": "-", "x": 18.5, "y": 3 },
-        { "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 4 },
-        { "label": "S", "x": 2.75, "y": 4 },
-        { "label": "D", "x": 3.75, "y": 4 },
-        { "label": "F", "x": 4.75, "y": 4 },
-        { "label": "G", "x": 5.75, "y": 4 },
-        { "label": "H", "x": 6.75, "y": 4 },
-        { "label": "J", "x": 7.75, "y": 4 },
-        { "label": "K", "x": 8.75, "y": 4 },
-        { "label": "L", "x": 9.75, "y": 4 },
-        { "label": ";", "x": 10.75, "y": 4 },
-        { "label": "'", "x": 11.75, "y": 4 },
-        { "label": "ISO Hash", "x": 12.75, "y": 4 },
-        { "label": "Enter", "x": 13.75, "y": 4, "w": 1.25 },
-        { "label": "4", "x": 15.5, "y": 4 },
-        { "label": "5", "x": 16.5, "y": 4 },
-        { "label": "6", "x": 17.5, "y": 4 },
-        { "label": "+", "x": 18.5, "y": 4 },
-        { "label": "Shift", "x": 0, "y": 5, "w": 1.25 },
-        { "label": "ISO Backslash", "x": 1.25, "y": 5 },
-        { "label": "Z", "x": 2.25, "y": 5 },
-        { "label": "X", "x": 3.25, "y": 5 },
-        { "label": "C", "x": 4.25, "y": 5 },
-        { "label": "V", "x": 5.25, "y": 5 },
-        { "label": "B", "x": 6.25, "y": 5 },
-        { "label": "N", "x": 7.25, "y": 5 },
-        { "label": "M", "x": 8.25, "y": 5 },
-        { "label": ",", "x": 9.25, "y": 5 },
-        { "label": ".", "x": 10.25, "y": 5 },
-        { "label": "/", "x": 11.25, "y": 5 },
-        { "label": "Shift", "x": 12.25, "y": 5, "w": 1.75 },
-        { "label": "Up", "x": 14.25, "y": 5.25 },
-        { "label": "1", "x": 15.5, "y": 5 },
-        { "label": "2", "x": 16.5, "y": 5 },
-        { "label": "3", "x": 17.5, "y": 5 },
-        { "label": "Enter_Top", "x": 18.5, "y": 5 },
-        { "label": "Ctrl", "x": 0, "y": 6, "w": 1.25 },
-        { "label": "GUI", "x": 1.25, "y": 6, "w": 1.25 },
-        { "label": "Alt", "x": 2.5, "y": 6, "w": 1.25 },
-        { "label": "Space", "x": 3.75, "y": 6, "w": 6.25 },
-        { "label": "Alt", "x": 10, "y": 6 },
-        { "label": "Fn", "x": 11, "y": 6 },
-        { "label": "Ctrl", "x": 12, "y": 6 },
-        { "label": "Left", "x": 13.25, "y": 6.25 },
-        { "label": "Down", "x": 14.25, "y": 6.25 },
-        { "label": "Right", "x": 15.25, "y": 6.25 },
-        { "label": "0", "x": 16.5, "y": 6 },
-        { "label": ".", "x": 17.5, "y": 6 },
-        { "label": "Enter", "x": 18.5, "y": 6 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 1.25, "y": 0},
+        {"matrix": [0, 3], "x": 2.25, "y": 0},
+        {"matrix": [0, 4], "x": 3.25, "y": 0},
+        {"matrix": [0, 5], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 6], "x": 5.5, "y": 0},
+        {"matrix": [0, 7], "x": 6.5, "y": 0},
+        {"matrix": [0, 8], "x": 7.5, "y": 0},
+        {"matrix": [0, 9], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 9.75, "y": 0},
+        {"matrix": [0, 11], "x": 10.75, "y": 0},
+        {"matrix": [0, 12], "x": 11.75, "y": 0},
+        {"matrix": [0, 13], "x": 12.75, "y": 0},
+
+        {"matrix": [0, 15], "x": 15.5, "y": 0},
+        {"matrix": [0, 16], "x": 16.5, "y": 0},
+        {"matrix": [0, 17], "x": 17.5, "y": 0},
+        {"matrix": [0, 18], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 15], "x": 15.5, "y": 1},
+        {"matrix": [1, 16], "x": 16.5, "y": 1},
+        {"matrix": [1, 17], "x": 17.5, "y": 1},
+        {"matrix": [1, 18], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+        {"matrix": [2, 12], "x": 12, "y": 2},
+        {"matrix": [2, 13], "x": 13, "y": 2},
+        {"matrix": [2, 14], "x": 14, "y": 2},
+
+        {"matrix": [2, 15], "x": 15.5, "y": 2},
+        {"matrix": [2, 16], "x": 16.5, "y": 2},
+        {"matrix": [2, 17], "x": 17.5, "y": 2},
+        {"matrix": [2, 18], "x": 18.5, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3},
+        {"matrix": [3, 2], "x": 2.5, "y": 3},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5},
+
+        {"matrix": [3, 15], "x": 15.5, "y": 3},
+        {"matrix": [3, 16], "x": 16.5, "y": 3},
+        {"matrix": [3, 17], "x": 17.5, "y": 3},
+        {"matrix": [3, 18], "x": 18.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75},
+        {"matrix": [4, 1], "x": 1.75, "y": 4},
+        {"matrix": [4, 2], "x": 2.75, "y": 4},
+        {"matrix": [4, 3], "x": 3.75, "y": 4},
+        {"matrix": [4, 4], "x": 4.75, "y": 4},
+        {"matrix": [4, 5], "x": 5.75, "y": 4},
+        {"matrix": [4, 6], "x": 6.75, "y": 4},
+        {"matrix": [4, 7], "x": 7.75, "y": 4},
+        {"matrix": [4, 8], "x": 8.75, "y": 4},
+        {"matrix": [4, 9], "x": 9.75, "y": 4},
+        {"matrix": [4, 10], "x": 10.75, "y": 4},
+        {"matrix": [4, 11], "x": 11.75, "y": 4},
+        {"matrix": [4, 12], "x": 12.75, "y": 4},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 15.5, "y": 4},
+        {"matrix": [4, 16], "x": 16.5, "y": 4},
+        {"matrix": [4, 17], "x": 17.5, "y": 4},
+        {"matrix": [4, 18], "x": 18.5, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5},
+        {"matrix": [5, 2], "x": 2.25, "y": 5},
+        {"matrix": [5, 3], "x": 3.25, "y": 5},
+        {"matrix": [5, 4], "x": 4.25, "y": 5},
+        {"matrix": [5, 5], "x": 5.25, "y": 5},
+        {"matrix": [5, 6], "x": 6.25, "y": 5},
+        {"matrix": [5, 7], "x": 7.25, "y": 5},
+        {"matrix": [5, 8], "x": 8.25, "y": 5},
+        {"matrix": [5, 9], "x": 9.25, "y": 5},
+        {"matrix": [5, 10], "x": 10.25, "y": 5},
+        {"matrix": [5, 11], "x": 11.25, "y": 5},
+        {"matrix": [5, 12], "x": 12.25, "y": 5, "w": 1.75},
+
+        {"matrix": [5, 13], "x": 14.25, "y": 5.25},
+
+        {"matrix": [5, 15], "x": 15.5, "y": 5},
+        {"matrix": [5, 16], "x": 16.5, "y": 5},
+        {"matrix": [5, 17], "x": 17.5, "y": 5},
+        {"matrix": [5, 18], "x": 18.5, "y": 5},
+
+        {"matrix": [6, 0], "x": 0, "y": 6, "w": 1.25},
+        {"matrix": [6, 1], "x": 1.25, "y": 6, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 6, "w": 1.25},
+        {"matrix": [6, 5], "x": 3.75, "y": 6, "w": 6.25},
+        {"matrix": [6, 9], "x": 10, "y": 6},
+        {"matrix": [6, 10], "x": 11, "y": 6},
+        {"matrix": [6, 11], "x": 12, "y": 6},
+
+        {"matrix": [6, 12], "x": 13.25, "y": 6.25},
+        {"matrix": [6, 13], "x": 14.25, "y": 6.25},
+        {"matrix": [6, 14], "x": 15.25, "y": 6.25},
+
+        {"matrix": [6, 16], "x": 16.5, "y": 6},
+        {"matrix": [6, 17], "x": 17.5, "y": 6},
+        {"matrix": [6, 18], "x": 18.5, "y": 6}
       ]
     }
   }
diff --git a/keyboards/tkc/tkc1800/tkc1800.c b/keyboards/tkc/tkc1800/tkc1800.c
index 08e4e0bb3b..b5b4cf0887 100644
--- a/keyboards/tkc/tkc1800/tkc1800.c
+++ b/keyboards/tkc/tkc1800/tkc1800.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 "tkc1800.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinInputHigh(D0);
diff --git a/keyboards/tkc/tkc1800/tkc1800.h b/keyboards/tkc/tkc1800/tkc1800.h
deleted file mode 100644
index 4d1686cf16..0000000000
--- a/keyboards/tkc/tkc1800/tkc1800.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2017 Mathias Andersson <wraul@dbox.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, K0G, K0H, K0I, \
-                                                                               K1F, K1G, K1H, K1I, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, K3G, K3H, K3I, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4F, K4G, K4H, K4I, \
-    K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C,    K5D,   K5F, K5G, K5H, K5I, \
-    K60, K61, K62,           K65,                K69, K6A, K6B,    K6C, K6D, K6E,   K6G, K6H, K6I  \
-) { \
-    { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO, K0F,   K0G, K0H, K0I }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1F,   K1G, K1H, K1I }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G, K2H, K2I }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, K3F,   K3G, K3H, K3I }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   K4G, K4H, K4I }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   KC_NO, K5F,   K5G, K5H, K5I }, \
-    { K60,   K61,   K62,   KC_NO, KC_NO, K65,   KC_NO, KC_NO, KC_NO, K69,   K6A,   K6B,   K6C,   K6D,   K6E,   KC_NO, K6G, K6H, K6I }  \
-}