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

8 files changed, 366 insertions, 454 deletions

diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json
index daa2e87807..1d519d7aad 100644
--- a/keyboards/cozykeys/bloomer/v2/info.json
+++ b/keyboards/cozykeys/bloomer/v2/info.json
@@ -12,93 +12,109 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k00", "x":  0.868, "y":     0, "r":  10 },
-        { "label": "k01", "x":  1.853, "y": 0.174, "r":  10 },
-        { "label": "k02", "x":  2.856, "y": 0.244, "r":  10 },
-        { "label": "k03", "x":  3.896, "y": 0.107, "r":  10 },
-        { "label": "k04", "x":  4.826, "y": 0.591, "r":  10 },
-        { "label": "k05", "x":  5.765, "y": 1.023, "r":  10 },
-        { "label": "k06", "x":  7.031, "y": 0.724, "r":   0 },
-        { "label": "k07", "x":  8.031, "y":  0.46, "r":   0 },
-        { "label": "k08", "x":  9.031, "y": 0.724, "r":   0 },
-        { "label": "k09", "x": 10.297, "y": 1.023, "r": -10 },
-        { "label": "k10", "x": 11.236, "y": 0.591, "r": -10 },
-        { "label": "k11", "x": 12.166, "y": 0.107, "r": -10 },
-        { "label": "k12", "x": 13.196, "y": 0.192, "r": -10 },
-        { "label": "k13", "x": 14.208, "y": 0.174, "r": -10 },
-        { "label": "k14", "x": 15.193, "y":     0, "r": -10 },
-        { "label": "k15", "x":  0.695, "y": 0.985, "r":  10 },
-        { "label": "k16", "x":  1.679, "y": 1.158, "r":  10 },
-        { "label": "k17", "x":  2.682, "y": 1.229, "r":  10 },
-        { "label": "k18", "x":  3.722, "y": 1.092, "r":  10 },
-        { "label": "k19", "x":  4.652, "y": 1.576, "r":  10 },
-        { "label": "k20", "x":  5.591, "y": 2.008, "r":  10 },
-        { "label": "k21", "x":  7.031, "y": 2.249, "r":   0 },
-        { "label": "k22", "x":  8.031, "y": 1.985, "r":   0 },
-        { "label": "k23", "x":  9.031, "y": 2.249, "r":   0 },
-        { "label": "k24", "x":  10.47, "y": 2.008, "r": -10 },
-        { "label": "k25", "x": 11.409, "y": 1.576, "r": -10 },
-        { "label": "k26", "x":  12.34, "y": 1.092, "r": -10 },
-        { "label": "k27", "x":  13.37, "y": 1.177, "r": -10 },
-        { "label": "k28", "x": 14.382, "y": 1.158, "r": -10 },
-        { "label": "k29", "x": 15.367, "y": 0.985, "r": -10 },
-        { "label": "k30", "x":  0.521, "y":  1.97, "r":  10 },
-        { "label": "k31", "x":  1.506, "y": 2.143, "r":  10 },
-        { "label": "k32", "x":  2.509, "y": 2.214, "r":  10 },
-        { "label": "k33", "x":  3.548, "y": 2.077, "r":  10 },
-        { "label": "k34", "x":  4.478, "y": 2.561, "r":  10 },
-        { "label": "k35", "x":  5.418, "y": 2.993, "r":  10 },
-        { "label": "k36", "x":  7.031, "y": 3.249, "r":   0 },
-        { "label": "k37", "x":  8.031, "y": 2.985, "r":   0 },
-        { "label": "k38", "x":  9.031, "y": 3.249, "r":   0 },
-        { "label": "k39", "x": 10.644, "y": 2.993, "r": -10 },
-        { "label": "k40", "x": 11.583, "y": 2.561, "r": -10 },
-        { "label": "k41", "x": 12.513, "y": 2.077, "r": -10 },
-        { "label": "k42", "x": 13.544, "y": 2.162, "r": -10 },
-        { "label": "k43", "x": 14.556, "y": 2.143, "r": -10 },
-        { "label": "k44", "x": 15.541, "y":  1.97, "r": -10 },
-        { "label": "k45", "x":  0.347, "y": 2.954, "r":  10 },
-        { "label": "k46", "x":  1.332, "y": 3.128, "r":  10 },
-        { "label": "k47", "x":  2.335, "y": 3.198, "r":  10 },
-        { "label": "k48", "x":  3.375, "y": 3.062, "r":  10 },
-        { "label": "k49", "x":  4.305, "y": 3.546, "r":  10 },
-        { "label": "k50", "x":  5.244, "y": 3.978, "r":  10 },
-        { "label": "k51", "x": 10.818, "y": 3.978, "r": -10 },
-        { "label": "k52", "x": 11.757, "y": 3.546, "r": -10 },
-        { "label": "k53", "x": 12.687, "y": 3.062, "r": -10 },
-        { "label": "k54", "x": 13.717, "y": 3.147, "r": -10 },
-        { "label": "k55", "x": 14.729, "y": 3.128, "r": -10 },
-        { "label": "k56", "x": 15.714, "y": 2.954, "r": -10 },
-        { "label": "k57", "x":  0.174, "y": 3.939, "r":  10 },
-        { "label": "k58", "x":  1.158, "y": 4.113, "r":  10 },
-        { "label": "k59", "x":  2.161, "y": 4.183, "r":  10 },
-        { "label": "k60", "x":  3.201, "y": 4.047, "r":  10 },
-        { "label": "k61", "x":  4.131, "y":  4.53, "r":  10 },
-        { "label": "k62", "x":   5.07, "y": 4.963, "r":  10 },
-        { "label": "k63", "x":  7.031, "y": 4.984, "r":   0 },
-        { "label": "k64", "x":  8.031, "y":  4.51, "r":   0 },
-        { "label": "k65", "x":  9.031, "y": 4.984, "r":   0 },
-        { "label": "k66", "x": 10.991, "y": 4.963, "r": -10 },
-        { "label": "k67", "x":  11.93, "y":  4.53, "r": -10 },
-        { "label": "k68", "x": 12.861, "y": 4.047, "r": -10 },
-        { "label": "k69", "x": 13.891, "y": 4.131, "r": -10 },
-        { "label": "k70", "x": 14.903, "y": 4.113, "r": -10 },
-        { "label": "k71", "x": 15.888, "y": 3.939, "r": -10 },
-        { "label": "k72", "x":      0, "y": 4.924, "r":  10 },
-        { "label": "k73", "x":  0.985, "y": 5.098, "r":  10 },
-        { "label": "k74", "x":  1.988, "y": 5.168, "r":  10 },
-        { "label": "k75", "x":  3.027, "y": 5.031, "r":  10 },
-        { "label": "k76", "x":  3.957, "y": 5.515, "r":  10 },
-        { "label": "k77", "x":  4.897, "y": 5.947, "r":  10 },
-        { "label": "k78", "x":  5.883, "y": 6.115, "r":  10 },
-        { "label": "k79", "x":  8.031, "y":  5.51, "r":   0 },
-        { "label": "k80", "x": 10.179, "y": 6.115, "r": -10 },
-        { "label": "k81", "x": 11.165, "y": 5.947, "r": -10 },
-        { "label": "k82", "x": 12.104, "y": 5.515, "r": -10 },
-        { "label": "k83", "x": 13.034, "y": 5.031, "r": -10 },
-        { "label": "k84", "x": 14.065, "y": 5.116, "r": -10 },
-        { "label": "k85", "x": 15.077, "y": 5.098, "r": -10 },
-        { "label": "k86", "x": 16.062, "y": 4.924, "r": -10 }
+        {"matrix": [0, 0], "x": 0.868, "y": 0, "r": 10},
+        {"matrix": [0, 1], "x": 1.853, "y": 0.174, "r": 10},
+        {"matrix": [0, 2], "x": 2.856, "y": 0.244, "r": 10},
+        {"matrix": [0, 3], "x": 3.896, "y": 0.107, "r": 10},
+        {"matrix": [0, 4], "x": 4.826, "y": 0.591, "r": 10},
+        {"matrix": [0, 5], "x": 5.765, "y": 1.023, "r": 10},
+
+        {"matrix": [0, 6], "x": 7.031, "y": 0.724, "r": 0},
+        {"matrix": [0, 7], "x": 8.031, "y": 0.46, "r": 0},
+        {"matrix": [0, 8], "x": 9.031, "y": 0.724, "r": 0},
+
+        {"matrix": [0, 9], "x": 10.297, "y": 1.023, "r": -10},
+        {"matrix": [0, 10], "x": 11.236, "y": 0.591, "r": -10},
+        {"matrix": [0, 11], "x": 12.166, "y": 0.107, "r": -10},
+        {"matrix": [0, 12], "x": 13.196, "y": 0.192, "r": -10},
+        {"matrix": [0, 13], "x": 14.208, "y": 0.174, "r": -10},
+        {"matrix": [0, 14], "x": 15.193, "y": 0, "r": -10},
+
+        {"matrix": [1, 0], "x": 0.695, "y": 0.985, "r": 10},
+        {"matrix": [1, 1], "x": 1.679, "y": 1.158, "r": 10},
+        {"matrix": [1, 2], "x": 2.682, "y": 1.229, "r": 10},
+        {"matrix": [1, 3], "x": 3.722, "y": 1.092, "r": 10},
+        {"matrix": [1, 4], "x": 4.652, "y": 1.576, "r": 10},
+        {"matrix": [1, 5], "x": 5.591, "y": 2.008, "r": 10},
+
+        {"matrix": [1, 6], "x": 7.031, "y": 2.249, "r": 0},
+        {"matrix": [1, 7], "x": 8.031, "y": 1.985, "r": 0},
+        {"matrix": [1, 8], "x": 9.031, "y": 2.249, "r": 0},
+
+        {"matrix": [1, 9], "x": 10.47, "y": 2.008, "r": -10},
+        {"matrix": [1, 10], "x": 11.409, "y": 1.576, "r": -10},
+        {"matrix": [1, 11], "x": 12.34, "y": 1.092, "r": -10},
+        {"matrix": [1, 12], "x": 13.37, "y": 1.177, "r": -10},
+        {"matrix": [1, 13], "x": 14.382, "y": 1.158, "r": -10},
+        {"matrix": [1, 14], "x": 15.367, "y": 0.985, "r": -10},
+
+        {"matrix": [2, 0], "x": 0.521, "y": 1.97, "r": 10},
+        {"matrix": [2, 1], "x": 1.506, "y": 2.143, "r": 10},
+        {"matrix": [2, 2], "x": 2.509, "y": 2.214, "r": 10},
+        {"matrix": [2, 3], "x": 3.548, "y": 2.077, "r": 10},
+        {"matrix": [2, 4], "x": 4.478, "y": 2.561, "r": 10},
+        {"matrix": [2, 5], "x": 5.418, "y": 2.993, "r": 10},
+
+        {"matrix": [2, 6], "x": 7.031, "y": 3.249, "r": 0},
+        {"matrix": [2, 7], "x": 8.031, "y": 2.985, "r": 0},
+        {"matrix": [2, 8], "x": 9.031, "y": 3.249, "r": 0},
+
+        {"matrix": [2, 9], "x": 10.644, "y": 2.993, "r": -10},
+        {"matrix": [2, 10], "x": 11.583, "y": 2.561, "r": -10},
+        {"matrix": [2, 11], "x": 12.513, "y": 2.077, "r": -10},
+        {"matrix": [2, 12], "x": 13.544, "y": 2.162, "r": -10},
+        {"matrix": [2, 13], "x": 14.556, "y": 2.143, "r": -10},
+        {"matrix": [2, 14], "x": 15.541, "y": 1.97, "r": -10},
+
+        {"matrix": [3, 0], "x": 0.347, "y": 2.954, "r": 10},
+        {"matrix": [3, 1], "x": 1.332, "y": 3.128, "r": 10},
+        {"matrix": [3, 2], "x": 2.335, "y": 3.198, "r": 10},
+        {"matrix": [3, 3], "x": 3.375, "y": 3.062, "r": 10},
+        {"matrix": [3, 4], "x": 4.305, "y": 3.546, "r": 10},
+        {"matrix": [3, 5], "x": 5.244, "y": 3.978, "r": 10},
+
+        {"matrix": [3, 9], "x": 10.818, "y": 3.978, "r": -10},
+        {"matrix": [3, 10], "x": 11.757, "y": 3.546, "r": -10},
+        {"matrix": [3, 11], "x": 12.687, "y": 3.062, "r": -10},
+        {"matrix": [3, 12], "x": 13.717, "y": 3.147, "r": -10},
+        {"matrix": [3, 13], "x": 14.729, "y": 3.128, "r": -10},
+        {"matrix": [3, 14], "x": 15.714, "y": 2.954, "r": -10},
+
+        {"matrix": [4, 0], "x": 0.174, "y": 3.939, "r": 10},
+        {"matrix": [4, 1], "x": 1.158, "y": 4.113, "r": 10},
+        {"matrix": [4, 2], "x": 2.161, "y": 4.183, "r": 10},
+        {"matrix": [4, 3], "x": 3.201, "y": 4.047, "r": 10},
+        {"matrix": [4, 4], "x": 4.131, "y": 4.53, "r": 10},
+        {"matrix": [4, 5], "x": 5.07, "y": 4.963, "r": 10},
+
+        {"matrix": [4, 6], "x": 7.031, "y": 4.984, "r": 0},
+        {"matrix": [4, 7], "x": 8.031, "y": 4.51, "r": 0},
+        {"matrix": [4, 8], "x": 9.031, "y": 4.984, "r": 0},
+
+        {"matrix": [4, 9], "x": 10.991, "y": 4.963, "r": -10},
+        {"matrix": [4, 10], "x": 11.93, "y": 4.53, "r": -10},
+        {"matrix": [4, 11], "x": 12.861, "y": 4.047, "r": -10},
+        {"matrix": [4, 12], "x": 13.891, "y": 4.131, "r": -10},
+        {"matrix": [4, 13], "x": 14.903, "y": 4.113, "r": -10},
+        {"matrix": [4, 14], "x": 15.888, "y": 3.939, "r": -10},
+
+        {"matrix": [5, 0], "x": 0, "y": 4.924, "r": 10},
+        {"matrix": [5, 1], "x": 0.985, "y": 5.098, "r": 10},
+        {"matrix": [5, 2], "x": 1.988, "y": 5.168, "r": 10},
+        {"matrix": [5, 3], "x": 3.027, "y": 5.031, "r": 10},
+        {"matrix": [5, 4], "x": 3.957, "y": 5.515, "r": 10},
+        {"matrix": [5, 5], "x": 4.897, "y": 5.947, "r": 10},
+        {"matrix": [5, 6], "x": 5.883, "y": 6.115, "r": 10},
+
+        {"matrix": [5, 7], "x": 8.031, "y": 5.51, "r": 0},
+
+        {"matrix": [5, 8], "x": 10.179, "y": 6.115, "r": -10},
+        {"matrix": [5, 9], "x": 11.165, "y": 5.947, "r": -10},
+        {"matrix": [5, 10], "x": 12.104, "y": 5.515, "r": -10},
+        {"matrix": [5, 11], "x": 13.034, "y": 5.031, "r": -10},
+        {"matrix": [5, 12], "x": 14.065, "y": 5.116, "r": -10},
+        {"matrix": [5, 13], "x": 15.077, "y": 5.098, "r": -10},
+        {"matrix": [5, 14], "x": 16.062, "y": 4.924, "r": -10}
       ]
     }
   }
