096aca63c5d7789669d90ef5f128189be85b7a35
- Author
- QMK Bot <hello@qmk.fm>
- Committer
- QMK Bot <hello@qmk.fm>
- Date
Message
Merge remote-tracking branch 'origin/master' into develop
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/1upkeyboards/1up60hte/keyboard.json b/keyboards/1upkeyboards/1up60hte/keyboard.json
2index 53e91017ddc89b0a5c049bbba5b540dea68adb5c..7f8a660d80f449fdc5f2060c2ca4eb92a67e6ce7 100644
3--- a/keyboards/1upkeyboards/1up60hte/keyboard.json
4+++ b/keyboards/1upkeyboards/1up60hte/keyboard.json
5@@ -62,11 +62,15 @@
6 "processor": "atmega32u4",
7 "bootloader": "atmel-dfu",
8 "layout_aliases": {
9- "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
10+ "LAYOUT_tsangan": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
11+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
12 },
13- "community_layouts": ["60_hhkb", "60_tsangan_hhkb"],
14+ "community_layouts": [
15+ "60_hhkb",
16+ "60_ansi_tsangan_split_bs_rshift"
17+ ],
18 "layouts": {
19- "LAYOUT_60_tsangan_hhkb": {
20+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
21 "layout": [
22 {"matrix": [0, 0], "x": 0, "y": 0},
23 {"matrix": [0, 1], "x": 1, "y": 0},
24diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
25index 40d3d5c3e90e6f0448060e45e5732bd43ba3e2b1..bc21fb2c4ae8cf0a195febdab2c893284726b1df 100644
26--- a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
27+++ b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
28@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
29 #include QMK_KEYBOARD_H
30
31 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32- [0] = LAYOUT_60_tsangan_hhkb(
33+ [0] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
34 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
35 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
36 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
37@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
38 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL
39 ),
40
41- [1] = LAYOUT_60_tsangan_hhkb(
42+ [1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
43 QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
44 KC_CAPS, BL_TOGG, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP, _______, KC_CLR,
45 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, UG_VALD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
46diff --git a/keyboards/1upkeyboards/pi60/keyboard.json b/keyboards/1upkeyboards/pi60/keyboard.json
47index 45c3876a6b6c34efcd4df356c505348d83f96356..ca3007ee76d0e53ad5e4fed29941e559618fbe6e 100644
48--- a/keyboards/1upkeyboards/pi60/keyboard.json
49+++ b/keyboards/1upkeyboards/pi60/keyboard.json
50@@ -104,15 +104,20 @@
51 },
52 "community_layouts": [
53 "60_ansi",
54+ "60_ansi_arrow",
55 "60_ansi_split_bs_rshift",
56 "60_ansi_tsangan",
57- "60_tsangan_hhkb",
58+ "60_ansi_tsangan_split_bs_rshift",
59 "60_hhkb",
60- "60_ansi_arrow",
61 "60_iso",
62+ "60_iso_arrow",
63 "60_iso_split_bs_rshift",
64- "60_iso_tsangan"
65+ "60_iso_tsangan",
66+ "60_iso_tsangan_split_bs_rshift"
67 ],
68+ "layout_aliases": {
69+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
70+ },
71 "layouts": {
72 "LAYOUT_all": {
73 "layout": [
74@@ -394,7 +399,7 @@
75 {"label": "RCtrl", "matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
76 ]
77 },
78- "LAYOUT_60_tsangan_hhkb": {
79+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
80 "layout": [
81 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
82 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
83diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json b/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
84index 18d8ba5d8aad26b7d4f7a9beb814385d76fa55b3..59a518b9713d6f270e33d1646da1dcdc7d3779a0 100644
85--- a/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
86+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
87@@ -64,12 +64,16 @@
88 "60_ansi",
89 "60_ansi_split_bs_rshift",
90 "60_ansi_tsangan",
91- "60_tsangan_hhkb",
92+ "60_ansi_tsangan_split_bs_rshift",
93 "60_hhkb",
94 "60_iso",
95 "60_iso_split_bs_rshift",
96- "60_iso_tsangan"
97+ "60_iso_tsangan",
98+ "60_iso_tsangan_split_bs_rshift"
99 ],
100+ "layout_aliases": {
101+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
102+ },
103 "layouts": {
104 "LAYOUT_all": {
105 "layout": [
106@@ -352,7 +356,7 @@
107 {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
108 ]
109 },
110- "LAYOUT_60_tsangan_hhkb": {
111+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
112 "layout": [
113 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
114 {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
115diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json b/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
116index e0356d5dad58ddf63ce1abc4ec19da16f8a2ddf0..bf7d11f74ba96012edcb64e82e2bf8f09ce31fd1 100644
117--- a/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
118+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
119@@ -64,17 +64,19 @@
120 "processor": "STM32F072",
121 "bootloader": "stm32-dfu",
122 "layout_aliases": {
123- "LAYOUT": "LAYOUT_all"
124+ "LAYOUT": "LAYOUT_all",
125+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
126 },
127 "community_layouts": [
128 "60_ansi",
129 "60_ansi_split_bs_rshift",
130 "60_ansi_tsangan",
131- "60_tsangan_hhkb",
132+ "60_ansi_tsangan_split_bs_rshift",
133 "60_hhkb",
134 "60_iso",
135 "60_iso_split_bs_rshift",
136- "60_iso_tsangan"
137+ "60_iso_tsangan",
138+ "60_iso_tsangan_split_bs_rshift"
139 ],
140 "layouts": {
141 "LAYOUT_all": {
142@@ -360,7 +362,7 @@
143 {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
144 ]
145 },
146- "LAYOUT_60_tsangan_hhkb": {
147+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
148 "layout": [
149 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
150 {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
151diff --git a/keyboards/4pplet/steezy60/rev_a/keyboard.json b/keyboards/4pplet/steezy60/rev_a/keyboard.json
152index ffd44642230cad30a7d93988f80f934cd68383ed..bbc3d1601b8fbb2a583c0bf917337c989275106b 100644
153--- a/keyboards/4pplet/steezy60/rev_a/keyboard.json
154+++ b/keyboards/4pplet/steezy60/rev_a/keyboard.json
155@@ -18,11 +18,11 @@
156 "60_ansi",
157 "60_ansi_split_bs_rshift",
158 "60_ansi_tsangan",
159+ "60_ansi_tsangan_split_bs_rshift",
160 "60_hhkb",
161 "60_iso",
162 "60_iso_split_bs_rshift",
163- "60_iso_tsangan",
164- "60_tsangan_hhkb"
165+ "60_iso_tsangan"
166 ],
167 "diode_direction": "COL2ROW",
168 "matrix_pins": {
169@@ -57,6 +57,9 @@
170 "ws2812": {
171 "pin": "D3"
172 },
173+ "layout_aliases": {
174+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
175+ },
176 "layouts": {
177 "LAYOUT_all": {
178 "layout": [
179@@ -591,7 +594,7 @@
180 {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
181 ]
182 },
183- "LAYOUT_60_tsangan_hhkb": {
184+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
185 "layout": [
186 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
187 {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
188diff --git a/keyboards/4pplet/steezy60/rev_b/keyboard.json b/keyboards/4pplet/steezy60/rev_b/keyboard.json
189index 8ff41bd1561cecf54424ba446dac36045bef2038..810f7f8cb95b72542ea3f4a60bb57fe2b27e3777 100644
190--- a/keyboards/4pplet/steezy60/rev_b/keyboard.json
191+++ b/keyboards/4pplet/steezy60/rev_b/keyboard.json
192@@ -14,11 +14,11 @@
193 "60_ansi",
194 "60_ansi_split_bs_rshift",
195 "60_ansi_tsangan",
196+ "60_ansi_tsangan_split_bs_rshift",
197 "60_hhkb",
198 "60_iso",
199 "60_iso_split_bs_rshift",
200- "60_iso_tsangan",
201- "60_tsangan_hhkb"
202+ "60_iso_tsangan"
203 ],
204 "diode_direction": "COL2ROW",
205 "matrix_pins": {
206@@ -53,6 +53,9 @@
207 "ws2812": {
208 "pin": "A8"
209 },
210+ "layout_aliases": {
211+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
212+ },
213 "layouts": {
214 "LAYOUT_all": {
215 "layout": [
216@@ -587,7 +590,7 @@
217 {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
218 ]
219 },
220- "LAYOUT_60_tsangan_hhkb": {
221+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
222 "layout": [
223 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
224 {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
225diff --git a/keyboards/4pplet/waffling60/rev_e/keyboard.json b/keyboards/4pplet/waffling60/rev_e/keyboard.json
226index 4cd2501bbd47aedd21e68eb1b4293e253f2dcf25..9adf6dada3a8f2ad990102f5c8a223714b11718d 100644
227--- a/keyboards/4pplet/waffling60/rev_e/keyboard.json
228+++ b/keyboards/4pplet/waffling60/rev_e/keyboard.json
229@@ -49,7 +49,19 @@
230 "ws2812": {
231 "pin": "A8"
232 },
233- "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_tsangan_hhkb"],
234+ "community_layouts": [
235+ "60_ansi",
236+ "60_ansi_split_bs_rshift",
237+ "60_ansi_tsangan",
238+ "60_ansi_tsangan_split_bs_rshift",
239+ "60_hhkb",
240+ "60_iso",
241+ "60_iso_split_bs_rshift",
242+ "60_iso_tsangan"
243+ ],
244+ "layout_aliases": {
245+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
246+ },
247 "layouts": {
248 "LAYOUT_60_ansi": {
249 "layout": [
250@@ -510,7 +522,7 @@
251 {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
252 ]
253 },
254- "LAYOUT_60_tsangan_hhkb": {
255+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
256 "layout": [
257 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
258 {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
259diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json b/keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json
260index a1b5d0e11eb43b6f52a0a3845df31314f0fe9606..15d3c7cfe9ec44c4fdea903ab828df1dd6163a61 100644
261--- a/keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json
262+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json
263@@ -50,9 +50,12 @@
264 "pin": "A8"
265 },
266 "community_layouts": [
267- "60_tsangan_hhkb",
268+ "60_ansi_tsangan_split_bs_rshift",
269 "60_hhkb"
270 ],
271+ "layout_aliases": {
272+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
273+ },
274 "layouts": {
275 "LAYOUT_all": {
276 "layout": [
277@@ -122,7 +125,7 @@
278 {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
279 ]
280 },
281- "LAYOUT_60_tsangan_hhkb": {
282+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
283 "layout": [
284 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
285 {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
286diff --git a/keyboards/acheron/arctic/keyboard.json b/keyboards/acheron/arctic/keyboard.json
287index cc686be5fa2215da5779cd196926bed406f5022e..5b5768a490cca3000edbcc2eea88dbddd0d727e5 100644
288--- a/keyboards/acheron/arctic/keyboard.json
289+++ b/keyboards/acheron/arctic/keyboard.json
290@@ -29,6 +29,9 @@
291 "diode_direction": "COL2ROW",
292 "processor": "STM32F072",
293 "bootloader": "stm32-dfu",
294+ "layout_aliases": {
295+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
296+ },
297 "layouts": {
298 "LAYOUT_60_ansi_tsangan": {
299 "layout": [
300@@ -98,7 +101,7 @@
301 {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}
302 ]
303 },
304- "LAYOUT_60_tsangan_hhkb": {
305+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
306 "layout": [
307 {"matrix": [0, 0], "x": 0, "y": 0},
308 {"matrix": [0, 1], "x": 1, "y": 0},
309diff --git a/keyboards/acheron/arctic/keymaps/default/keymap.c b/keyboards/acheron/arctic/keymaps/default/keymap.c
310index 041b814bb99a1f2525fe2b044a670e8d7b3a88b1..dc5b32a5f1fe5933fe27b9f1692e12b35592c0f2 100755
311--- a/keyboards/acheron/arctic/keymaps/default/keymap.c
312+++ b/keyboards/acheron/arctic/keymaps/default/keymap.c
313@@ -17,13 +17,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
314 #include QMK_KEYBOARD_H
315
316 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
317- [0] = LAYOUT_60_tsangan_hhkb(
318+ [0] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
319 QK_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,
320 KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS,
321 KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT ,
322 KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_RSFT,
323 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, MO(1) , KC_RCTL ),
324- [1] = LAYOUT_60_tsangan_hhkb(
325+ [1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
326 KC_GRV, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_TRNS, KC_TRNS, KC_DEL, KC_DEL,
327 KC_TRNS, KC_TRNS, KC_UP , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS,
328 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_PGUP, KC_TRNS,
329diff --git a/keyboards/ah/haven60/keyboard.json b/keyboards/ah/haven60/keyboard.json
330index a9c2afb0b3799356d2797942d2b7d14e0b783c77..0eb5d8aa20e9fab080c92c0a512778ef268fc6ef 100644
331--- a/keyboards/ah/haven60/keyboard.json
332+++ b/keyboards/ah/haven60/keyboard.json
333@@ -46,7 +46,20 @@
334 "twinkle": true
335 }
336 },
337- "community_layouts": ["60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
338+ "community_layouts": [
339+ "60_ansi_tsangan",
340+ "60_ansi_tsangan_split_bs_rshift",
341+ "60_ansi_wkl",
342+ "60_ansi_wkl_split_bs_rshift",
343+ "60_hhkb",
344+ "60_iso_tsangan",
345+ "60_iso_tsangan_split_bs_rshift",
346+ "60_iso_wkl",
347+ "60_iso_wkl_split_bs_rshift"
348+ ],
349+ "layout_aliases": {
350+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
351+ },
352 "layouts": {
353 "LAYOUT_all": {
354 "layout": [
355@@ -179,7 +192,7 @@
356 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
357 ]
358 },
359- "LAYOUT_60_tsangan_hhkb": {
360+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
361 "layout": [
362 {"matrix": [0, 0], "x": 0, "y": 0},
363 {"matrix": [0, 1], "x": 1, "y": 0},
364diff --git a/keyboards/ai03/polaris/keyboard.json b/keyboards/ai03/polaris/keyboard.json
365index decedbab3df0fe330db8138434100f0fe6e42335..7e6ab9aec722ffc3dcc89b982d9c0d42f7c47268 100644
366--- a/keyboards/ai03/polaris/keyboard.json
367+++ b/keyboards/ai03/polaris/keyboard.json
368@@ -58,7 +58,14 @@
369 },
370 "processor": "atmega32u4",
371 "bootloader": "atmel-dfu",
372- "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
373+ "community_layouts": [
374+ "60_ansi",
375+ "60_ansi_split_bs_rshift",
376+ "60_ansi_tsangan_split_bs_rshift"
377+ ],
378+ "layout_aliases": {
379+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
380+ },
381 "layouts": {
382 "LAYOUT_all": {
383 "layout": [
384@@ -274,7 +281,7 @@
385 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
386 ]
387 },
388- "LAYOUT_60_tsangan_hhkb": {
389+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
390 "layout": [
391 {"matrix": [0, 0], "x": 0, "y": 0},
392 {"matrix": [0, 1], "x": 1, "y": 0},
393diff --git a/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/keymap.c b/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/keymap.c
394index 10190e13c48d5ba1e7f96672e9666d88136d20da..ff4a61e4e4b8c3352470540220d7f0f1b34ba162 100644
395--- a/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/keymap.c
396+++ b/keyboards/ai03/polaris/keymaps/default_ansi_tsangan/keymap.c
397@@ -21,14 +21,14 @@ enum layer_names {
398 };
399
400 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
401- [_BASE] = LAYOUT_60_tsangan_hhkb( /* Base */
402+ [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift( /* Base */
403 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
404 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
405 MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
406 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_DEL,
407 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
408 ),
409- [_FN] = LAYOUT_60_tsangan_hhkb( /* FN */
410+ [_FN] = LAYOUT_60_ansi_tsangan_split_bs_rshift( /* FN */
411 QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC,
412 _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP,
413 _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
414diff --git a/keyboards/alas/keyboard.json b/keyboards/alas/keyboard.json
415index b5617189dec038e82bc92af037b13290e438334f..41fa879a69aa674c35cb8bc9710f506f9040fcfc 100755
416--- a/keyboards/alas/keyboard.json
417+++ b/keyboards/alas/keyboard.json
418@@ -25,7 +25,18 @@
419 "diode_direction": "COL2ROW",
420 "processor": "STM32F072",
421 "bootloader": "stm32-dfu",
422- "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_tsangan_hhkb"],
423+ "community_layouts": [
424+ "60_ansi",
425+ "60_ansi_split_bs_rshift",
426+ "60_ansi_tsangan",
427+ "60_ansi_tsangan_split_bs_rshift",
428+ "60_iso",
429+ "60_iso_split_bs_rshift",
430+ "60_iso_tsangan"
431+ ],
432+ "layout_aliases": {
433+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
434+ },
435 "layouts": {
436 "LAYOUT_all": {
437 "layout": [
438@@ -518,7 +529,7 @@
439 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
440 ]
441 },
442- "LAYOUT_60_tsangan_hhkb": {
443+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
444 "layout": [
445 {"matrix": [0, 0], "x": 0, "y": 0},
446 {"matrix": [0, 1], "x": 1, "y": 0},
447diff --git a/keyboards/ares/keyboard.json b/keyboards/ares/keyboard.json
448index 389456570277d740011400494782da1778bb1ba1..f1e650397ebf09d729bc861920d3455e1ef12329 100644
449--- a/keyboards/ares/keyboard.json
450+++ b/keyboards/ares/keyboard.json
451@@ -52,9 +52,24 @@
452 "processor": "atmega32a",
453 "bootloader": "bootloadhid",
454 "layout_aliases": {
455- "LAYOUT": "LAYOUT_all"
456+ "LAYOUT": "LAYOUT_all",
457+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
458 },
459diff --git a/keyboards/argyle/keyboard.json b/keyboards/argyle/keyboard.json
460index 82dbe1562af42bb49c1f8efc3041e76e3dce2daf..a7bfc335df9968797d7b603e2775f34ba8727051 100755
461--- a/keyboards/argyle/keyboard.json
462+++ b/keyboards/argyle/keyboard.json
463@@ -45,7 +45,7 @@
464 "60_ansi",
465 "60_ansi_split_bs_rshift",
466 "60_ansi_tsangan",
467- "60_tsangan_hhkb",
468+ "60_ansi_tsangan_split_bs_rshift",
469 "60_ansi_wkl",
470 "60_ansi_wkl_split_bs_rshift",
471 "60_hhkb",
472@@ -56,6 +56,9 @@
473 "60_iso_wkl",
474 "60_iso_wkl_split_bs_rshift"
475 ],
476+ "layout_aliases": {
477+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
478+ },
479 "layouts": {
480 "LAYOUT_60_ansi": {
481 "layout": [
482@@ -837,7 +840,7 @@
483 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
484 ]
485 },
486- "LAYOUT_60_tsangan_hhkb": {
487+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
488 "layout": [
489 {"matrix": [0, 0], "x": 0, "y": 0},
490 {"matrix": [0, 1], "x": 1, "y": 0},
491diff --git a/keyboards/atxkb/1894/keyboard.json b/keyboards/atxkb/1894/keyboard.json
492index 5abaf88eb0bc5623564cfd05c4424d2e60cd5589..878c3d998c16b2b71d7745d4c5b235a44dcdae79 100644
493--- a/keyboards/atxkb/1894/keyboard.json
494+++ b/keyboards/atxkb/1894/keyboard.json
495@@ -60,7 +60,14 @@
496 },
497 "processor": "atmega32u4",
498 "bootloader": "atmel-dfu",
499- "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
500+ "community_layouts": [
501+ "60_ansi",
502+ "60_ansi_split_bs_rshift",
503+ "60_ansi_tsangan_split_bs_rshift"
504+ ],
505+ "layout_aliases": {
506+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
507+ },
508 "layouts": {
509 "LAYOUT_all": {
510 "layout": [
511@@ -276,7 +283,7 @@
512 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
513 ]
514 },
515- "LAYOUT_60_tsangan_hhkb": {
516+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
517 "layout": [
518 {"matrix": [0, 0], "x": 0, "y": 0},
519 {"matrix": [0, 1], "x": 1, "y": 0},
520diff --git a/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/keymap.c b/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/keymap.c
521index 10190e13c48d5ba1e7f96672e9666d88136d20da..ff4a61e4e4b8c3352470540220d7f0f1b34ba162 100644
522--- a/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/keymap.c
523+++ b/keyboards/atxkb/1894/keymaps/default_ansi_tsangan/keymap.c
524@@ -21,14 +21,14 @@ enum layer_names {
525 };
526
527 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
528- [_BASE] = LAYOUT_60_tsangan_hhkb( /* Base */
529+ [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift( /* Base */
530 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
531 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
532 MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
533 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_DEL,
534 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
535 ),
536- [_FN] = LAYOUT_60_tsangan_hhkb( /* FN */
537+ [_FN] = LAYOUT_60_ansi_tsangan_split_bs_rshift( /* FN */
538 QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC,
539 _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, BL_STEP,
540 _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
541diff --git a/keyboards/bioi/f60/keyboard.json b/keyboards/bioi/f60/keyboard.json
542index 9adbb2f48abc4694a17e07d9c3e7081ea91d6ff7..8974a68e027b00889ec4dcf7eb166448b8c843b4 100644
543--- a/keyboards/bioi/f60/keyboard.json
544+++ b/keyboards/bioi/f60/keyboard.json
545@@ -53,7 +53,20 @@
546 },
547 "processor": "atmega32u4",
548 "bootloader": "atmel-dfu",
549- "community_layouts": ["60_ansi", "60_ansi_tsangan", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb", "60_ansi_arrow", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"],
550+ "community_layouts": [
551+ "60_ansi",
552+ "60_ansi_arrow",
553+ "60_ansi_split_bs_rshift",
554+ "60_ansi_tsangan",
555+ "60_ansi_tsangan_split_bs_rshift",
556+ "60_hhkb",
557+ "60_iso",
558+ "60_iso_split_bs_rshift",
559+ "60_iso_tsangan"
560+ ],
561+ "layout_aliases": {
562+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
563+ },
564 "layouts": {
565 "LAYOUT_all": {
566 "layout": [
567@@ -406,7 +419,7 @@
568 {"matrix": [4, 12], "x": 12.5, "y": 4}
569 ]
570 },
571- "LAYOUT_60_tsangan_hhkb": {
572+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
573 "layout": [
574 {"matrix": [0, 0], "x": 0, "y": 0},
575 {"matrix": [0, 1], "x": 1, "y": 0},
576diff --git a/keyboards/bioi/g60/keyboard.json b/keyboards/bioi/g60/keyboard.json
577index b98aee8273f11d5b1517ed867979c0091e809186..4140abfbe2f7ff1733de750d4bcf03e63b5a136e 100644
578--- a/keyboards/bioi/g60/keyboard.json
579+++ b/keyboards/bioi/g60/keyboard.json
580@@ -64,6 +64,9 @@
581 },
582 "processor": "atmega32u4",
583 "bootloader": "qmk-dfu",
584+ "layout_aliases": {
585+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
586+ },
587 "layouts": {
588 "LAYOUT_all": {
589 "layout": [
590@@ -282,7 +285,7 @@
591 {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
592 ]
593 },
594- "LAYOUT_60_tsangan_hhkb": {
595+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
596 "layout": [
597 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
598 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
599@@ -496,7 +499,7 @@
600 {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
601 ]
602 },
603- "LAYOUT_60_tsangan_hhkb_iso": {
604+ "LAYOUT_60_iso_tsangan_split_bs_rshift": {
605 "layout": [
606 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
607 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
608diff --git a/keyboards/bioi/g60ble/keyboard.json b/keyboards/bioi/g60ble/keyboard.json
609index 2d09fadff088b3f14130dca684d5dec40f7c52dc..8b24556b37fc07ea68d5a9417be20473108f976d 100644
610--- a/keyboards/bioi/g60ble/keyboard.json
611+++ b/keyboards/bioi/g60ble/keyboard.json
612@@ -60,7 +60,16 @@
613 },
614 "processor": "atmega32u4",
615 "bootloader": "qmk-dfu",
616- "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
617+ "community_layouts": [
618+ "60_ansi",
619+ "60_ansi_split_bs_rshift",
620+ "60_ansi_tsangan_split_bs_rshift",
621+ "60_hhkb",
622+ "60_iso"
623+ ],
624+ "layout_aliases": {
625+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
626+ },
627 "layouts": {
628 "LAYOUT_all": {
629 "layout": [
630@@ -415,7 +424,7 @@
631 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
632 ]
633 },
634- "LAYOUT_60_tsangan_hhkb": {
635+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
636 "layout": [
637 {"matrix": [0, 0], "x": 0, "y": 0},
638 {"matrix": [0, 1], "x": 1, "y": 0},
639diff --git a/keyboards/blank/blank01/keyboard.json b/keyboards/blank/blank01/keyboard.json
640index f8af736bef883d08731d15342a4fed8b379b1119..672a292def34f5f8b24fc3f35b0dfbe05f6c3c2e 100644
641--- a/keyboards/blank/blank01/keyboard.json
642+++ b/keyboards/blank/blank01/keyboard.json
643@@ -32,8 +32,11 @@
644 },
645 "processor": "atmega32u4",
646 "bootloader": "atmel-dfu",
647+ "layout_aliases": {
648+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
649+ },
650 "layouts": {
651- "LAYOUT_60_tsangan_hhkb": {
652+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
653 "layout": [
654 {"matrix": [0, 0], "x": 0, "y": 0},
655 {"matrix": [0, 1], "x": 1, "y": 0},
656diff --git a/keyboards/blank/blank01/keymaps/default/keymap.c b/keyboards/blank/blank01/keymaps/default/keymap.c
657index 2e2a863f278ba3a808e519378c509cc2b773765e..03f8987fa7e3922dacd376aceac78bb578b9bf04 100644
658--- a/keyboards/blank/blank01/keymaps/default/keymap.c
659+++ b/keyboards/blank/blank01/keymaps/default/keymap.c
660@@ -18,7 +18,7 @@
661 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
662
663 // Default layer
664- [0] = LAYOUT_60_tsangan_hhkb(
665+ [0] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
666 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
667 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
668 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
669@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
670 ),
671
672 // Fn1 Layer
673- [1] = LAYOUT_60_tsangan_hhkb(
674+ [1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
675 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
676 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
677 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS,
678diff --git a/keyboards/buildakb/mw60/keyboard.json b/keyboards/buildakb/mw60/keyboard.json
679index 9a8b7955a85b19eeebbce79d3308d91d60c00800..9969768345be25ee577e39ab0b1b42d357077688 100644
680--- a/keyboards/buildakb/mw60/keyboard.json
681+++ b/keyboards/buildakb/mw60/keyboard.json
682@@ -23,7 +23,24 @@
683 "pid": "0x0004",
684 "vid": "0x4A56"
685 },
686diff --git a/keyboards/cannonkeys/an_c/keyboard.json b/keyboards/cannonkeys/an_c/keyboard.json
687index ea127998710651ca0eeef99f7eb71518db988352..29225da183f55839c684c11fc37d4da582e99d56 100644
688--- a/keyboards/cannonkeys/an_c/keyboard.json
689+++ b/keyboards/cannonkeys/an_c/keyboard.json
690@@ -55,7 +55,10 @@
691 "resync": true
692 }
693 },
694- "community_layouts": ["60_ansi", "60_tsangan_hhkb"],
695+ "community_layouts": ["60_ansi", "60_ansi_tsangan_split_bs_rshift"],
696+ "layout_aliases": {
697+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
698+ },
699 "layouts": {
700 "LAYOUT_60_ansi": {
701 "layout": [
702@@ -126,7 +129,7 @@
703 {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
704 ]
705 },
706- "LAYOUT_60_tsangan_hhkb": {
707+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
708 "layout": [
709 {"matrix": [0, 0], "x": 0, "y": 0},
710 {"matrix": [0, 1], "x": 1, "y": 0},
711diff --git a/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c
712index ac3e794880f264f932edcee58bce7228dbf2162d..9d799168358579212b5d5c1f143ab5d2e9adb770 100644
713--- a/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c
714+++ b/keyboards/cannonkeys/an_c/keymaps/tsangan/keymap.c
715@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
716
717
718 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
719- [_BASE] = LAYOUT_60_tsangan_hhkb(
720+ [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
721 QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
722 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
723 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
724@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
725 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
726 ),
727
728- [_FN1] = LAYOUT_60_tsangan_hhkb(
729+ [_FN1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
730 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
731 UG_TOGG, UG_NEXT, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
732 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
733diff --git a/keyboards/cannonkeys/bastion60/keyboard.json b/keyboards/cannonkeys/bastion60/keyboard.json
734index 07443b50b780eadb01d7f4719ee19fca552b8c58..26cf507984cc62fd078c8b4d9b0eb1cceda4ccba 100644
735--- a/keyboards/cannonkeys/bastion60/keyboard.json
736+++ b/keyboards/cannonkeys/bastion60/keyboard.json
737@@ -53,12 +53,16 @@
738 "60_ansi",
739 "60_ansi_split_bs_rshift",
740 "60_ansi_tsangan",
741- "60_tsangan_hhkb",
742+ "60_ansi_tsangan_split_bs_rshift",
743 "60_hhkb",
744 "60_iso",
745 "60_iso_split_bs_rshift",
746- "60_iso_tsangan"
747+ "60_iso_tsangan",
748+ "60_iso_tsangan_split_bs_rshift"
749 ],
750+ "layout_aliases": {
751+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
752+ },
753 "layouts": {
754 "LAYOUT_60_ansi": {
755 "layout": [
756@@ -260,7 +264,7 @@
757 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
758 ]
759 },
760- "LAYOUT_60_tsangan_hhkb": {
761+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
762 "layout": [
763 {"matrix": [0, 0], "x": 0, "y": 0},
764 {"matrix": [0, 1], "x": 1, "y": 0},
765diff --git a/keyboards/cannonkeys/brutalv2_60/keyboard.json b/keyboards/cannonkeys/brutalv2_60/keyboard.json
766index 3ee5f0d576b90a6a702444c224e807ab58e42fcc..923be17c9af703d7d04f814b2f16fca13c8eca6a 100644
767--- a/keyboards/cannonkeys/brutalv2_60/keyboard.json
768+++ b/keyboards/cannonkeys/brutalv2_60/keyboard.json
769@@ -29,12 +29,16 @@
770 "60_ansi",
771 "60_ansi_split_bs_rshift",
772 "60_ansi_tsangan",
773- "60_tsangan_hhkb",
774+ "60_ansi_tsangan_split_bs_rshift",
775 "60_hhkb",
776 "60_iso",
777 "60_iso_split_bs_rshift",
778- "60_iso_tsangan"
779+ "60_iso_tsangan",
780+ "60_iso_tsangan_split_bs_rshift"
781 ],
782+ "layout_aliases": {
783+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
784+ },
785 "layouts": {
786 "LAYOUT_all": {
787 "layout": [
788@@ -300,7 +304,7 @@
789 {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
790 ]
791 },
792- "LAYOUT_60_tsangan_hhkb": {
793+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
794 "layout": [
795 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
796 {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
797diff --git a/keyboards/cannonkeys/db60/hotswap/keyboard.json b/keyboards/cannonkeys/db60/hotswap/keyboard.json
798index d272b35a0f67ce1a30ece4c43321b30790f6a403..dfed24c5654ce41b6282145a91bb3c3dd2afaba6 100644
799--- a/keyboards/cannonkeys/db60/hotswap/keyboard.json
800+++ b/keyboards/cannonkeys/db60/hotswap/keyboard.json
801@@ -3,7 +3,13 @@
802 "usb": {
803 "pid": "0xDB62"
804 },
805- "community_layouts": ["60_ansi", "60_tsangan_hhkb"],
806+ "community_layouts": [
807+ "60_ansi",
808+ "60_ansi_tsangan_split_bs_rshift"
809+ ],
810+ "layout_aliases": {
811+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
812+ },
813 "layouts": {
814 "LAYOUT_60_ansi": {
815 "layout": [
816@@ -74,7 +80,7 @@
817 {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
818 ]
819 },
820- "LAYOUT_60_tsangan_hhkb": {
821+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
822 "layout": [
823 {"x": 0, "y": 0, "matrix": [0, 0]},
824 {"x": 1, "y": 0, "matrix": [0, 1]},
825diff --git a/keyboards/cannonkeys/db60/j02/keyboard.json b/keyboards/cannonkeys/db60/j02/keyboard.json
826index 0778b604fffac4bdcc023bd49d3053e8b57821cf..bb693bcfc048e333af3e33f9547222cbf1e78492 100644
827--- a/keyboards/cannonkeys/db60/j02/keyboard.json
828+++ b/keyboards/cannonkeys/db60/j02/keyboard.json
829@@ -3,7 +3,14 @@
830 "usb": {
831 "pid": "0xDB60"
832 },
833- "community_layouts": ["60_ansi", "60_tsangan_hhkb", "60_iso"],
834+ "community_layouts": [
835+ "60_ansi",
836+ "60_ansi_tsangan_split_bs_rshift",
837+ "60_iso"
838+ ],
839+ "layout_aliases": {
840+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
841+ },
842 "layouts": {
843 "LAYOUT_60_ansi": {
844 "layout": [
845@@ -74,7 +81,7 @@
846 {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
847 ]
848 },
849- "LAYOUT_60_tsangan_hhkb": {
850+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
851 "layout": [
852 {"x": 0, "y": 0, "matrix": [0, 0]},
853 {"x": 1, "y": 0, "matrix": [0, 1]},
854diff --git a/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c
855index 279b238547ea84079d9092d6c6f7a6748fa93d95..f82afc8b32329615081b11d9ae05e8454f81e3f4 100644
856--- a/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c
857+++ b/keyboards/cannonkeys/db60/keymaps/tsangan/keymap.c
858@@ -28,7 +28,7 @@ enum layer_names {
859
860
861 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
862- [_BASE] = LAYOUT_60_tsangan_hhkb(
863+ [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
864 QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
865 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
866 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
867@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
868 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
869 ),
870
871- [_FN1] = LAYOUT_60_tsangan_hhkb(
872+ [_FN1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
873 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
874 UG_TOGG, UG_NEXT, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
875 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
876diff --git a/keyboards/cannonkeys/db60/rev2/keyboard.json b/keyboards/cannonkeys/db60/rev2/keyboard.json
877index dc45ffecd50f4ded4d6b8f1d65d428d70e474f2b..81fc8208d560d2b2041dc9cb0653a9deb50241be 100644
878--- a/keyboards/cannonkeys/db60/rev2/keyboard.json
879+++ b/keyboards/cannonkeys/db60/rev2/keyboard.json
880@@ -3,7 +3,14 @@
881 "usb": {
882 "pid": "0xDB61"
883 },
884- "community_layouts": ["60_ansi", "60_tsangan_hhkb", "60_iso"],
885+ "community_layouts": [
886+ "60_ansi",
887+ "60_ansi_tsangan_split_bs_rshift",
888+ "60_iso"
889+ ],
890+ "layout_aliases": {
891+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
892+ },
893 "layouts": {
894 "LAYOUT_60_ansi": {
895 "layout": [
896@@ -74,7 +81,7 @@
897 {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
898 ]
899 },
900- "LAYOUT_60_tsangan_hhkb": {
901+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
902 "layout": [
903 {"x": 0, "y": 0, "matrix": [0, 0]},
904 {"x": 1, "y": 0, "matrix": [0, 1]},
905diff --git a/keyboards/cannonkeys/ellipse/keyboard.json b/keyboards/cannonkeys/ellipse/keyboard.json
906index 2f35c453516a8772b66304d8603b9b6fb6b0fd0c..c7e37befbdc7f01d1b5c837fa918c4e8169fd31d 100644
907--- a/keyboards/cannonkeys/ellipse/keyboard.json
908+++ b/keyboards/cannonkeys/ellipse/keyboard.json
909@@ -37,11 +37,15 @@
910 "60_ansi",
911 "60_ansi_split_bs_rshift",
912 "60_ansi_tsangan",
913- "60_tsangan_hhkb",
914+ "60_ansi_tsangan_split_bs_rshift",
915 "60_iso",
916 "60_iso_split_bs_rshift",
917- "60_iso_tsangan"
918+ "60_iso_tsangan",
919+ "60_iso_tsangan_split_bs_rshift"
920 ],
921+ "layout_aliases": {
922+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
923+ },
924 "layouts": {
925 "LAYOUT_all": {
926 "layout": [
927@@ -324,7 +328,7 @@
928 {"label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4.0, "w": 1.5}
929 ]
930 },
931- "LAYOUT_60_tsangan_hhkb": {
932+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
933 "layout": [
934 {"label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0},
935 {"label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0},
936diff --git a/keyboards/cannonkeys/ellipse_hs/keyboard.json b/keyboards/cannonkeys/ellipse_hs/keyboard.json
937index 098882fcc3ba15a503becb92a4069ab2e61fb263..da79dea27af72637325f206d2afdecb58c2e48e7 100644
938--- a/keyboards/cannonkeys/ellipse_hs/keyboard.json
939+++ b/keyboards/cannonkeys/ellipse_hs/keyboard.json
940@@ -24,13 +24,14 @@
941 "pid": "0x0016"
942 },
943 "layout_aliases": {
944- "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
945+ "LAYOUT_all": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
946+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
947 },
948 "community_layouts": [
949- "60_tsangan_hhkb"
950+ "60_ansi_tsangan_split_bs_rshift"
951 ],
952 "layouts": {
953- "LAYOUT_60_tsangan_hhkb": {
954+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
955 "layout": [
956 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
957 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
958diff --git a/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
959index 3d829466c3699557fd42ecaca4662611eb0734df..e4e3af2dabd753df7f62ab546447acb8269b41ce 100644
960--- a/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
961+++ b/keyboards/cannonkeys/ellipse_hs/keymaps/default/keymap.c
962@@ -12,7 +12,7 @@ enum layer_names {
963
964 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
965
966- [_BASE] = LAYOUT_60_tsangan_hhkb(
967+ [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
968 QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
969 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
970 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
971@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
972 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
973 ),
974
975- [_FN1] = LAYOUT_60_tsangan_hhkb(
976+ [_FN1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
977 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
978 _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
979 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
980@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
981 _______, _______, _______, _______, _______, _______, QK_BOOT
982 ),
983
984- [_FN2] = LAYOUT_60_tsangan_hhkb(
985+ [_FN2] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
986 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
987 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
988 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
989@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
990 _______, _______, _______, _______, _______, _______, _______
991 ),
992
993- [_FN3] = LAYOUT_60_tsangan_hhkb(
994+ [_FN3] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
995 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
996 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
997 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
998diff --git a/keyboards/cannonkeys/instant60/keyboard.json b/keyboards/cannonkeys/instant60/keyboard.json
999index 3261a82f28b1e0c272cd2d4d62bb134cba61d65b..f802823709b5e728121e3c9cc09db016c2e2b460 100644
1000--- a/keyboards/cannonkeys/instant60/keyboard.json
1001+++ b/keyboards/cannonkeys/instant60/keyboard.json
1002@@ -55,7 +55,13 @@
1003 "resync": true
1004 }
1005 },
1006- "community_layouts": ["60_ansi", "60_tsangan_hhkb"],
1007+ "community_layouts": [
1008+ "60_ansi",
1009+ "60_ansi_tsangan_split_bs_rshift"
1010+ ],
1011+ "layout_aliases": {
1012+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
1013+ },
1014 "layouts": {
1015 "LAYOUT_60_ansi": {
1016 "layout": [
1017@@ -126,7 +132,7 @@
1018 {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
1019 ]
1020 },
1021- "LAYOUT_60_tsangan_hhkb": {
1022+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
1023 "layout": [
1024 {"matrix": [0, 0], "x": 0, "y": 0},
1025 {"matrix": [0, 1], "x": 1, "y": 0},
1026diff --git a/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c
1027index dc04a39c5e69f94d986c8e9589c6808cbc403255..c9e5d9ba16ef673b9771e09c29e1a36c76247156 100644
1028--- a/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c
1029+++ b/keyboards/cannonkeys/instant60/keymaps/tsangan/keymap.c
1030@@ -30,7 +30,7 @@ enum custom_keycodes {
1031 };
1032
1033 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1034- [_BASE] = LAYOUT_60_tsangan_hhkb(
1035+ [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1036 QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
1037 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
1038 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
1039@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1040 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
1041 ),
1042
1043- [_FN1] = LAYOUT_60_tsangan_hhkb(
1044+ [_FN1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1045 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
1046 UG_TOGG, UG_NEXT, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1047 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1048diff --git a/keyboards/cannonkeys/leviatan/keyboard.json b/keyboards/cannonkeys/leviatan/keyboard.json
1049index 7e8d6c6fdd12424637a5604694c3fbf3b7830613..c929447e89d5fdbf3804363b70699fc36fe7bbee 100644
1050--- a/keyboards/cannonkeys/leviatan/keyboard.json
1051+++ b/keyboards/cannonkeys/leviatan/keyboard.json
1052@@ -23,7 +23,14 @@
1053 "diode_direction": "COL2ROW",
1054 "processor": "STM32F072",
1055 "bootloader": "stm32-dfu",
1056- "community_layouts": ["60_ansi", "60_tsangan_hhkb", "60_iso"],
1057+ "community_layouts": [
1058+ "60_ansi",
1059+ "60_ansi_tsangan_split_bs_rshift",
1060+ "60_iso"
1061+ ],
1062+ "layout_aliases": {
1063+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
1064+ },
1065 "layouts": {
1066 "LAYOUT_60_ansi": {
1067 "layout": [
1068@@ -94,7 +101,7 @@
1069 {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
1070 ]
1071 },
1072- "LAYOUT_60_tsangan_hhkb": {
1073+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
1074 "layout": [
1075 {"x": 0, "y": 0, "matrix": [0, 0]},
1076 {"x": 1, "y": 0, "matrix": [0, 1]},
1077diff --git a/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c
1078index c735160c3d64d5f053b7d8d3c36853e5c0e34d10..30d1781fe65ea4103204ecf047ed7c266b8ae936 100644
1079--- a/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c
1080+++ b/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c
1081@@ -28,7 +28,7 @@ enum layer_names {
1082
1083
1084 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1085- [_BASE] = LAYOUT_60_tsangan_hhkb(
1086+ [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1087 QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
1088 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
1089 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
1090@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1091 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
1092 ),
1093
1094- [_FN1] = LAYOUT_60_tsangan_hhkb(
1095+ [_FN1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1096 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
1097 _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1098 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1099diff --git a/keyboards/cannonkeys/moment/keyboard.json b/keyboards/cannonkeys/moment/keyboard.json
1100index 4e489a7d9732a418d3deda10367c6e4c5b08dee9..4aec3c9c060e4fa9b22135e190c56562fc1863f2 100644
1101--- a/keyboards/cannonkeys/moment/keyboard.json
1102+++ b/keyboards/cannonkeys/moment/keyboard.json
1103@@ -35,9 +35,13 @@
1104 },
1105 "community_layouts": [
1106 "60_ansi_tsangan",
1107- "60_tsangan_hhkb",
1108- "60_iso_tsangan"
1109+ "60_ansi_tsangan_split_bs_rshift",
1110+ "60_iso_tsangan",
1111+ "60_iso_tsangan_split_bs_rshift"
1112 ],
1113+ "layout_aliases": {
1114+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
1115+ },
1116 "layouts": {
1117 "LAYOUT_all": {
1118 "layout": [
1119@@ -179,7 +183,7 @@
1120 {"label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4.0, "w": 1.5}
1121 ]
1122 },
1123- "LAYOUT_60_tsangan_hhkb": {
1124+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
1125 "layout": [
1126 {"label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0},
1127 {"label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0},
1128@@ -318,7 +322,7 @@
1129 {"label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4.0, "w": 1.5}
1130 ]
1131 },
1132- "LAYOUT_60_tsangan_hhkb_iso": {
1133+ "LAYOUT_60_iso_tsangan_split_bs_rshift": {
1134 "layout": [
1135 {"label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0},
1136 {"label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0},
1137diff --git a/keyboards/cannonkeys/moment_hs/keyboard.json b/keyboards/cannonkeys/moment_hs/keyboard.json
1138index c83c5e7a9d7ee8af8be44c3c78bcde9b2ea3a3d0..dc1f6503227a7c45fdce54f4fd474efe838b71c6 100644
1139--- a/keyboards/cannonkeys/moment_hs/keyboard.json
1140+++ b/keyboards/cannonkeys/moment_hs/keyboard.json
1141@@ -28,13 +28,14 @@
1142 "pid": "0x0013"
1143 },
1144 "layout_aliases": {
1145- "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
1146+ "LAYOUT_all": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
1147+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
1148 },
1149 "community_layouts": [
1150- "60_tsangan_hhkb"
1151+ "60_ansi_tsangan_split_bs_rshift"
1152 ],
1153 "layouts": {
1154- "LAYOUT_60_tsangan_hhkb": {
1155+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
1156 "layout": [
1157 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
1158 {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
1159diff --git a/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
1160index 3d829466c3699557fd42ecaca4662611eb0734df..e4e3af2dabd753df7f62ab546447acb8269b41ce 100644
1161--- a/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
1162+++ b/keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
1163@@ -12,7 +12,7 @@ enum layer_names {
1164
1165 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1166
1167- [_BASE] = LAYOUT_60_tsangan_hhkb(
1168+ [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1169 QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
1170 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
1171 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
1172@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1173 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
1174 ),
1175
1176- [_FN1] = LAYOUT_60_tsangan_hhkb(
1177+ [_FN1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1178 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
1179 _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1180 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1181@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1182 _______, _______, _______, _______, _______, _______, QK_BOOT
1183 ),
1184
1185- [_FN2] = LAYOUT_60_tsangan_hhkb(
1186+ [_FN2] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1187 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1188 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1189 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1190@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1191 _______, _______, _______, _______, _______, _______, _______
1192 ),
1193
1194- [_FN3] = LAYOUT_60_tsangan_hhkb(
1195+ [_FN3] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1196 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1197 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1198 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1199diff --git a/keyboards/cannonkeys/vector/keyboard.json b/keyboards/cannonkeys/vector/keyboard.json
1200index 09fd5b601fd52d2576a2541654a2d47fa234e7be..46fc0b4578012add384eb176b4ba38501ec87baa 100644
1201--- a/keyboards/cannonkeys/vector/keyboard.json
1202+++ b/keyboards/cannonkeys/vector/keyboard.json
1203@@ -29,9 +29,13 @@
1204 },
1205 "community_layouts": [
1206 "60_ansi_tsangan",
1207- "60_tsangan_hhkb",
1208- "60_iso_tsangan"
1209+ "60_ansi_tsangan_split_bs_rshift",
1210+ "60_iso_tsangan",
1211+ "60_iso_tsangan_split_bs_rshift"
1212 ],
1213+ "layout_aliases": {
1214+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
1215+ },
1216 "layouts": {
1217 "LAYOUT_all": {
1218 "layout": [
1219@@ -174,7 +178,7 @@
1220 {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
1221 ]
1222 },
1223- "LAYOUT_60_tsangan_hhkb": {
1224+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
1225 "layout": [
1226 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
1227 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
1228diff --git a/keyboards/checkerboards/g_idb60/keyboard.json b/keyboards/checkerboards/g_idb60/keyboard.json
1229index b4fc0f9b6d90d1615872c21fa576202ae24a604e..16f70dc8683e8a7a624f344c093d385b00eba0f6 100644
1230--- a/keyboards/checkerboards/g_idb60/keyboard.json
1231+++ b/keyboards/checkerboards/g_idb60/keyboard.json
1232@@ -30,11 +30,12 @@
1233 "processor": "atmega32u4",
1234 "bootloader": "atmel-dfu",
1235 "layout_aliases": {
1236- "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
1237+ "LAYOUT_all": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
1238+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
1239 },
1240 "community_layouts": [
1241 "60_ansi_tsangan",
1242- "60_tsangan_hhkb"
1243+ "60_ansi_tsangan_split_bs_rshift"
1244 ],
1245 "layouts": {
1246 "LAYOUT_60_ansi_tsangan": {
1247@@ -105,7 +106,7 @@
1248 {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
1249 ]
1250 },
1251- "LAYOUT_60_tsangan_hhkb": {
1252+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
1253 "layout": [
1254 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
1255 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
1256diff --git a/keyboards/checkerboards/g_idb60/keymaps/default/keymap.c b/keyboards/checkerboards/g_idb60/keymaps/default/keymap.c
1257index f49a3ff09d54bab865040039e3d87ee4ed7c0de4..8f78394753526b353b05fde989016cac9fd488ec 100644
1258--- a/keyboards/checkerboards/g_idb60/keymaps/default/keymap.c
1259+++ b/keyboards/checkerboards/g_idb60/keymaps/default/keymap.c
1260@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1261 * |Ctrl |GUI |Alt | Space |Alt |GUI |Ctrl |
1262 * `-------------------------------------------------------------'
1263 */
1264- [0] = LAYOUT_60_tsangan_hhkb(
1265+ [0] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1266 QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
1267 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
1268 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
1269@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1270 * | | | | | | |QK_BOOT |
1271 * `------------------------------------------------------------------------------'
1272 */
1273- [1] = LAYOUT_60_tsangan_hhkb(
1274+ [1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1275 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
1276 _______,_______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1277 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1278@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1279 * | | | | | | |QK_BOOT |
1280 * `------------------------------------------------------------------------------'
1281 */
1282- [2] = LAYOUT_60_tsangan_hhkb(
1283+ [2] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1284 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
1285 _______,_______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1286 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1287diff --git a/keyboards/checkerboards/nop60/keyboard.json b/keyboards/checkerboards/nop60/keyboard.json
1288index a07c2af3bc5847ccfdcbcaf99a0d5e59aa783d13..9b86a3936a447d3031c05b48f6644613679afe48 100644
1289--- a/keyboards/checkerboards/nop60/keyboard.json
1290+++ b/keyboards/checkerboards/nop60/keyboard.json
1291@@ -59,11 +59,12 @@
1292 "processor": "atmega32u4",
1293 "bootloader": "atmel-dfu",
1294 "layout_aliases": {
1295- "LAYOUT_2x3u": "LAYOUT_60_tsangan_hhkb_split_space",
1296- "LAYOUT_7u": "LAYOUT_60_tsangan_hhkb"
1297+ "LAYOUT_2x3u": "LAYOUT_60_ansi_tsangan_split_bs_rshift_split_space",
1298+ "LAYOUT_7u": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
1299+ "LAYOUT_60_tsangan_hhkb_split_space": "LAYOUT_60_ansi_tsangan_split_bs_rshift_split_space"
1300 },
1301 "layouts": {
1302- "LAYOUT_60_tsangan_hhkb_split_space": {
1303+ "LAYOUT_60_ansi_tsangan_split_bs_rshift_split_space": {
1304 "layout": [
1305 {"matrix": [0, 0], "x": 0, "y": 0},
1306 {"matrix": [0, 1], "x": 1, "y": 0},
1307@@ -135,7 +136,7 @@
1308 {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
1309 ]
1310 },
1311- "LAYOUT_60_tsangan_hhkb": {
1312+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
1313 "layout": [
1314 {"matrix": [0, 0], "x": 0, "y": 0},
1315 {"matrix": [0, 1], "x": 1, "y": 0},
1316diff --git a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
1317index 6cf55851fd528901293b65c12ccf8c557d2cc6bf..8443807d5ff2df5cdd7be1c88b60c599c122d01d 100644
1318--- a/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
1319+++ b/keyboards/checkerboards/nop60/keymaps/7u/keymap.c
1320@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1321 * |Ctrl |GUI |Alt | Space |Alt |GUI |Ctrl |
1322 * `-------------------------------------------------------------'
1323 */
1324- [0] = LAYOUT_60_tsangan_hhkb(
1325+ [0] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1326 QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
1327 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
1328 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
1329@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1330 * | | | | | | |QK_BOOT |
1331 * `------------------------------------------------------------------------------'
1332 */
1333- [1] = LAYOUT_60_tsangan_hhkb(
1334+ [1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1335 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
1336 UG_TOGG, UG_NEXT, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1337 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1338@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1339 * | | | | | | |QK_BOOT |
1340 * `------------------------------------------------------------------------------'
1341 */
1342- [2] = LAYOUT_60_tsangan_hhkb(
1343+ [2] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
1344 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
1345 UG_TOGG, UG_NEXT, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1346 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1347diff --git a/keyboards/checkerboards/nop60/keymaps/default/keymap.c b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
1348index 6c64d98c1223a1cfaaf28625b910efeff59da484..9a8fb4f8b794d374f9fb03f389776b0d54e2a075 100644
1349--- a/keyboards/checkerboards/nop60/keymaps/default/keymap.c
1350+++ b/keyboards/checkerboards/nop60/keymaps/default/keymap.c
1351@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1352 * |Ctrl |GUI |Alt |Space |BLTOG |Space |Alt |GUI |Ctrl |
1353 * `-------------------------------------------------------------'
1354 */
1355- [0] = LAYOUT_60_tsangan_hhkb_split_space(
1356+ [0] = LAYOUT_60_ansi_tsangan_split_bs_rshift_split_space(
1357 QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
1358 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
1359 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
1360@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1361 * | | | | | | | | |QK_BOOT |
1362 * `------------------------------------------------------------------------------'
1363 */
1364- [1] = LAYOUT_60_tsangan_hhkb_split_space(
1365+ [1] = LAYOUT_60_ansi_tsangan_split_bs_rshift_split_space(
1366 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
1367 UG_TOGG, UG_NEXT, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1368 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1369@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1370 * | | | | | | | | |QK_BOOT |
1371 * `------------------------------------------------------------------------------'
1372 */
1373- [2] = LAYOUT_60_tsangan_hhkb_split_space(
1374+ [2] = LAYOUT_60_ansi_tsangan_split_bs_rshift_split_space(
1375 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
1376 UG_TOGG, UG_NEXT, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1377 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
1378diff --git a/keyboards/chickenman/ciel/keyboard.json b/keyboards/chickenman/ciel/keyboard.json
1379index 554d41c3945b59b2f896e2943d2fc029400fee4b..f28995794cd208d900fe0e41c070f73275b0fd11 100644
1380--- a/keyboards/chickenman/ciel/keyboard.json
1381+++ b/keyboards/chickenman/ciel/keyboard.json
1382@@ -29,7 +29,14 @@
1383 "diode_direction": "COL2ROW",
1384 "processor": "atmega32u2",
1385 "bootloader": "atmel-dfu",
1386- "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_tsangan_hhkb"],
1387+ "community_layouts": [
1388+ "60_ansi",
1389+ "60_ansi_split_bs_rshift",
1390+ "60_ansi_tsangan_split_bs_rshift"
1391+ ],
1392+ "layout_aliases": {
1393+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
1394+ },
1395 "layouts": {
1396 "LAYOUT_60_ansi_split_bs_rshift": {
1397 "layout": [
1398@@ -171,7 +178,7 @@
1399 {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
1400 ]
1401 },
1402- "LAYOUT_60_tsangan_hhkb": {
1403+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
1404 "layout": [
1405 {"matrix": [0, 0], "x": 0, "y": 0},
1406 {"matrix": [0, 1], "x": 1, "y": 0},