Move single `LAYOUT_all`s to data driven (#20430)

4 files changed, 197 insertions, 250 deletions

diff --git a/keyboards/kikoslab/ellora65/ellora65.h b/keyboards/kikoslab/ellora65/ellora65.h
deleted file mode 100644
index 2662f5a7a6..0000000000
--- a/keyboards/kikoslab/ellora65/ellora65.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107,\
-    K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207      ,\
-    K400, K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507,\
-    K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K707,\
-    K800, K900, K801, K901,       K802,       K803,       K804,       K905, K806, K906, K807, K907 \
-){ \
-    {K000, K001, K002, K003, K004, K005, K006, K007},\
-    {K100, K101, K102, K103, K104, K105, K106, K107},\
-    {K200, K201, K202, K203, K204, K205, K206, K207},\
-    {K300, K301, K302, K303, K304, K305, K306,  XXX},\
-    {K400, K401, K402, K403, K404, K405, K406, K407},\
-    {K500, K501, K502, K503, K504, K505, K506, K507},\
-    {K600, K601, K602, K603, K604, K605, K606, K607},\
-    {K700, K701, K702, K703, K704, K705, K706, K707},\
-    {K800, K801, K802, K803, K804,  XXX, K806, K807},\
-    {K900, K901,  XXX,  XXX,  XXX, K905, K906, K907} \
-}
diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json
index 8b8c83fbbc..0bcbd52b40 100644
--- a/keyboards/kikoslab/ellora65/info.json
+++ b/keyboards/kikoslab/ellora65/info.json
@@ -29,85 +29,91 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0},
-                {"label":"Esc", "x":1.25, "y":0.25},
-                {"label":"1", "x":2.25, "y":0.25},
-                {"label":"2", "x":3.25, "y":0.25},
-                {"label":"3", "x":4.25, "y":0.25},
-                {"label":"4", "x":5.25, "y":0.25},
-                {"label":"5", "x":6.25, "y":0.25},
-                {"label":"6", "x":7.25, "y":0.25},
-                {"label":"7", "x":8.25, "y":0.25},
-                {"label":"8", "x":9.25, "y":0.25},
-                {"label":"9", "x":10.25, "y":0.25},
-                {"label":"0", "x":11.25, "y":0.25},
-                {"label":"-_", "x":12.25, "y":0.25},
-                {"label":"=+", "x":13.25, "y":0.25},
-                {"label":"Backspace", "x":14.25, "y":0.25},
-                {"label":"Backspace", "x":15.25, "y":0.25},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label":"F13", "x":0, "y":1.25},
-                {"label":"Tab", "x":1.25, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2.75, "y":1.25},
-                {"label":"W", "x":3.75, "y":1.25},
-                {"label":"E", "x":4.75, "y":1.25},
-                {"label":"R", "x":5.75, "y":1.25},
-                {"label":"T", "x":6.75, "y":1.25},
-                {"label":"Y", "x":7.75, "y":1.25},
-                {"label":"U", "x":8.75, "y":1.25},
-                {"label":"I", "x":9.75, "y":1.25},
-                {"label":"O", "x":10.75, "y":1.25},
-                {"label":"P", "x":11.75, "y":1.25},
-                {"label":"[{", "x":12.75, "y":1.25},
-                {"label":"]}", "x":13.75, "y":1.25},
-                {"label":"\\|", "x":14.75, "y":1.25, "w":1.5},
+                {"matrix": [1, 0], "x": 1.25, "y": 0.25},
+                {"matrix": [0, 1], "x": 2.25, "y": 0.25},
+                {"matrix": [1, 1], "x": 3.25, "y": 0.25},
+                {"matrix": [0, 2], "x": 4.25, "y": 0.25},
+                {"matrix": [1, 2], "x": 5.25, "y": 0.25},
+                {"matrix": [0, 3], "x": 6.25, "y": 0.25},
+                {"matrix": [1, 3], "x": 7.25, "y": 0.25},
+                {"matrix": [0, 4], "x": 8.25, "y": 0.25},
+                {"matrix": [1, 4], "x": 9.25, "y": 0.25},
+                {"matrix": [0, 5], "x": 10.25, "y": 0.25},
+                {"matrix": [1, 5], "x": 11.25, "y": 0.25},
+                {"matrix": [0, 6], "x": 12.25, "y": 0.25},
+                {"matrix": [1, 6], "x": 13.25, "y": 0.25},
+                {"matrix": [0, 7], "x": 14.25, "y": 0.25},
+                {"matrix": [1, 7], "x": 15.25, "y": 0.25},
 