diff --git a/keyboards/cozykeys/bloomer/v2/v2.h b/keyboards/cozykeys/bloomer/v2/v2.h
deleted file mode 100644
index c6575cd4e6..0000000000
--- a/keyboards/cozykeys/bloomer/v2/v2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, \
-    k45, k46, k47, k48, k49, k50,                k51, k52, k53, k54, k55, k56, \
-    k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, \
-    k72, k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86  \
-) \
-{       /* c00  c01  c02  c03  c04  c05  c06  c07  c08  c09  c10  c11  c12  c13  c14 */ \
-/* r0 */ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
-/* r1 */ { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-/* r2 */ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44 }, \
-/* r3 */ { k45, k46, k47, k48, k49, k50, ___, ___, ___, k51, k52, k53, k54, k55, k56 }, \
-/* r4 */ { k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71 }, \
-/* r5 */ { k72, k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86 }, \
-}
diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json
index a7ceb820c8..3b630f852a 100644
--- a/keyboards/cozykeys/bloomer/v3/info.json
+++ b/keyboards/cozykeys/bloomer/v3/info.json
@@ -12,96 +12,111 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k00", "x":  0.868, "y":     0, "r":  10 },
-        { "label": "k01", "x":  1.853, "y": 0.174, "r":  10 },
-        { "label": "k02", "x":  2.856, "y": 0.244, "r":  10 },
-        { "label": "k03", "x":  3.896, "y": 0.107, "r":  10 },
-        { "label": "k04", "x":  4.826, "y": 0.591, "r":  10 },
-        { "label": "k05", "x":  5.765, "y": 1.023, "r":  10 },
-        { "label": "k06", "x": 10.507, "y": 1.023, "r": -10 },
-        { "label": "k07", "x": 11.446, "y": 0.591, "r": -10 },
-        { "label": "k08", "x": 12.376, "y": 0.107, "r": -10 },
-        { "label": "k09", "x": 13.406, "y": 0.192, "r": -10 },
-        { "label": "k10", "x": 14.418, "y": 0.174, "r": -10 },
-        { "label": "k11", "x": 15.403, "y":     0, "r": -10 },
-        { "label": "k12", "x":  0.695, "y": 0.985, "r":  10 },
-        { "label": "k13", "x":  1.679, "y": 1.158, "r":  10 },
-        { "label": "k14", "x":  2.682, "y": 1.229, "r":  10 },
-        { "label": "k15", "x":  3.722, "y": 1.092, "r":  10 },
-        { "label": "k16", "x":  4.652, "y": 1.576, "r":  10 },
-        { "label": "k17", "x":  5.591, "y": 2.008, "r":  10 },
-        { "label": "k18", "x":  10.68, "y": 2.008, "r": -10 },
-        { "label": "k19", "x": 11.619, "y": 1.576, "r": -10 },
-        { "label": "k20", "x":  12.55, "y": 1.092, "r": -10 },
-        { "label": "k21", "x":  13.58, "y": 1.177, "r": -10 },
-        { "label": "k22", "x": 14.592, "y": 1.158, "r": -10 },
-        { "label": "k23", "x": 15.577, "y": 0.985, "r": -10 },
-        { "label": "k24", "x":  0.521, "y":  1.97, "r":  10 },
-        { "label": "k25", "x":  1.506, "y": 2.143, "r":  10 },
-        { "label": "k26", "x":  2.509, "y": 2.214, "r":  10 },
-        { "label": "k27", "x":  3.548, "y": 2.077, "r":  10 },
-        { "label": "k28", "x":  4.478, "y": 2.561, "r":  10 },
-        { "label": "k29", "x":  5.418, "y": 2.993, "r":  10 },
-        { "label": "k30", "x":  6.402, "y": 3.167, "r":  10 },
-        { "label": "k31", "x":  7.636, "y": 3.217, "r":   0 },
-        { "label": "k32", "x":  8.636, "y": 3.217, "r":   0 },
-        { "label": "k33", "x":  9.869, "y": 3.167, "r": -10 },
-        { "label": "k34", "x": 10.854, "y": 2.993, "r": -10 },
-        { "label": "k35", "x": 11.793, "y": 2.561, "r": -10 },
-        { "label": "k36", "x": 12.723, "y": 2.077, "r": -10 },
-        { "label": "k37", "x": 13.754, "y": 2.162, "r": -10 },
-        { "label": "k38", "x": 14.766, "y": 2.143, "r": -10 },
-        { "label": "k39", "x":  15.75, "y":  1.97, "r": -10 },
-        { "label": "k40", "x":  0.347, "y": 2.954, "r":  10 },
-        { "label": "k41", "x":  1.332, "y": 3.128, "r":  10 },
-        { "label": "k42", "x":  2.335, "y": 3.198, "r":  10 },
-        { "label": "k43", "x":  3.375, "y": 3.062, "r":  10 },
-        { "label": "k44", "x":  4.305, "y": 3.546, "r":  10 },
-        { "label": "k45", "x":  5.244, "y": 3.978, "r":  10 },
-        { "label": "k46", "x":  6.229, "y": 4.151, "r":  10 },
-        { "label": "k47", "x":  7.636, "y": 4.217, "r":   0 },
-        { "label": "k48", "x":  8.636, "y": 4.217, "r":   0 },
-        { "label": "k49", "x": 10.043, "y": 4.151, "r": -10 },
-        { "label": "k50", "x": 11.027, "y": 3.978, "r": -10 },
-        { "label": "k51", "x": 11.967, "y": 3.546, "r": -10 },
-        { "label": "k52", "x": 12.897, "y": 3.062, "r": -10 },
-        { "label": "k53", "x": 13.927, "y": 3.147, "r": -10 },
-        { "label": "k54", "x": 14.939, "y": 3.128, "r": -10 },
-        { "label": "k55", "x": 15.924, "y": 2.954, "r": -10 },
-        { "label": "k56", "x":  0.174, "y": 3.939, "r":  10 },
-        { "label": "k57", "x":  1.158, "y": 4.113, "r":  10 },
-        { "label": "k58", "x":  2.161, "y": 4.183, "r":  10 },
-        { "label": "k59", "x":  3.201, "y": 4.047, "r":  10 },
-        { "label": "k60", "x":  4.131, "y":  4.53, "r":  10 },
-        { "label": "k61", "x":   5.07, "y": 4.963, "r":  10 },
-        { "label": "k62", "x":  6.055, "y": 5.136, "r":  10 },
-        { "label": "k63", "x":  7.136, "y": 5.217, "r":   0 },
-        { "label": "k64", "x":  8.136, "y": 5.217, "r":   0 },
-        { "label": "k65", "x":  9.136, "y": 5.217, "r":   0 },
-        { "label": "k66", "x": 10.216, "y": 5.136, "r": -10 },
-        { "label": "k67", "x": 11.201, "y": 4.963, "r": -10 },
-        { "label": "k68", "x":  12.14, "y":  4.53, "r": -10 },
-        { "label": "k69", "x":  13.07, "y": 4.047, "r": -10 },
-        { "label": "k70", "x": 14.101, "y": 4.131, "r": -10 },
-        { "label": "k71", "x": 15.113, "y": 4.113, "r": -10 },
-        { "label": "k72", "x": 16.098, "y": 3.939, "r": -10 },
-        { "label": "k73", "x":      0, "y": 4.924, "r":  10 },
-        { "label": "k74", "x":  0.985, "y": 5.098, "r":  10 },
-        { "label": "k75", "x":  1.988, "y": 5.168, "r":  10 },
-        { "label": "k76", "x":  3.027, "y": 5.031, "r":  10 },
-        { "label": "k77", "x":  3.957, "y": 5.515, "r":  10 },
-        { "label": "k78", "x":  4.897, "y": 5.947, "r":  10 },
-        { "label": "k79", "x":  5.881, "y": 6.121, "r":  10 },
-        { "label": "k80", "x":  7.136, "y": 6.217, "r":   0 },
-        { "label": "k81", "x":  8.136, "y": 6.217, "r":   0 },
-        { "label": "k82", "x":  9.136, "y": 6.217, "r":   0 },
-        { "label": "k83", "x":  10.39, "y": 6.121, "r": -10 },
-        { "label": "k84", "x": 11.375, "y": 5.947, "r": -10 },
-        { "label": "k85", "x": 12.314, "y": 5.515, "r": -10 },
-        { "label": "k86", "x": 13.244, "y": 5.031, "r": -10 },
-        { "label": "k87", "x": 14.274, "y": 5.116, "r": -10 },
-        { "label": "k88", "x": 15.287, "y": 5.098, "r": -10 },
-        { "label": "k89", "x": 16.271, "y": 4.924, "r": -10 }
+        {"matrix": [0, 0], "x": 0.868, "y": 0, "r": 10},
+        {"matrix": [0, 1], "x": 1.853, "y": 0.174, "r": 10},
+        {"matrix": [0, 2], "x": 2.856, "y": 0.244, "r": 10},
+        {"matrix": [0, 3], "x": 3.896, "y": 0.107, "r": 10},
+        {"matrix": [0, 4], "x": 4.826, "y": 0.591, "r": 10},
+        {"matrix": [0, 5], "x": 5.765, "y": 1.023, "r": 10},
+
+        {"matrix": [0, 9], "x": 10.507, "y": 1.023, "r": -10},
+        {"matrix": [0, 10], "x": 11.446, "y": 0.591, "r": -10},
+        {"matrix": [0, 11], "x": 12.376, "y": 0.107, "r": -10},
+        {"matrix": [0, 12], "x": 13.406, "y": 0.192, "r": -10},
+        {"matrix": [0, 13], "x": 14.418, "y": 0.174, "r": -10},
+        {"matrix": [0, 14], "x": 15.403, "y": 0, "r": -10},
+
+        {"matrix": [1, 0], "x": 0.695, "y": 0.985, "r": 10},
+        {"matrix": [1, 1], "x": 1.679, "y": 1.158, "r": 10},
+        {"matrix": [1, 2], "x": 2.682, "y": 1.229, "r": 10},
+        {"matrix": [1, 3], "x": 3.722, "y": 1.092, "r": 10},
+        {"matrix": [1, 4], "x": 4.652, "y": 1.576, "r": 10},
+        {"matrix": [1, 5], "x": 5.591, "y": 2.008, "r": 10},
+
+        {"matrix": [1, 9], "x": 10.68, "y": 2.008, "r": -10},
+        {"matrix": [1, 10], "x": 11.619, "y": 1.576, "r": -10},
+        {"matrix": [1, 11], "x": 12.55, "y": 1.092, "r": -10},
+        {"matrix": [1, 12], "x": 13.58, "y": 1.177, "r": -10},
+        {"matrix": [1, 13], "x": 14.592, "y": 1.158, "r": -10},
+        {"matrix": [1, 14], "x": 15.577, "y": 0.985, "r": -10},
+
+        {"matrix": [2, 0], "x": 0.521, "y": 1.97, "r": 10},
+        {"matrix": [2, 1], "x": 1.506, "y": 2.143, "r": 10},
+        {"matrix": [2, 2], "x": 2.509, "y": 2.214, "r": 10},
+        {"matrix": [2, 3], "x": 3.548, "y": 2.077, "r": 10},
+        {"matrix": [2, 4], "x": 4.478, "y": 2.561, "r": 10},
+        {"matrix": [2, 5], "x": 5.418, "y": 2.993, "r": 10},
+        {"matrix": [2, 6], "x": 6.402, "y": 3.167, "r": 10},
+
+        {"matrix": [0, 6], "x": 7.636, "y": 3.217, "r": 0},
+        {"matrix": [0, 8], "x": 8.636, "y": 3.217, "r": 0},
+
+        {"matrix": [2, 8], "x": 9.869, "y": 3.167, "r": -10},
+        {"matrix": [2, 9], "x": 10.854, "y": 2.993, "r": -10},
+        {"matrix": [2, 10], "x": 11.793, "y": 2.561, "r": -10},
+        {"matrix": [2, 11], "x": 12.723, "y": 2.077, "r": -10},
+        {"matrix": [2, 12], "x": 13.754, "y": 2.162, "r": -10},
+        {"matrix": [2, 13], "x": 14.766, "y": 2.143, "r": -10},
+        {"matrix": [2, 14], "x": 15.75, "y": 1.97, "r": -10},
+
+        {"matrix": [3, 0], "x": 0.347, "y": 2.954, "r": 10},
+        {"matrix": [3, 1], "x": 1.332, "y": 3.128, "r": 10},
+        {"matrix": [3, 2], "x": 2.335, "y": 3.198, "r": 10},
+        {"matrix": [3, 3], "x": 3.375, "y": 3.062, "r": 10},
+        {"matrix": [3, 4], "x": 4.305, "y": 3.546, "r": 10},
+        {"matrix": [3, 5], "x": 5.244, "y": 3.978, "r": 10},
+        {"matrix": [3, 6], "x": 6.229, "y": 4.151, "r": 10},
+
+        {"matrix": [1, 6], "x": 7.636, "y": 4.217, "r": 0},
+        {"matrix": [1, 8], "x": 8.636, "y": 4.217, "r": 0},
+
+        {"matrix": [3, 8], "x": 10.043, "y": 4.151, "r": -10},
+        {"matrix": [3, 9], "x": 11.027, "y": 3.978, "r": -10},
+        {"matrix": [3, 10], "x": 11.967, "y": 3.546, "r": -10},
+        {"matrix": [3, 11], "x": 12.897, "y": 3.062, "r": -10},
+        {"matrix": [3, 12], "x": 13.927, "y": 3.147, "r": -10},
+        {"matrix": [3, 13], "x": 14.939, "y": 3.128, "r": -10},
+        {"matrix": [3, 14], "x": 15.924, "y": 2.954, "r": -10},
+
+        {"matrix": [4, 0], "x": 0.174, "y": 3.939, "r": 10},
+        {"matrix": [4, 1], "x": 1.158, "y": 4.113, "r": 10},
+        {"matrix": [4, 2], "x": 2.161, "y": 4.183, "r": 10},
+        {"matrix": [4, 3], "x": 3.201, "y": 4.047, "r": 10},
+        {"matrix": [4, 4], "x": 4.131, "y": 4.53, "r": 10},
+        {"matrix": [4, 5], "x": 5.07, "y": 4.963, "r": 10},
+        {"matrix": [4, 6], "x": 6.055, "y": 5.136, "r": 10},
+
+        {"matrix": [0, 7], "x": 7.136, "y": 5.217, "r": 0},
+        {"matrix": [2, 7], "x": 8.136, "y": 5.217, "r": 0},
+        {"matrix": [4, 7], "x": 9.136, "y": 5.217, "r": 0},
+
+        {"matrix": [4, 8], "x": 10.216, "y": 5.136, "r": -10},
+        {"matrix": [4, 9], "x": 11.201, "y": 4.963, "r": -10},
+        {"matrix": [4, 10], "x": 12.14, "y": 4.53, "r": -10},
+        {"matrix": [4, 11], "x": 13.07, "y": 4.047, "r": -10},
+        {"matrix": [4, 12], "x": 14.101, "y": 4.131, "r": -10},
+        {"matrix": [4, 13], "x": 15.113, "y": 4.113, "r": -10},
+        {"matrix": [4, 14], "x": 16.098, "y": 3.939, "r": -10},
+
+        {"matrix": [5, 0], "x": 0, "y": 4.924, "r": 10},
+        {"matrix": [5, 1], "x": 0.985, "y": 5.098, "r": 10},
+        {"matrix": [5, 2], "x": 1.988, "y": 5.168, "r": 10},
+        {"matrix": [5, 3], "x": 3.027, "y": 5.031, "r": 10},
+        {"matrix": [5, 4], "x": 3.957, "y": 5.515, "r": 10},
+        {"matrix": [5, 5], "x": 4.897, "y": 5.947, "r": 10},
+        {"matrix": [5, 6], "x": 5.881, "y": 6.121, "r": 10},
+
+        {"matrix": [1, 7], "x": 7.136, "y": 6.217, "r": 0},
+        {"matrix": [3, 7], "x": 8.136, "y": 6.217, "r": 0},
+        {"matrix": [5, 7], "x": 9.136, "y": 6.217, "r": 0},
+
+        {"matrix": [5, 8], "x": 10.39, "y": 6.121, "r": -10},
+        {"matrix": [5, 9], "x": 11.375, "y": 5.947, "r": -10},
+        {"matrix": [5, 10], "x": 12.314, "y": 5.515, "r": -10},
+        {"matrix": [5, 11], "x": 13.244, "y": 5.031, "r": -10},
+        {"matrix": [5, 12], "x": 14.274, "y": 5.116, "r": -10},
+        {"matrix": [5, 13], "x": 15.287, "y": 5.098, "r": -10},
+        {"matrix": [5, 14], "x": 16.271, "y": 4.924, "r": -10}
       ]
     }
   }
