09a2b70a661323aa7ea023341bb1e9dcd3c75e24
- Author
- Ryan <fauxpark@gmail.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Move Alice and Ergodox layouts to data driven (#20340)
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/axolstudio/yeti/soldered/info.json b/keyboards/axolstudio/yeti/soldered/info.json
2index 0f283bc675a5d332913e7a3eafc637fdcd629ebc..a2b3097716bb4c8b63d20d985de6c21036369edb 100644
3--- a/keyboards/axolstudio/yeti/soldered/info.json
4+++ b/keyboards/axolstudio/yeti/soldered/info.json
5@@ -19,278 +19,320 @@
6 "layouts": {
7 "LAYOUT_alice": {
8 "layout": [
9- {"x":0, "y":0},
10- {"x":1.25, "y":0},
11- {"x":2.25, "y":0},
12- {"x":3.25, "y":0},
13- {"x":4.25, "y":0},
14- {"x":5.25, "y":0},
15- {"x":6.25, "y":0},
16- {"x":7.25, "y":0},
17- {"x":10.25, "y":0},
18- {"x":11.25, "y":0},
19- {"x":12.25, "y":0},
20- {"x":13.25, "y":0},
21- {"x":14.25, "y":0},
22- {"x":15.25, "y":0},
23- {"x":16.25, "y":0, "w": 2},
24- {"x":0, "y":1},
25- {"x":1.25, "y":1, "w":1.5},
26- {"x":2.75, "y":1},
27- {"x":3.75, "y":1},
28- {"x":4.75, "y":1},
29- {"x":5.75, "y":1},
30- {"x":6.75, "y":1},
31- {"x":9.75, "y":1},
32- {"x":10.75, "y":1},
33- {"x":11.75, "y":1},
34- {"x":12.75, "y":1},
35- {"x":13.75, "y":1},
36- {"x":14.75, "y":1},
37- {"x":15.75, "y":1},
38- {"x":16.75, "y":1, "w":1.5},
39- {"x":0, "y":2},
40- {"x":1.25, "y":2, "w":1.75},
41- {"x":3, "y":2},
42- {"x":4, "y":2},
43- {"x":5, "y":2},
44- {"x":6, "y":2},
45- {"x":7, "y":2},
46- {"x":10, "y":2},
47- {"x":11, "y":2},
48- {"x":12, "y":2},
49- {"x":13, "y":2},
50- {"x":14, "y":2},
51- {"x":15, "y":2},
52- {"x":16, "y":2, "w":2.25},
53- {"x":1.25, "y":3, "w":2.25},
54- {"x":3.5, "y":3},
55- {"x":4.5, "y":3},
56- {"x":5.5, "y":3},
57- {"x":6.5, "y":3},
58- {"x":7.5, "y":3},
59- {"x":9.5, "y":3},
60- {"x":10.5, "y":3},
61- {"x":11.5, "y":3},
62- {"x":12.5, "y":3},
63- {"x":13.5, "y":3},
64- {"x":14.5, "y":3},
65- {"x":15.5, "y":3, "w":1.75},
66- {"x":17.25, "y":3},
67- {"x":1.25, "y":4, "w":1.5},
68- {"x":4.25, "y":4, "w":1.5},
69- {"x":5.75, "y":4, "w":2},
70- {"x":7.75, "y":4, "w":1.25},
71- {"x":9.5, "y":4, "w":2.75},
72- {"x":12.25, "y":4, "w":1.5},
73- {"x":16.75, "y":4, "w":1.5}
74+ {"matrix": [1, 0], "x": 0, "y": 0},
75+
76+ {"matrix": [0, 0], "x": 1.25, "y": 0},
77+ {"matrix": [0, 1], "x": 2.25, "y": 0},
78+ {"matrix": [0, 2], "x": 3.25, "y": 0},
79+ {"matrix": [0, 3], "x": 4.25, "y": 0},
80+ {"matrix": [0, 4], "x": 5.25, "y": 0},
81+ {"matrix": [0, 5], "x": 6.25, "y": 0},
82+ {"matrix": [0, 6], "x": 7.25, "y": 0},
83+
84+ {"matrix": [0, 7], "x": 10.25, "y": 0},
85+ {"matrix": [0, 8], "x": 11.25, "y": 0},
86+ {"matrix": [0, 9], "x": 12.25, "y": 0},
87+ {"matrix": [0, 10], "x": 13.25, "y": 0},
88+ {"matrix": [0, 11], "x": 14.25, "y": 0},
89+ {"matrix": [0, 12], "x": 15.25, "y": 0},
90+ {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
91+
92+ {"matrix": [2, 0], "x": 0, "y": 1},
93+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
94+ {"matrix": [1, 2], "x": 2.75, "y": 1},
95+ {"matrix": [1, 3], "x": 3.75, "y": 1},
96+ {"matrix": [1, 4], "x": 4.75, "y": 1},
97+ {"matrix": [1, 5], "x": 5.75, "y": 1},
98+ {"matrix": [1, 6], "x": 6.75, "y": 1},
99+
100+ {"matrix": [1, 7], "x": 9.75, "y": 1},
101+ {"matrix": [1, 8], "x": 10.75, "y": 1},
102+ {"matrix": [1, 9], "x": 11.75, "y": 1},
103+ {"matrix": [1, 10], "x": 12.75, "y": 1},
104+ {"matrix": [1, 11], "x": 13.75, "y": 1},
105diff --git a/keyboards/axolstudio/yeti/soldered/soldered.h b/keyboards/axolstudio/yeti/soldered/soldered.h
106deleted file mode 100644
107index 7c3b5cba1d5ee8ea59de862a803c9a8c4fa13c85..0000000000000000000000000000000000000000
108--- a/keyboards/axolstudio/yeti/soldered/soldered.h
109+++ /dev/null
110@@ -1,76 +0,0 @@
111-/* Copyright 2020 kb-elmo
112- *
113- * This program is free software: you can redistribute it and/or modify
114- * it under the terms of the GNU General Public License as published by
115- * the Free Software Foundation, either version 2 of the License, or
116- * (at your option) any later version.
117- *
118- * This program is distributed in the hope that it will be useful,
119- * but WITHOUT ANY WARRANTY; without even the implied warranty of
120- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
121- * GNU General Public License for more details.
122- *
123- * You should have received a copy of the GNU General Public License
124- * along with this program. If not, see <http://www.gnu.org/licenses/>.
125- */
126-
127-#pragma once
128-
129-#include "quantum.h"
130-
131-#define LAYOUT_alice( \
132- k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k14, \
133- k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k31, \
134- k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k30, \
135- k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k45, k47, \
136- k61, k62, k63, k64, k65, k66, k67 \
137-) { \
138- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, KC_NO, k14, KC_NO }, \
139- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31 }, \
140- { k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, KC_NO, k47 }, \
141- { k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, KC_NO, KC_NO, KC_NO }, \
142- { KC_NO, k61, KC_NO, k62, KC_NO, k63, k64, KC_NO, k65, KC_NO, k66, KC_NO, KC_NO, KC_NO, KC_NO, k67 } \
143-}
144-
145-// Equivalent to LAYOUT_all
146-#define LAYOUT_alice_split_bs( \
147- k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k15, \
148- k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k31, \
149- k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k30, \
150- k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k45, k47, \
151- k61, k62, k63, k64, k65, k66, k67 \
152-) { \
153- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, KC_NO, k15 }, \
154- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31 }, \
155- { k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, KC_NO, k47 }, \
156- { k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, KC_NO, KC_NO, KC_NO }, \
157- { KC_NO, k61, KC_NO, k62, KC_NO, k63, k64, KC_NO, k65, KC_NO, k66, KC_NO, KC_NO, KC_NO, KC_NO, k67 } \
158-}
159-
160-#define LAYOUT_alice_split_bs_full_rshift( \
161- k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k15, \
162- k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k31, \
163- k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k30, \
164- k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k46, \
165- k61, k62, k63, k64, k65, k66, k67 \
166-) { \
167- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, KC_NO, k15 }, \
168- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31 }, \
169- { k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, KC_NO, k46, KC_NO }, \
170- { k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, KC_NO, KC_NO, KC_NO }, \
171- { KC_NO, k61, KC_NO, k62, KC_NO, k63, k64, KC_NO, k65, KC_NO, k66, KC_NO, KC_NO, KC_NO, KC_NO, k67 } \
172-}
173-
174-#define LAYOUT_alice_full_rshift( \
175- k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k14, \
176- k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k31, \
177- k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k30, \
178- k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k46, \
179- k61, k62, k63, k64, k65, k66, k67 \
180-) { \
181- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, KC_NO, k14, KC_NO }, \
182- { k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31 }, \
183- { k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, KC_NO, k46, KC_NO }, \
184- { k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, KC_NO, KC_NO, KC_NO }, \
185- { KC_NO, k61, KC_NO, k62, KC_NO, k63, k64, KC_NO, k65, KC_NO, k66, KC_NO, KC_NO, KC_NO, KC_NO, k67 } \
186-}
187diff --git a/keyboards/bolsa/bolsalice/bolsalice.h b/keyboards/bolsa/bolsalice/bolsalice.h
188deleted file mode 100644
189index 475b5b101dd5e579f2eb6a8dd6bee9fe5729e175..0000000000000000000000000000000000000000
190--- a/keyboards/bolsa/bolsalice/bolsalice.h
191+++ /dev/null
192@@ -1,52 +0,0 @@
193-/*
194-Copyright 2022 CMM.Studio Freather
195-
196-This program is free software: you can redistribute it and/or modify
197-it under the terms of the GNU General Public License as published by
198-the Free Software Foundation, either version 2 of the License, or
199-(at your option) any later version.
200-
201-This program is distributed in the hope that it will be useful,
202-but WITHOUT ANY WARRANTY; without even the implied warranty of
203-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
204-GNU General Public License for more details.
205-
206-You should have received a copy of the GNU General Public License
207-along with this program. If not, see <http://www.gnu.org/licenses/>.
208-*/
209-
210-#pragma once
211-
212-#include "quantum.h"
213-
214-#define XXX KC_NO
215-
216-#define LAYOUT_alice_split_bs( \
217- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, \
218- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \
219- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
220- K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
221- K41, K43, K45, K46, K48, K4A, K4E \
222-){ \
223- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E},\
224- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E},\
225- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},\
226- {XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E},\
227- {XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E},\
228-}
229-
230-#define LAYOUT_alice( \
231- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
232- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \
233- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
234- K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
235- K41, K43, K45, K46, K48, K4A, K4E \
236-){ \
237- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E},\
238- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX},\
239- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E},\
240- {XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E},\
241- {XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E},\
242-}
243-
244-
245diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/info.json
246index 09ee356a7e57195fd5cca3daca1a7ed51c07cd54..f201b722044f68720b2aa9c626d1de2cf94e01ba 100644
247--- a/keyboards/bolsa/bolsalice/info.json
248+++ b/keyboards/bolsa/bolsalice/info.json
249@@ -19,141 +19,163 @@
250 "layouts": {
251 "LAYOUT_alice_split_bs": {
252 "layout": [
253- {"label":"Esc", "x":0.5, "y":0},
254- {"label":"~", "x":1.75, "y":0},
255- {"label":"!", "x":2.75, "y":0},
256- {"label":"@", "x":3.75, "y":0},
257- {"label":"#", "x":4.75, "y":0},
258- {"label":"$", "x":5.75, "y":0},
259- {"label":"%", "x":6.75, "y":0},
260- {"label":"^", "x":7.75, "y":0},
261- {"label":"&", "x":10, "y":0},
262- {"label":"*", "x":11, "y":0},
263- {"label":"(", "x":12, "y":0},
264- {"label":")", "x":13, "y":0},
265- {"label":"_", "x":14, "y":0},
266- {"label":"+", "x":15, "y":0},
267- {"label":"|", "x":16, "y":0},
268- {"label":"~", "x":17, "y":0},
269- {"label":"PgUp", "x":0.25, "y":1},
270- {"label":"Tab", "x":1.5, "y":1, "w":1.5},
271- {"label":"Q", "x":3, "y":1},
272- {"label":"W", "x":4, "y":1},
273- {"label":"E", "x":5, "y":1},
274- {"label":"R", "x":6, "y":1},
275- {"label":"T", "x":7, "y":1},
276- {"label":"Y", "x":9.75, "y":1},
277- {"label":"U", "x":10.75, "y":1},
278- {"label":"I", "x":11.75, "y":1},
279- {"label":"O", "x":12.75, "y":1},
280- {"label":"P", "x":13.75, "y":1},
281- {"label":"{", "x":14.75, "y":1},
282- {"label":"}", "x":15.75, "y":1},
283- {"label":"Backspace", "x":16.75, "y":1, "w":1.5},
284- {"label":"PgDn", "x":0, "y":2},
285- {"label":"Control", "x":1.25, "y":2, "w":1.75},
286- {"label":"A", "x":3, "y":2},
287- {"label":"S", "x":4, "y":2},
288- {"label":"D", "x":5, "y":2},
289- {"label":"F", "x":6, "y":2},
290- {"label":"G", "x":7, "y":2},
291- {"label":"H", "x":10.25, "y":2},
292- {"label":"J", "x":11.25, "y":2},
293- {"label":"K", "x":12.25, "y":2},
294- {"label":"L", "x":13.25, "y":2},
295- {"label":":", "x":14.25, "y":2},
296- {"label":"\"", "x":15.25, "y":2},
297- {"label":"Enter", "x":16.25, "y":2, "w":2.25},
298- {"label":"Shift", "x":1, "y":3, "w":2.25},
299- {"label":"Z", "x":3.25, "y":3},
300- {"label":"X", "x":4.25, "y":3},
301- {"label":"C", "x":5.25, "y":3},
302- {"label":"V", "x":6.25, "y":3},
303- {"label":"B", "x":7.25, "y":3},
304- {"label":"B", "x":10, "y":3},
305- {"label":"N", "x":11, "y":3},
306- {"label":"M", "x":12, "y":3},
307- {"label":"<", "x":13, "y":3},
308- {"label":">", "x":14, "y":3},
309- {"label":"?", "x":15, "y":3},
310- {"label":"Shift", "x":16, "y":3, "w":1.75},
311- {"label":"Fn1", "x":17.75, "y":3},
312- {"label":"Ctrl", "x":1, "y":4, "w":1.5},
313- {"label":"Alt", "x":4, "y":4, "w":1.5},
314- {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
315- {"label":"Fn2", "x":7.75, "y":4},
316- {"label":"RSpace", "x":10, "y":4, "w":2.75},
317- {"label":"RAlt", "x":12.75, "y":4, "w":1.5},
318- {"label":"RCtl", "x":17, "y":4, "w":1.5}
319+ {"matrix": [0, 0], "x": 0.5, "y": 0},
320+
321+ {"matrix": [0, 1], "x": 1.75, "y": 0},
322+ {"matrix": [0, 2], "x": 2.75, "y": 0},
323+ {"matrix": [0, 3], "x": 3.75, "y": 0},
324+ {"matrix": [0, 4], "x": 4.75, "y": 0},
325+ {"matrix": [0, 5], "x": 5.75, "y": 0},
326+ {"matrix": [0, 6], "x": 6.75, "y": 0},
327+ {"matrix": [0, 7], "x": 7.75, "y": 0},
328+
329+ {"matrix": [0, 8], "x": 10, "y": 0},
330+ {"matrix": [0, 9], "x": 11, "y": 0},
331+ {"matrix": [0, 10], "x": 12, "y": 0},
332+ {"matrix": [0, 11], "x": 13, "y": 0},
333+ {"matrix": [0, 12], "x": 14, "y": 0},
334+ {"matrix": [0, 13], "x": 15, "y": 0},
335+ {"matrix": [0, 14], "x": 16, "y": 0},
336+ {"matrix": [1, 14], "x": 17, "y": 0},
337+
338+ {"matrix": [1, 0], "x": 0.25, "y": 1},
339+
340+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
341+ {"matrix": [1, 2], "x": 3, "y": 1},
342+ {"matrix": [1, 3], "x": 4, "y": 1},
343+ {"matrix": [1, 4], "x": 5, "y": 1},
344+ {"matrix": [1, 5], "x": 6, "y": 1},
345+ {"matrix": [1, 6], "x": 7, "y": 1},
346+
347+ {"matrix": [1, 7], "x": 9.75, "y": 1},
348+ {"matrix": [1, 8], "x": 10.75, "y": 1},
349diff --git a/keyboards/cheshire/curiosity/curiosity.c b/keyboards/cheshire/curiosity/curiosity.c
350index e52499b352ea0d5876c6815f45c04327f758c469..9db2651e9419da9fb563545bbbdf4e12ddd273b0 100644
351--- a/keyboards/cheshire/curiosity/curiosity.c
352+++ b/keyboards/cheshire/curiosity/curiosity.c
353@@ -1,4 +1,4 @@
354-#include "curiosity.h"
355+#include "quantum.h"
356
357 void matrix_init_board(void){
358 setPinOutput(A8);
359diff --git a/keyboards/cheshire/curiosity/curiosity.h b/keyboards/cheshire/curiosity/curiosity.h
360deleted file mode 100644
361index c26b03e20a48786cb7528ab3de94899fa9a9d5ec..0000000000000000000000000000000000000000
362--- a/keyboards/cheshire/curiosity/curiosity.h
363+++ /dev/null
364@@ -1,59 +0,0 @@
365-/* Copyright 2019 zvecr<git@zvecr.com>
366- *
367- * This program is free software: you can redistribute it and/or modify
368- * it under the terms of the GNU General Public License as published by
369- * the Free Software Foundation, either version 2 of the License, or
370- * (at your option) any later version.
371- *
372- * This program is distributed in the hope that it will be useful,
373- * but WITHOUT ANY WARRANTY; without even the implied warranty of
374- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
375- * GNU General Public License for more details.
376- *
377- * You should have received a copy of the GNU General Public License
378- * along with this program. If not, see <http://www.gnu.org/licenses/>.
379- */
380-#pragma once
381-
382-#include "quantum.h"
383-#define ____ KC_NO
384-
385-/* This a shortcut to help you visually see your layout.
386- *
387- * The first section contains all of the arguments representing the physical
388- * layout of the board and position of the keys.
389- *
390- * The second converts the arguments into a two-dimensional array which
391- * represents the switch matrix.
392- */
393-#define LAYOUT_alice_split_bs( \
394- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
395- K100, K101, K102, K103, K104, K105, K106, K108, K109, K110, K111, K112, K113, K114, K115, \
396- K200, K201, K202, K203, K204, K205, K206, K208, K209, K210, K211, K212, K213, K215, \
397- K301, K302, K303, K304, K305, K306, K308, K309, K310, K311, K312, K313, K314, K315, \
398- K401, K403, K405, K406, K409, K411, K414 \
399-) \
400-{ \
401- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015}, \
402- { K100, K101, K102, K103, K104, K105, K106, ____, K108, K109, K110, K111, K112, K113, K114, K115}, \
403- { K200, K201, K202, K203, K204, K205, K206, ____, K208, K209, K210, K211, K212, K213, ____, K215}, \
404- { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \
405- { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \
406-}
407-
408-#define LAYOUT_alice( \
409- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \
410- K100, K101, K102, K103, K104, K105, K106, K108, K109, K110, K111, K112, K113, K114, K115, \
411- K200, K201, K202, K203, K204, K205, K206, K208, K209, K210, K211, K212, K213, K215, \
412- K301, K302, K303, K304, K305, K306, K308, K309, K310, K311, K312, K313, K314, K315, \
413- K401, K403, K405, K406, K409, K411, K414 \
414-) \
415-{ \
416- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, K015}, \
417- { K100, K101, K102, K103, K104, K105, K106, ____, K108, K109, K110, K111, K112, K113, K114, K115}, \
418- { K200, K201, K202, K203, K204, K205, K206, ____, K208, K209, K210, K211, K212, K213, ____, K215}, \
419- { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \
420- { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \
421-}
422-
423-#define LAYOUT_default LAYOUT_alice_split_bs
424diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json
425index 5d007d4a3971133cc6f6e361ec01529182ad0be3..9363276635e3c734d4dbbf83fd5a23916952bf0d 100644
426--- a/keyboards/cheshire/curiosity/info.json
427+++ b/keyboards/cheshire/curiosity/info.json
428@@ -15,152 +15,169 @@
429 "processor": "STM32F072",
430 "bootloader": "stm32-dfu",
431 "community_layouts": ["alice", "alice_split_bs"],
432+ "layout_aliases": {
433+ "LAYOUT_default": "LAYOUT_alice_split_bs"
434+ },
435 "layouts": {
436 "LAYOUT_alice_split_bs": {
437 "layout": [
438- {"label":"Esc", "x":0.5, "y":0},
439- {"label":"`", "x":1.75, "y":0.25},
440- {"label":"1", "x":2.75, "y":0.25},
441- {"label":"2", "x":3.75, "y":0},
442- {"label":"3", "x":4.75, "y":0.25},
443- {"label":"4", "x":5.75, "y":0.25},
444- {"label":"5", "x":6.75, "y":0.25},
445- {"label":"6", "x":7.75, "y":0.25},
446- {"label":"7", "x":11, "y":0.25},
447- {"label":"8", "x":12, "y":0.25},
448- {"label":"9", "x":13, "y":0.25},
449- {"label":"0", "x":14, "y":0.25},
450- {"label":"-", "x":15, "y":0},
451- {"label":"=", "x":16, "y":0.25},
452- {"label":"Del", "x":17, "y":0.25},
453- {"label":"Backspace", "x":18, "y":0.25},
454-
455- {"label":"PgUp", "x":0.25, "y":1},
456- {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
457- {"label":"Q", "x":3, "y":1.25},
458- {"label":"W", "x":4.25, "y":1.25},
459- {"label":"E", "x":5.25, "y":1.25},
460- {"label":"R", "x":6.25, "y":1.25},
461- {"label":"T", "x":7.25, "y":1.25},
462- {"label":"Y", "x":10.5, "y":1.25},
463- {"label":"U", "x":11.5, "y":1.25},
464- {"label":"I", "x":12.5, "y":1.25},
465- {"label":"O", "x":13.5, "y":1.25},
466- {"label":"P", "x":14.75, "y":1.25},
467- {"label":"{", "x":15.75, "y":1.25},
468- {"label":"}", "x":16.75, "y":1.25},
469- {"label":"|", "x":17.75, "y":1.25, "w":1.5},
470-
471- {"label":"PgDn", "x":0, "y":2},
472- {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
473- {"label":"A", "x":3.25, "y":2.25},
474- {"label":"S", "x":4.5, "y":2.25},
475- {"label":"D", "x":5.5, "y":2.25},
476- {"label":"F", "x":6.5, "y":2.25},
477- {"label":"G", "x":7.5, "y":2.25},
478- {"label":"H", "x":10.75, "y":2.25},
479- {"label":"J", "x":11.75, "y":2.25},
480- {"label":"K", "x":12.75, "y":2.25},
481- {"label":"L", "x":13.75, "y":2.25},
482- {"label":":", "x":15.25, "y":2.25},
483- {"label":"\"", "x":16.25, "y":2.25},
484- {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
485-
486- {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
487- {"label":"Z", "x":3.75, "y":3.25},
488- {"label":"X", "x":5, "y":3.25},
489- {"label":"C", "x":6, "y":3.25},
490- {"label":"V", "x":7, "y":3.25},
491- {"label":"B", "x":8, "y":3.25},
492- {"label":"Fn", "x":10.25, "y":3.25},
493- {"label":"N", "x":11.25, "y":3.25},
494- {"label":"M", "x":12.25, "y":3.25},
495- {"label":"<", "x":13.25, "y":3.25},
496- {"label":">", "x":15, "y":3.25},
497- {"label":"?", "x":16, "y":3.25},
498- {"label":"Shift", "x":17, "y":3.25, "w":1.75},
499- {"label":"Fn", "x":18.75, "y":3.25},
500-
501- {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
502- {"label":"Alt", "x":5, "y":4.25, "w":1.5},
503- {"label":"Space", "x":6.5, "y":4.25, "w":2},
504- {"label":"Menu", "x":8.5, "y":4.25},
505- {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
506- {"label":"Alt", "x":13, "y":4.25, "w":1.5},
507- {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
508+ {"matrix": [0, 0], "x": 0.5, "y": 0},
509+
510+ {"matrix": [0, 1], "x": 1.75, "y": 0.25},
511+ {"matrix": [0, 2], "x": 2.75, "y": 0.25},
512+ {"matrix": [0, 3], "x": 3.75, "y": 0},
513+ {"matrix": [0, 4], "x": 4.75, "y": 0.25},
514+ {"matrix": [0, 5], "x": 5.75, "y": 0.25},
515+ {"matrix": [0, 6], "x": 6.75, "y": 0.25},
516+ {"matrix": [0, 7], "x": 7.75, "y": 0.25},
517+
518+ {"matrix": [0, 8], "x": 11, "y": 0.25},
519+ {"matrix": [0, 9], "x": 12, "y": 0.25},
520+ {"matrix": [0, 10], "x": 13, "y": 0.25},
521+ {"matrix": [0, 11], "x": 14, "y": 0.25},
522+ {"matrix": [0, 12], "x": 15, "y": 0},
523+ {"matrix": [0, 13], "x": 16, "y": 0.25},
524+ {"matrix": [0, 14], "x": 17, "y": 0.25},
525+ {"matrix": [0, 15], "x": 18, "y": 0.25},
526+
527+ {"matrix": [1, 0], "x": 0.25, "y": 1},
528diff --git a/keyboards/coarse/cordillera/cordillera.h b/keyboards/coarse/cordillera/cordillera.h
529deleted file mode 100644
530index 01ae781cfbc0618742840b82b42456e3ec3b4a8d..0000000000000000000000000000000000000000
531--- a/keyboards/coarse/cordillera/cordillera.h
532+++ /dev/null
533@@ -1,90 +0,0 @@
534-/*
535-Copyright 2020 coarse <coarsekeys@gmail.com>
536-
537-This program is free software: you can redistribute it and/or modify
538-it under the terms of the GNU General Public License as published by
539-the Free Software Foundation, either version 2 of the License, or
540-(at your option) any later version.
541-
542-This program is distributed in the hope that it will be useful,
543-but WITHOUT ANY WARRANTY; without even the implied warranty of
544-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
545-GNU General Public License for more details.
546-
547-You should have received a copy of the GNU General Public License
548-along with this program. If not, see <http://www.gnu.org/licenses/>.
549-*/
550-
551-#pragma once
552-
553-#include "quantum.h"
554-
555-#define XXX KC_NO
556-
557-// Full backspace
558-// Split right shift
559-#define LAYOUT_alice( \
560- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \
561- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
562- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2a, k2b, k2c, k2d, k2f, \
563- k31, k32, k33, k34, k35, k36, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
564- k41, k43, k45, k46, k49, k4b, k4f \
565-) \
566-{ \
567- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX, k0f }, \
568- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
569- { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
570- { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
571- { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
572-}
573-
574-// Split backspace
575-// Split right shift
576-#define LAYOUT_alice_split_bs( \
577- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
578- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
579- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2a, k2b, k2c, k2d, k2f, \
580- k31, k32, k33, k34, k35, k36, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
581- k41, k43, k45, k46, k49, k4b, k4f \
582-) \
583-{ \
584- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
585- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
586- { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
587- { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
588- { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
589-}
590-
591-// Split backspace
592-// Full right shift
593-#define LAYOUT_alice_split_bs_full_rshift( \
594- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
595- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
596- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2a, k2b, k2c, k2d, k2f, \
597- k31, k32, k33, k34, k35, k36, k38, k39, k3a, k3b, k3c, k3d, k3e, \
598- k41, k43, k45, k46, k49, k4b, k4f \
599-) \
600-{ \
601- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
602- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
603- { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
604- { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
605- { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
606-}
607-
608-// Full backspace
609-// Full right shift
610-#define LAYOUT_alice_full_rshift( \
611- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \
612- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
613- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2a, k2b, k2c, k2d, k2f, \
614- k31, k32, k33, k34, k35, k36, k38, k39, k3a, k3b, k3c, k3d, k3e, \
615- k41, k43, k45, k46, k49, k4b, k4f \
616-) \
617-{ \
618- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX, k0f }, \
619- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
620- { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
621- { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
622- { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
623-}
624diff --git a/keyboards/coarse/cordillera/info.json b/keyboards/coarse/cordillera/info.json
625index 507d4992365049dad5a81ab5a19fbd67a12bed78..7252f65f29deb6f1a3a4294e511208bc10163c95 100644
626--- a/keyboards/coarse/cordillera/info.json
627+++ b/keyboards/coarse/cordillera/info.json
628@@ -30,294 +30,322 @@
629 "layouts": {
630 "LAYOUT_alice": {
631 "layout": [
632- {"label":"Esc", "x":0.5, "y":0},
633- {"label":"`", "x":1.75, "y":0.25},
634- {"label":"1", "x":2.75, "y":0.25},
635- {"label":"2", "x":3.75, "y":0},
636- {"label":"3", "x":4.75, "y":0.25},
637- {"label":"4", "x":5.75, "y":0.25},
638- {"label":"5", "x":6.75, "y":0.25},
639- {"label":"6", "x":7.75, "y":0.25},
640- {"label":"7", "x":11, "y":0.25},
641- {"label":"8", "x":12, "y":0.25},
642- {"label":"9", "x":13, "y":0.25},
643- {"label":"0", "x":14, "y":0.25},
644- {"label":"-", "x":15, "y":0},
645- {"label":"=", "x":16, "y":0.25},
646- {"label":"Backspace", "x":17, "y":0.25, "w":2},
647-
648- {"label":"PgUp", "x":0.25, "y":1},
649- {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
650- {"label":"Q", "x":3, "y":1.25},
651- {"label":"W", "x":4.25, "y":1.25},
652- {"label":"E", "x":5.25, "y":1.25},
653- {"label":"R", "x":6.25, "y":1.25},
654- {"label":"T", "x":7.25, "y":1.25},
655- {"label":"Y", "x":10.5, "y":1.25},
656- {"label":"U", "x":11.5, "y":1.25},
657- {"label":"I", "x":12.5, "y":1.25},
658- {"label":"O", "x":13.5, "y":1.25},
659- {"label":"P", "x":14.75, "y":1.25},
660- {"label":"{", "x":15.75, "y":1.25},
661- {"label":"}", "x":16.75, "y":1.25},
662- {"label":"|", "x":17.75, "y":1.25, "w":1.5},
663-
664- {"label":"PgDn", "x":0, "y":2},
665- {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
666- {"label":"A", "x":3.25, "y":2.25},
667- {"label":"S", "x":4.5, "y":2.25},
668- {"label":"D", "x":5.5, "y":2.25},
669- {"label":"F", "x":6.5, "y":2.25},
670- {"label":"G", "x":7.5, "y":2.25},
671- {"label":"H", "x":10.75, "y":2.25},
672- {"label":"J", "x":11.75, "y":2.25},
673- {"label":"K", "x":12.75, "y":2.25},
674- {"label":"L", "x":13.75, "y":2.25},
675- {"label":":", "x":15.25, "y":2.25},
676- {"label":"\"", "x":16.25, "y":2.25},
677- {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
678-
679- {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
680- {"label":"Z", "x":3.75, "y":3.25},
681- {"label":"X", "x":5, "y":3.25},
682- {"label":"C", "x":6, "y":3.25},
683- {"label":"V", "x":7, "y":3.25},
684- {"label":"B", "x":8, "y":3.25},
685- {"label":"Fn", "x":10.25, "y":3.25},
686- {"label":"N", "x":11.25, "y":3.25},
687- {"label":"M", "x":12.25, "y":3.25},
688- {"label":"<", "x":13.25, "y":3.25},
689- {"label":">", "x":15, "y":3.25},
690- {"label":"?", "x":16, "y":3.25},
691- {"label":"Shift", "x":17, "y":3.25, "w":1.75},
692- {"label":"Fn", "x":18.75, "y":3.25},
693-
694- {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
695- {"label":"Alt", "x":5, "y":4.25, "w":1.5},
696- {"label":"Space", "x":6.5, "y":4.25, "w":2},
697- {"label":"Menu", "x":8.5, "y":4.25},
698- {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
699- {"label":"Alt", "x":13, "y":4.25, "w":1.5},
700- {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
701+ {"matrix": [0, 0], "x": 0.5, "y": 0},
702+
703+ {"matrix": [0, 1], "x": 1.75, "y": 0.25},
704+ {"matrix": [0, 2], "x": 2.75, "y": 0.25},
705+ {"matrix": [0, 3], "x": 3.75, "y": 0},
706+ {"matrix": [0, 4], "x": 4.75, "y": 0.25},
707+ {"matrix": [0, 5], "x": 5.75, "y": 0.25},
708+ {"matrix": [0, 6], "x": 6.75, "y": 0.25},
709+ {"matrix": [0, 7], "x": 7.75, "y": 0.25},
710+
711+ {"matrix": [0, 8], "x": 11, "y": 0.25},
712+ {"matrix": [0, 9], "x": 12, "y": 0.25},
713+ {"matrix": [0, 10], "x": 13, "y": 0.25},
714+ {"matrix": [0, 11], "x": 14, "y": 0.25},
715+ {"matrix": [0, 12], "x": 15, "y": 0},
716+ {"matrix": [0, 13], "x": 16, "y": 0.25},
717+ {"matrix": [0, 15], "x": 17, "y": 0.25, "w": 2},
718+
719+ {"matrix": [1, 0], "x": 0.25, "y": 1},
720+
721+ {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
722+ {"matrix": [1, 2], "x": 3, "y": 1.25},
723+ {"matrix": [1, 3], "x": 4.25, "y": 1.25},
724+ {"matrix": [1, 4], "x": 5.25, "y": 1.25},
725+ {"matrix": [1, 5], "x": 6.25, "y": 1.25},
726+ {"matrix": [1, 6], "x": 7.25, "y": 1.25},
727+
728diff --git a/keyboards/edda/edda.c b/keyboards/edda/edda.c
729index a04f3cc4c131095eaf497b53faa174b25127431f..38d1d5ddab78e9c0c846cc6e268ba44cc789c55c 100644
730--- a/keyboards/edda/edda.c
731+++ b/keyboards/edda/edda.c
732@@ -11,7 +11,7 @@ GNU General Public License for more details.
733 You should have received a copy of the GNU General Public License
734 along with this program. If not, see <http://www.gnu.org/licenses/>.
735 */
736-#include "edda.h"
737+#include "quantum.h"
738
739 void keyboard_pre_init_kb(void) {
740 // Call the keyboard pre init code.
741diff --git a/keyboards/edda/edda.h b/keyboards/edda/edda.h
742deleted file mode 100644
743index d15606b2c22a530b918e764e95ef7ea26da0a70d..0000000000000000000000000000000000000000
744--- a/keyboards/edda/edda.h
745+++ /dev/null
746@@ -1,47 +0,0 @@
747-/*
748-Copyright 2021 Martin Arnstad
749-This program is free software: you can redistribute it and/or modify
750-it under the terms of the GNU General Public License as published by
751-the Free Software Foundation, either version 2 of the License, or
752-(at your option) any later version.
753-This program is distributed in the hope that it will be useful,
754-but WITHOUT ANY WARRANTY; without even the implied warranty of
755-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
756-GNU General Public License for more details.
757-You should have received a copy of the GNU General Public License
758-along with this program. If not, see <http://www.gnu.org/licenses/>.
759-*/
760-#pragma once
761-
762-#include "quantum.h"
763-
764-#define KNO KC_NO
765-#define LAYOUT_default LAYOUT_alice_split_bs
766-
767-#define LAYOUT_alice_split_bs( \
768- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
769- K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
770- K20, K21, K22, K23, K24, K25, K26, K28, K29, K2A, K2B, K2C, K2D, K2F, \
771- K31, K32, K33, K34, K35, K36, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
772- K41, K43, K44, K46, K49, K4B, K4F \
773-) { \
774- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
775- { K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
776- { K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F }, \
777- { KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
778- { KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F } \
779-}
780-
781-#define LAYOUT_alice( \
782- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
783- K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
784- K20, K21, K22, K23, K24, K25, K26, K28, K29, K2A, K2B, K2C, K2D, K2F, \
785- K31, K32, K33, K34, K35, K36, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
786- K41, K43, K44, K46, K49, K4B, K4F \
787-) { \
788- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KNO, K0F }, \
789- { K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
790- { K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F }, \
791- { KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
792- { KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F } \
793-}
794diff --git a/keyboards/edda/info.json b/keyboards/edda/info.json
795index 8893abdd95e1614d9a4bd6f5c17b1e62a395e105..3cf050fb9eab32043160589900524df13ad874d8 100644
796--- a/keyboards/edda/info.json
797+++ b/keyboards/edda/info.json
798@@ -16,152 +16,169 @@
799 "processor": "atmega32u4",
800 "bootloader": "qmk-dfu",
801 "community_layouts": ["alice", "alice_split_bs"],
802+ "layout_aliases": {
803+ "LAYOUT_default": "LAYOUT_alice_split_bs"
804+ },
805 "layouts": {
806 "LAYOUT_alice_split_bs": {
807 "layout": [
808- {"label":"Esc", "x":0.5, "y":0},
809- {"label":"`", "x":1.75, "y":0.25},
810- {"label":"1", "x":2.75, "y":0.25},
811- {"label":"2", "x":3.75, "y":0},
812- {"label":"3", "x":4.75, "y":0.25},
813- {"label":"4", "x":5.75, "y":0.25},
814- {"label":"5", "x":6.75, "y":0.25},
815- {"label":"6", "x":7.75, "y":0.25},
816- {"label":"7", "x":11, "y":0.25},
817- {"label":"8", "x":12, "y":0.25},
818- {"label":"9", "x":13, "y":0.25},
819- {"label":"0", "x":14, "y":0.25},
820- {"label":"-", "x":15, "y":0},
821- {"label":"=", "x":16, "y":0.25},
822- {"label":"Del", "x":17, "y":0.25},
823- {"label":"Backspace", "x":18, "y":0.25},
824-
825- {"label":"PgUp", "x":0.25, "y":1},
826- {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
827- {"label":"Q", "x":3, "y":1.25},
828- {"label":"W", "x":4.25, "y":1.25},
829- {"label":"E", "x":5.25, "y":1.25},
830- {"label":"R", "x":6.25, "y":1.25},
831- {"label":"T", "x":7.25, "y":1.25},
832- {"label":"Y", "x":10.5, "y":1.25},
833- {"label":"U", "x":11.5, "y":1.25},
834- {"label":"I", "x":12.5, "y":1.25},
835- {"label":"O", "x":13.5, "y":1.25},
836- {"label":"P", "x":14.75, "y":1.25},
837- {"label":"{", "x":15.75, "y":1.25},
838- {"label":"}", "x":16.75, "y":1.25},
839- {"label":"|", "x":17.75, "y":1.25, "w":1.5},
840-
841- {"label":"PgDn", "x":0, "y":2},
842- {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
843- {"label":"A", "x":3.25, "y":2.25},
844- {"label":"S", "x":4.5, "y":2.25},
845- {"label":"D", "x":5.5, "y":2.25},
846- {"label":"F", "x":6.5, "y":2.25},
847- {"label":"G", "x":7.5, "y":2.25},
848- {"label":"H", "x":10.75, "y":2.25},
849- {"label":"J", "x":11.75, "y":2.25},
850- {"label":"K", "x":12.75, "y":2.25},
851- {"label":"L", "x":13.75, "y":2.25},
852- {"label":":", "x":15.25, "y":2.25},
853- {"label":"\"", "x":16.25, "y":2.25},
854- {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
855-
856- {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
857- {"label":"Z", "x":3.75, "y":3.25},
858- {"label":"X", "x":5, "y":3.25},
859- {"label":"C", "x":6, "y":3.25},
860- {"label":"V", "x":7, "y":3.25},
861- {"label":"B", "x":8, "y":3.25},
862- {"label":"Fn", "x":10.25, "y":3.25},
863- {"label":"N", "x":11.25, "y":3.25},
864- {"label":"M", "x":12.25, "y":3.25},
865- {"label":"<", "x":13.25, "y":3.25},
866- {"label":">", "x":15, "y":3.25},
867- {"label":"?", "x":16, "y":3.25},
868- {"label":"Shift", "x":17, "y":3.25, "w":1.75},
869- {"label":"Fn", "x":18.75, "y":3.25},
870-
871- {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
872- {"label":"Alt", "x":5, "y":4.25, "w":1.5},
873- {"label":"Space", "x":6.5, "y":4.25, "w":2},
874- {"label":"Menu", "x":8.5, "y":4.25},
875- {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
876- {"label":"Alt", "x":13, "y":4.25, "w":1.5},
877- {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
878+ {"matrix": [0, 0], "x": 0.5, "y": 0},
879+
880+ {"matrix": [0, 1], "x": 1.75, "y": 0.25},
881+ {"matrix": [0, 2], "x": 2.75, "y": 0.25},
882+ {"matrix": [0, 3], "x": 3.75, "y": 0},
883+ {"matrix": [0, 4], "x": 4.75, "y": 0.25},
884+ {"matrix": [0, 5], "x": 5.75, "y": 0.25},
885+ {"matrix": [0, 6], "x": 6.75, "y": 0.25},
886+ {"matrix": [0, 7], "x": 7.75, "y": 0.25},
887+
888+ {"matrix": [0, 8], "x": 11, "y": 0.25},
889+ {"matrix": [0, 9], "x": 12, "y": 0.25},
890+ {"matrix": [0, 10], "x": 13, "y": 0.25},
891+ {"matrix": [0, 11], "x": 14, "y": 0.25},
892+ {"matrix": [0, 12], "x": 15, "y": 0},
893+ {"matrix": [0, 13], "x": 16, "y": 0.25},
894+ {"matrix": [0, 14], "x": 17, "y": 0.25},
895+ {"matrix": [0, 15], "x": 18, "y": 0.25},
896+
897+ {"matrix": [1, 0], "x": 0.25, "y": 1},
898diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
899index 8551c8f3a107981ff65bf5286d6c84546d512a2b..0c23a129690112a010ffc79153f2305e43ba982b 100644
900--- a/keyboards/ergodox_ez/ergodox_ez.h
901+++ b/keyboards/ergodox_ez/ergodox_ez.h
902@@ -140,152 +140,6 @@ typedef union {
903
904 extern keyboard_config_t keyboard_config;
905
906-/*
907- * LEFT HAND: LINES 115-122
908- * RIGHT HAND: LINES 124-131
909- */
910-#define LAYOUT_ergodox( \
911- \
912- k00,k01,k02,k03,k04,k05,k06, \
913- k10,k11,k12,k13,k14,k15,k16, \
914- k20,k21,k22,k23,k24,k25, \
915- k30,k31,k32,k33,k34,k35,k36, \
916- k40,k41,k42,k43,k44, \
917- k55,k56, \
918- k54, \
919- k53,k52,k51, \
920- \
921- k07,k08,k09,k0A,k0B,k0C,k0D, \
922- k17,k18,k19,k1A,k1B,k1C,k1D, \
923- k28,k29,k2A,k2B,k2C,k2D, \
924- k37,k38,k39,k3A,k3B,k3C,k3D, \
925- k49,k4A,k4B,k4C,k4D, \
926- k57,k58, \
927- k59, \
928- k5C,k5B,k5A ) \
929- \
930- /* matrix positions */ \
931- { \
932- { k00, k10, k20, k30, k40, KC_NO }, \
933- { k01, k11, k21, k31, k41, k51 }, \
934- { k02, k12, k22, k32, k42, k52 }, \
935- { k03, k13, k23, k33, k43, k53 }, \
936- { k04, k14, k24, k34, k44, k54 }, \
937- { k05, k15, k25, k35, KC_NO, k55 }, \
938- { k06, k16, KC_NO, k36, KC_NO, k56 }, \
939- \
940- { k07, k17, KC_NO, k37,KC_NO, k57 }, \
941- { k08, k18, k28, k38,KC_NO, k58 }, \
942- { k09, k19, k29, k39, k49, k59 }, \
943- { k0A, k1A, k2A, k3A, k4A, k5A }, \
944- { k0B, k1B, k2B, k3B, k4B, k5B }, \
945- { k0C, k1C, k2C, k3C, k4C, k5C }, \
946- { k0D, k1D, k2D, k3D, k4D, KC_NO } \
947- }
948-
949-/*
950- * LEFT HAND: LINES 158-165
951- * RIGHT HAND: LINES 167-174
952- */
953-#define LAYOUT_ergodox_80( \
954- \
955- k00,k01,k02,k03,k04,k05,k06, \
956- k10,k11,k12,k13,k14,k15,k16, \
957- k20,k21,k22,k23,k24,k25, \
958- k30,k31,k32,k33,k34,k35,k36, \
959- k40,k41,k42,k43,k44, \
960- k55,k56, \
961- k45,k46,k54, \
962- k53,k52,k51, \
963- \
964- k07,k08,k09,k0A,k0B,k0C,k0D, \
965- k17,k18,k19,k1A,k1B,k1C,k1D, \
966- k28,k29,k2A,k2B,k2C,k2D, \
967- k37,k38,k39,k3A,k3B,k3C,k3D, \
968- k49,k4A,k4B,k4C,k4D, \
969- k57,k58, \
970- k59,k47,k48, \
971- k5C,k5B,k5A ) \
972- \
973- /* matrix positions */ \
974- { \
975- { k00, k10, k20, k30, k40, KC_NO }, \
976- { k01, k11, k21, k31, k41, k51 }, \
977- { k02, k12, k22, k32, k42, k52 }, \
978- { k03, k13, k23, k33, k43, k53 }, \
979- { k04, k14, k24, k34, k44, k54 }, \
980- { k05, k15, k25, k35, k45, k55 }, \
981- { k06, k16, KC_NO, k36, k46, k56 }, \
982- \
983- { k07, k17, KC_NO, k37, k47, k57 }, \
984- { k08, k18, k28, k38, k48, k58 }, \
985- { k09, k19, k29, k39, k49, k59 }, \
986- { k0A, k1A, k2A, k3A, k4A, k5A }, \
987- { k0B, k1B, k2B, k3B, k4B, k5B }, \
988- { k0C, k1C, k2C, k3C, k4C, k5C }, \
989- { k0D, k1D, k2D, k3D, k4D, KC_NO } \
990- }
991-
992-/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
993-#define LAYOUT_ergodox_pretty( \
994- L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \
995- L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
996- L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \
997- L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \
998- L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \
999- L55,L56, R50,R51, \
1000- L54, R52, \
1001- L53,L52,L51, R55,R54,R53 ) \
1002diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
1003index cfef8426170e0d574bdc57bff919b12895d9f6e1..b4b55221403091835ee6818356669ac65fa88521 100644
1004--- a/keyboards/ergodox_ez/info.json
1005+++ b/keyboards/ergodox_ez/info.json
1006@@ -13,97 +13,386 @@
1007 "layouts": {
1008 "LAYOUT_ergodox": {
1009 "layout": [
1010- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
1011- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
1012- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
1013- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
1014- {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
1015+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
1016+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
1017+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
1018+ {"matrix": [3, 0], "x": 3.5, "y": 0},
1019+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
1020+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
1021+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
1022
1023- {"x":6, "y":5}, {"x":7, "y":5},
1024- {"x":7, "y":6},
1025- {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
1026+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
1027+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
1028+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
1029+ {"matrix": [3, 1], "x": 3.5, "y": 1},
1030+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
1031+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
1032+ {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
1033
1034+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
1035+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
1036+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
1037+ {"matrix": [3, 2], "x": 3.5, "y": 2},
1038+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
1039+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
1040
1041- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
1042- {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
1043- {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
1044- {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
1045- {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
1046+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
1047+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
1048+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
1049+ {"matrix": [3, 3], "x": 3.5, "y": 3},
1050+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
1051+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
1052+ {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
1053
1054+ {"matrix": [0, 4], "x": 0.5, "y": 4.375},
1055+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
1056+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
1057+ {"matrix": [3, 4], "x": 3.5, "y": 4},
1058+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
1059
1060- {"x":9, "y":5}, {"x":10, "y":5},
1061- {"x":9, "y":6},
1062- {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
1063+ {"matrix": [5, 5], "x": 6, "y": 5},
1064+ {"matrix": [6, 5], "x": 7, "y": 5},
1065+ {"matrix": [4, 5], "x": 7, "y": 6},
1066+ {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
1067+ {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
1068+ {"matrix": [1, 5], "x": 7, "y": 7},
1069+
1070+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
1071+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
1072+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
1073+ {"matrix": [10, 0], "x": 12.5, "y": 0},
1074+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
1075+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
1076+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
1077+
1078+ {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
1079+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
1080+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
1081+ {"matrix": [10, 1], "x": 12.5, "y": 1},
1082+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
1083+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
1084+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
1085+
1086+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
1087+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
1088+ {"matrix": [10, 2], "x": 12.5, "y": 2},
1089+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
1090+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
1091+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
1092+ {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
1093+
1094+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
1095+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
1096+ {"matrix": [10, 3], "x": 12.5, "y": 3},
1097+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
1098+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
1099+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
1100+
1101+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
1102+ {"matrix": [10, 4], "x": 12.5, "y": 4},
1103+ {"matrix": [11, 4], "x": 13.5, "y": 4.125},
1104+ {"matrix": [12, 4], "x": 14.5, "y": 4.375},
1105+ {"matrix": [13, 4], "x": 15.5, "y": 4.375},
1106diff --git a/keyboards/ergodox_stm32/ergodox_stm32.h b/keyboards/ergodox_stm32/ergodox_stm32.h
1107index b84b101f3890df35dbedffe3c386acd8f104a5df..5a736ad818a05978d463691c80d79cef5170b611 100644
1108--- a/keyboards/ergodox_stm32/ergodox_stm32.h
1109+++ b/keyboards/ergodox_stm32/ergodox_stm32.h
1110@@ -35,80 +35,3 @@ extern volatile int mcp23017_status;
1111 uint8_t init_mcp23017(void);
1112
1113 void ergodox_blink_all_leds(void);
1114-
1115-/*
1116- * LEFT HAND: LINES 115-122
1117- * RIGHT HAND: LINES 124-131
1118- */
1119-#define LAYOUT_ergodox( \
1120- \
1121- k00, k01, k02, k03, k04, k05, k06, \
1122- k10, k11, k12, k13, k14, k15, k16, \
1123- k20, k21, k22, k23, k24, k25, \
1124- k30, k31, k32, k33, k34, k35, k36, \
1125- k40, k41, k42, k43, k44, \
1126- k55, k56, \
1127- k54, \
1128- k53, k52, k51, \
1129- \
1130- k07, k08, k09, k0A, k0B, k0C, k0D, \
1131- k17, k18, k19, k1A, k1B, k1C, k1D, \
1132- k28, k29, k2A, k2B, k2C, k2D, \
1133- k37, k38, k39, k3A, k3B, k3C, k3D, \
1134- k49, k4A, k4B, k4C, k4D, \
1135- k57, k58, \
1136- k59, \
1137- k5C, k5B, k5A) \
1138- \
1139- /* matrix positions */ \
1140- { \
1141- {k00, k10, k20, k30, k40, KC_NO}, \
1142- {k01, k11, k21, k31, k41, k51}, \
1143- {k02, k12, k22, k32, k42, k52}, \
1144- {k03, k13, k23, k33, k43, k53}, \
1145- {k04, k14, k24, k34, k44, k54}, \
1146- {k05, k15, k25, k35, KC_NO, k55}, \
1147- {k06, k16, KC_NO, k36, KC_NO, k56}, \
1148- \
1149- {k07, k17, KC_NO, k37, KC_NO, k57}, \
1150- {k08, k18, k28, k38, KC_NO, k58}, \
1151- {k09, k19, k29, k39, k49, k59}, \
1152- {k0A, k1A, k2A, k3A, k4A, k5A}, \
1153- {k0B, k1B, k2B, k3B, k4B, k5B}, \
1154- {k0C, k1C, k2C, k3C, k4C, k5C}, \
1155- { \
1156- k0D, k1D, k2D, k3D, k4D, KC_NO \
1157- } \
1158- }
1159-
1160-/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
1161-#define LAYOUT_ergodox_pretty( \
1162- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
1163- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
1164- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \
1165- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
1166- L40, L41, L42, L43, L44, R42, R43, R44, R45, R46, \
1167- L55, L56, R50, R51, \
1168- L54, R52, \
1169- L53, L52, L51, R55, R54, R53) \
1170- \
1171- /* matrix positions */ \
1172- { \
1173- {L00, L10, L20, L30, L40, KC_NO}, \
1174- {L01, L11, L21, L31, L41, L51}, \
1175- {L02, L12, L22, L32, L42, L52}, \
1176- {L03, L13, L23, L33, L43, L53}, \
1177- {L04, L14, L24, L34, L44, L54}, \
1178- {L05, L15, L25, L35, KC_NO, L55}, \
1179- {L06, L16, KC_NO, L36, KC_NO, L56}, \
1180- \
1181- {R00, R10, KC_NO, R30, KC_NO, R50}, \
1182- {R01, R11, R21, R31, KC_NO, R51}, \
1183- {R02, R12, R22, R32, R42, R52}, \
1184- {R03, R13, R23, R33, R43, R53}, \
1185- {R04, R14, R24, R34, R44, R54}, \
1186- {R05, R15, R25, R35, R45, R55}, \
1187- { \
1188- R06, R16, R26, R36, R46, KC_NO \
1189- } \
1190- }
1191diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/info.json
1192index 73e2d7f5327eec8caaca3b9eab4cefcc4f6245fe..305adc9e12550db19ec2a969c2a23c189a4e05d9 100644
1193--- a/keyboards/ergodox_stm32/info.json
1194+++ b/keyboards/ergodox_stm32/info.json
1195@@ -8,52 +8,196 @@
1196 "pid": "0x1308",
1197 "device_version": "1.0.1"
1198 },
1199- "layouts": {
1200+"layouts": {
1201 "LAYOUT_ergodox": {
1202 "layout": [
1203- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
1204- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
1205- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
1206- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
1207- {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
1208+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
1209+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
1210+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
1211+ {"matrix": [3, 0], "x": 3.5, "y": 0},
1212+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
1213+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
1214+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
1215
1216- {"x":6, "y":5}, {"x":7, "y":5},
1217- {"x":7, "y":6},
1218- {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
1219+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
1220+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
1221+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
1222+ {"matrix": [3, 1], "x": 3.5, "y": 1},
1223+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
1224+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
1225+ {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
1226
1227+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
1228+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
1229+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
1230+ {"matrix": [3, 2], "x": 3.5, "y": 2},
1231+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
1232+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
1233
1234- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
1235- {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
1236- {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
1237- {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
1238- {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
1239+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
1240+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
1241+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
1242+ {"matrix": [3, 3], "x": 3.5, "y": 3},
1243+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
1244+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
1245+ {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
1246+ {"matrix": [0, 4], "x": 0.5, "y": 4.375},
1247+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
1248+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
1249+ {"matrix": [3, 4], "x": 3.5, "y": 4},
1250+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
1251
1252+ {"matrix": [5, 5], "x": 6, "y": 5},
1253+ {"matrix": [6, 5], "x": 7, "y": 5},
1254+ {"matrix": [4, 5], "x": 7, "y": 6},
1255
1256- {"x":9, "y":5}, {"x":10, "y":5},
1257- {"x":9, "y":6},
1258- {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
1259+ {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
1260+ {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
1261+ {"matrix": [1, 5], "x": 7, "y": 7},
1262+
1263+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
1264+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
1265+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
1266+ {"matrix": [10, 0], "x": 12.5, "y": 0},
1267+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
1268+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
1269+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
1270+
1271+ {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
1272+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
1273+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
1274+ {"matrix": [10, 1], "x": 12.5, "y": 1},
1275+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
1276+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
1277+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
1278+
1279+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
1280+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
1281+ {"matrix": [10, 2], "x": 12.5, "y": 2},
1282+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
1283+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
1284+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
1285+
1286+ {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
1287+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
1288+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
1289+ {"matrix": [10, 3], "x": 12.5, "y": 3},
1290+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
1291+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
1292+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
1293+
1294+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
1295diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json
1296index bc7aa9113c8f3b2a19726d0c7fbb52124d804029..8722c5e037496a9dddc44251dde02ad3954785d3 100644
1297--- a/keyboards/evyd13/wonderland/info.json
1298+++ b/keyboards/evyd13/wonderland/info.json
1299@@ -27,144 +27,169 @@
1300 "processor": "atmega32u4",
1301 "bootloader": "qmk-dfu",
1302 "community_layouts": ["alice", "alice_split_bs"],
1303+ "layout_aliases": {
1304+ "LAYOUT": "LAYOUT_alice_split_bs"
1305+ },
1306 "layouts": {
1307 "LAYOUT_alice_split_bs": {
1308 "layout": [
1309- {"label":"k10", "x":0, "y":0},
1310- {"label":"k00", "x":1.25, "y":0},
1311- {"label":"k01", "x":2.25, "y":0},
1312- {"label":"k02", "x":3.25, "y":0},
1313- {"label":"k03", "x":4.25, "y":0},
1314- {"label":"k04", "x":5.25, "y":0},
1315- {"label":"k05", "x":6.25, "y":0},
1316- {"label":"k06", "x":7.25, "y":0},
1317- {"label":"k07", "x":10.25, "y":0},
1318- {"label":"k08", "x":11.25, "y":0},
1319- {"label":"k09", "x":12.25, "y":0},
1320- {"label":"k0a", "x":13.25, "y":0},
1321- {"label":"k0b", "x":14.25, "y":0},
1322- {"label":"k0c", "x":15.25, "y":0},
1323- {"label":"k0d", "x":16.25, "y":0},
1324- {"label":"k0e", "x":17.25, "y":0},
1325- {"label":"k20", "x":0, "y":1},
1326- {"label":"k11", "x":1.25, "y":1, "w":1.5},
1327- {"label":"k12", "x":2.75, "y":1},
1328- {"label":"k13", "x":3.75, "y":1},
1329- {"label":"k14", "x":4.75, "y":1},
1330- {"label":"k15", "x":5.75, "y":1},
1331- {"label":"k16", "x":6.75, "y":1},
1332- {"label":"k17", "x":9.75, "y":1},
1333- {"label":"k18", "x":10.75, "y":1},
1334- {"label":"k19", "x":11.75, "y":1},
1335- {"label":"k1a", "x":12.75, "y":1},
1336- {"label":"k1b", "x":13.75, "y":1},
1337- {"label":"k1c", "x":14.75, "y":1},
1338- {"label":"k1d", "x":15.75, "y":1},
1339- {"label":"k1e", "x":16.75, "y":1, "w":1.5},
1340- {"label":"k30", "x":0, "y":2},
1341- {"label":"k21", "x":1.25, "y":2, "w":1.75},
1342- {"label":"k22", "x":3, "y":2},
1343- {"label":"k23", "x":4, "y":2},
1344- {"label":"k24", "x":5, "y":2},
1345- {"label":"k25", "x":6, "y":2},
1346- {"label":"k26", "x":7, "y":2},
1347- {"label":"k27", "x":10, "y":2},
1348- {"label":"k28", "x":11, "y":2},
1349- {"label":"k29", "x":12, "y":2},
1350- {"label":"k2a", "x":13, "y":2},
1351- {"label":"k2b", "x":14, "y":2},
1352- {"label":"k2c", "x":15, "y":2},
1353- {"label":"k2e", "x":16, "y":2, "w":2.25},
1354- {"label":"k31", "x":1.25, "y":3, "w":2.25},
1355- {"label":"k32", "x":3.5, "y":3},
1356- {"label":"k33", "x":4.5, "y":3},
1357- {"label":"k34", "x":5.5, "y":3},
1358- {"label":"k35", "x":6.5, "y":3},
1359- {"label":"k36", "x":7.5, "y":3},
1360- {"label":"k37", "x":9.5, "y":3},
1361- {"label":"k38", "x":10.5, "y":3},
1362- {"label":"k39", "x":11.5, "y":3},
1363- {"label":"k3a", "x":12.5, "y":3},
1364- {"label":"k3b", "x":13.5, "y":3},
1365- {"label":"k3c", "x":14.5, "y":3},
1366- {"label":"k3d", "x":15.5, "y":3, "w":1.75},
1367- {"label":"k3e", "x":17.25, "y":3},
1368- {"label":"k41", "x":1.25, "y":4, "w":1.5},
1369- {"label":"k43", "x":4.25, "y":4, "w":1.5},
1370- {"label":"k45", "x":5.75, "y":4, "w":2},
1371- {"label":"k46", "x":7.75, "y":4, "w":1.25},
1372- {"label":"k48", "x":9.5, "y":4, "w":2.75},
1373- {"label":"k4a", "x":12.25, "y":4, "w":1.5},
1374- {"label":"k4e", "x":16.75, "y":4, "w":1.5}
1375+ {"matrix": [1, 0], "x": 0, "y": 0},
1376+
1377+ {"matrix": [0, 0], "x": 1.25, "y": 0},
1378+ {"matrix": [0, 1], "x": 2.25, "y": 0},
1379+ {"matrix": [0, 2], "x": 3.25, "y": 0},
1380+ {"matrix": [0, 3], "x": 4.25, "y": 0},
1381+ {"matrix": [0, 4], "x": 5.25, "y": 0},
1382+ {"matrix": [0, 5], "x": 6.25, "y": 0},
1383+ {"matrix": [0, 6], "x": 7.25, "y": 0},
1384+
1385+ {"matrix": [0, 7], "x": 10.25, "y": 0},
1386+ {"matrix": [0, 8], "x": 11.25, "y": 0},
1387+ {"matrix": [0, 9], "x": 12.25, "y": 0},
1388+ {"matrix": [0, 10], "x": 13.25, "y": 0},
1389+ {"matrix": [0, 11], "x": 14.25, "y": 0},
1390+ {"matrix": [0, 12], "x": 15.25, "y": 0},
1391+ {"matrix": [0, 13], "x": 16.25, "y": 0},
1392+ {"matrix": [0, 14], "x": 17.25, "y": 0},
1393+
1394+ {"matrix": [2, 0], "x": 0, "y": 1},
1395+
1396+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
1397+ {"matrix": [1, 2], "x": 2.75, "y": 1},
1398+ {"matrix": [1, 3], "x": 3.75, "y": 1},
1399diff --git a/keyboards/evyd13/wonderland/wonderland.h b/keyboards/evyd13/wonderland/wonderland.h
1400deleted file mode 100644
1401index 13ea1476384724d53d264f864f5d6f518ffaa8ef..0000000000000000000000000000000000000000
1402--- a/keyboards/evyd13/wonderland/wonderland.h
1403+++ /dev/null
1404@@ -1,39 +0,0 @@
1405-#pragma once
1406-#include "quantum.h"
1407-
1408-// readability
1409-#define XXX KC_NO
1410-#define LAYOUT_alice_split_bs( \
1411- k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
1412- k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
1413- k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \
1414- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
1415- k41, k43, k45, k46, k48, k4a, k4e \
1416-) \
1417-{ \
1418- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
1419- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
1420- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \
1421- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
1422- {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e} \
1423-}
1424-
1425-#define LAYOUT_alice( \
1426- k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
1427- k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
1428- k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \
1429- k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
1430- k41, k43, k45, k46, k48, k4a, k4e \
1431-) \
1432-{ \
1433- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
1434- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
1435- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \
1436- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
1437- {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e} \
1438-}
1439-
1440-#define LAYOUT LAYOUT_alice_split_bs
1441-
1442-void matrix_init_user(void);
1443-void matrix_scan_user(void);
1444diff --git a/keyboards/fallacy/fallacy.c b/keyboards/fallacy/fallacy.c
1445index 486084098a2e9363186a68c95717fdd524505d42..05f68a0f99aca2294612f4d30d597c6966afd4d8 100755
1446--- a/keyboards/fallacy/fallacy.c
1447+++ b/keyboards/fallacy/fallacy.c
1448@@ -14,7 +14,7 @@
1449 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1450 */
1451
1452-#include "fallacy.h"
1453+#include "quantum.h"
1454 #include "indicators.h"
1455
1456 void matrix_init_kb(void) {
1457diff --git a/keyboards/fallacy/fallacy.h b/keyboards/fallacy/fallacy.h
1458deleted file mode 100755
1459index b77c81fa1a010c3555f0c35a99b6b2e2b9f31622..0000000000000000000000000000000000000000
1460--- a/keyboards/fallacy/fallacy.h
1461+++ /dev/null
1462@@ -1,57 +0,0 @@
1463-/* Copyright 2020 B. Fletcher (toraifu) <typefast@kyaa.gg>
1464- *
1465- * This program is free software: you can redistribute it and/or modify
1466- * it under the terms of the GNU General Public License as published by
1467- * the Free Software Foundation, either version 2 of the License, or
1468- * (at your option) any later version.
1469- *
1470- * This program is distributed in the hope that it will be useful,
1471- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1472- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1473- * GNU General Public License for more details.
1474- *
1475- * You should have received a copy of the GNU General Public License
1476- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1477- */
1478-#pragma once
1479-
1480-#include "quantum.h"
1481-
1482-/* All keys in matrix active:
1483- * - Split Backspace
1484- * - Split Right Shift
1485- */
1486-#define LAYOUT_alice_split_bs( \
1487- K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
1488- K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
1489- K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \
1490- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
1491- K401, K403, K405, K406, K408, K410, K414 \
1492-) { \
1493- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
1494- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
1495- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \
1496- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
1497- { KC_NO, K401, KC_NO, K403, KC_NO, K405, K406, KC_NO, K408, KC_NO, K410, KC_NO, KC_NO, KC_NO, K414 } \
1498-}
1499-
1500-/* Disable position 013 and 314 for:
1501- * - Full size Backspace
1502- * - Full size Right Shift
1503- */
1504-#define LAYOUT_alice( \
1505- K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \
1506- K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
1507- K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \
1508- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
1509- K401, K403, K405, K406, K408, K410, K414 \
1510-) { \
1511- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \
1512- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
1513- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \
1514- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
1515- { KC_NO, K401, KC_NO, K403, KC_NO, K405, K406, KC_NO, K408, KC_NO, K410, KC_NO, KC_NO, KC_NO, K414 } \
1516-}
1517-
1518-#define LAYOUT_default LAYOUT_alice
1519-#define LAYOUT_all LAYOUT_alice_split_bs
1520diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
1521index 1dbccf8dd545735e5f2cbf128fa978d05b10e846..ec13666e68c46aaf464f4ed492b6ed3630acbab0 100644
1522--- a/keyboards/fallacy/info.json
1523+++ b/keyboards/fallacy/info.json
1524@@ -15,144 +15,170 @@
1525 "processor": "atmega32u4",
1526 "bootloader": "atmel-dfu",
1527 "community_layouts": ["alice", "alice_split_bs"],
1528+ "layout_aliases": {
1529+ "LAYOUT_all": "LAYOUT_alice_split_bs",
1530+ "LAYOUT_default": "LAYOUT_alice"
1531+ },
1532 "layouts": {
1533 "LAYOUT_alice_split_bs": {
1534 "layout": [
1535- {"label":"Esc", "x":0.5, "y":0},
1536- {"label":"~", "x":1.75, "y":0},
1537- {"label":"!", "x":2.75, "y":0},
1538- {"label":"@", "x":3.75, "y":0},
1539- {"label":"#", "x":4.75, "y":0},
1540- {"label":"$", "x":5.75, "y":0},
1541- {"label":"%", "x":6.75, "y":0},
1542- {"label":"^", "x":7.75, "y":0},
1543- {"label":"&", "x":10, "y":0},
1544- {"label":"*", "x":11, "y":0},
1545- {"label":"(", "x":12, "y":0},
1546- {"label":")", "x":13, "y":0},
1547- {"label":"_", "x":14, "y":0},
1548- {"label":"+", "x":15, "y":0},
1549- {"label":"|", "x":16, "y":0},
1550- {"label":"~", "x":17, "y":0},
1551- {"label":"PgUp", "x":0.25, "y":1},
1552- {"label":"Tab", "x":1.5, "y":1, "w":1.5},
1553- {"label":"Q", "x":3, "y":1},
1554- {"label":"W", "x":4, "y":1},
1555- {"label":"E", "x":5, "y":1},
1556- {"label":"R", "x":6, "y":1},
1557- {"label":"T", "x":7, "y":1},
1558- {"label":"Y", "x":9.75, "y":1},
1559- {"label":"U", "x":10.75, "y":1},
1560- {"label":"I", "x":11.75, "y":1},
1561- {"label":"O", "x":12.75, "y":1},
1562- {"label":"P", "x":13.75, "y":1},
1563- {"label":"{", "x":14.75, "y":1},
1564- {"label":"}", "x":15.75, "y":1},
1565- {"label":"Backspace", "x":16.75, "y":1, "w":1.5},
1566- {"label":"PgDn", "x":0, "y":2},
1567- {"label":"Control", "x":1.25, "y":2, "w":1.75},
1568- {"label":"A", "x":3, "y":2},
1569- {"label":"S", "x":4, "y":2},
1570- {"label":"D", "x":5, "y":2},
1571- {"label":"F", "x":6, "y":2},
1572- {"label":"G", "x":7, "y":2},
1573- {"label":"H", "x":10.25, "y":2},
1574- {"label":"J", "x":11.25, "y":2},
1575- {"label":"K", "x":12.25, "y":2},
1576- {"label":"L", "x":13.25, "y":2},
1577- {"label":":", "x":14.25, "y":2},
1578- {"label":"\"", "x":15.25, "y":2},
1579- {"label":"Enter", "x":16.25, "y":2, "w":2.25},
1580- {"label":"Shift", "x":1, "y":3, "w":2.25},
1581- {"label":"Z", "x":3.25, "y":3},
1582- {"label":"X", "x":4.25, "y":3},
1583- {"label":"C", "x":5.25, "y":3},
1584- {"label":"V", "x":6.25, "y":3},
1585- {"label":"B", "x":7.25, "y":3},
1586- {"label":"B", "x":10, "y":3},
1587- {"label":"N", "x":11, "y":3},
1588- {"label":"M", "x":12, "y":3},
1589- {"label":"<", "x":13, "y":3},
1590- {"label":">", "x":14, "y":3},
1591- {"label":"?", "x":15, "y":3},
1592- {"label":"Shift", "x":16, "y":3, "w":1.75},
1593- {"label":"Fn1", "x":17.75, "y":3},
1594- {"label":"Ctrl", "x":1, "y":4, "w":1.5},
1595- {"label":"Alt", "x":4, "y":4, "w":1.5},
1596- {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
1597- {"label":"Fn2", "x":7.75, "y":4},
1598- {"label":"RSpace", "x":10, "y":4, "w":2.75},
1599- {"label":"RAlt", "x":12.75, "y":4, "w":1.5},
1600- {"label":"RCtl", "x":17, "y":4, "w":1.5}
1601+ {"matrix": [1, 0], "x": 0.5, "y": 0},
1602+
1603+ {"matrix": [0, 0], "x": 1.75, "y": 0},
1604+ {"matrix": [0, 1], "x": 2.75, "y": 0},
1605+ {"matrix": [0, 2], "x": 3.75, "y": 0},
1606+ {"matrix": [0, 3], "x": 4.75, "y": 0},
1607+ {"matrix": [0, 4], "x": 5.75, "y": 0},
1608+ {"matrix": [0, 5], "x": 6.75, "y": 0},
1609+ {"matrix": [0, 6], "x": 7.75, "y": 0},
1610+
1611+ {"matrix": [0, 7], "x": 10, "y": 0},
1612+ {"matrix": [0, 8], "x": 11, "y": 0},
1613+ {"matrix": [0, 9], "x": 12, "y": 0},
1614+ {"matrix": [0, 10], "x": 13, "y": 0},
1615+ {"matrix": [0, 11], "x": 14, "y": 0},
1616+ {"matrix": [0, 12], "x": 15, "y": 0},
1617+ {"matrix": [0, 13], "x": 16, "y": 0},
1618+ {"matrix": [0, 14], "x": 17, "y": 0},
1619+
1620+ {"matrix": [2, 0], "x": 0.25, "y": 1},
1621+
1622+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
1623+ {"matrix": [1, 2], "x": 3, "y": 1},
1624diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json
1625index 609324ec394386e5a58bc28a25dd203c55b5b2ab..7ffb7aab6e97f3df31c3059a2939e2b43bd079d9 100644
1626--- a/keyboards/fjlabs/swordfish/info.json
1627+++ b/keyboards/fjlabs/swordfish/info.json
1628@@ -18,87 +18,80 @@
1629 "layouts": {
1630 "LAYOUT_alice_all": {
1631 "layout": [
1632- {"x": 0, "y": 0},
1633- {"x": 1, "y": 0},
1634- {"x": 2, "y": 0},
1635- {"x": 3, "y": 0},
1636- {"x": 4, "y": 0},
1637- {"x": 5, "y": 0},
1638- {"x": 6, "y": 0},
1639+ {"matrix": [0, 0], "x": 0, "y": 0},
1640+ {"matrix": [0, 1], "x": 1, "y": 0},
1641+ {"matrix": [0, 2], "x": 2, "y": 0},
1642+ {"matrix": [0, 3], "x": 3, "y": 0},
1643+ {"matrix": [0, 4], "x": 4, "y": 0},
1644+ {"matrix": [0, 5], "x": 5, "y": 0},
1645+ {"matrix": [0, 6], "x": 6, "y": 0},
1646+ {"matrix": [0, 7], "x": 8.5, "y": 0},
1647+ {"matrix": [0, 8], "x": 9.5, "y": 0},
1648+ {"matrix": [0, 9], "x": 10.5, "y": 0},
1649+ {"matrix": [0, 10], "x": 11.5, "y": 0},
1650+ {"matrix": [0, 11], "x": 12.5, "y": 0},
1651+ {"matrix": [0, 12], "x": 13.5, "y": 0},
1652+ {"matrix": [0, 13], "x": 14.5, "y": 0},
1653+ {"matrix": [0, 14], "x": 15.5, "y": 0},
1654+ {"matrix": [1, 0], "x": 16.75, "y": 0},
1655
1656- {"x": 8.5, "y": 0},
1657- {"x": 9.5, "y": 0},
1658- {"x": 10.5, "y": 0},
1659- {"x": 11.5, "y": 0},
1660- {"x": 12.5, "y": 0},
1661- {"x": 13.5, "y": 0},
1662- {"x": 14.5, "y": 0},
1663- {"x": 15.5, "y": 0},
1664- {"x": 16.75, "y": 0},
1665+ {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
1666+ {"matrix": [1, 2], "x": 1.5, "y": 1},
1667+ {"matrix": [1, 3], "x": 2.5, "y": 1},
1668+ {"matrix": [1, 4], "x": 3.5, "y": 1},
1669+ {"matrix": [1, 5], "x": 4.5, "y": 1},
1670+ {"matrix": [1, 6], "x": 5.5, "y": 1},
1671+ {"matrix": [1, 7], "x": 8, "y": 1},
1672+ {"matrix": [1, 8], "x": 9, "y": 1},
1673+ {"matrix": [1, 9], "x": 10, "y": 1},
1674+ {"matrix": [1, 10], "x": 11, "y": 1},
1675+ {"matrix": [1, 11], "x": 12, "y": 1},
1676+ {"matrix": [1, 12], "x": 13, "y": 1},
1677+ {"matrix": [1, 13], "x": 14, "y": 1},
1678+ {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.5},
1679+ {"matrix": [2, 0], "x": 16.75, "y": 1},
1680
1681- {"x": 0, "y": 1, "w": 1.5},
1682- {"x": 1.5, "y": 1},
1683- {"x": 2.5, "y": 1},
1684- {"x": 3.5, "y": 1},
1685- {"x": 4.5, "y": 1},
1686- {"x": 5.5, "y": 1},
1687+ {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
1688+ {"matrix": [2, 2], "x": 1.75, "y": 2},
1689+ {"matrix": [2, 3], "x": 2.75, "y": 2},
1690+ {"matrix": [2, 4], "x": 3.75, "y": 2},
1691+ {"matrix": [2, 5], "x": 4.75, "y": 2},
1692+ {"matrix": [2, 6], "x": 5.75, "y": 2},
1693+ {"matrix": [2, 7], "x": 8.25, "y": 2},
1694+ {"matrix": [2, 8], "x": 9.25, "y": 2},
1695+ {"matrix": [2, 9], "x": 10.25, "y": 2},
1696+ {"matrix": [2, 10], "x": 11.25, "y": 2},
1697+ {"matrix": [2, 11], "x": 12.25, "y": 2},
1698+ {"matrix": [2, 13], "x": 13.25, "y": 2},
1699+ {"matrix": [2, 14], "x": 14.25, "y": 2, "w": 2.25},
1700+ {"matrix": [3, 0], "x": 16.75, "y": 2},
1701
1702- {"x": 8, "y": 1},
1703- {"x": 9, "y": 1},
1704- {"x": 10, "y": 1},
1705- {"x": 11, "y": 1},
1706- {"x": 12, "y": 1},
1707- {"x": 13, "y": 1},
1708- {"x": 14, "y": 1},
1709- {"x": 15, "y": 1, "w": 1.5},
1710- {"x": 16.75, "y": 1},
1711+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
1712+ {"matrix": [3, 2], "x": 2.25, "y": 3},
1713+ {"matrix": [3, 3], "x": 3.25, "y": 3},
1714+ {"matrix": [3, 4], "x": 4.25, "y": 3},
1715+ {"matrix": [3, 5], "x": 5.25, "y": 3},
1716+ {"matrix": [3, 6], "x": 6.25, "y": 3},
1717+ {"matrix": [3, 7], "x": 8, "y": 3},
1718+ {"matrix": [3, 8], "x": 9, "y": 3},
1719+ {"matrix": [3, 9], "x": 10, "y": 3},
1720+ {"matrix": [3, 10], "x": 11, "y": 3},
1721+ {"matrix": [3, 11], "x": 12, "y": 3},
1722+ {"matrix": [3, 12], "x": 13, "y": 3},
1723+ {"matrix": [3, 13], "x": 14, "y": 3, "w": 1.5},
1724+ {"matrix": [4, 0], "x": 15.75, "y": 3.25},
1725
1726- {"x": 0, "y": 2, "w": 1.75},
1727- {"x": 1.75, "y": 2},
1728diff --git a/keyboards/fjlabs/swordfish/swordfish.h b/keyboards/fjlabs/swordfish/swordfish.h
1729deleted file mode 100644
1730index 0b2e8acc6290a4bc2fbf2dcded7ae3a02ef48e36..0000000000000000000000000000000000000000
1731--- a/keyboards/fjlabs/swordfish/swordfish.h
1732+++ /dev/null
1733@@ -1,32 +0,0 @@
1734-/*
1735-Copyright 2022 <me@fjlaboratories.com>
1736-This program is free software: you can redistribute it and/or modify
1737-it under the terms of the GNU General Public License as published by
1738-the Free Software Foundation, either version 2 of the License, or
1739-(at your option) any later version.
1740-This program is distributed in the hope that it will be useful,
1741-but WITHOUT ANY WARRANTY; without even the implied warranty of
1742-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1743-GNU General Public License for more details.
1744-You should have received a copy of the GNU General Public License
1745-along with this program. If not, see <http://www.gnu.org/licenses/>.
1746-*/
1747-
1748-#pragma once
1749-
1750-#include "quantum.h"
1751-
1752-/* === All used matrix spots populated === */
1753-#define LAYOUT_alice_all( \
1754- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
1755- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
1756- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
1757- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, \
1758- K50, K51, K52, K54, K55, K57, K58, K5A, K5B, K5C, K5D, K5E \
1759-) { \
1760- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
1761- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
1762- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
1763- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO }, \
1764- { K50, K51, K52, KC_NO, K54, K55, KC_NO, K57, K58, KC_NO, K5A, K5B, K5C, K5D, K5E } \
1765-}
1766diff --git a/keyboards/handwired/colorlice/colorlice.c b/keyboards/handwired/colorlice/colorlice.c
1767index 1fd5fddd1145e5fa1d661abeb5e6f6e8c21cacf3..736db8d4651355f8093207fe575765f63aac68e5 100644
1768--- a/keyboards/handwired/colorlice/colorlice.c
1769+++ b/keyboards/handwired/colorlice/colorlice.c
1770@@ -13,7 +13,8 @@
1771 * You should have received a copy of the GNU General Public License
1772 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1773 */
1774-#include "colorlice.h"
1775+
1776+#include "quantum.h"
1777
1778 #ifdef RGB_MATRIX_ENABLE
1779 led_config_t g_led_config = { {
1780diff --git a/keyboards/handwired/colorlice/colorlice.h b/keyboards/handwired/colorlice/colorlice.h
1781deleted file mode 100644
1782index dbf31f5680143d989c87ff0688f0a355250ff3d3..0000000000000000000000000000000000000000
1783--- a/keyboards/handwired/colorlice/colorlice.h
1784+++ /dev/null
1785@@ -1,43 +0,0 @@
1786-/* Copyright 2019 marhalloweenvt
1787- *
1788- * This program is free software: you can redistribute it and/or modify
1789- * it under the terms of the GNU General Public License as published by
1790- * the Free Software Foundation, either version 2 of the License, or
1791- * (at your option) any later version.
1792- *
1793- * This program is distributed in the hope that it will be useful,
1794- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1795- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1796- * GNU General Public License for more details.
1797- *
1798- * You should have received a copy of the GNU General Public License
1799- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1800- */
1801-#pragma once
1802-
1803-
1804-#include "quantum.h"
1805-
1806-/* This a shortcut to help you visually see your layout.
1807- *
1808- * The first section contains all of the arguments representing the physical
1809- * layout of the board and position of the keys.
1810- *
1811- * The second converts the arguments into a two-dimensional array which
1812- * represents the switch matrix.
1813- */
1814-#define LAYOUT_alice_split_bs( \
1815- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
1816- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
1817- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, K2e, \
1818- k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
1819- k40, k42, k43, k44, k47, k4a, k4e \
1820-) { \
1821- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
1822- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, KC_NO }, \
1823- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, K2e, KC_NO }, \
1824- { k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, KC_NO }, \
1825- { k40, KC_NO, k42, k43, k44, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, KC_NO,KC_NO, KC_NO, k4e, KC_NO }, \
1826-}
1827-
1828-#define LAYOUT LAYOUT_alice_split_bs
1829diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json
1830index 66e5836a15dc04d7179d86320f66db1ffb708a44..29783d211cad7074b714ea34dbb99f0b9e55e7e3 100644
1831--- a/keyboards/handwired/colorlice/info.json
1832+++ b/keyboards/handwired/colorlice/info.json
1833@@ -16,76 +16,90 @@
1834 "processor": "atmega32u4",
1835 "bootloader": "atmel-dfu",
1836 "community_layouts": ["alice_split_bs"],
1837+ "layout_aliases": {
1838+ "LAYOUT": "LAYOUT_alice_split_bs"
1839+ },
1840 "layouts": {
1841 "LAYOUT_alice_split_bs": {
1842 "layout": [
1843- {"label":"K63", "x":0, "y":0},
1844- {"label":"K00", "x":1.25, "y":0},
1845- {"label":"K01", "x":2.25, "y":0},
1846- {"label":"K02", "x":3.25, "y":0},
1847- {"label":"K03", "x":4.25, "y":0},
1848- {"label":"K04", "x":5.25, "y":0},
1849- {"label":"K05", "x":6.25, "y":0},
1850- {"label":"K06", "x":7.25, "y":0},
1851- {"label":"K07", "x":10.25, "y":0},
1852- {"label":"K08", "x":11.25, "y":0},
1853- {"label":"K09", "x":12.25, "y":0},
1854- {"label":"K10", "x":13.25, "y":0},
1855- {"label":"K11", "x":14.25, "y":0},
1856- {"label":"K12", "x":15.25, "y":0},
1857- {"label":"K13", "x":16.25, "y":0},
1858- {"label":"K14", "x":17.25, "y":0},
1859- {"label":"K64", "x":0, "y":1},
1860- {"label":"K15", "x":1.25, "y":1, "w":1.5},
1861- {"label":"K16", "x":2.75, "y":1},
1862- {"label":"K17", "x":3.75, "y":1},
1863- {"label":"K18", "x":4.75, "y":1},
1864- {"label":"K19", "x":5.75, "y":1},
1865- {"label":"K20", "x":6.75, "y":1},
1866- {"label":"K21", "x":9.75, "y":1},
1867- {"label":"K22", "x":10.75, "y":1},
1868- {"label":"K23", "x":11.75, "y":1},
1869- {"label":"K24", "x":12.75, "y":1},
1870- {"label":"K25", "x":13.75, "y":1},
1871- {"label":"K26", "x":14.75, "y":1},
1872- {"label":"K27", "x":15.75, "y":1},
1873- {"label":"K28", "x":16.75, "y":1, "w":1.5},
1874- {"label":"K65", "x":0, "y":2},
1875- {"label":"K29", "x":1.25, "y":2, "w":1.75},
1876- {"label":"K30", "x":3, "y":2},
1877- {"label":"K31", "x":4, "y":2},
1878- {"label":"K32", "x":5, "y":2},
1879- {"label":"K33", "x":6, "y":2},
1880- {"label":"K34", "x":7, "y":2},
1881- {"label":"K35", "x":10, "y":2},
1882- {"label":"K36", "x":11, "y":2},
1883- {"label":"K37", "x":12, "y":2},
1884- {"label":"K38", "x":13, "y":2},
1885- {"label":"K39", "x":14, "y":2},
1886- {"label":"K40", "x":15, "y":2},
1887- {"label":"K41", "x":16, "y":2, "w":2.25},
1888- {"label":"K42", "x":1.25, "y":3, "w":2.25},
1889- {"label":"K43", "x":3.5, "y":3},
1890- {"label":"K44", "x":4.5, "y":3},
1891- {"label":"K45", "x":5.5, "y":3},
1892- {"label":"K46", "x":6.5, "y":3},
1893- {"label":"K47", "x":7.5, "y":3},
1894- {"label":"K48", "x":9.5, "y":3},
1895- {"label":"K49", "x":10.5, "y":3},
1896- {"label":"K50", "x":11.5, "y":3},
1897- {"label":"K51", "x":12.5, "y":3},
1898- {"label":"K52", "x":13.5, "y":3},
1899- {"label":"K53", "x":14.5, "y":3},
1900- {"label":"K54", "x":15.5, "y":3, "w":1.75},
1901- {"label":"K55", "x":17.25, "y":3},
1902- {"label":"K56", "x":1.25, "y":4, "w":1.5},
1903- {"label":"K57", "x":4.25, "y":4, "w":1.5},
1904- {"label":"K58", "x":5.75, "y":4, "w":2},
1905- {"label":"K59", "x":7.75, "y":4, "w":1.25},
1906- {"label":"K60", "x":9.5, "y":4, "w":2.75},
1907- {"label":"K61", "x":12.25, "y":4, "w":1.5},
1908- {"label":"K62", "x":16.75, "y":4, "w":1.5}
1909+ {"label": "K63", "matrix": [0, 0], "x": 0, "y": 0},
1910+
1911+ {"label": "K00", "matrix": [0, 1], "x": 1.25, "y": 0},
1912+ {"label": "K01", "matrix": [0, 2], "x": 2.25, "y": 0},
1913+ {"label": "K02", "matrix": [0, 3], "x": 3.25, "y": 0},
1914+ {"label": "K03", "matrix": [0, 4], "x": 4.25, "y": 0},
1915+ {"label": "K04", "matrix": [0, 5], "x": 5.25, "y": 0},
1916+ {"label": "K05", "matrix": [0, 6], "x": 6.25, "y": 0},
1917+ {"label": "K06", "matrix": [0, 7], "x": 7.25, "y": 0},
1918+
1919+ {"label": "K07", "matrix": [0, 8], "x": 10.25, "y": 0},
1920+ {"label": "K08", "matrix": [0, 9], "x": 11.25, "y": 0},
1921+ {"label": "K09", "matrix": [0, 10], "x": 12.25, "y": 0},
1922+ {"label": "K10", "matrix": [0, 11], "x": 13.25, "y": 0},
1923+ {"label": "K11", "matrix": [0, 12], "x": 14.25, "y": 0},
1924+ {"label": "K12", "matrix": [0, 13], "x": 15.25, "y": 0},
1925+ {"label": "K13", "matrix": [0, 14], "x": 16.25, "y": 0},
1926+ {"label": "K14", "matrix": [0, 15], "x": 17.25, "y": 0},
1927+
1928+ {"label": "K64", "matrix": [1, 0], "x": 0, "y": 1},
1929+
1930+ {"label": "K15", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
1931+ {"label": "K16", "matrix": [1, 2], "x": 2.75, "y": 1},
1932+ {"label": "K17", "matrix": [1, 3], "x": 3.75, "y": 1},
1933diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json
1934index 6b84c37e9bef54a3e317e0f0cb37ad3fc8c65dad..c8be456104c73c2d78beb74ab5e67f76099df244 100644
1935--- a/keyboards/handwired/owlet60/info.json
1936+++ b/keyboards/handwired/owlet60/info.json
1937@@ -12,18 +12,344 @@
1938 "bootloader": "caterina",
1939 "debounce": 9,
1940 "community_layouts": ["alice", "alice_split_bs"],
1941+ "layout_aliases": {
1942+ "LAYOUT_owlet60_60_percent_full_bsp": "LAYOUT_alice",
1943+ "LAYOUT_owlet60_60_percent_split_bsp": "LAYOUT_alice_split_bs"
1944+ },
1945 "layouts": {
1946 "LAYOUT_owlet60_full_bsp": {
1947diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c
1948index ad36c99039d124ac4ed55280e62dcc06dc201008..b233dd7a52694d53dd457aa55b0bd9b76edae03b 100644
1949--- a/keyboards/handwired/owlet60/matrix.c
1950+++ b/keyboards/handwired/owlet60/matrix.c
1951@@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1952 */
1953 #include <stdint.h>
1954 #include <stdbool.h>
1955-#include "owlet60.h"
1956 #include "wait.h"
1957 #include "print.h"
1958 #include "debug.h"
1959diff --git a/keyboards/handwired/owlet60/owlet60.h b/keyboards/handwired/owlet60/owlet60.h
1960deleted file mode 100644
1961index b54c3df0e2c480a2e476b64d9f229489ee3115bd..0000000000000000000000000000000000000000
1962--- a/keyboards/handwired/owlet60/owlet60.h
1963+++ /dev/null
1964@@ -1,101 +0,0 @@
1965-/* Copyright 2019 worthlessowl
1966- *
1967- * This program is free software: you can redistribute it and/or modify
1968- * it under the terms of the GNU General Public License as published by
1969- * the Free Software Foundation, either version 2 of the License, or
1970- * (at your option) any later version.
1971- *
1972- * This program is distributed in the hope that it will be useful,
1973- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1974- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1975- * GNU General Public License for more details.
1976- *
1977- * You should have received a copy of the GNU General Public License
1978- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1979- */
1980-#pragma once
1981-
1982-#include "quantum.h"
1983-
1984-/* This a shortcut to help you visually see your layout.
1985- *
1986- * The first section contains all of the arguments representing the physical
1987- * layout of the board and position of the keys.
1988- *
1989- * The second converts the arguments into a two-dimensional array which
1990- * represents the switch matrix.
1991- */
1992-#define LAYOUT_owlet60_split_bsp( \
1993- k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
1994- k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
1995- k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
1996- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
1997- k40, k41, k42, k43, k44, k45, k46, k47, k48 \
1998-) { \
1999- { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
2000- { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
2001- { k52, k31, k33, k35, k27, k39, k3b, k47}, \
2002- { k40, k41, k42, k43, k37, k45, k46, k48}, \
2003- { k30, k32, k34, k44, k38, k3a, k3c, k3e}, \
2004- { k20, k22, k24, k36, k28, k2a, k2c, k2d}, \
2005- { k10, k12, k14, k26, k18, k1a, k1c, k1e}, \
2006- { k00, k02, k04, k16, k08, k0a, k0c, k0f}, \
2007- { k01, k03, k05, k06, k09, k0b, k0d, k0e} \
2008-}
2009-
2010-#define LAYOUT_owlet60_full_bsp( \
2011- k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \
2012- k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
2013- k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
2014- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
2015- k40, k41, k42, k43, k44, k45, k46, k47, k48 \
2016-) { \
2017- { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
2018- { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
2019- { k52, k31, k33, k35, k27, k39, k3b, k47}, \
2020- { k40, k41, k42, k43, k37, k45, k46, k48}, \
2021- { k30, k32, k34, k44, k38, k3a, k3c, k3e}, \
2022- { k20, k22, k24, k36, k28, k2a, k2c, k2d}, \
2023- { k10, k12, k14, k26, k18, k1a, k1c, k1e}, \
2024- { k00, k02, k04, k16, k08, k0a, k0c, k0f}, \
2025- { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \
2026-}
2027-
2028-#define LAYOUT_alice_split_bs( \
2029- k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
2030- k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
2031- k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
2032- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
2033- k40, k41, k42, k43, k44, k45, k47 \
2034-) { \
2035- { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
2036- { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
2037- { k52, k31, k33, k35, k27, k39, k3b, k47}, \
2038- { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \
2039- { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \
2040- { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \
2041- { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \
2042- { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \
2043- { k01, k03, k05, k06, k09, k0b, k0d, k0e} \
2044-}
2045-
2046-#define LAYOUT_alice( \
2047- k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
2048- k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
2049- k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
2050- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
2051- k40, k41, k42, k43, k44, k45, k47 \
2052-) { \
2053- { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
2054- { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
2055- { k52, k31, k33, k35, k27, k39, k3b, k47}, \
2056- { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \
2057- { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \
2058- { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \
2059- { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \
2060- { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \
2061- { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \
2062-}
2063-
2064diff --git a/keyboards/hotdox/hotdox.h b/keyboards/hotdox/hotdox.h
2065index 3db092d3bd9761bdac30b6420baf7abed82f844c..b93334443936fe203e4b7dab4a996ba24cb75dd9 100644
2066--- a/keyboards/hotdox/hotdox.h
2067+++ b/keyboards/hotdox/hotdox.h
2068@@ -69,116 +69,3 @@ inline void ergodox_right_led_set(uint8_t l, uint8_t n) {}
2069 inline void ergodox_led_all_set(uint8_t n) {}
2070
2071 void ergodox_blink_all_leds(void);
2072-
2073-/*
2074- * LEFT HAND: LINES 76-83
2075- * RIGHT HAND: LINES 85-92
2076- */
2077-#define LAYOUT_ergodox( \
2078- \
2079- k00,k01,k02,k03,k04,k05,k06, \
2080- k10,k11,k12,k13,k14,k15,k16, \
2081- k20,k21,k22,k23,k24,k25, \
2082- k30,k31,k32,k33,k34,k35,k36, \
2083- k40,k41,k42,k43,k44, \
2084- k55,k56, \
2085- k54, \
2086- k51,k52,k53, \
2087- \
2088- k07,k08,k09,k0A,k0B,k0C,k0D, \
2089- k17,k18,k19,k1A,k1B,k1C,k1D, \
2090- k28,k29,k2A,k2B,k2C,k2D, \
2091- k37,k38,k39,k3A,k3B,k3C,k3D, \
2092- k49,k4A,k4B,k4C,k4D, \
2093- k57,k58, \
2094- k59, \
2095- k5A,k5B,k5C ) \
2096- \
2097- /* matrix positions */ \
2098- { \
2099- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
2100- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
2101- { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO, k28, k29, k2A, k2B, k2C, k2D }, \
2102- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
2103- { k40, k41, k42, k43, k44, KC_NO, KC_NO, KC_NO, KC_NO, k49, k4A, k4B, k4C, k4D }, \
2104- { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \
2105- }
2106-
2107-/*
2108- * LEFT HAND: LINES 110-117
2109- * RIGHT HAND: LINES 119-126
2110- */
2111-#define LAYOUT_ergodox_80( \
2112- \
2113- k00,k01,k02,k03,k04,k05,k06, \
2114- k10,k11,k12,k13,k14,k15,k16, \
2115- k20,k21,k22,k23,k24,k25, \
2116- k30,k31,k32,k33,k34,k35,k36, \
2117- k40,k41,k42,k43,k44, \
2118- k55,k56, \
2119- k45,k46,k54, \
2120- k53,k52,k51, \
2121- \
2122- k07,k08,k09,k0A,k0B,k0C,k0D, \
2123- k17,k18,k19,k1A,k1B,k1C,k1D, \
2124- k28,k29,k2A,k2B,k2C,k2D, \
2125- k37,k38,k39,k3A,k3B,k3C,k3D, \
2126- k49,k4A,k4B,k4C,k4D, \
2127- k57,k58, \
2128- k59,k47,k48, \
2129- k5A,k5B,k5C ) \
2130- \
2131- /* matrix positions */ \
2132- { \
2133- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
2134- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
2135- { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO, k28, k29, k2A, k2B, k2C, k2D }, \
2136- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
2137- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D }, \
2138- { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \
2139- }
2140-
2141-/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
2142-#define LAYOUT_ergodox_pretty( \
2143- \
2144- L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \
2145- L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
2146- L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \
2147- L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \
2148- L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \
2149- L55,L56, R50,R51, \
2150- L54, R52, \
2151- L51,L52,L53, R53,R54,R55 ) \
2152- \
2153- /* matrix positions */ \
2154- { \
2155- { L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06 }, \
2156- { L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16 }, \
2157- { L20,L21,L22,L23,L24,L25,KC_NO, KC_NO,R21,R22,R23,R24,R25,R26 }, \
2158- { L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36 }, \
2159- { L40,L41,L42,L43,L44,KC_NO,KC_NO, KC_NO,KC_NO,R42,R43,R44,R45,R46 }, \
2160- { KC_NO,L51,L52,L53,L54,L55,L56, R50,R51,R52,R53,R54,R55,KC_NO } \
2161- }
2162-
2163-/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */
2164-#define LAYOUT_ergodox_pretty_80( \
2165- \
2166- L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \
2167- L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
2168diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json
2169index 2e2352b7eeff1f53ef57f7bec4f5f6a844660aed..51c0465899a4e0fac83e573f2bc658df3f91b6aa 100644
2170--- a/keyboards/hotdox/info.json
2171+++ b/keyboards/hotdox/info.json
2172@@ -14,103 +14,386 @@
2173 "bootloader": "atmel-dfu",
2174 "community_layouts": ["ergodox"],
2175 "layouts": {
2176- "LAYOUT_ergodox": {
2177+ "LAYOUT_ergodox": {
2178+ "layout": [
2179+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
2180+ {"matrix": [0, 1], "x": 1.5, "y": 0.375},
2181+ {"matrix": [0, 2], "x": 2.5, "y": 0.125},
2182+ {"matrix": [0, 3], "x": 3.5, "y": 0},
2183+ {"matrix": [0, 4], "x": 4.5, "y": 0.125},
2184+ {"matrix": [0, 5], "x": 5.5, "y": 0.25},
2185+ {"matrix": [0, 6], "x": 6.5, "y": 0.25},
2186
2187- "layout": [
2188- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
2189- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
2190- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
2191- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
2192- {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
2193+ {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
2194+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
2195+ {"matrix": [1, 2], "x": 2.5, "y": 1.125},
2196+ {"matrix": [1, 3], "x": 3.5, "y": 1},
2197+ {"matrix": [1, 4], "x": 4.5, "y": 1.125},
2198+ {"matrix": [1, 5], "x": 5.5, "y": 1.25},
2199+ {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
2200
2201- {"x":6, "y":5}, {"x":7, "y":5},
2202- {"x":7, "y":6},
2203- {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
2204+ {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
2205+ {"matrix": [2, 1], "x": 1.5, "y": 2.375},
2206+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
2207+ {"matrix": [2, 3], "x": 3.5, "y": 2},
2208+ {"matrix": [2, 4], "x": 4.5, "y": 2.125},
2209+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
2210
2211+ {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
2212+ {"matrix": [3, 1], "x": 1.5, "y": 3.375},
2213+ {"matrix": [3, 2], "x": 2.5, "y": 3.125},
2214+ {"matrix": [3, 3], "x": 3.5, "y": 3},
2215+ {"matrix": [3, 4], "x": 4.5, "y": 3.125},
2216+ {"matrix": [3, 5], "x": 5.5, "y": 3.25},
2217+ {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
2218
2219- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
2220- {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
2221- {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
2222- {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
2223- {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
2224+ {"matrix": [4, 0], "x": 0.5, "y": 4.375},
2225+ {"matrix": [4, 1], "x": 1.5, "y": 4.375},
2226+ {"matrix": [4, 2], "x": 2.5, "y": 4.125},
2227+ {"matrix": [4, 3], "x": 3.5, "y": 4},
2228+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
2229
2230+ {"matrix": [5, 5], "x": 6, "y": 5},
2231+ {"matrix": [5, 6], "x": 7, "y": 5},
2232
2233- {"x":9, "y":5}, {"x":10, "y":5},
2234- {"x":9, "y":6},
2235- {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
2236- ]
2237- },
2238- "LAYOUT_ergodox_pretty": {
2239- "layout": [
2240- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
2241- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
2242+ {"matrix": [5, 4], "x": 7, "y": 6},
2243+ {"matrix": [5, 1], "x": 5, "y": 6, "h": 2},
2244+ {"matrix": [5, 2], "x": 6, "y": 6, "h": 2},
2245
2246- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
2247- {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
2248+ {"matrix": [5, 3], "x": 7, "y": 7},
2249
2250- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
2251- {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
2252+ {"matrix": [0, 7], "x": 9.5, "y": 0.25},
2253+ {"matrix": [0, 8], "x": 10.5, "y": 0.25},
2254+ {"matrix": [0, 9], "x": 11.5, "y": 0.125},
2255+ {"matrix": [0, 10], "x": 12.5, "y": 0},
2256+ {"matrix": [0, 11], "x": 13.5, "y": 0.125},
2257+ {"matrix": [0, 12], "x": 14.5, "y": 0.375},
2258+ {"matrix": [0, 13], "x": 15.5, "y": 0.375, "w": 1.5},
2259
2260- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
2261- {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
2262+ {"matrix": [1, 7], "x": 9.5, "y": 1.25, "h": 1.5},
2263+ {"matrix": [1, 8], "x": 10.5, "y": 1.25},
2264+ {"matrix": [1, 9], "x": 11.5, "y": 1.125},
2265+ {"matrix": [1, 10], "x": 12.5, "y": 1},
2266+ {"matrix": [1, 11], "x": 13.5, "y": 1.125},
2267+ {"matrix": [1, 12], "x": 14.5, "y": 1.375},
2268+ {"matrix": [1, 13], "x": 15.5, "y": 1.375, "w": 1.5},
2269
2270- {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
2271- {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
2272diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.h b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
2273index b9636b69be321a65a5cb8990f30d9e7c4eaca4ee..99826529ed3e523c31ff4815680f5f2c5a94b6aa 100644
2274--- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
2275+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
2276@@ -80,74 +80,3 @@ inline void ergodox_led_all_set(uint8_t n) {
2277 }
2278
2279 void ergodox_infinity_lcd_color(uint16_t r, uint16_t g, uint16_t b);
2280-
2281-#define XXX KC_NO
2282-
2283-#define LAYOUT_ergodox( \
2284- A80, A70, A60, A50, A40, A30, A20, \
2285- A81, A71, A61, A51, A41, A31, A21, \
2286- A82, A72, A62, A52, A42, A32, \
2287- A83, A73, A63, A53, A43, A33, A23, \
2288- A84, A74, A64, A54, A44, \
2289- A13, A03, \
2290- A04, \
2291- A34, A24, A14, \
2292-\
2293- B20, B30, B40, B50, B60, B70, B80, \
2294- B21, B31, B41, B51, B61, B71, B81, \
2295- B32, B42, B52, B62, B72, B82, \
2296- B23, B33, B43, B53, B63, B73, B83, \
2297- B44, B54, B64, B74, B84, \
2298- B03, B13, \
2299- B04, \
2300- B14, B24, B34 \
2301-) { \
2302- { XXX, XXX, XXX, A03, A04 }, \
2303- { XXX, XXX, XXX, A13, A14 }, \
2304- { A20, A21, XXX, A23, A24 }, \
2305- { A30, A31, A32, A33, A34 }, \
2306- { A40, A41, A42, A43, A44 }, \
2307- { A50, A51, A52, A53, A54 }, \
2308- { A60, A61, A62, A63, A64 }, \
2309- { A70, A71, A72, A73, A74 }, \
2310- { A80, A81, A82, A83, A84 }, \
2311- { XXX, XXX, XXX, B03, B04 }, \
2312- { XXX, XXX, XXX, B13, B14 }, \
2313- { B20, B21, XXX, B23, B24 }, \
2314- { B30, B31, B32, B33, B34 }, \
2315- { B40, B41, B42, B43, B44 }, \
2316- { B50, B51, B52, B53, B54 }, \
2317- { B60, B61, B62, B63, B64 }, \
2318- { B70, B71, B72, B73, B74 }, \
2319- { B80, B81, B82, B83, B84 } \
2320-}
2321-
2322-#define LAYOUT_ergodox_pretty( \
2323- A80, A70, A60, A50, A40, A30, A20, B20, B30, B40, B50, B60, B70, B80, \
2324- A81, A71, A61, A51, A41, A31, A21, B21, B31, B41, B51, B61, B71, B81, \
2325- A82, A72, A62, A52, A42, A32, B32, B42, B52, B62, B72, B82, \
2326- A83, A73, A63, A53, A43, A33, A23, B23, B33, B43, B53, B63, B73, B83, \
2327- A84, A74, A64, A54, A44, B44, B54, B64, B74, B84, \
2328- A13, A03, B03, B13, \
2329- A04, B04, \
2330- A34, A24, A14, B14, B24, B34 \
2331-) { \
2332- { XXX, XXX, XXX, A03, A04 }, \
2333- { XXX, XXX, XXX, A13, A14 }, \
2334- { A20, A21, XXX, A23, A24 }, \
2335- { A30, A31, A32, A33, A34 }, \
2336- { A40, A41, A42, A43, A44 }, \
2337- { A50, A51, A52, A53, A54 }, \
2338- { A60, A61, A62, A63, A64 }, \
2339- { A70, A71, A72, A73, A74 }, \
2340- { A80, A81, A82, A83, A84 }, \
2341- { XXX, XXX, XXX, B03, B04 }, \
2342- { XXX, XXX, XXX, B13, B14 }, \
2343- { B20, B21, XXX, B23, B24 }, \
2344- { B30, B31, B32, B33, B34 }, \
2345- { B40, B41, B42, B43, B44 }, \
2346- { B50, B51, B52, B53, B54 }, \
2347- { B60, B61, B62, B63, B64 }, \
2348- { B70, B71, B72, B73, B74 }, \
2349- { B80, B81, B82, B83, B84 } \
2350-}
2351diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
2352index c751cfe3f24a88da29012897b5f05fc87e996a74..c03c38ed0de440d31dbd939ee49e9d83802660c5 100644
2353--- a/keyboards/input_club/ergodox_infinity/info.json
2354+++ b/keyboards/input_club/ergodox_infinity/info.json
2355@@ -16,52 +16,193 @@
2356 "board": "IC_TEENSY_3_1",
2357 "community_layouts": ["ergodox"],
2358 "layouts": {
2359- "LAYOUT_ergodox": {
2360- "layout": [
2361- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
2362- {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25, "h":1.5},
2363- {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25},
2364- {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":6.5, "y":2.75, "h":1.5},
2365- {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125},
2366-
2367- {"x":6, "y":5}, {"x":7, "y":5},
2368- {"x":7, "y":6},
2369- {"x":5, "y":6, "h":2}, {"x":6, "y":6, "h":2}, {"x":7, "y":7},
2370-
2371-
2372- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
2373- {"x":9.5, "y":1.25, "h":1.5}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.375, "w":1.5},
2374- {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.375, "w":1.5},
2375- {"x":9.5, "y":2.75, "h":1.5}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.375, "w":1.5},
2376- {"x":11.5, "y":4.125}, {"x":12.5, "y":4}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375}, {"x":15.5, "y":4.375},
2377-
2378-
2379- {"x":9, "y":5}, {"x":10, "y":5},
2380- {"x":9, "y":6},
2381- {"x":9, "y":7}, {"x":10, "y":6, "h":2}, {"x":11, "y":6, "h":2}
2382- ]
2383- },
2384- "LAYOUT_ergodox_pretty": {
2385- "layout": [
2386- {"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":6.5, "y":0.25},
2387- {"x":9.5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.375, "w":1.5},
2388+ "LAYOUT_ergodox": {
2389+ "layout": [
2390+ {"matrix": [8, 0], "x": 0, "y": 0.375, "w": 1.5},
2391+ {"matrix": [7, 0], "x": 1.5, "y": 0.375},
2392+ {"matrix": [6, 0], "x": 2.5, "y": 0.125},
2393+ {"matrix": [5, 0], "x": 3.5, "y": 0},
2394+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
2395+ {"matrix": [3, 0], "x": 5.5, "y": 0.25},
2396+ {"matrix": [2, 0], "x": 6.5, "y": 0.25},
2397+
2398+ {"matrix": [8, 1], "x": 0, "y": 1.375, "w": 1.5},
2399+ {"matrix": [7, 1], "x": 1.5, "y": 1.375},
2400+ {"matrix": [6, 1], "x": 2.5, "y": 1.125},
2401+ {"matrix": [5, 1], "x": 3.5, "y": 1},
2402+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
2403+ {"matrix": [3, 1], "x": 5.5, "y": 1.25},
2404+ {"matrix": [2, 1], "x": 6.5, "y": 1.25, "h": 1.5},
2405+
2406+ {"matrix": [8, 2], "x": 0, "y": 2.375, "w": 1.5},
2407+ {"matrix": [7, 2], "x": 1.5, "y": 2.375},
2408+ {"matrix": [6, 2], "x": 2.5, "y": 2.125},
2409+ {"matrix": [5, 2], "x": 3.5, "y": 2},
2410+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
2411+ {"matrix": [3, 2], "x": 5.5, "y": 2.25},
2412+
2413+ {"matrix": [8, 3], "x": 0, "y": 3.375, "w": 1.5},
2414+ {"matrix": [7, 3], "x": 1.5, "y": 3.375},
2415+ {"matrix": [6, 3], "x": 2.5, "y": 3.125},
2416+ {"matrix": [5, 3], "x": 3.5, "y": 3},
2417+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
2418+ {"matrix": [3, 3], "x": 5.5, "y": 3.25},
2419+ {"matrix": [2, 3], "x": 6.5, "y": 2.75, "h": 1.5},
2420+
2421+ {"matrix": [8, 4], "x": 0.5, "y": 4.375},
2422+ {"matrix": [7, 4], "x": 1.5, "y": 4.375},
2423+ {"matrix": [6, 4], "x": 2.5, "y": 4.125},
2424+ {"matrix": [5, 4], "x": 3.5, "y": 4},
2425+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
2426+
2427+ {"matrix": [1, 3], "x": 6, "y": 5},
2428+ {"matrix": [0, 3], "x": 7, "y": 5},
2429+
2430+ {"matrix": [0, 4], "x": 7, "y": 6},
2431+ {"matrix": [3, 4], "x": 5, "y": 6, "h": 2},
2432+ {"matrix": [2, 4], "x": 6, "y": 6, "h": 2},
2433+
2434+ {"matrix": [1, 4], "x": 7, "y": 7},
2435+
2436+ {"matrix": [11, 0], "x": 9.5, "y": 0.25},
2437+ {"matrix": [12, 0], "x": 10.5, "y": 0.25},
2438+ {"matrix": [13, 0], "x": 11.5, "y": 0.125},
2439+ {"matrix": [14, 0], "x": 12.5, "y": 0},
2440+ {"matrix": [15, 0], "x": 13.5, "y": 0.125},
2441+ {"matrix": [16, 0], "x": 14.5, "y": 0.375},
2442+ {"matrix": [17, 0], "x": 15.5, "y": 0.375, "w": 1.5},
2443+
2444+ {"matrix": [11, 1], "x": 9.5, "y": 1.25, "h": 1.5},
2445+ {"matrix": [12, 1], "x": 10.5, "y": 1.25},
2446+ {"matrix": [13, 1], "x": 11.5, "y": 1.125},
2447+ {"matrix": [14, 1], "x": 12.5, "y": 1},
2448+ {"matrix": [15, 1], "x": 13.5, "y": 1.125},
2449+ {"matrix": [16, 1], "x": 14.5, "y": 1.375},
2450+ {"matrix": [17, 1], "x": 15.5, "y": 1.375, "w": 1.5},
2451+
2452+ {"matrix": [12, 2], "x": 10.5, "y": 2.25},
2453+ {"matrix": [13, 2], "x": 11.5, "y": 2.125},
2454+ {"matrix": [14, 2], "x": 12.5, "y": 2},
2455diff --git a/keyboards/kapcave/arya/arya.c b/keyboards/kapcave/arya/arya.c
2456deleted file mode 100644
2457index 13cae06189c387591400bc49867c3a38ff5b73d3..0000000000000000000000000000000000000000
2458--- a/keyboards/kapcave/arya/arya.c
2459+++ /dev/null
2460@@ -1,17 +0,0 @@
2461-/*
2462-Copyright 2021 KapCave
2463-
2464-This program is free software: you can redistribute it and/or modify
2465-it under the terms of the GNU General Public License as published by
2466-the Free Software Foundation, either version 2 of the License, or
2467-(at your option) any later version.
2468-
2469-This program is distributed in the hope that it will be useful,
2470-but WITHOUT ANY WARRANTY; without even the implied warranty of
2471-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2472-GNU General Public License for more details.
2473-
2474-You should have received a copy of the GNU General Public License
2475-along with this program. If not, see <http://www.gnu.org/licenses/>.
2476-*/
2477-#include "arya.h"
2478diff --git a/keyboards/kapcave/arya/arya.h b/keyboards/kapcave/arya/arya.h
2479deleted file mode 100644
2480index 38e4afaf055a1cc272dbb2af79875a450931bd73..0000000000000000000000000000000000000000
2481--- a/keyboards/kapcave/arya/arya.h
2482+++ /dev/null
2483@@ -1,38 +0,0 @@
2484-/*
2485-Copyright 2021 KapCave
2486-
2487-This program is free software: you can redistribute it and/or modify
2488-it under the terms of the GNU General Public License as published by
2489-the Free Software Foundation, either version 2 of the License, or
2490-(at your option) any later version.
2491-
2492-This program is distributed in the hope that it will be useful,
2493-but WITHOUT ANY WARRANTY; without even the implied warranty of
2494-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2495-GNU General Public License for more details.
2496-
2497-You should have received a copy of the GNU General Public License
2498-along with this program. If not, see <http://www.gnu.org/licenses/>.
2499-*/
2500-#pragma once
2501-
2502-#include "quantum.h"
2503-
2504-#define LAYOUT_alice_split_bs( \
2505- K81, K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \
2506- K80, K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \
2507- K82, K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \
2508- K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \
2509- K30, K40, K50, K60, K00, K10, K20 \
2510-) \
2511-{ \
2512- { K00 , K01 , K02 , K03 , K04 , K05 , K06 , K07 }, \
2513- { K10 , K11 , K12 , K13 , K14 , K15 , K16 , K17 }, \
2514- { K20 , K21 , K22 , K23 , K24 , K25 , K26 , K27 }, \
2515- { K30 , K31 , K32 , K33 , K34 , K35 , K36 , K37 }, \
2516- { K40 , K41 , K42 , K43 , K44 , K45 , K46 , K47 }, \
2517- { K50 , K51 , K52 , K53 , K54 , K55 , K56 , K57 }, \
2518- { K60 , K61 , K62 , K63 , K64 , K65 , K66 , K67 }, \
2519- { KC_NO , K71 , K72 , K73 , K74 , K75 , K76 , K77 }, \
2520- { K80 , K81 , K82 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
2521-}
2522diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json
2523index 1bd9c188dd2d5d32ff2ed82030d45611a92a0dee..0bfc8cec3fba703be553b8898c5382ea31a09a1a 100644
2524--- a/keyboards/kapcave/arya/info.json
2525+++ b/keyboards/kapcave/arya/info.json
2526@@ -26,76 +26,80 @@
2527 "layouts": {
2528 "LAYOUT_alice_split_bs": {
2529 "layout": [
2530- {"x":0.4, "y":0},
2531- {"x":1.55, "y":0.1},
2532- {"x":2.55, "y":0.1},
2533- {"x":3.55, "y":0},
2534- {"x":4.55, "y":0.1},
2535- {"x":5.55, "y":0.1},
2536- {"x":6.55, "y":0.1},
2537- {"x":7.55, "y":0.1},
2538- {"x":9.75, "y":0.1},
2539- {"x":10.75, "y":0.1},
2540- {"x":11.75, "y":0.1},
2541- {"x":12.75, "y":0.1},
2542- {"x":13.75, "y":0},
2543- {"x":14.75, "y":0.1},
2544- {"x":15.75, "y":0.1},
2545- {"x":16.75, "y":0.1},
2546+ {"matrix": [8, 1], "x": 0.4, "y": 0},
2547+ {"matrix": [3, 6], "x": 1.55, "y": 0.1},
2548+ {"matrix": [3, 7], "x": 2.55, "y": 0.1},
2549+ {"matrix": [4, 6], "x": 3.55, "y": 0},
2550+ {"matrix": [4, 7], "x": 4.55, "y": 0.1},
2551+ {"matrix": [5, 6], "x": 5.55, "y": 0.1},
2552+ {"matrix": [5, 7], "x": 6.55, "y": 0.1},
2553+ {"matrix": [6, 6], "x": 7.55, "y": 0.1},
2554
2555- {"x":0.2, "y":1},
2556- {"x":1.35, "y":1.1, "w":1.5},
2557- {"x":2.85, "y":1.1},
2558- {"x":3.85, "y":1.1},
2559- {"x":4.85, "y":1.1},
2560- {"x":5.85, "y":1.1},
2561- {"x":6.85, "y":1.1},
2562- {"x":9.45, "y":1.1},
2563- {"x":10.45, "y":1.1},
2564- {"x":11.45, "y":1.1},
2565- {"x":12.45, "y":1.1},
2566- {"x":13.45, "y":1.1},
2567- {"x":14.45, "y":1.1},
2568- {"x":15.45, "y":1.1},
2569- {"x":16.45, "y":1.1, "w":1.5},
2570+ {"matrix": [6, 7], "x": 9.75, "y": 0.1},
2571+ {"matrix": [7, 6], "x": 10.75, "y": 0.1},
2572+ {"matrix": [7, 7], "x": 11.75, "y": 0.1},
2573+ {"matrix": [0, 6], "x": 12.75, "y": 0.1},
2574+ {"matrix": [0, 7], "x": 13.75, "y": 0},
2575+ {"matrix": [1, 7], "x": 14.75, "y": 0.1},
2576+ {"matrix": [2, 6], "x": 15.75, "y": 0.1},
2577+ {"matrix": [2, 7], "x": 16.75, "y": 0.1},
2578
2579- {"x":0, "y":2},
2580- {"x":1.15, "y":2.1, "w":1.75},
2581- {"x":2.9, "y":2.1},
2582- {"x":3.9, "y":2.1},
2583- {"x":4.9, "y":2.1},
2584- {"x":5.9, "y":2.1},
2585- {"x":6.9, "y":2.1},
2586- {"x":9.9, "y":2.1},
2587- {"x":10.9, "y":2.1},
2588- {"x":11.9, "y":2.1},
2589- {"x":12.9, "y":2.1},
2590- {"x":13.9, "y":2.1},
2591- {"x":14.9, "y":2.1},
2592- {"x":15.9, "y":2.1, "w":2.25},
2593+ {"matrix": [8, 0], "x": 0.2, "y": 1},
2594+ {"matrix": [3, 4], "x": 1.35, "y": 1.1, "w": 1.5},
2595+ {"matrix": [3, 5], "x": 2.85, "y": 1.1},
2596+ {"matrix": [4, 4], "x": 3.85, "y": 1.1},
2597+ {"matrix": [4, 5], "x": 4.85, "y": 1.1},
2598+ {"matrix": [5, 4], "x": 5.85, "y": 1.1},
2599+ {"matrix": [5, 5], "x": 6.85, "y": 1.1},
2600
2601- {"x":0.95, "y":3.1, "w":2.25},
2602- {"x":3.2, "y":3.1},
2603- {"x":4.2, "y":3.1},
2604- {"x":5.2, "y":3.1},
2605- {"x":6.2, "y":3.1},
2606- {"x":7.2, "y":3.1},
2607- {"x":9.6, "y":3.1},
2608- {"x":10.6, "y":3.1},
2609- {"x":11.6, "y":3.1},
2610- {"x":12.6, "y":3.1},
2611- {"x":13.6, "y":3.1},
2612- {"x":14.6, "y":3.1},
2613- {"x":15.6, "y":3.1, "w":1.75},
2614- {"x":17.35, "y":3.1},
2615+ {"matrix": [6, 4], "x": 9.45, "y": 1.1},
2616+ {"matrix": [6, 5], "x": 10.45, "y": 1.1},
2617+ {"matrix": [7, 5], "x": 11.45, "y": 1.1},
2618+ {"matrix": [0, 5], "x": 12.45, "y": 1.1},
2619+ {"matrix": [1, 5], "x": 13.45, "y": 1.1},
2620+ {"matrix": [1, 6], "x": 14.45, "y": 1.1},
2621+ {"matrix": [2, 5], "x": 15.45, "y": 1.1},
2622+ {"matrix": [2, 4], "x": 16.45, "y": 1.1, "w": 1.5},
2623
2624- {"x":0.95, "y":4.1, "w":1.5},
2625- {"x":3.85, "y":4.1, "w":1.5},
2626diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json
2627index d94b4271750c9d83dcacd7c3689ee1fb8e6c7888..ef10a725992d19fb6d68505b5f112dcbc2167418 100644
2628--- a/keyboards/kb_elmo/sesame/info.json
2629+++ b/keyboards/kb_elmo/sesame/info.json
2630@@ -19,281 +19,329 @@
2631 "processor": "atmega32a",
2632 "bootloader": "usbasploader",
2633 "community_layouts": ["alice", "alice_split_bs"],
2634+ "layout_aliases": {
2635+ "LAYOUT": "LAYOUT_alice",
2636+ "LAYOUT_all": "LAYOUT_alice_split_bs"
2637+ },
2638 "layouts": {
2639 "LAYOUT_alice": {
2640 "layout": [
2641- {"x":0, "y":0},
2642- {"x":1.25, "y":0},
2643- {"x":2.25, "y":0},
2644- {"x":3.25, "y":0},
2645- {"x":4.25, "y":0},
2646- {"x":5.25, "y":0},
2647- {"x":6.25, "y":0},
2648- {"x":7.25, "y":0},
2649- {"x":10.25, "y":0},
2650- {"x":11.25, "y":0},
2651- {"x":12.25, "y":0},
2652- {"x":13.25, "y":0},
2653- {"x":14.25, "y":0},
2654- {"x":15.25, "y":0},
2655- {"x":16.25, "y":0, "w": 2},
2656- {"x":0, "y":1},
2657- {"x":1.25, "y":1, "w":1.5},
2658- {"x":2.75, "y":1},
2659- {"x":3.75, "y":1},
2660- {"x":4.75, "y":1},
2661- {"x":5.75, "y":1},
2662- {"x":6.75, "y":1},
2663- {"x":9.75, "y":1},
2664- {"x":10.75, "y":1},
2665- {"x":11.75, "y":1},
2666- {"x":12.75, "y":1},
2667- {"x":13.75, "y":1},
2668- {"x":14.75, "y":1},
2669- {"x":15.75, "y":1},
2670- {"x":16.75, "y":1, "w":1.5},
2671- {"x":0, "y":2},
2672- {"x":1.25, "y":2, "w":1.75},
2673- {"x":3, "y":2},
2674- {"x":4, "y":2},
2675- {"x":5, "y":2},
2676- {"x":6, "y":2},
2677- {"x":7, "y":2},
2678- {"x":10, "y":2},
2679- {"x":11, "y":2},
2680- {"x":12, "y":2},
2681- {"x":13, "y":2},
2682- {"x":14, "y":2},
2683- {"x":15, "y":2},
2684- {"x":16, "y":2, "w":2.25},
2685- {"x":1.25, "y":3, "w":2.25},
2686- {"x":3.5, "y":3},
2687- {"x":4.5, "y":3},
2688- {"x":5.5, "y":3},
2689- {"x":6.5, "y":3},
2690- {"x":7.5, "y":3},
2691- {"x":9.5, "y":3},
2692- {"x":10.5, "y":3},
2693- {"x":11.5, "y":3},
2694- {"x":12.5, "y":3},
2695- {"x":13.5, "y":3},
2696- {"x":14.5, "y":3},
2697- {"x":15.5, "y":3, "w":1.75},
2698- {"x":17.25, "y":3},
2699- {"x":1.25, "y":4, "w":1.5},
2700- {"x":4.25, "y":4, "w":1.5},
2701- {"x":5.75, "y":4, "w":2},
2702- {"x":7.75, "y":4, "w":1.25},
2703- {"x":9.5, "y":4, "w":2.75},
2704- {"x":12.25, "y":4, "w":1.5},
2705- {"x":16.75, "y":4, "w":1.5}
2706+ {"matrix": [0, 0], "x": 0, "y": 0},
2707+
2708+ {"matrix": [0, 1], "x": 1.25, "y": 0},
2709+ {"matrix": [0, 2], "x": 2.25, "y": 0},
2710+ {"matrix": [0, 3], "x": 3.25, "y": 0},
2711+ {"matrix": [0, 4], "x": 4.25, "y": 0},
2712+ {"matrix": [0, 5], "x": 5.25, "y": 0},
2713+ {"matrix": [0, 6], "x": 6.25, "y": 0},
2714+ {"matrix": [0, 7], "x": 7.25, "y": 0},
2715+
2716+ {"matrix": [0, 8], "x": 10.25, "y": 0},
2717+ {"matrix": [0, 9], "x": 11.25, "y": 0},
2718+ {"matrix": [0, 10], "x": 12.25, "y": 0},
2719+ {"matrix": [0, 11], "x": 13.25, "y": 0},
2720+ {"matrix": [0, 12], "x": 14.25, "y": 0},
2721+ {"matrix": [0, 13], "x": 15.25, "y": 0},
2722+ {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
2723+
2724+ {"matrix": [1, 0], "x": 0, "y": 1},
2725+
2726+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
2727+ {"matrix": [1, 2], "x": 2.75, "y": 1},
2728+ {"matrix": [1, 3], "x": 3.75, "y": 1},
2729+ {"matrix": [1, 4], "x": 4.75, "y": 1},
2730diff --git a/keyboards/kb_elmo/sesame/sesame.h b/keyboards/kb_elmo/sesame/sesame.h
2731deleted file mode 100644
2732index d596619c3a367e998710470a4ab1ff28ecc1b47d..0000000000000000000000000000000000000000
2733--- a/keyboards/kb_elmo/sesame/sesame.h
2734+++ /dev/null
2735@@ -1,86 +0,0 @@
2736-/* Copyright 2020 kb-elmo<mail@elmo.space>
2737- *
2738- * This program is free software: you can redistribute it and/or modify
2739- * it under the terms of the GNU General Public License as published by
2740- * the Free Software Foundation, either version 2 of the License, or
2741- * (at your option) any later version.
2742- *
2743- * This program is distributed in the hope that it will be useful,
2744- * but WITHOUT ANY WARRANTY; without even the implied warranty of
2745- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2746- * GNU General Public License for more details.
2747- *
2748- * You should have received a copy of the GNU General Public License
2749- * along with this program. If not, see <http://www.gnu.org/licenses/>.
2750- */
2751-
2752-#pragma once
2753-
2754-#include "quantum.h"
2755-
2756-/* This is a shortcut to help you visually see your layout.
2757- *
2758- * The first section contains all of the arguments representing the physical
2759- * layout of the board and position of the keys.
2760- *
2761- * The second converts the arguments into a two-dimensional array which
2762- * represents the switch matrix.
2763- */
2764-#define LAYOUT_alice( \
2765- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
2766- k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
2767- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k44, \
2768- k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, \
2769- k59, k60, k61, k62, k63, k64, k65 \
2770-) { \
2771- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
2772- { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
2773- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, KC_NO, k44 }, \
2774- { KC_NO, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
2775- { KC_NO, k59, KC_NO, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, k64, KC_NO, KC_NO, k65, KC_NO } \
2776-}
2777-
2778-#define LAYOUT_alice_split_bs( \
2779- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \
2780- k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
2781- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k44, \
2782- k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, \
2783- k59, k60, k61, k62, k63, k64, k65 \
2784-) { \
2785- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
2786- { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
2787- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44 }, \
2788- { KC_NO, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
2789- { KC_NO, k59, KC_NO, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, k64, KC_NO, KC_NO, k65, KC_NO } \
2790-}
2791-
2792-#define LAYOUT_long_rshift( \
2793- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
2794- k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
2795- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k44, \
2796- k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, \
2797- k59, k60, k61, k62, k63, k64, k65 \
2798-) { \
2799- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
2800- { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
2801- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, KC_NO, k44 }, \
2802- { KC_NO, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO }, \
2803- { KC_NO, k59, KC_NO, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, k64, KC_NO, KC_NO, k65, KC_NO } \
2804-}
2805-
2806-#define LAYOUT_split_bs( \
2807- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \
2808- k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
2809- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k44, \
2810- k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, \
2811- k59, k60, k61, k62, k63, k64, k65 \
2812-) { \
2813- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
2814- { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
2815- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44 }, \
2816- { KC_NO, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO }, \
2817- { KC_NO, k59, KC_NO, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, k64, KC_NO, KC_NO, k65, KC_NO } \
2818-}
2819-
2820-#define LAYOUT LAYOUT_alice
2821-#define LAYOUT_all LAYOUT_alice_split_bs
2822diff --git a/keyboards/keebsforall/coarse60/coarse60.c b/keyboards/keebsforall/coarse60/coarse60.c
2823deleted file mode 100644
2824index a609a09588a7308c6c0dc9f8cec84dd17f49cca0..0000000000000000000000000000000000000000
2825--- a/keyboards/keebsforall/coarse60/coarse60.c
2826+++ /dev/null
2827@@ -1,17 +0,0 @@
2828-/*
2829-Copyright 2021 Elliot Powell
2830-
2831-This program is free software: you can redistribute it and/or modify
2832-it under the terms of the GNU General Public License as published by
2833-the Free Software Foundation, either version 2 of the License, or
2834-(at your option) any later version.
2835-
2836-This program is distributed in the hope that it will be useful,
2837-but WITHOUT ANY WARRANTY; without even the implied warranty of
2838-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2839-GNU General Public License for more details.
2840-
2841-You should have received a copy of the GNU General Public License
2842-along with this program. If not, see <http://www.gnu.org/licenses/>.
2843-*/
2844-#include "coarse60.h"
2845diff --git a/keyboards/keebsforall/coarse60/coarse60.h b/keyboards/keebsforall/coarse60/coarse60.h
2846deleted file mode 100644
2847index 76f147cf12f665a80975e0b63c4ab18feaa08755..0000000000000000000000000000000000000000
2848--- a/keyboards/keebsforall/coarse60/coarse60.h
2849+++ /dev/null
2850@@ -1,50 +0,0 @@
2851-/*
2852-Copyright 2021 Elliot Powell
2853-
2854-This program is free software: you can redistribute it and/or modify
2855-it under the terms of the GNU General Public License as published by
2856-the Free Software Foundation, either version 2 of the License, or
2857-(at your option) any later version.
2858-
2859-This program is distributed in the hope that it will be useful,
2860-but WITHOUT ANY WARRANTY; without even the implied warranty of
2861-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2862-GNU General Public License for more details.
2863-
2864-You should have received a copy of the GNU General Public License
2865-along with this program. If not, see <http://www.gnu.org/licenses/>.
2866-*/
2867-#pragma once
2868-
2869-#include "quantum.h"
2870-
2871-#define KNO KC_NO
2872-#define LAYOUT_default LAYOUT_alice_split_bs
2873-
2874-#define LAYOUT_alice_split_bs( \
2875- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2D,\
2876- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
2877- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
2878- K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
2879- K41, K44, K45, K46, K48, K4A, K4E \
2880-) { \
2881- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
2882- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
2883- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
2884- { KNO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
2885- { KNO, K41, KNO, KNO, K44, K45, K46, KNO, K48, KNO, K4A, KNO, KNO, KNO, K4E } \
2886-}
2887-
2888-#define LAYOUT_alice( \
2889- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
2890- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
2891- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
2892- K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
2893- K41, K44, K45, K46, K48, K4A, K4E \
2894-) { \
2895- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
2896- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
2897- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KNO, K2E }, \
2898- { KNO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
2899- { KNO, K41, KNO, KNO, K44, K45, K46, KNO, K48, KNO, K4A, KNO, KNO, KNO, K4E } \
2900-}
2901diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json
2902index 7176e394d473962c7ab66ac1014f9da7b79be848..5962d918ebd501699e696211840f1addc969be24 100644
2903--- a/keyboards/keebsforall/coarse60/info.json
2904+++ b/keyboards/keebsforall/coarse60/info.json
2905@@ -35,152 +35,169 @@
2906 "processor": "STM32F072",
2907 "bootloader": "stm32-dfu",
2908 "community_layouts": ["alice", "alice_split_bs"],
2909+ "layout_aliases": {
2910+ "LAYOUT_default": "LAYOUT_alice_split_bs"
2911+ },
2912 "layouts": {
2913 "LAYOUT_alice_split_bs": {
2914 "layout": [
2915- {"label":"Esc", "x":0.5, "y":0},
2916- {"label":"`", "x":1.75, "y":0.25},
2917- {"label":"1", "x":2.75, "y":0.25},
2918- {"label":"2", "x":3.75, "y":0},
2919- {"label":"3", "x":4.75, "y":0.25},
2920- {"label":"4", "x":5.75, "y":0.25},
2921- {"label":"5", "x":6.75, "y":0.25},
2922- {"label":"6", "x":7.75, "y":0.25},
2923- {"label":"7", "x":11, "y":0.25},
2924- {"label":"8", "x":12, "y":0.25},
2925- {"label":"9", "x":13, "y":0.25},
2926- {"label":"0", "x":14, "y":0.25},
2927- {"label":"-", "x":15, "y":0},
2928- {"label":"=", "x":16, "y":0.25},
2929- {"label":"Del", "x":17, "y":0.25},
2930- {"label":"Backspace", "x":18, "y":0.25},
2931-
2932- {"label":"PgUp", "x":0.25, "y":1},
2933- {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
2934- {"label":"Q", "x":3, "y":1.25},
2935- {"label":"W", "x":4.25, "y":1.25},
2936- {"label":"E", "x":5.25, "y":1.25},
2937- {"label":"R", "x":6.25, "y":1.25},
2938- {"label":"T", "x":7.25, "y":1.25},
2939- {"label":"Y", "x":10.5, "y":1.25},
2940- {"label":"U", "x":11.5, "y":1.25},
2941- {"label":"I", "x":12.5, "y":1.25},
2942- {"label":"O", "x":13.5, "y":1.25},
2943- {"label":"P", "x":14.75, "y":1.25},
2944- {"label":"{", "x":15.75, "y":1.25},
2945- {"label":"}", "x":16.75, "y":1.25},
2946- {"label":"|", "x":17.75, "y":1.25, "w":1.5},
2947-
2948- {"label":"PgDn", "x":0, "y":2},
2949- {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
2950- {"label":"A", "x":3.25, "y":2.25},
2951- {"label":"S", "x":4.5, "y":2.25},
2952- {"label":"D", "x":5.5, "y":2.25},
2953- {"label":"F", "x":6.5, "y":2.25},
2954- {"label":"G", "x":7.5, "y":2.25},
2955- {"label":"H", "x":10.75, "y":2.25},
2956- {"label":"J", "x":11.75, "y":2.25},
2957- {"label":"K", "x":12.75, "y":2.25},
2958- {"label":"L", "x":13.75, "y":2.25},
2959- {"label":":", "x":15.25, "y":2.25},
2960- {"label":"\"", "x":16.25, "y":2.25},
2961- {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
2962-
2963- {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
2964- {"label":"Z", "x":3.75, "y":3.25},
2965- {"label":"X", "x":5, "y":3.25},
2966- {"label":"C", "x":6, "y":3.25},
2967- {"label":"V", "x":7, "y":3.25},
2968- {"label":"B", "x":8, "y":3.25},
2969- {"label":"Fn", "x":10.25, "y":3.25},
2970- {"label":"N", "x":11.25, "y":3.25},
2971- {"label":"M", "x":12.25, "y":3.25},
2972- {"label":"<", "x":13.25, "y":3.25},
2973- {"label":">", "x":15, "y":3.25},
2974- {"label":"?", "x":16, "y":3.25},
2975- {"label":"Shift", "x":17, "y":3.25, "w":1.75},
2976- {"label":"Fn", "x":18.75, "y":3.25},
2977-
2978- {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
2979- {"label":"Alt", "x":5, "y":4.25, "w":1.5},
2980- {"label":"Space", "x":6.5, "y":4.25, "w":2},
2981- {"label":"Menu", "x":8.5, "y":4.25},
2982- {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
2983- {"label":"Alt", "x":13, "y":4.25, "w":1.5},
2984- {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
2985+ {"matrix": [0, 0], "x": 0.5, "y": 0},
2986+
2987+ {"matrix": [0, 1], "x": 1.75, "y": 0.25},
2988+ {"matrix": [0, 2], "x": 2.75, "y": 0.25},
2989+ {"matrix": [0, 3], "x": 3.75, "y": 0},
2990+ {"matrix": [0, 4], "x": 4.75, "y": 0.25},
2991+ {"matrix": [0, 5], "x": 5.75, "y": 0.25},
2992+ {"matrix": [0, 6], "x": 6.75, "y": 0.25},
2993+ {"matrix": [0, 7], "x": 7.75, "y": 0.25},
2994+
2995+ {"matrix": [0, 8], "x": 11, "y": 0.25},
2996+ {"matrix": [0, 9], "x": 12, "y": 0.25},
2997+ {"matrix": [0, 10], "x": 13, "y": 0.25},
2998+ {"matrix": [0, 11], "x": 14, "y": 0.25},
2999+ {"matrix": [0, 12], "x": 15, "y": 0},
3000+ {"matrix": [0, 13], "x": 16, "y": 0.25},
3001+ {"matrix": [0, 14], "x": 17, "y": 0.25},
3002+ {"matrix": [2, 13], "x": 18, "y": 0.25},
3003+
3004+ {"matrix": [1, 0], "x": 0.25, "y": 1},
3005diff --git a/keyboards/keyhive/ergosaurus/ergosaurus.h b/keyboards/keyhive/ergosaurus/ergosaurus.h
3006deleted file mode 100644
3007index cef594993d18970ace104536f27bc225b1acfa02..0000000000000000000000000000000000000000
3008--- a/keyboards/keyhive/ergosaurus/ergosaurus.h
3009+++ /dev/null
3010@@ -1,40 +0,0 @@
3011-/* Copyright 2019 cfbender
3012- *
3013- * This program is free software: you can redistribute it and/or modify
3014- * it under the terms of the GNU General Public License as published by
3015- * the Free Software Foundation, either version 2 of the License, or
3016- * (at your option) any later version.
3017- *
3018- * This program is distributed in the hope that it will be useful,
3019- * but WITHOUT ANY WARRANTY; without even the implied warranty of
3020- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3021- * GNU General Public License for more details.
3022- *
3023- * You should have received a copy of the GNU General Public License
3024- * along with this program. If not, see <http://www.gnu.org/licenses/>.
3025- */
3026-#pragma once
3027-
3028-#include "quantum.h"
3029-
3030-#define KNO KC_NO
3031-
3032-#define LAYOUT_alice_split_bs( \
3033- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
3034- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \
3035- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, \
3036- K60, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, \
3037- K80, K81, K82, K83, K84, K85, K87 \
3038-) { \
3039- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
3040- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
3041- { K20, K21, K22, K23, K24, K25, K26, K27 }, \
3042- { K30, K31, K32, K33, K34, K35, K36, KNO }, \
3043- { K40, K41, K42, K43, K44, K45, K46, K47 }, \
3044- { K50, K51, K52, K53, K54, K55, KNO, KNO }, \
3045- { K60, K61, K62, K63, K64, K65, K66, K67 }, \
3046- { KNO, K71, K72, K73, K74, K75, K76, KNO }, \
3047- { K80, K81, K82, K83, K84, K85, KNO, K87 } \
3048-}
3049-
3050-#define LAYOUT LAYOUT_alice_split_bs
3051diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
3052index f9e3944fec36667c22cf8424926c04b5dc49c6dd..afd25e2785dc327bc7a9c0abe034c19f2f55c576 100644
3053--- a/keyboards/keyhive/ergosaurus/info.json
3054+++ b/keyboards/keyhive/ergosaurus/info.json
3055@@ -15,79 +15,82 @@
3056 "processor": "atmega32u4",
3057 "bootloader": "caterina",
3058 "community_layouts": ["alice_split_bs"],
3059+ "layout_aliases": {
3060+ "LAYOUT": "LAYOUT_alice_split_bs"
3061+ },
3062 "layouts": {
3063 "LAYOUT_alice_split_bs": {
3064 "layout": [
3065- {"label":"`", "x":0.5, "y":0},
3066- {"label":"Esc", "x":1.75, "y":0.25},
3067- {"label":"1", "x":2.75, "y":0.25},
3068- {"label":"2", "x":3.75, "y":0},
3069- {"label":"3", "x":4.75, "y":0.25},
3070- {"label":"4", "x":5.75, "y":0.25},
3071- {"label":"5", "x":6.75, "y":0.25},
3072- {"label":"6", "x":7.75, "y":0.25},
3073- {"label":"7", "x":11, "y":0.25},
3074- {"label":"8", "x":12, "y":0.25},
3075- {"label":"9", "x":13, "y":0.25},
3076- {"label":"0", "x":14, "y":0.25},
3077- {"label":"-", "x":15, "y":0},
3078- {"label":"=", "x":16, "y":0.25},
3079- {"label":"|", "x":17, "y":0.25},
3080- {"label":"Del", "x":18, "y":0.25},
3081+ {"matrix": [0, 0], "x": 0.5, "y": 0},
3082+ {"matrix": [1, 0], "x": 1.75, "y": 0.25},
3083+ {"matrix": [0, 1], "x": 2.75, "y": 0.25},
3084+ {"matrix": [1, 1], "x": 3.75, "y": 0},
3085+ {"matrix": [0, 2], "x": 4.75, "y": 0.25},
3086+ {"matrix": [1, 2], "x": 5.75, "y": 0.25},
3087+ {"matrix": [0, 3], "x": 6.75, "y": 0.25},
3088+ {"matrix": [1, 3], "x": 7.75, "y": 0.25},
3089+ {"matrix": [0, 4], "x": 11, "y": 0.25},
3090+ {"matrix": [1, 4], "x": 12, "y": 0.25},
3091+ {"matrix": [0, 5], "x": 13, "y": 0.25},
3092+ {"matrix": [1, 5], "x": 14, "y": 0.25},
3093+ {"matrix": [0, 6], "x": 15, "y": 0},
3094+ {"matrix": [1, 6], "x": 16, "y": 0.25},
3095+ {"matrix": [0, 7], "x": 17, "y": 0.25},
3096+ {"matrix": [1, 7], "x": 18, "y": 0.25},
3097
3098- {"label":"PgUp", "x":0.25, "y":1},
3099- {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
3100- {"label":"Q", "x":3, "y":1.25},
3101- {"label":"W", "x":4.25, "y":1.25},
3102- {"label":"E", "x":5.25, "y":1.25},
3103- {"label":"R", "x":6.25, "y":1.25},
3104- {"label":"T", "x":7.25, "y":1.25},
3105- {"label":"Y", "x":10.5, "y":1.25},
3106- {"label":"U", "x":11.5, "y":1.25},
3107- {"label":"I", "x":12.5, "y":1.25},
3108- {"label":"O", "x":13.5, "y":1.25},
3109- {"label":"P", "x":14.75, "y":1.25},
3110- {"label":"{", "x":15.75, "y":1.25},
3111- {"label":"}", "x":16.75, "y":1.25},
3112- {"label":"Backspace", "x":17.75, "y":1.25, "w":1.5},
3113+ {"matrix": [2, 0], "x": 0.25, "y": 1},
3114+ {"matrix": [3, 0], "x": 1.5, "y": 1.25, "w": 1.5},
3115+ {"matrix": [2, 1], "x": 3, "y": 1.25},
3116+ {"matrix": [3, 1], "x": 4.25, "y": 1.25},
3117+ {"matrix": [2, 2], "x": 5.25, "y": 1.25},
3118+ {"matrix": [3, 2], "x": 6.25, "y": 1.25},
3119+ {"matrix": [2, 3], "x": 7.25, "y": 1.25},
3120+ {"matrix": [3, 3], "x": 10.5, "y": 1.25},
3121+ {"matrix": [2, 4], "x": 11.5, "y": 1.25},
3122+ {"matrix": [3, 4], "x": 12.5, "y": 1.25},
3123+ {"matrix": [2, 5], "x": 13.5, "y": 1.25},
3124+ {"matrix": [3, 5], "x": 14.75, "y": 1.25},
3125+ {"matrix": [2, 6], "x": 15.75, "y": 1.25},
3126+ {"matrix": [3, 6], "x": 16.75, "y": 1.25},
3127+ {"matrix": [2, 7], "x": 17.75, "y": 1.25, "w": 1.5},
3128
3129- {"label":"PgDn", "x":0, "y":2},
3130- {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
3131- {"label":"A", "x":3.25, "y":2.25},
3132- {"label":"S", "x":4.5, "y":2.25},
3133- {"label":"D", "x":5.5, "y":2.25},
3134- {"label":"F", "x":6.5, "y":2.25},
3135- {"label":"G", "x":7.5, "y":2.25},
3136- {"label":"H", "x":10.75, "y":2.25},
3137- {"label":"J", "x":11.75, "y":2.25},
3138- {"label":"K", "x":12.75, "y":2.25},
3139- {"label":"L", "x":13.75, "y":2.25},
3140- {"label":":", "x":15.25, "y":2.25},
3141- {"label":"\"", "x":16.25, "y":2.25},
3142- {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
3143+ {"matrix": [4, 0], "x": 0, "y": 2},
3144+ {"matrix": [5, 0], "x": 1.5, "y": 2.25, "w": 1.75},
3145+ {"matrix": [4, 1], "x": 3.25, "y": 2.25},
3146+ {"matrix": [5, 1], "x": 4.5, "y": 2.25},
3147+ {"matrix": [4, 2], "x": 5.5, "y": 2.25},
3148+ {"matrix": [5, 2], "x": 6.5, "y": 2.25},
3149+ {"matrix": [4, 3], "x": 7.5, "y": 2.25},
3150+ {"matrix": [5, 3], "x": 10.75, "y": 2.25},
3151+ {"matrix": [4, 4], "x": 11.75, "y": 2.25},
3152+ {"matrix": [5, 4], "x": 12.75, "y": 2.25},
3153+ {"matrix": [4, 5], "x": 13.75, "y": 2.25},
3154+ {"matrix": [5, 5], "x": 15.25, "y": 2.25},
3155diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json
3156index 3489d64245291a5eca50e6ccb252494811f0e5a7..a220d57687e84fac9845062fb33a88e7629db3c0 100644
3157--- a/keyboards/kiwikey/wanderland/info.json
3158+++ b/keyboards/kiwikey/wanderland/info.json
3159@@ -27,143 +27,167 @@
3160 "layouts": {
3161 "LAYOUT_alice_split_bs": {
3162 "layout": [
3163- {"label":"Esc", "x":0, "y":0},
3164- {"label":"~", "x":1.25, "y":0},
3165- {"label":"!", "x":2.25, "y":0},
3166- {"label":"@", "x":3.25, "y":0},
3167- {"label":"#", "x":4.25, "y":0},
3168- {"label":"$", "x":5.25, "y":0},
3169- {"label":"%", "x":6.25, "y":0},
3170- {"label":"^", "x":7.25, "y":0},
3171- {"label":"&", "x":10.25, "y":0},
3172- {"label":"*", "x":11.25, "y":0},
3173- {"label":"(", "x":12.25, "y":0},
3174- {"label":")", "x":13.25, "y":0},
3175- {"label":"_", "x":14.25, "y":0},
3176- {"label":"+", "x":15.25, "y":0},
3177- {"label":"Backspace", "x":16.25, "y":0},
3178- {"label":"Del", "x":17.25, "y":0},
3179- {"label":"Mute", "x":0, "y":1},
3180- {"label":"Tab", "x":1.25, "y":1, "w":1.5},
3181- {"label":"Q", "x":2.75, "y":1},
3182- {"label":"W", "x":3.75, "y":1},
3183- {"label":"E", "x":4.75, "y":1},
3184- {"label":"R", "x":5.75, "y":1},
3185- {"label":"T", "x":6.75, "y":1},
3186- {"label":"Y", "x":9.75, "y":1},
3187- {"label":"U", "x":10.75, "y":1},
3188- {"label":"I", "x":11.75, "y":1},
3189- {"label":"O", "x":12.75, "y":1},
3190- {"label":"P", "x":13.75, "y":1},
3191- {"label":"{", "x":14.75, "y":1},
3192- {"label":"}", "x":15.75, "y":1},
3193- {"label":"|", "x":16.75, "y":1, "w":1.5},
3194- {"label":"Vol-", "x":0, "y":2},
3195- {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75},
3196- {"label":"A", "x":3, "y":2},
3197- {"label":"S", "x":4, "y":2},
3198- {"label":"D", "x":5, "y":2},
3199- {"label":"F", "x":6, "y":2},
3200- {"label":"G", "x":7, "y":2},
3201- {"label":"H", "x":10, "y":2},
3202- {"label":"J", "x":11, "y":2},
3203- {"label":"K", "x":12, "y":2},
3204- {"label":"L", "x":13, "y":2},
3205- {"label":":", "x":14, "y":2},
3206- {"label":"\"", "x":15, "y":2},
3207- {"label":"Enter", "x":16, "y":2, "w":2.25},
3208- {"label":"Vol+", "x":0, "y":3},
3209- {"label":"Shift", "x":1.25, "y":3, "w":2.25},
3210- {"label":"Z", "x":3.5, "y":3},
3211- {"label":"X", "x":4.5, "y":3},
3212- {"label":"C", "x":5.5, "y":3},
3213- {"label":"V", "x":6.5, "y":3},
3214- {"label":"B", "x":7.5, "y":3},
3215- {"label":"B", "x":9.5, "y":3},
3216- {"label":"N", "x":10.5, "y":3},
3217- {"label":"M", "x":11.5, "y":3},
3218- {"label":"<", "x":12.5, "y":3},
3219- {"label":">", "x":13.5, "y":3},
3220- {"label":"?", "x":14.5, "y":3},
3221- {"label":"Shift", "x":15.5, "y":3, "w":1.75},
3222- {"label":"Win", "x":17.25, "y":3},
3223- {"label":"Ctrl", "x":1.25, "y":4, "w":1.5},
3224- {"label":"Alt", "x":4.25, "y":4, "w":1.25},
3225- {"label":"Space", "x":5.5, "y":4, "w":2.25},
3226- {"label":"FN", "x":7.75, "y":4, "w":1.25},
3227- {"label":"Space", "x":9.5, "y":4, "w":2.75},
3228- {"label":"Alt", "x":12.25, "y":4, "w":1.5},
3229- {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}
3230+ {"matrix": [0, 2], "x": 0, "y": 0},
3231+
3232+ {"matrix": [1, 0], "x": 1.25, "y": 0},
3233+ {"matrix": [1, 1], "x": 2.25, "y": 0},
3234+ {"matrix": [1, 2], "x": 3.25, "y": 0},
3235+ {"matrix": [1, 3], "x": 4.25, "y": 0},
3236+ {"matrix": [1, 4], "x": 5.25, "y": 0},
3237+ {"matrix": [1, 5], "x": 6.25, "y": 0},
3238+ {"matrix": [0, 5], "x": 7.25, "y": 0},
3239+
3240+ {"matrix": [0, 6], "x": 10.25, "y": 0},
3241+ {"matrix": [1, 6], "x": 11.25, "y": 0},
3242+ {"matrix": [1, 7], "x": 12.25, "y": 0},
3243+ {"matrix": [1, 8], "x": 13.25, "y": 0},
3244+ {"matrix": [1, 9], "x": 14.25, "y": 0},
3245+ {"matrix": [1, 10], "x": 15.25, "y": 0},
3246+ {"matrix": [1, 11], "x": 16.25, "y": 0},
3247+ {"matrix": [1, 12], "x": 17.25, "y": 0},
3248+
3249+ {"matrix": [0, 1], "x": 0, "y": 1},
3250+
3251+ {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
3252+ {"matrix": [2, 1], "x": 2.75, "y": 1},
3253+ {"matrix": [2, 2], "x": 3.75, "y": 1},
3254+ {"matrix": [2, 3], "x": 4.75, "y": 1},
3255+ {"matrix": [2, 4], "x": 5.75, "y": 1},
3256+ {"matrix": [2, 5], "x": 6.75, "y": 1},
3257+ {"matrix": [0, 7], "x": 9.75, "y": 1},
3258+
3259diff --git a/keyboards/kiwikey/wanderland/wanderland.h b/keyboards/kiwikey/wanderland/wanderland.h
3260deleted file mode 100644
3261index f207d01d6cd8126c2114890fb6b3e3b45efcb3ec..0000000000000000000000000000000000000000
3262--- a/keyboards/kiwikey/wanderland/wanderland.h
3263+++ /dev/null
3264@@ -1,77 +0,0 @@
3265-/* Copyright 2021 KiwiKey
3266- *
3267- * This program is free software: you can redistribute it and/or modify
3268- * it under the terms of the GNU General Public License as published by
3269- * the Free Software Foundation, either version 2 of the License, or
3270- * (at your option) any later version.
3271- *
3272- * This program is distributed in the hope that it will be useful,
3273- * but WITHOUT ANY WARRANTY; without even the implied warranty of
3274- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3275- * GNU General Public License for more details.
3276- *
3277- * You should have received a copy of the GNU General Public License
3278- * along with this program. If not, see <http://www.gnu.org/licenses/>.
3279- */
3280-
3281-#pragma once
3282-
3283-#include "quantum.h"
3284-
3285-/* Layout Alice split-backspace
3286- * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐
3287- * │02 │ │10 │11 │12 │13 │14 │15 │05 │ │06 │16 │17 │18 │19 │1A │1B │1C │
3288- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
3289- * │01 │ │ 20 │21 │22 │23 │24 │25 │ │07 │26 │27 │28 │29 │2A │2B │ 2C │
3290- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
3291- * │00 │ │ 30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │ 3C │
3292- * ├───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
3293- * │03 │ │ 40 │41 │42 │43 │44 │45 │ │46 │47 │48 │49 │4A │4B │ 5B │4C │
3294- * └───┘ ├──────┬─┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
3295- * │ 50 │ │ 52 │ 53 │ 55 │ │ 57 │ 59 │ │ 5C │
3296- * └──────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘
3297- */
3298-#define LAYOUT_alice_split_bs( \
3299- k02, k10, k11, k12, k13, k14, k15, k05, k06, k16, k17, k18, k19, k1A, k1B, k1C, \
3300- k01, k20, k21, k22, k23, k24, k25, k07, k26, k27, k28, k29, k2A, k2B, k2C, \
3301- k00, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
3302- k03, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k5B, k4C, \
3303- k50, k52, k53, k55, k57, k59, k5C \
3304-) \
3305-{ \
3306- { k00, k01, k02, k03, KC_NO, k05, k06, k07, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
3307- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \
3308- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
3309- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \
3310- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C }, \
3311- { k50, KC_NO, k52, k53, KC_NO, k55, KC_NO, k57, KC_NO, k59, KC_NO, k5B, k5C } \
3312-}
3313-
3314-/* Layout Alice
3315- * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐
3316- * │02 │ │10 │11 │12 │13 │14 │15 │05 │ │06 │16 │17 │18 │19 │1A │ 1B │
3317- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
3318- * │01 │ │ 20 │21 │22 │23 │24 │25 │ │07 │26 │27 │28 │29 │2A │2B │ 2C │
3319- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
3320- * │00 │ │ 30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │ 3C │
3321- * ├───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
3322- * │03 │ │ 40 │41 │42 │43 │44 │45 │ │46 │47 │48 │49 │4A │4B │ 5B │4C │
3323- * └───┘ ├──────┬─┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
3324- * │ 50 │ │ 52 │ 53 │ 55 │ │ 57 │ 59 │ │ 5C │
3325- * └──────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘
3326- */
3327-#define LAYOUT_alice( \
3328- k02, k10, k11, k12, k13, k14, k15, k05, k06, k16, k17, k18, k19, k1A, k1B, \
3329- k01, k20, k21, k22, k23, k24, k25, k07, k26, k27, k28, k29, k2A, k2B, k2C, \
3330- k00, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
3331- k03, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k5B, k4C, \
3332- k50, k52, k53, k55, k57, k59, k5C \
3333-) \
3334-{ \
3335- { k00, k01, k02, k03, KC_NO, k05, k06, k07, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
3336- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, KC_NO }, \
3337- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
3338- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \
3339- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C }, \
3340- { k50, KC_NO, k52, k53, KC_NO, k55, KC_NO, k57, KC_NO, k59, KC_NO, k5B, k5C } \
3341-}
3342diff --git a/keyboards/linworks/dolice/dolice.h b/keyboards/linworks/dolice/dolice.h
3343deleted file mode 100644
3344index 22a9338cf30600f4d35e2e64881144f46696452f..0000000000000000000000000000000000000000
3345--- a/keyboards/linworks/dolice/dolice.h
3346+++ /dev/null
3347@@ -1,93 +0,0 @@
3348-/* Copyright 221 Moritz Plattner
3349- *
3350- * This program is free software: you can redistribute it and/or modify
3351- * it under the terms of the GNU General Public License as published by
3352- * the Free Software Foundation, either version 2 of the License, or
3353- * (at your option) any later version.
3354- *
3355- * This program is distributed in the hope that it will be useful,
3356- * but WITHOUT ANY WARRANTY; without even the implied warranty of
3357- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3358- * GNU General Public License for more details.
3359- *
3360- * You should have received a copy of the GNU General Public License
3361- * along with this program. If not, see <http://www.gnu.org/licenses/>.
3362- */
3363-
3364-#pragma once
3365-
3366-#include "quantum.h"
3367-
3368-#define LAYOUT_alice( \
3369- K00, K10, K01, K11, K02, K12, K03, K13, K14, K05, K15, K06, K16, K07, K17, \
3370- K20, K30, K21, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, \
3371- K40, K50, K41, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \
3372- K70, K61, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, K77, \
3373- K80, K81, K82, K83, K84, K85, K87 \
3374-) { \
3375- { K00, K01, K02, K03, KC_NO, K05, K06, K07, }, \
3376- { K10, K11, K12, K13, K14, K15, K16, K17, }, \
3377- { K20, K21, K22, K23, K24, K25, K26, K27, }, \
3378- { K30, KC_NO, K32, K33, K34, K35, K36, K37, }, \
3379- { K40, K41, K42, K43, K44, K45, K46, K47, }, \
3380- { K50, KC_NO, K52, K53, K54, K55, K56, KC_NO, }, \
3381- { KC_NO, K61, K62, K63, K64, K65, K66, K67, }, \
3382- { K70, KC_NO, K72, K73, K74, K75, K76, K77, }, \
3383- { K80, K81, K82, K83, K84, K85, KC_NO, K87 } \
3384-}
3385-
3386-#define LAYOUT_alice_split_bs( \
3387- K00, K10, K01, K11, K02, K12, K03, K13, K14, K05, K15, K06, K16, K07, K17, K57, \
3388- K20, K30, K21, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, \
3389- K40, K50, K41, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \
3390- K70, K61, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, K77, \
3391- K80, K81, K82, K83, K84, K85, K87 \
3392-) { \
3393- { K00, K01, K02, K03, KC_NO, K05, K06, K07, }, \
3394- { K10, K11, K12, K13, K14, K15, K16, K17, }, \
3395- { K20, K21, K22, K23, K24, K25, K26, K27, }, \
3396- { K30, KC_NO, K32, K33, K34, K35, K36, K37, }, \
3397- { K40, K41, K42, K43, K44, K45, K46, K47, }, \
3398- { K50, KC_NO, K52, K53, K54, K55, K56, K57, }, \
3399- { KC_NO, K61, K62, K63, K64, K65, K66, K67, }, \
3400- { K70, KC_NO, K72, K73, K74, K75, K76, K77, }, \
3401- { K80, K81, K82, K83, K84, K85, KC_NO, K87 } \
3402-}
3403-
3404-#define LAYOUT_long_rshift( \
3405- K00, K10, K01, K11, K02, K12, K03, K13, K14, K05, K15, K06, K16, K07, K17, \
3406- K20, K30, K21, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, \
3407- K40, K50, K41, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \
3408- K70, K61, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, \
3409- K80, K81, K82, K83, K84, K85, K87 \
3410-) { \
3411- { K00, K01, K02, K03, KC_NO, K05, K06, K07, }, \
3412- { K10, K11, K12, K13, K14, K15, K16, K17, }, \
3413- { K20, K21, K22, K23, K24, K25, K26, K27, }, \
3414- { K30, KC_NO, K32, K33, K34, K35, K36, K37, }, \
3415- { K40, K41, K42, K43, K44, K45, K46, K47, }, \
3416- { K50, KC_NO, K52, K53, K54, K55, K56, KC_NO, }, \
3417- { KC_NO, K61, K62, K63, K64, K65, K66, K67, }, \
3418- { K70, KC_NO, K72, K73, K74, K75, K76, KC_NO, }, \
3419- { K80, K81, K82, K83, K84, K85, KC_NO, K87 } \
3420-}
3421-
3422-#define LAYOUT_long_rshift_split_bs( \
3423- K00, K10, K01, K11, K02, K12, K03, K13, K14, K05, K15, K06, K16, K07, K17, K57, \
3424- K20, K30, K21, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, \
3425- K40, K50, K41, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \
3426- K70, K61, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, \
3427- K80, K81, K82, K83, K84, K85, K87 \
3428-) { \
3429- { K00, K01, K02, K03, KC_NO, K05, K06, K07, }, \
3430- { K10, K11, K12, K13, K14, K15, K16, K17, }, \
3431- { K20, K21, K22, K23, K24, K25, K26, K27, }, \
3432- { K30, KC_NO, K32, K33, K34, K35, K36, K37, }, \
3433- { K40, K41, K42, K43, K44, K45, K46, K47, }, \
3434- { K50, KC_NO, K52, K53, K54, K55, K56, K57, }, \
3435- { KC_NO, K61, K62, K63, K64, K65, K66, K67, }, \
3436- { K70, KC_NO, K72, K73, K74, K75, K76, KC_NO, }, \
3437- { K80, K81, K82, K83, K84, K85, KC_NO, K87 } \
3438-}
3439-
3440-#define LAYOUT_all LAYOUT_alice_split_bs
3441diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json
3442index 32d0b3aabde044a98ea3dd29560a2260278c1269..ae201fd50e9bb272a1cd95cb8a4f8a2eb5bffd9b 100644
3443--- a/keyboards/linworks/dolice/info.json
3444+++ b/keyboards/linworks/dolice/info.json
3445@@ -24,282 +24,329 @@
3446 },
3447 "processor": "atmega32u4",
3448 "bootloader": "atmel-dfu",
3449+ "layout_aliases": {
3450+ "LAYOUT_all": "LAYOUT_alice_split_bs"
3451+ },
3452 "layouts": {
3453 "LAYOUT_alice": {
3454 "layout": [
3455- {"x":0, "y":0},
3456- {"x":1.25, "y":0},
3457- {"x":2.25, "y":0},
3458- {"x":3.25, "y":0},
3459- {"x":4.25, "y":0},
3460- {"x":5.25, "y":0},
3461- {"x":6.25, "y":0},
3462- {"x":7.25, "y":0},
3463- {"x":10.25, "y":0},
3464- {"x":11.25, "y":0},
3465- {"x":12.25, "y":0},
3466- {"x":13.25, "y":0},
3467- {"x":14.25, "y":0},
3468- {"x":15.25, "y":0},
3469- {"x":16.25, "y":0, "w": 2},
3470- {"x":0, "y":1},
3471- {"x":1.25, "y":1, "w":1.5},
3472- {"x":2.75, "y":1},
3473- {"x":3.75, "y":1},
3474- {"x":4.75, "y":1},
3475- {"x":5.75, "y":1},
3476- {"x":6.75, "y":1},
3477- {"x":9.75, "y":1},
3478- {"x":10.75, "y":1},
3479- {"x":11.75, "y":1},
3480- {"x":12.75, "y":1},
3481- {"x":13.75, "y":1},
3482- {"x":14.75, "y":1},
3483- {"x":15.75, "y":1},
3484- {"x":16.75, "y":1, "w":1.5},
3485- {"x":0, "y":2},
3486- {"x":1.25, "y":2, "w":1.75},
3487- {"x":3, "y":2},
3488- {"x":4, "y":2},
3489- {"x":5, "y":2},
3490- {"x":6, "y":2},
3491- {"x":7, "y":2},
3492- {"x":10, "y":2},
3493- {"x":11, "y":2},
3494- {"x":12, "y":2},
3495- {"x":13, "y":2},
3496- {"x":14, "y":2},
3497- {"x":15, "y":2},
3498- {"x":16, "y":2, "w":2.25},
3499- {"x":1.25, "y":3, "w":2.25},
3500- {"x":3.5, "y":3},
3501- {"x":4.5, "y":3},
3502- {"x":5.5, "y":3},
3503- {"x":6.5, "y":3},
3504- {"x":7.5, "y":3},
3505- {"x":9.5, "y":3},
3506- {"x":10.5, "y":3},
3507- {"x":11.5, "y":3},
3508- {"x":12.5, "y":3},
3509- {"x":13.5, "y":3},
3510- {"x":14.5, "y":3},
3511- {"x":15.5, "y":3, "w":1.75},
3512- {"x":17.25, "y":3},
3513- {"x":1.25, "y":4, "w":1.5},
3514- {"x":4.25, "y":4, "w":1.5},
3515- {"x":5.75, "y":4, "w":2},
3516- {"x":7.75, "y":4, "w":1.25},
3517- {"x":9.5, "y":4, "w":2.75},
3518- {"x":12.25, "y":4, "w":1.5},
3519- {"x":16.75, "y":4, "w":1.5}
3520+ {"matrix": [0, 0], "x": 0, "y": 0},
3521+
3522+ {"matrix": [1, 0], "x": 1.25, "y": 0},
3523+ {"matrix": [0, 1], "x": 2.25, "y": 0},
3524+ {"matrix": [1, 1], "x": 3.25, "y": 0},
3525+ {"matrix": [0, 2], "x": 4.25, "y": 0},
3526+ {"matrix": [1, 2], "x": 5.25, "y": 0},
3527+ {"matrix": [0, 3], "x": 6.25, "y": 0},
3528+ {"matrix": [1, 3], "x": 7.25, "y": 0},
3529+
3530+ {"matrix": [1, 4], "x": 10.25, "y": 0},
3531+ {"matrix": [0, 5], "x": 11.25, "y": 0},
3532+ {"matrix": [1, 5], "x": 12.25, "y": 0},
3533+ {"matrix": [0, 6], "x": 13.25, "y": 0},
3534+ {"matrix": [1, 6], "x": 14.25, "y": 0},
3535+ {"matrix": [0, 7], "x": 15.25, "y": 0},
3536+ {"matrix": [1, 7], "x": 16.25, "y": 0, "w": 2},
3537+
3538+ {"matrix": [2, 0], "x": 0, "y": 1},
3539+
3540+ {"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
3541+ {"matrix": [2, 1], "x": 2.75, "y": 1},
3542+ {"matrix": [2, 2], "x": 3.75, "y": 1},
3543+ {"matrix": [3, 2], "x": 4.75, "y": 1},
3544+ {"matrix": [2, 3], "x": 5.75, "y": 1},
3545diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json
3546index f9680e47d5bde58a2b3ecef75fd4f1df9da520a7..42b16d639842205dc7eefe62f0b3d5bc77cdd2ff 100644
3547--- a/keyboards/mechlovin/adelais/info.json
3548+++ b/keyboards/mechlovin/adelais/info.json
3549@@ -6,302 +6,5 @@
3550 "vid": "0x4D4C",
3551 "device_version": "0.0.1"
3552 },
3553- "layout_aliases": {
3554- "LAYOUT_all": "LAYOUT_alice_split_bs"
3555- },
3556- "community_layouts": ["alice", "alice_split_bs"],
3557- "layouts": {
3558- "LAYOUT_alice_split_bs": {
3559- "layout": [
3560- {"label":"K1E", "x":0, "y":0},
3561- {"label":"K00", "x":1.5, "y":0},
3562- {"label":"K01", "x":2.5, "y":0},
3563- {"label":"K02", "x":3.5, "y":0},
3564- {"label":"K03", "x":4.5, "y":0},
3565- {"label":"K04", "x":5.5, "y":0},
3566- {"label":"K05", "x":6.5, "y":0},
3567- {"label":"K06", "x":7.5, "y":0},
3568- {"label":"K07", "x":10.5, "y":0},
3569- {"label":"K08", "x":11.5, "y":0},
3570- {"label":"K09", "x":12.5, "y":0},
3571- {"label":"K0A", "x":13.5, "y":0},
3572- {"label":"K0B", "x":14.5, "y":0},
3573- {"label":"K0C", "x":15.5, "y":0},
3574- {"label":"K0D", "x":16.5, "y":0},
3575- {"label":"K0E", "x":17.5, "y":0},
3576-
3577- {"label":"K2E", "x":0, "y":1},
3578- {"label":"K10", "x":1.5, "y":1, "w":1.5},
3579- {"label":"K11", "x":3, "y":1},
3580- {"label":"K12", "x":4, "y":1},
3581- {"label":"K13", "x":5, "y":1},
3582- {"label":"K14", "x":6, "y":1},
3583- {"label":"K15", "x":7, "y":1},
3584- {"label":"K16", "x":10, "y":1},
3585- {"label":"K17", "x":11, "y":1},
3586- {"label":"K18", "x":12, "y":1},
3587- {"label":"K19", "x":13, "y":1},
3588- {"label":"K1A", "x":14, "y":1},
3589- {"label":"K1B", "x":15, "y":1},
3590- {"label":"K1C", "x":16, "y":1},
3591- {"label":"K1D", "x":17, "y":1, "w":1.5},
3592-
3593- {"label":"K3E", "x":0, "y":2},
3594- {"label":"K20", "x":1.5, "y":2, "w":1.75},
3595- {"label":"K21", "x":3.25, "y":2},
3596- {"label":"K22", "x":4.25, "y":2},
3597- {"label":"K23", "x":5.25, "y":2},
3598- {"label":"K24", "x":6.25, "y":2},
3599- {"label":"K25", "x":7.25, "y":2},
3600- {"label":"K26", "x":10.25, "y":2},
3601- {"label":"K27", "x":11.25, "y":2},
3602- {"label":"K28", "x":12.25, "y":2},
3603- {"label":"K29", "x":13.25, "y":2},
3604- {"label":"K2A", "x":14.25, "y":2},
3605- {"label":"K2B", "x":15.25, "y":2},
3606- {"label":"K2D", "x":16.25, "y":2, "w":2.25},
3607-
3608- {"label":"K30", "x":1.5, "y":3, "w":2.25},
3609- {"label":"K32", "x":3.75, "y":3},
3610- {"label":"K33", "x":4.75, "y":3},
3611- {"label":"K34", "x":5.75, "y":3},
3612- {"label":"K35", "x":6.75, "y":3},
3613- {"label":"K36", "x":7.75, "y":3},
3614- {"label":"K37", "x":9.75, "y":3},
3615- {"label":"K38", "x":10.75, "y":3},
3616- {"label":"K39", "x":11.75, "y":3},
3617- {"label":"K3A", "x":12.75, "y":3},
3618- {"label":"K3B", "x":13.75, "y":3},
3619- {"label":"K3D", "x":14.75, "y":3},
3620- {"label":"K3C", "x":15.75, "y":3, "w":1.75},
3621- {"label":"K4D", "x":17.5, "y":3},
3622-
3623- {"label":"K40", "x":1.5, "y":4, "w":1.5},
3624- {"label":"K42", "x":4.5, "y":4, "w":1.25},
3625- {"label":"K44", "x":5.75, "y":4, "w":2.25},
3626- {"label":"K46", "x":8, "y":4, "w":1.25},
3627- {"label":"K48", "x":9.75, "y":4, "w":2.75},
3628- {"label":"K4A", "x":12.5, "y":4, "w":1.25},
3629- {"label":"K4E", "x":17, "y":4, "w":1.5}
3630- ]
3631- },
3632- "LAYOUT_alice": {
3633- "layout": [
3634- {"label":"K1E", "x":0, "y":0},
3635- {"label":"K00", "x":1.5, "y":0},
3636- {"label":"K01", "x":2.5, "y":0},
3637- {"label":"K02", "x":3.5, "y":0},
3638- {"label":"K03", "x":4.5, "y":0},
3639- {"label":"K04", "x":5.5, "y":0},
3640- {"label":"K05", "x":6.5, "y":0},
3641- {"label":"K06", "x":7.5, "y":0},
3642- {"label":"K07", "x":10.5, "y":0},
3643- {"label":"K08", "x":11.5, "y":0},
3644- {"label":"K09", "x":12.5, "y":0},
3645- {"label":"K0A", "x":13.5, "y":0},
3646- {"label":"K0B", "x":14.5, "y":0},
3647- {"label":"K0C", "x":15.5, "y":0},
3648- {"label":"K0D", "x":16.5, "y":0, "w":2},
3649diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
3650index 81adcf57e41338daaac4e3af7a0d99764334573c..92ff0d8952606faa83caf3540ee65cad40629309 100644
3651--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
3652+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
3653@@ -15,5 +15,330 @@
3654 "caps_lock": "B2",
3655 "num_lock": "C15",
3656 "scroll_lock": "B9"
3657+ },
3658+ "layout_aliases": {
3659+ "LAYOUT_all": "LAYOUT_alice_split_bs"
3660+ },
3661+ "layouts": {
3662+ "LAYOUT_alice": {
3663+ "layout": [
3664+ {"matrix": [1, 14], "x": 0, "y": 0},
3665+
3666+ {"matrix": [0, 0], "x": 1.5, "y": 0},
3667+ {"matrix": [0, 1], "x": 2.5, "y": 0},
3668+ {"matrix": [0, 2], "x": 3.5, "y": 0},
3669+ {"matrix": [0, 3], "x": 4.5, "y": 0},
3670+ {"matrix": [0, 4], "x": 5.5, "y": 0},
3671+ {"matrix": [0, 5], "x": 6.5, "y": 0},
3672+ {"matrix": [0, 6], "x": 7.5, "y": 0},
3673+
3674+ {"matrix": [0, 7], "x": 10.5, "y": 0},
3675+ {"matrix": [0, 8], "x": 11.5, "y": 0},
3676+ {"matrix": [0, 9], "x": 12.5, "y": 0},
3677+ {"matrix": [0, 10], "x": 13.5, "y": 0},
3678+ {"matrix": [0, 11], "x": 14.5, "y": 0},
3679+ {"matrix": [0, 12], "x": 15.5, "y": 0},
3680+ {"matrix": [0, 13], "x": 16.5, "y": 0, "w": 2},
3681+
3682+ {"matrix": [2, 14], "x": 0, "y": 1},
3683+
3684+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
3685+ {"matrix": [1, 1], "x": 3, "y": 1},
3686+ {"matrix": [1, 2], "x": 4, "y": 1},
3687+ {"matrix": [1, 3], "x": 5, "y": 1},
3688+ {"matrix": [1, 4], "x": 6, "y": 1},
3689+ {"matrix": [1, 5], "x": 7, "y": 1},
3690+
3691+ {"matrix": [1, 6], "x": 10, "y": 1},
3692+ {"matrix": [1, 7], "x": 11, "y": 1},
3693+ {"matrix": [1, 8], "x": 12, "y": 1},
3694+ {"matrix": [1, 9], "x": 13, "y": 1},
3695+ {"matrix": [1, 10], "x": 14, "y": 1},
3696+ {"matrix": [1, 11], "x": 15, "y": 1},
3697+ {"matrix": [1, 12], "x": 16, "y": 1},
3698+ {"matrix": [1, 13], "x": 17, "y": 1, "w": 1.5},
3699+
3700+ {"matrix": [3, 14], "x": 0, "y": 2},
3701+
3702+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
3703+ {"matrix": [2, 1], "x": 3.25, "y": 2},
3704+ {"matrix": [2, 2], "x": 4.25, "y": 2},
3705+ {"matrix": [2, 3], "x": 5.25, "y": 2},
3706+ {"matrix": [2, 4], "x": 6.25, "y": 2},
3707+ {"matrix": [2, 5], "x": 7.25, "y": 2},
3708+
3709+ {"matrix": [2, 6], "x": 10.25, "y": 2},
3710+ {"matrix": [2, 7], "x": 11.25, "y": 2},
3711+ {"matrix": [2, 8], "x": 12.25, "y": 2},
3712+ {"matrix": [2, 9], "x": 13.25, "y": 2},
3713+ {"matrix": [2, 10], "x": 14.25, "y": 2},
3714+ {"matrix": [2, 11], "x": 15.25, "y": 2},
3715+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
3716+
3717+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
3718+ {"matrix": [3, 2], "x": 3.75, "y": 3},
3719+ {"matrix": [3, 3], "x": 4.75, "y": 3},
3720+ {"matrix": [3, 4], "x": 5.75, "y": 3},
3721+ {"matrix": [3, 5], "x": 6.75, "y": 3},
3722+ {"matrix": [3, 6], "x": 7.75, "y": 3},
3723+
3724+ {"matrix": [3, 7], "x": 9.75, "y": 3},
3725+ {"matrix": [3, 8], "x": 10.75, "y": 3},
3726+ {"matrix": [3, 9], "x": 11.75, "y": 3},
3727+ {"matrix": [3, 10], "x": 12.75, "y": 3},
3728+ {"matrix": [3, 11], "x": 13.75, "y": 3},
3729+ {"matrix": [3, 13], "x": 14.75, "y": 3},
3730+ {"matrix": [3, 12], "x": 15.75, "y": 3, "w": 1.75},
3731+ {"matrix": [4, 13], "x": 17.5, "y": 3},
3732+
3733+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
3734+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
3735+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2.25},
3736+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
3737+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
3738+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
3739+ {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
3740+ ]
3741+ },
3742+ "LAYOUT_alice_full_rshift": {
3743+ "layout": [
3744+ {"matrix": [1, 14], "x": 0, "y": 0},
3745+
3746+ {"matrix": [0, 0], "x": 1.5, "y": 0},
3747+ {"matrix": [0, 1], "x": 2.5, "y": 0},
3748+ {"matrix": [0, 2], "x": 3.5, "y": 0},
3749+ {"matrix": [0, 3], "x": 4.5, "y": 0},
3750+ {"matrix": [0, 4], "x": 5.5, "y": 0},
3751+ {"matrix": [0, 5], "x": 6.5, "y": 0},
3752+ {"matrix": [0, 6], "x": 7.5, "y": 0},
3753diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
3754index a86b1e5dd5e6890469b26fc2b988f6071d44c8cd..5f01f322dfd64802f5cc2e3b9ee51fc1e65f8dae 100644
3755--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
3756+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c
3757@@ -14,7 +14,7 @@
3758 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3759 */
3760
3761-#include "rev1.h"
3762+#include "quantum.h"
3763
3764 #ifdef RGB_MATRIX_ENABLE
3765 led_config_t g_led_config = { {