-                {"label":"F14", "x":0, "y":2.25},
-                {"label":"Caps Lock", "x":1.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":3, "y":2.25},
-                {"label":"S", "x":4, "y":2.25},
-                {"label":"D", "x":5, "y":2.25},
-                {"label":"F", "x":6, "y":2.25},
-                {"label":"G", "x":7, "y":2.25},
-                {"label":"H", "x":8, "y":2.25},
-                {"label":"J", "x":9, "y":2.25},
-                {"label":"K", "x":10, "y":2.25},
-                {"label":"L", "x":11, "y":2.25},
-                {"label":";:", "x":12, "y":2.25},
-                {"label":"'\"", "x":13, "y":2.25},
-                {"label":"Enter", "x":14, "y":2.25},
-                {"label":"Enter", "x":15, "y":2.25, "w":1.25},
-                {"label":"Insert", "x":16.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
 
-                {"label":"F15", "x":0, "y":3.25},
-                {"label":"Shift", "x":1.25, "y":3.25, "w":1.25},
-                {"label":"\\|", "x":2.5, "y":3.25},
-                {"label":"Z", "x":3.5, "y":3.25},
-                {"label":"X", "x":4.5, "y":3.25},
-                {"label":"C", "x":5.5, "y":3.25},
-                {"label":"V", "x":6.5, "y":3.25},
-                {"label":"B", "x":7.5, "y":3.25},
-                {"label":"N", "x":8.5, "y":3.25},
-                {"label":"M", "x":9.5, "y":3.25},
-                {"label":",<", "x":10.5, "y":3.25},
-                {"label":".>", "x":11.5, "y":3.25},
-                {"label":"/?", "x":12.5, "y":3.25},
-                {"label":"Shift", "x":13.5, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":15.25, "y":3.25},
-                {"label":"Delete", "x":16.25, "y":3.25},
+                {"matrix": [3, 0], "x": 1.25, "y": 1.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 2.75, "y": 1.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 1.25},
+                {"matrix": [2, 2], "x": 4.75, "y": 1.25},
+                {"matrix": [3, 2], "x": 5.75, "y": 1.25},
+                {"matrix": [2, 3], "x": 6.75, "y": 1.25},
+                {"matrix": [3, 3], "x": 7.75, "y": 1.25},
+                {"matrix": [2, 4], "x": 8.75, "y": 1.25},
+                {"matrix": [3, 4], "x": 9.75, "y": 1.25},
+                {"matrix": [2, 5], "x": 10.75, "y": 1.25},
+                {"matrix": [3, 5], "x": 11.75, "y": 1.25},
+                {"matrix": [2, 6], "x": 12.75, "y": 1.25},
+                {"matrix": [3, 6], "x": 13.75, "y": 1.25},
+                {"matrix": [2, 7], "x": 14.75, "y": 1.25, "w": 1.5},
 
-                {"label":"F16", "x":0, "y":4.25},
-                {"label":"Ctrl", "x":1.25, "y":4.25, "w":1.25},
-                {"label":"GUI", "x":2.5, "y":4.25, "w":1.25},
-                {"label":"Alt", "x":3.75, "y":4.25, "w":1.25},
-                {"label":"Fn", "x":5, "y":4.25, "w":2.75},
-                {"label":"Space", "x":7.75, "y":4.25, "w":1.25},
-                {"label":"Fn", "x":9, "y":4.25, "w":2.25},
-                {"label":"Fn", "x":11.25, "y":4.25},
-                {"label":"Fn", "x":12.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":14.25, "y":4.25},
-                {"label":"\u2193", "x":15.25, "y":4.25},
-                {"label":"\u2192", "x":16.25, "y":4.25}
+                {"matrix": [4, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [5, 0], "x": 1.25, "y": 2.25, "w": 1.75},
+                {"matrix": [4, 1], "x": 3, "y": 2.25},
+                {"matrix": [5, 1], "x": 4, "y": 2.25},
+                {"matrix": [4, 2], "x": 5, "y": 2.25},
+                {"matrix": [5, 2], "x": 6, "y": 2.25},
+                {"matrix": [4, 3], "x": 7, "y": 2.25},
+                {"matrix": [5, 3], "x": 8, "y": 2.25},
+                {"matrix": [4, 4], "x": 9, "y": 2.25},
+                {"matrix": [5, 4], "x": 10, "y": 2.25},
+                {"matrix": [4, 5], "x": 11, "y": 2.25},
+                {"matrix": [5, 5], "x": 12, "y": 2.25},
+                {"matrix": [4, 6], "x": 13, "y": 2.25},
+                {"matrix": [5, 6], "x": 14, "y": 2.25},
+                {"matrix": [4, 7], "x": 15, "y": 2.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [7, 0], "x": 1.25, "y": 3.25, "w": 1.25},
+                {"matrix": [6, 1], "x": 2.5, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.5, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.5, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.5, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.5, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.5, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.5, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 7], "x": 15.25, "y": 3.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 1], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [8, 2], "x": 5, "y": 4.25, "w": 2.75},
+                {"matrix": [8, 3], "x": 7.75, "y": 4.25, "w": 1.25},
+                {"matrix": [8, 4], "x": 9, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.5},
+
+                {"matrix": [9, 6], "x": 14.25, "y": 4.25},
+                {"matrix": [8, 7], "x": 15.25, "y": 4.25},
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/kikoslab/kl90/info.json b/keyboards/kikoslab/kl90/info.json
index 47141fbdd8..4d059dae24 100644
--- a/keyboards/kikoslab/kl90/info.json
+++ b/keyboards/kikoslab/kl90/info.json
@@ -24,105 +24,122 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1.5, "y":0},
-                {"label":"0,2", "x":2.75, "y":0},
-                {"label":"0,3", "x":3.75, "y":0},
-                {"label":"0,4", "x":4.75, "y":0},
-                {"label":"0,5", "x":5.75, "y":0},
-                {"label":"0,6", "x":7, "y":0},
-                {"label":"0,7", "x":8, "y":0},
-                {"label":"0,8", "x":9, "y":0},
-                {"label":"0,9", "x":10, "y":0},
-                {"label":"0,10", "x":11.25, "y":0},
-                {"label":"0,11", "x":12.25, "y":0},
-                {"label":"0,12", "x":13.25, "y":0},
-                {"label":"0,13", "x":14.25, "y":0},
-                {"label":"0,14", "x":15.5, "y":0},
-                {"label":"0,15", "x":17, "y":0},
-
-                {"label":"1,0", "x":0, "y":1.5},
-                {"label":"1,1", "x":1.5, "y":1.5},
-                {"label":"1,2", "x":2.5, "y":1.5},
-                {"label":"1,3", "x":3.5, "y":1.5},
-                {"label":"1,4", "x":4.5, "y":1.5},
-                {"label":"1,5", "x":5.5, "y":1.5},
-                {"label":"1,6", "x":6.5, "y":1.5},
-                {"label":"1,7", "x":7.5, "y":1.5},
-                {"label":"1,8", "x":8.5, "y":1.5},
-                {"label":"1,9", "x":9.5, "y":1.5},
-                {"label":"1,10", "x":10.5, "y":1.5},
-                {"label":"1,11", "x":11.5, "y":1.5},
-                {"label":"1,12", "x":12.5, "y":1.5},
-                {"label":"1,13", "x":13.5, "y":1.5},
-                {"label":"1,14", "x":14.5, "y":1.5, "w":2},
-                {"label":"1,15", "x":17, "y":1.5},
-
-                {"label":"2,0", "x":0, "y":2.5},
-                {"label":"2,1", "x":1.5, "y":2.5, "w":1.5},
-                {"label":"2,2", "x":3, "y":2.5},
-                {"label":"2,3", "x":4, "y":2.5},
-                {"label":"2,4", "x":5, "y":2.5},
-                {"label":"2,5", "x":6, "y":2.5},
-                {"label":"2,6", "x":7, "y":2.5},
-                {"label":"2,7", "x":8, "y":2.5},
-                {"label":"2,8", "x":9, "y":2.5},
-                {"label":"2,9", "x":10, "y":2.5},
-                {"label":"2,10", "x":11, "y":2.5},
-                {"label":"2,11", "x":12, "y":2.5},
-                {"label":"2,12", "x":13, "y":2.5},
-                {"label":"2,13", "x":14, "y":2.5},
-                {"label":"2,14", "x":15, "y":2.5, "w":1.5},
-                {"label":"2,15", "x":17, "y":2.5},
-
-                {"label":"3,0", "x":0, "y":3.5},
-                {"label":"3,1", "x":1.5, "y":3.5, "w":1.75},
-                {"label":"3,2", "x":3.25, "y":3.5},
-                {"label":"3,3", "x":4.25, "y":3.5},
-                {"label":"3,4", "x":5.25, "y":3.5},
-                {"label":"3,5", "x":6.25, "y":3.5},
-                {"label":"3,6", "x":7.25, "y":3.5},
-                {"label":"3,7", "x":8.25, "y":3.5},
-                {"label":"3,8", "x":9.25, "y":3.5},
-                {"label":"3,9", "x":10.25, "y":3.5},
-                {"label":"3,10", "x":11.25, "y":3.5},
-                {"label":"3,11", "x":12.25, "y":3.5},
-                {"label":"3,12", "x":13.25, "y":3.5},
-                {"label":"3,13", "x":14.25, "y":3.5},
-                {"label":"3,14", "x":15.25, "y":3.5, "w":1.25},
-                {"label":"3,15", "x":17, "y":3.5},
-
-                {"label":"4,0", "x":0, "y":4.5},
-                {"label":"4,1", "x":1.5, "y":4.5, "w":1.25},
-                {"label":"4,12", "x":2.75, "y":4.5},
-                {"label":"4,2", "x":3.75, "y":4.5},
-                {"label":"4,3", "x":4.75, "y":4.5},
-                {"label":"4,4", "x":5.75, "y":4.5},
-                {"label":"4,5", "x":6.75, "y":4.5},
-                {"label":"4,6", "x":7.75, "y":4.5},
-                {"label":"4,7", "x":8.75, "y":4.5},
-                {"label":"4,8", "x":9.75, "y":4.5},
-                {"label":"4,9", "x":10.75, "y":4.5},
-                {"label":"4,10", "x":11.75, "y":4.5},
-                {"label":"4,11", "x":12.75, "y":4.5},
-                {"label":"4,13", "x":13.75, "y":4.5, "w":1.75},
-                {"label":"4,14", "x":15.75, "y":4.75},
-                {"label":"4,15", "x":17, "y":4.5},
-
-                {"label":"5,0", "x":0, "y":5.5},
-                {"label":"5,1", "x":1.5, "y":5.5, "w":1.25},
-                {"label":"5,2", "x":2.75, "y":5.5, "w":1.25},
-                {"label":"5,3", "x":4, "y":5.5, "w":1.25},
-                {"label":"5,4", "x":5.25, "y":5.5, "w":2.25},
-                {"label":"5,6", "x":7.5, "y":5.5},
-                {"label":"5,6", "x":8.5, "y":5.5},
-                {"label":"5,8", "x":9.5, "y":5.5, "w":2},
-                {"label":"5,10", "x":11.5, "y":5.5},
-                {"label":"5,11", "x":12.5, "y":5.5},
-                {"label":"5,12", "x":13.5, "y":5.5},
-                {"label":"5,13", "x":14.75, "y":5.75},
-                {"label":"5,14", "x":15.75, "y":5.75},
-                {"label":"5,15", "x":16.75, "y":5.75}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [0, 15], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.5},
+                {"matrix": [1, 14], "x": 14.5, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 15], "x": 17, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 2.5},
+                {"matrix": [2, 3], "x": 4, "y": 2.5},
+                {"matrix": [2, 4], "x": 5, "y": 2.5},
+                {"matrix": [2, 5], "x": 6, "y": 2.5},
+                {"matrix": [2, 6], "x": 7, "y": 2.5},
+                {"matrix": [2, 7], "x": 8, "y": 2.5},
+                {"matrix": [2, 8], "x": 9, "y": 2.5},
+                {"matrix": [2, 9], "x": 10, "y": 2.5},
+                {"matrix": [2, 10], "x": 11, "y": 2.5},
+                {"matrix": [2, 11], "x": 12, "y": 2.5},
+                {"matrix": [2, 12], "x": 13, "y": 2.5},
+                {"matrix": [2, 13], "x": 14, "y": 2.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 17, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.5},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.5},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.5},
+                {"matrix": [3, 12], "x": 13.25, "y": 3.5},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.5, "w": 1.25},
+
+                {"matrix": [3, 15], "x": 17, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.75, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.75, "y": 4.5},
+                {"matrix": [4, 13], "x": 13.75, "y": 4.5, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 15.75, "y": 4.75},
+
+                {"matrix": [4, 15], "x": 17, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 4, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 4], "x": 5.25, "y": 5.5, "w": 2.25},
+                {"matrix": [5, 5], "x": 7.5, "y": 5.5},
+                {"matrix": [5, 6], "x": 8.5, "y": 5.5},
+                {"matrix": [5, 8], "x": 9.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5},
+
+                {"matrix": [5, 13], "x": 14.75, "y": 5.75},
+                {"matrix": [5, 14], "x": 15.75, "y": 5.75},
+                {"matrix": [5, 15], "x": 16.75, "y": 5.75}
             ]
         }
     }
diff --git a/keyboards/kikoslab/kl90/kl90.h b/keyboards/kikoslab/kl90/kl90.h
deleted file mode 100644
index 1fcb104308..0000000000
--- a/keyboards/kikoslab/kl90/kl90.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT_all( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, \
-    K500, K501, K502, K503, K504, K505, K506,       K508,       K510, K511, K512, K513, K514, K515  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315 }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414,  K415 }, \
-    { K500,  K501,  K502,  K503,  K504,  K505,  K506,  KC_NO, K508,  KC_NO, K510,  K511,  K512,  K513,  K514,  K515 }  \
-}