diff --git a/keyboards/cozykeys/bloomer/v3/v3.h b/keyboards/cozykeys/bloomer/v3/v3.h
deleted file mode 100644
index 3515ef84ce..0000000000
--- a/keyboards/cozykeys/bloomer/v3/v3.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,                          k06, k07, k08, k09, k10, k11, \
-    k12, k13, k14, k15, k16, k17,                          k18, k19, k20, k21, k22, k23, \
-    k24, k25, k26, k27, k28, k29, k30,    k31, k32,   k33, k34, k35, k36, k37, k38, k39, \
-    k40, k41, k42, k43, k44, k45, k46,    k47, k48,   k49, k50, k51, k52, k53, k54, k55, \
-    k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, \
-    k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89  \
-) \
-{       /* c00  c01  c02  c03  c04  c05  c06  c07  c08  c09  c10  c11  c12  c13  c14 */ \
-/* r0 */ { k00, k01, k02, k03, k04, k05, k31, k63, k32, k06, k07, k08, k09, k10, k11 }, \
-/* r1 */ { k12, k13, k14, k15, k16, k17, k47, k80, k48, k18, k19, k20, k21, k22, k23 }, \
-/* r2 */ { k24, k25, k26, k27, k28, k29, k30, k64, k33, k34, k35, k36, k37, k38, k39 }, \
-/* r3 */ { k40, k41, k42, k43, k44, k45, k46, k81, k49, k50, k51, k52, k53, k54, k55 }, \
-/* r4 */ { k56, k57, k58, k59, k60, k61, k62, k65, k66, k67, k68, k69, k70, k71, k72 }, \
-/* r5 */ { k73, k74, k75, k76, k77, k78, k79, k82, k83, k84, k85, k86, k87, k88, k89 }  \
-}
diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json
index ddeec48844..9e70d28b41 100644
--- a/keyboards/cozykeys/speedo/v2/info.json
+++ b/keyboards/cozykeys/speedo/v2/info.json
@@ -18,72 +18,86 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k01", "x":  0.693, "y":     0, "r":  10 },
-        { "label": "k02", "x":  1.675, "y": 0.173, "r":  10 },
-        { "label": "k03", "x":  2.685, "y": 0.191, "r":  10 },
-        { "label": "k04", "x":  3.712, "y": 0.106, "r":  10 },
-        { "label": "k05", "x":   4.64, "y": 0.589, "r":  10 },
-        { "label": "k06", "x":  5.577, "y": 1.021, "r":  10 },
-        { "label": "k07", "x":  7.571, "y": 1.021, "r": -10 },
-        { "label": "k08", "x":  8.507, "y": 0.589, "r": -10 },
-        { "label": "k09", "x":  9.435, "y": 0.106, "r": -10 },
-        { "label": "k10", "x": 10.463, "y": 0.191, "r": -10 },
-        { "label": "k11", "x": 11.472, "y": 0.173, "r": -10 },
-        { "label": "k12", "x": 12.454, "y":     0, "r": -10 },
-        { "label": "k13", "x":   0.52, "y": 0.982, "r":  10 },
-        { "label": "k14", "x":  1.502, "y": 1.155, "r":  10 },
-        { "label": "k15", "x":  2.511, "y": 1.174, "r":  10 },
-        { "label": "k16", "x":  3.539, "y": 1.088, "r":  10 },
-        { "label": "k17", "x":  4.467, "y": 1.572, "r":  10 },
-        { "label": "k18", "x":  5.403, "y": 2.003, "r":  10 },
-        { "label": "k19", "x":  6.574, "y": 2.559, "r":   0 },
-        { "label": "k20", "x":  7.744, "y": 2.003, "r": -10 },
-        { "label": "k21", "x":  8.681, "y": 1.572, "r": -10 },
-        { "label": "k22", "x":  9.608, "y": 1.088, "r": -10 },
-        { "label": "k23", "x": 10.636, "y": 1.174, "r": -10 },
-        { "label": "k24", "x": 11.645, "y": 1.155, "r": -10 },
-        { "label": "k25", "x": 12.628, "y": 0.982, "r": -10 },
-        { "label": "k26", "x":  0.346, "y": 1.964, "r":  10 },
-        { "label": "k27", "x":  1.329, "y": 2.138, "r":  10 },
-        { "label": "k28", "x":  2.338, "y": 2.156, "r":  10 },
-        { "label": "k29", "x":  3.366, "y":  2.07, "r":  10 },
-        { "label": "k30", "x":  4.294, "y": 2.554, "r":  10 },
-        { "label": "k31", "x":   5.23, "y": 2.986, "r":  10 },
-        { "label": "k32", "x":  6.574, "y": 3.557, "r":   0 },
-        { "label": "k33", "x":  7.917, "y": 2.986, "r": -10 },
-        { "label": "k34", "x":  8.854, "y": 2.554, "r": -10 },
-        { "label": "k35", "x":  9.781, "y":  2.07, "r": -10 },
-        { "label": "k36", "x": 10.809, "y": 2.156, "r": -10 },
-        { "label": "k37", "x": 11.819, "y": 2.138, "r": -10 },
-        { "label": "k38", "x": 12.801, "y": 1.964, "r": -10 },
-        { "label": "k39", "x":  0.173, "y": 2.947, "r":  10 },
-        { "label": "k40", "x":  1.155, "y":  3.12, "r":  10 },
-        { "label": "k41", "x":  2.165, "y": 3.138, "r":  10 },
-        { "label": "k42", "x":  3.193, "y": 3.053, "r":  10 },
-        { "label": "k43", "x":   4.12, "y": 3.536, "r":  10 },
-        { "label": "k44", "x":  5.057, "y": 3.968, "r":  10 },
-        { "label": "k45", "x":  6.075, "y": 4.554, "r":   0 },
-        { "label": "k46", "x":  7.072, "y": 4.554, "r":   0 },
-        { "label": "k47", "x":   8.09, "y": 3.968, "r": -10 },
-        { "label": "k48", "x":  9.027, "y": 3.536, "r": -10 },
-        { "label": "k49", "x":  9.954, "y": 3.053, "r": -10 },
-        { "label": "k50", "x": 10.982, "y": 3.138, "r": -10 },
-        { "label": "k51", "x": 11.992, "y":  3.12, "r": -10 },
-        { "label": "k52", "x": 12.974, "y": 2.947, "r": -10 },
-        { "label": "k53", "x":      0, "y": 3.929, "r":  10 },
-        { "label": "k54", "x":  0.982, "y": 4.102, "r":  10 },
-        { "label": "k55", "x":  1.992, "y":  4.12, "r":  10 },
-        { "label": "k56", "x":   3.02, "y": 4.035, "r":  10 },
-        { "label": "k57", "x":  3.947, "y": 4.518, "r":  10 },
-        { "label": "k58", "x":  4.994, "y": 5.235, "r":  40 },
-        { "label": "k59", "x":  5.753, "y": 6.064, "r":  55 },
-        { "label": "k60", "x":  7.395, "y": 6.064, "r": -55 },
-        { "label": "k61", "x":  8.154, "y": 5.235, "r":  40 },
-        { "label": "k62", "x":    9.2, "y": 4.518, "r": -10 },
-        { "label": "k63", "x": 10.128, "y": 4.035, "r": -10 },
-        { "label": "k64", "x": 11.155, "y":  4.12, "r": -10 },
-        { "label": "k65", "x": 12.165, "y": 4.102, "r": -10 },
-        { "label": "k66", "x": 13.147, "y": 3.929, "r": -10 }
+        {"matrix": [0, 0], "x": 0.693, "y": 0, "r": 10},
+        {"matrix": [0, 1], "x": 1.675, "y": 0.173, "r": 10},
+        {"matrix": [0, 2], "x": 2.685, "y": 0.191, "r": 10},
+        {"matrix": [0, 3], "x": 3.712, "y": 0.106, "r": 10},
+        {"matrix": [0, 4], "x": 4.64, "y": 0.589, "r": 10},
+        {"matrix": [0, 5], "x": 5.577, "y": 1.021, "r": 10},
+
+        {"matrix": [0, 8], "x": 7.571, "y": 1.021, "r": -10},
+        {"matrix": [0, 9], "x": 8.507, "y": 0.589, "r": -10},
+        {"matrix": [0, 10], "x": 9.435, "y": 0.106, "r": -10},
+        {"matrix": [0, 11], "x": 10.463, "y": 0.191, "r": -10},
+        {"matrix": [0, 12], "x": 11.472, "y": 0.173, "r": -10},
+        {"matrix": [0, 13], "x": 12.454, "y": 0, "r": -10},
+
+        {"matrix": [1, 0], "x": 0.52, "y": 0.982, "r": 10},
+        {"matrix": [1, 1], "x": 1.502, "y": 1.155, "r": 10},
+        {"matrix": [1, 2], "x": 2.511, "y": 1.174, "r": 10},
+        {"matrix": [1, 3], "x": 3.539, "y": 1.088, "r": 10},
+        {"matrix": [1, 4], "x": 4.467, "y": 1.572, "r": 10},
+        {"matrix": [1, 5], "x": 5.403, "y": 2.003, "r": 10},
+
+        {"matrix": [1, 6], "x": 6.574, "y": 2.559, "r": 0},
+
+        {"matrix": [1, 8], "x": 7.744, "y": 2.003, "r": -10},
+        {"matrix": [1, 9], "x": 8.681, "y": 1.572, "r": -10},
+        {"matrix": [1, 10], "x": 9.608, "y": 1.088, "r": -10},
+        {"matrix": [1, 11], "x": 10.636, "y": 1.174, "r": -10},
+        {"matrix": [1, 12], "x": 11.645, "y": 1.155, "r": -10},
+        {"matrix": [1, 13], "x": 12.628, "y": 0.982, "r": -10},
+
+        {"matrix": [2, 0], "x": 0.346, "y": 1.964, "r": 10},
+        {"matrix": [2, 1], "x": 1.329, "y": 2.138, "r": 10},
+        {"matrix": [2, 2], "x": 2.338, "y": 2.156, "r": 10},
+        {"matrix": [2, 3], "x": 3.366, "y": 2.07, "r": 10},
+        {"matrix": [2, 4], "x": 4.294, "y": 2.554, "r": 10},
+        {"matrix": [2, 5], "x": 5.23, "y": 2.986, "r": 10},
+
+        {"matrix": [2, 7], "x": 6.574, "y": 3.557, "r": 0},
+
+        {"matrix": [2, 8], "x": 7.917, "y": 2.986, "r": -10},
+        {"matrix": [2, 9], "x": 8.854, "y": 2.554, "r": -10},
+        {"matrix": [2, 10], "x": 9.781, "y": 2.07, "r": -10},
+        {"matrix": [2, 11], "x": 10.809, "y": 2.156, "r": -10},
+        {"matrix": [2, 12], "x": 11.819, "y": 2.138, "r": -10},
+        {"matrix": [2, 13], "x": 12.801, "y": 1.964, "r": -10},
+
+        {"matrix": [3, 0], "x": 0.173, "y": 2.947, "r": 10},
+        {"matrix": [3, 1], "x": 1.155, "y": 3.12, "r": 10},
+        {"matrix": [3, 2], "x": 2.165, "y": 3.138, "r": 10},
+        {"matrix": [3, 3], "x": 3.193, "y": 3.053, "r": 10},
+        {"matrix": [3, 4], "x": 4.12, "y": 3.536, "r": 10},
+        {"matrix": [3, 5], "x": 5.057, "y": 3.968, "r": 10},
+
+        {"matrix": [3, 6], "x": 6.075, "y": 4.554, "r": 0},
+        {"matrix": [3, 7], "x": 7.072, "y": 4.554, "r": 0},
+
+        {"matrix": [3, 8], "x": 8.09, "y": 3.968, "r": -10},
+        {"matrix": [3, 9], "x": 9.027, "y": 3.536, "r": -10},
+        {"matrix": [3, 10], "x": 9.954, "y": 3.053, "r": -10},
+        {"matrix": [3, 11], "x": 10.982, "y": 3.138, "r": -10},
+        {"matrix": [3, 12], "x": 11.992, "y": 3.12, "r": -10},
+        {"matrix": [3, 13], "x": 12.974, "y": 2.947, "r": -10},
+
+        {"matrix": [4, 0], "x": 0, "y": 3.929, "r": 10},
+        {"matrix": [4, 1], "x": 0.982, "y": 4.102, "r": 10},
+        {"matrix": [4, 2], "x": 1.992, "y": 4.12, "r": 10},
+        {"matrix": [4, 3], "x": 3.02, "y": 4.035, "r": 10},
+        {"matrix": [4, 4], "x": 3.947, "y": 4.518, "r": 10},
+
+        {"matrix": [4, 5], "x": 4.994, "y": 5.235, "r": 40},
+        {"matrix": [4, 6], "x": 5.753, "y": 6.064, "r": 55},
+
+        {"matrix": [4, 7], "x": 7.395, "y": 6.064, "r": -55},
+        {"matrix": [4, 8], "x": 8.154, "y": 5.235, "r": 40},
+
+        {"matrix": [4, 9], "x": 9.2, "y": 4.518, "r": -10},
+        {"matrix": [4, 10], "x": 10.128, "y": 4.035, "r": -10},
+        {"matrix": [4, 11], "x": 11.155, "y": 4.12, "r": -10},
+        {"matrix": [4, 12], "x": 12.165, "y": 4.102, "r": -10},
+        {"matrix": [4, 13], "x": 13.147, "y": 3.929, "r": -10}
       ]
     }
   }
diff --git a/keyboards/cozykeys/speedo/v2/v2.h b/keyboards/cozykeys/speedo/v2/v2.h
deleted file mode 100644
index ad1bdd2f26..0000000000
--- a/keyboards/cozykeys/speedo/v2/v2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,           k08, k09, k0A, k0B, k0C, k0D, \
-    k10, k11, k12, k13, k14, k15,    k16,   k18, k19, k1A, k1B, k1C, k1D, \
-    k20, k21, k22, k23, k24, k25,    k27,   k28, k29, k2A, k2B, k2C, k2D, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D \
-) { \
-    { k00, k01, k02, k03, k04, k05, ___, ___, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, ___, k18, k19, k1A, k1B, k1C, k1D }, \
-    { k20, k21, k22, k23, k24, k25, ___, k27, k28, k29, k2A, k2B, k2C, k2D }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \
-}
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index 0632dfd52d..d368fd25fc 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -21,72 +21,84 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k01", "x":  0.695, "y":     0, "r":  10 },
-        { "label": "k02", "x":  1.679, "y": 0.174, "r":  10 },
-        { "label": "k03", "x":  2.692, "y": 0.192, "r":  10 },
-        { "label": "k04", "x":  3.722, "y": 0.107, "r":  10 },
-        { "label": "k05", "x":  4.652, "y": 0.591, "r":  10 },
-        { "label": "k06", "x":  5.591, "y": 1.023, "r":  10 },
-        { "label": "k07", "x":  9.457, "y": 1.023, "r": -10 },
-        { "label": "k08", "x": 10.396, "y": 0.591, "r": -10 },
-        { "label": "k09", "x": 11.326, "y": 0.107, "r": -10 },
-        { "label": "k10", "x": 12.356, "y": 0.192, "r": -10 },
-        { "label": "k11", "x": 13.369, "y": 0.174, "r": -10 },
-        { "label": "k12", "x": 14.353, "y":     0, "r": -10 },
-        { "label": "k13", "x":  0.521, "y": 0.985, "r":  10 },
-        { "label": "k14", "x":  1.506, "y": 1.158, "r":  10 },
-        { "label": "k15", "x":  2.518, "y": 1.177, "r":  10 },
-        { "label": "k16", "x":  3.548, "y": 1.092, "r":  10 },
-        { "label": "k17", "x":  4.478, "y": 1.576, "r":  10 },
-        { "label": "k18", "x":  5.418, "y": 2.008, "r":  10 },
-        { "label": "k19", "x":  7.524, "y": 3.305, "r":   0 },
-        { "label": "k20", "x":   9.63, "y": 2.008, "r": -10 },
-        { "label": "k21", "x":  10.57, "y": 1.576, "r": -10 },
-        { "label": "k22", "x":   11.5, "y": 1.092, "r": -10 },
-        { "label": "k23", "x":  12.53, "y": 1.177, "r": -10 },
-        { "label": "k24", "x": 13.542, "y": 1.158, "r": -10 },
-        { "label": "k25", "x": 14.527, "y": 0.985, "r": -10 },
-        { "label": "k26", "x":  0.347, "y":  1.97, "r":  10 },
-        { "label": "k27", "x":  1.332, "y": 2.143, "r":  10 },
-        { "label": "k28", "x":  2.344, "y": 2.162, "r":  10 },
-        { "label": "k29", "x":  3.375, "y": 2.077, "r":  10 },
-        { "label": "k30", "x":  4.305, "y": 2.561, "r":  10 },
-        { "label": "k31", "x":  5.244, "y": 2.993, "r":  10 },
-        { "label": "k32", "x":  6.524, "y": 3.805, "r":   0 },
-        { "label": "k33", "x":  8.524, "y": 3.805, "r":   0 },
-        { "label": "k34", "x":  9.804, "y": 2.993, "r": -10 },
-        { "label": "k35", "x": 10.743, "y": 2.561, "r": -10 },
-        { "label": "k36", "x": 11.673, "y": 2.077, "r": -10 },
-        { "label": "k37", "x": 12.704, "y": 2.162, "r": -10 },
-        { "label": "k38", "x": 13.716, "y": 2.143, "r": -10 },
-        { "label": "k39", "x": 14.701, "y":  1.97, "r": -10 },
-        { "label": "k40", "x":  0.174, "y": 2.954, "r":  10 },
-        { "label": "k41", "x":  1.158, "y": 3.128, "r":  10 },
-        { "label": "k42", "x":  2.171, "y": 3.147, "r":  10 },
-        { "label": "k43", "x":  3.201, "y": 3.062, "r":  10 },
-        { "label": "k44", "x":  4.131, "y": 3.546, "r":  10 },
-        { "label": "k45", "x":   5.07, "y": 3.978, "r":  10 },
-        { "label": "k46", "x":  7.524, "y": 4.305, "r":   0 },
-        { "label": "k47", "x":  9.978, "y": 3.978, "r": -10 },
-        { "label": "k48", "x": 10.917, "y": 3.546, "r": -10 },
-        { "label": "k49", "x": 11.847, "y": 3.062, "r": -10 },
-        { "label": "k50", "x": 12.877, "y": 3.147, "r": -10 },
-        { "label": "k51", "x":  13.89, "y": 3.128, "r": -10 },
-        { "label": "k52", "x": 14.874, "y": 2.954, "r": -10 },
-        { "label": "k53", "x":      0, "y": 3.939, "r":  10 },
-        { "label": "k54", "x":  0.985, "y": 4.113, "r":  10 },
-        { "label": "k55", "x":  1.997, "y": 4.131, "r":  10 },
-        { "label": "k56", "x":  3.027, "y": 4.047, "r":  10 },
-        { "label": "k57", "x":  3.957, "y":  4.53, "r":  10 },
-        { "label": "k58", "x":  4.897, "y": 4.963, "r":  10 },
-        { "label": "k59", "x":  5.881, "y": 5.136, "r":  10 },
-        { "label": "k60", "x":  9.166, "y": 5.136, "r": -10 },
-        { "label": "k61", "x": 10.151, "y": 4.963, "r": -10 },
-        { "label": "k62", "x":  11.09, "y":  4.53, "r": -10 },
-        { "label": "k63", "x": 12.021, "y": 4.047, "r": -10 },
-        { "label": "k64", "x": 13.051, "y": 4.131, "r": -10 },
-        { "label": "k65", "x": 14.063, "y": 4.113, "r": -10 },
-        { "label": "k66", "x": 15.048, "y": 3.939, "r": -10 }
+        {"matrix": [0, 0], "x": 0.695, "y": 0, "r": 10},
+        {"matrix": [0, 1], "x": 1.679, "y": 0.174, "r": 10},
+        {"matrix": [0, 2], "x": 2.692, "y": 0.192, "r": 10},
+        {"matrix": [0, 3], "x": 3.722, "y": 0.107, "r": 10},
+        {"matrix": [0, 4], "x": 4.652, "y": 0.591, "r": 10},
+        {"matrix": [0, 5], "x": 5.591, "y": 1.023, "r": 10},
+
+        {"matrix": [0, 8], "x": 9.457, "y": 1.023, "r": -10},
+        {"matrix": [0, 9], "x": 10.396, "y": 0.591, "r": -10},
+        {"matrix": [0, 10], "x": 11.326, "y": 0.107, "r": -10},
+        {"matrix": [0, 11], "x": 12.356, "y": 0.192, "r": -10},
+        {"matrix": [0, 12], "x": 13.369, "y": 0.174, "r": -10},
+        {"matrix": [0, 13], "x": 14.353, "y": 0, "r": -10},
+
+        {"matrix": [1, 0], "x": 0.521, "y": 0.985, "r": 10},
+        {"matrix": [1, 1], "x": 1.506, "y": 1.158, "r": 10},
+        {"matrix": [1, 2], "x": 2.518, "y": 1.177, "r": 10},
+        {"matrix": [1, 3], "x": 3.548, "y": 1.092, "r": 10},
+        {"matrix": [1, 4], "x": 4.478, "y": 1.576, "r": 10},
+        {"matrix": [1, 5], "x": 5.418, "y": 2.008, "r": 10},
+
+        {"matrix": [2, 7], "x": 7.524, "y": 3.305, "r": 0},
+
+        {"matrix": [1, 8], "x": 9.63, "y": 2.008, "r": -10},
+        {"matrix": [1, 9], "x": 10.57, "y": 1.576, "r": -10},
+        {"matrix": [1, 10], "x": 11.5, "y": 1.092, "r": -10},
+        {"matrix": [1, 11], "x": 12.53, "y": 1.177, "r": -10},
+        {"matrix": [1, 12], "x": 13.542, "y": 1.158, "r": -10},
+        {"matrix": [1, 13], "x": 14.527, "y": 0.985, "r": -10},
+
+        {"matrix": [2, 0], "x": 0.347, "y": 1.97, "r": 10},
+        {"matrix": [2, 1], "x": 1.332, "y": 2.143, "r": 10},
+        {"matrix": [2, 2], "x": 2.344, "y": 2.162, "r": 10},
+        {"matrix": [2, 3], "x": 3.375, "y": 2.077, "r": 10},
+        {"matrix": [2, 4], "x": 4.305, "y": 2.561, "r": 10},
+        {"matrix": [2, 5], "x": 5.244, "y": 2.993, "r": 10},
+
+        {"matrix": [2, 6], "x": 6.524, "y": 3.805, "r": 0},
+        {"matrix": [3, 7], "x": 8.524, "y": 3.805, "r": 0},
+
+        {"matrix": [2, 8], "x": 9.804, "y": 2.993, "r": -10},
+        {"matrix": [2, 9], "x": 10.743, "y": 2.561, "r": -10},
+        {"matrix": [2, 10], "x": 11.673, "y": 2.077, "r": -10},
+        {"matrix": [2, 11], "x": 12.704, "y": 2.162, "r": -10},
+        {"matrix": [2, 12], "x": 13.716, "y": 2.143, "r": -10},
+        {"matrix": [2, 13], "x": 14.701, "y": 1.97, "r": -10},
+
+        {"matrix": [3, 0], "x": 0.174, "y": 2.954, "r": 10},
+        {"matrix": [3, 1], "x": 1.158, "y": 3.128, "r": 10},
+        {"matrix": [3, 2], "x": 2.171, "y": 3.147, "r": 10},
+        {"matrix": [3, 3], "x": 3.201, "y": 3.062, "r": 10},
+        {"matrix": [3, 4], "x": 4.131, "y": 3.546, "r": 10},
+        {"matrix": [3, 5], "x": 5.07, "y": 3.978, "r": 10},
+
+        {"matrix": [3, 6], "x": 7.524, "y": 4.305, "r": 0},
+
+        {"matrix": [3, 8], "x": 9.978, "y": 3.978, "r": -10},
+        {"matrix": [3, 9], "x": 10.917, "y": 3.546, "r": -10},
+        {"matrix": [3, 10], "x": 11.847, "y": 3.062, "r": -10},
+        {"matrix": [3, 11], "x": 12.877, "y": 3.147, "r": -10},
+        {"matrix": [3, 12], "x": 13.89, "y": 3.128, "r": -10},
+        {"matrix": [3, 13], "x": 14.874, "y": 2.954, "r": -10},
+
+        {"matrix": [4, 0], "x": 0, "y": 3.939, "r": 10},
+        {"matrix": [4, 1], "x": 0.985, "y": 4.113, "r": 10},
+        {"matrix": [4, 2], "x": 1.997, "y": 4.131, "r": 10},
+        {"matrix": [4, 3], "x": 3.027, "y": 4.047, "r": 10},
+        {"matrix": [4, 4], "x": 3.957, "y": 4.53, "r": 10},
+        {"matrix": [4, 5], "x": 4.897, "y": 4.963, "r": 10},
+        {"matrix": [4, 6], "x": 5.881, "y": 5.136, "r": 10},
+
+        {"matrix": [4, 7], "x": 9.166, "y": 5.136, "r": -10},
+        {"matrix": [4, 8], "x": 10.151, "y": 4.963, "r": -10},
+        {"matrix": [4, 9], "x": 11.09, "y": 4.53, "r": -10},
+        {"matrix": [4, 10], "x": 12.021, "y": 4.047, "r": -10},
+        {"matrix": [4, 11], "x": 13.051, "y": 4.131, "r": -10},
+        {"matrix": [4, 12], "x": 14.063, "y": 4.113, "r": -10},
+        {"matrix": [4, 13], "x": 15.048, "y": 3.939, "r": -10}
       ]
     }
   }
diff --git a/keyboards/cozykeys/speedo/v3/v3.h b/keyboards/cozykeys/speedo/v3/v3.h
deleted file mode 100644
index a8623c0f95..0000000000
--- a/keyboards/cozykeys/speedo/v3/v3.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
-    k01, k02, k03, k04, k05, k06,                k07, k08, k09, k10, k11, k12, \
-    k13, k14, k15, k16, k17, k18,      k19,      k20, k21, k22, k23, k24, k25, \
-    k26, k27, k28, k29, k30, k31, k32,      k33, k34, k35, k36, k37, k38, k39, \
-    k40, k41, k42, k43, k44, k45,      k46,      k47, k48, k49, k50, k51, k52, \
-    k53, k54, k55, k56, k57, k58, k59,      k60, k61, k62, k63, k64, k65, k66 \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
-    { k13, k14, k15, k16, k17, k18, ___, ___, k20, k21, k22, k23, k24, k25 }, \
-    { k26, k27, k28, k29, k30, k31, k32, k19, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k33, k47, k48, k49, k50, k51, k52 }, \
-    { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
-}