Diff
1diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
2deleted file mode 100644
3index 5a870e5f7eeb341f5cc2aef162b7d729bcf537a2..0000000000000000000000000000000000000000
4--- a/keyboards/do60/config.h
5+++ /dev/null
6@@ -1,23 +0,0 @@
7-/*
8-Copyright 2012 Doyu Studio <sy_yang@doyustudio.com>
9-
10-This program is free software: you can redistribute it and/or modify
11-it under the terms of the GNU General Public License as published by
12-the Free Software Foundation, either version 2 of the License, or
13-(at your option) any later version.
14-
15-This program is distributed in the hope that it will be useful,
16-but WITHOUT ANY WARRANTY; without even the implied warranty of
17-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18-GNU General Public License for more details.
19-
20-You should have received a copy of the GNU General Public License
21-along with this program. If not, see <http://www.gnu.org/licenses/>.
22-*/
23-
24-#pragma once
25-
26-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
27-#define LOCKING_SUPPORT_ENABLE
28-/* Locking resynchronize hack */
29-#define LOCKING_RESYNC_ENABLE
30diff --git a/keyboards/do60/keyboard.json b/keyboards/do60/keyboard.json
31index 76de66f6d7d087ceed5520daf75d4fe961d238f9..2a7d585f65c0813ea381a1a31a24d7daa087db38 100644
32--- a/keyboards/do60/keyboard.json
33+++ b/keyboards/do60/keyboard.json
34@@ -18,6 +18,12 @@
35 "nkro": true,
36 "rgblight": true
37 },
38+ "qmk": {
39+ "locking": {
40+ "enabled": true,
41+ "resync": true
42+ }
43+ },
44 "matrix_pins": {
45 "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "F4", "B4", "D7", "D6", "B3", "B0"],
46 "rows": ["D0", "D1", "D2", "D3", "D5"]
47diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
48index 7050e67b7e329511823c762bdfcf5626e5bf97ab..04730a1f18ca008fb1da50e7399990515ac8421c 100644
49--- a/keyboards/doio/kb30/config.h
50+++ b/keyboards/doio/kb30/config.h
51@@ -17,11 +17,6 @@
52
53 #pragma once
54
55-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
56-#define LOCKING_SUPPORT_ENABLE
57-/* Locking resynchronize hack */
58-#define LOCKING_RESYNC_ENABLE
59-
60 /* OLED */
61 #ifdef OLED_ENABLE
62 # define OLED_BRIGHTNESS 5
63diff --git a/keyboards/doio/kb30/keyboard.json b/keyboards/doio/kb30/keyboard.json
64index 637a1fe68b18c7284f4bf161de5e2af378841ab7..b14eab1c33a591af9359a208fe3712678048d750 100644
65--- a/keyboards/doio/kb30/keyboard.json
66+++ b/keyboards/doio/kb30/keyboard.json
67@@ -59,6 +59,12 @@
68 "oled": true,
69 "rgb_matrix": true
70 },
71+ "qmk": {
72+ "locking": {
73+ "enabled": true,
74+ "resync": true
75+ }
76+ },
77 "matrix_pins": {
78 "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"],
79 "rows": ["B3", "B4", "B9", "B8", "A5", "A6"]
80diff --git a/keyboards/donutcables/scrabblepad/config.h b/keyboards/donutcables/scrabblepad/config.h
81deleted file mode 100644
82index 76f004028fae5c2694b25acf75f899a1e9fe9bbd..0000000000000000000000000000000000000000
83--- a/keyboards/donutcables/scrabblepad/config.h
84+++ /dev/null
85@@ -1,39 +0,0 @@
86-/*
87-Copyright 2021 DonutCables <contact@donutcables.com>
88-
89-This program is free software: you can redistribute it and/or modify
90-it under the terms of the GNU General Public License as published by
91-the Free Software Foundation, either version 2 of the License, or
92-(at your option) any later version.
93-
94-This program is distributed in the hope that it will be useful,
95-but WITHOUT ANY WARRANTY; without even the implied warranty of
96-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
97-GNU General Public License for more details.
98-
99-You should have received a copy of the GNU General Public License
100-along with this program. If not, see <http://www.gnu.org/licenses/>.
101-*/
102-
103-#pragma once
104-
105-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
106-#define LOCKING_SUPPORT_ENABLE
107-/* Locking resynchronize hack */
108-#define LOCKING_RESYNC_ENABLE
109-
110-/*
111- * Feature disable options
112- * These options are also useful to firmware size reduction.
113- */
114-
115-/* disable debug print */
116-//#define NO_DEBUG
117-
118-/* disable print */
119-//#define NO_PRINT
120-
121-/* disable action features */
122-//#define NO_ACTION_LAYER
123-//#define NO_ACTION_TAPPING
124-//#define NO_ACTION_ONESHOT
125diff --git a/keyboards/donutcables/scrabblepad/keyboard.json b/keyboards/donutcables/scrabblepad/keyboard.json
126index ed31e35018d8191cdc4a4eb5e4403791115d8f53..aa03523ed817d4c0d3189ebd1d08c37c8fab6247 100644
127--- a/keyboards/donutcables/scrabblepad/keyboard.json
128+++ b/keyboards/donutcables/scrabblepad/keyboard.json
129@@ -16,6 +16,12 @@
130 "mousekey": false,
131 "nkro": true
132 },
133+ "qmk": {
134+ "locking": {
135+ "enabled": true,
136+ "resync": true
137+ }
138+ },
139 "matrix_pins": {
140 "cols": ["D6", "D7", "E0", "E1", "B7", "D2", "D3", "D4", "C0", "B4", "B5", "B6", "F0", "E6", "E7"],
141 "rows": ["D5", "F1", "C7", "F2", "C6", "F3", "C5", "F4", "C4", "F5", "C3", "F6", "C2", "F7", "C1"]
142diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
143index a18b4847465607f13aaf879b5646873a923f103b..20a23ab6dad4f7e1c1829b6d860c152491f80b76 100644
144--- a/keyboards/doppelganger/config.h
145+++ b/keyboards/doppelganger/config.h
146@@ -21,11 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
147
148 // #define USE_I2C
149
150-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
151-#define LOCKING_SUPPORT_ENABLE
152-/* Locking resynchronize hack */
153-#define LOCKING_RESYNC_ENABLE
154-
155 /*
156 * Feature disable options
157 * These options are also useful to firmware size reduction.
158diff --git a/keyboards/doppelganger/keyboard.json b/keyboards/doppelganger/keyboard.json
159index 2be90e30abf404fe4ccb38297b90f657f563fb1f..9ea2241a807b2c0b316f009208f3f7087a7366cc 100644
160--- a/keyboards/doppelganger/keyboard.json
161+++ b/keyboards/doppelganger/keyboard.json
162@@ -41,6 +41,12 @@
163 "extrakey": true,
164 "rgblight": true
165 },
166+ "qmk": {
167+ "locking": {
168+ "enabled": true,
169+ "resync": true
170+ }
171+ },
172 "layouts": {
173 "LAYOUT": {
174 "layout": [
175diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
176deleted file mode 100644
177index b5a6d1893cf7cee52ee2191232d876636674a19c..0000000000000000000000000000000000000000
178--- a/keyboards/doro67/rgb/config.h
179+++ /dev/null
180@@ -1,23 +0,0 @@
181-/*
182-Copyright 2019 MechMerlin
183-
184-This program is free software: you can redistribute it and/or modify
185-it under the terms of the GNU General Public License as published by
186-the Free Software Foundation, either version 2 of the License, or
187-(at your option) any later version.
188-
189-This program is distributed in the hope that it will be useful,
190-but WITHOUT ANY WARRANTY; without even the implied warranty of
191-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
192-GNU General Public License for more details.
193-
194-You should have received a copy of the GNU General Public License
195-along with this program. If not, see <http://www.gnu.org/licenses/>.
196-*/
197-
198-#pragma once
199-
200-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
201-#define LOCKING_SUPPORT_ENABLE
202-/* Locking resynchronize hack */
203-#define LOCKING_RESYNC_ENABLE
204diff --git a/keyboards/doro67/rgb/keyboard.json b/keyboards/doro67/rgb/keyboard.json
205index 87a31e6e21e0bf04aac6c6689039b02bb3ff2093..9b660fd1aecf063e34101f187aeb3f991f5ae3a2 100644
206--- a/keyboards/doro67/rgb/keyboard.json
207+++ b/keyboards/doro67/rgb/keyboard.json
208@@ -65,6 +65,12 @@
209 "nkro": false,
210 "rgb_matrix": true
211 },
212+ "qmk": {
213+ "locking": {
214+ "enabled": true,
215+ "resync": true
216+ }
217+ },
218 "matrix_pins": {
219 "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"],
220 "rows": ["D0", "D1", "D2", "D3", "D5"]
221diff --git a/keyboards/dotmod/dymium65/config.h b/keyboards/dotmod/dymium65/config.h
222deleted file mode 100644
223index ca6e56156de00aee3e937a4c9817dbe4ef99e538..0000000000000000000000000000000000000000
224--- a/keyboards/dotmod/dymium65/config.h
225+++ /dev/null
226@@ -1,23 +0,0 @@
227-/* Copyright 2023 Finalkey
228- * Copyright 2023 LiWenLiu <https://github.com/LiuLiuQMK>
229- *
230- * This program is free software: you can redistribute it and/or modify
231- * it under the terms of the GNU General Public License as published by
232- * the Free Software Foundation, either version 2 of the License, or
233- * (at your option) any later version.
234- *
235- * This program is distributed in the hope that it will be useful,
236- * but WITHOUT ANY WARRANTY; without even the implied warranty of
237- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
238- * GNU General Public License for more details.
239- *
240- * You should have received a copy of the GNU General Public License
241- * along with this program. If not, see <http://www.gnu.org/licenses/>.
242- */
243-
244-#pragma once
245-
246-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
247-#define LOCKING_SUPPORT_ENABLE
248-/* Locking resynchronize hack */
249-#define LOCKING_RESYNC_ENABLE
250diff --git a/keyboards/dotmod/dymium65/keyboard.json b/keyboards/dotmod/dymium65/keyboard.json
251index 6095f4c3f1c8ff93afa183a09ff02e4bbb9e8054..c5cd1b2cb7d87069d8c17daa9a7ee37bebac714b 100644
252--- a/keyboards/dotmod/dymium65/keyboard.json
253+++ b/keyboards/dotmod/dymium65/keyboard.json
254@@ -25,6 +25,12 @@
255 "mousekey": true,
256 "rgb_matrix": true
257 },
258+ "qmk": {
259+ "locking": {
260+ "enabled": true,
261+ "resync": true
262+ }
263+ },
264 "build": {
265 "lto": true
266 },
267diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
268deleted file mode 100644
269index 96a439558477f7eb4c55adab68e2ba37e6a47f8c..0000000000000000000000000000000000000000
270--- a/keyboards/draytronics/daisy/config.h
271+++ /dev/null
272@@ -1,37 +0,0 @@
273-/*Copyright 2021 Blake Drayson / Draytronics
274-
275-Contact info@draytronics.co.uk
276-
277-This program is free software: you can redistribute it and/or modify
278-it under the terms of the GNU General Public License as published by
279-the Free Software Foundation, either version 2 of the License, or
280-(at your option) any later version.
281-
282-This program is distributed in the hope that it will be useful,
283-but WITHOUT ANY WARRANTY; without even the implied warranty of
284-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
285-GNU General Public License for more details.
286-
287-You should have received a copy of the GNU General Public License
288-along with this program. If not, see <http://www.gnu.org/licenses/>.
289-*/
290-
291-#pragma once
292-
293-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
294-#define LOCKING_SUPPORT_ENABLE
295-/* Locking resynchronize hack */
296-#define LOCKING_RESYNC_ENABLE
297-
298-/*
299- * Feature disable options
300- * These options are also useful to firmware size reduction.
301- */
302-/* disable debug print */
303-//#define NO_DEBUG
304-/* disable print */
305-//#define NO_PRINT
306-/* disable action features */
307-//#define NO_ACTION_LAYER
308-//#define NO_ACTION_TAPPING
309-//#define NO_ACTION_ONESHOT
310diff --git a/keyboards/draytronics/daisy/keyboard.json b/keyboards/draytronics/daisy/keyboard.json
311index f871517e879e386b23b260f76be96abe2b68a4f0..92b0b54f43cfbf563747103eb89a92feed931bdf 100644
312--- a/keyboards/draytronics/daisy/keyboard.json
313+++ b/keyboards/draytronics/daisy/keyboard.json
314@@ -30,7 +30,11 @@
315 ]
316 },
317 "qmk": {
318- "tap_keycode_delay": 10
319+ "tap_keycode_delay": 10,
320+ "locking": {
321+ "enabled": true,
322+ "resync": true
323+ }
324 },
325 "rgblight": {
326 "saturation_steps": 8,
327diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
328deleted file mode 100644
329index 0df48812aa316c8ecc2f76d67ebc0577348453af..0000000000000000000000000000000000000000
330--- a/keyboards/draytronics/elise/config.h
331+++ /dev/null
332@@ -1,24 +0,0 @@
333-/*Copyright 2021 Blake Drayson / Draytronics
334-
335-Contact info@draytronics.co.uk
336-
337-This program is free software: you can redistribute it and/or modify
338-it under the terms of the GNU General Public License as published by
339-the Free Software Foundation, either version 2 of the License, or
340-(at your option) any later version.
341-
342-This program is distributed in the hope that it will be useful,
343-but WITHOUT ANY WARRANTY; without even the implied warranty of
344-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
345-GNU General Public License for more details.
346-
347-You should have received a copy of the GNU General Public License
348-along with this program. If not, see <http://www.gnu.org/licenses/>.
349-*/
350-
351-#pragma once
352-
353-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
354-#define LOCKING_SUPPORT_ENABLE
355-/* Locking resynchronize hack */
356-#define LOCKING_RESYNC_ENABLE
357diff --git a/keyboards/draytronics/elise/keyboard.json b/keyboards/draytronics/elise/keyboard.json
358index 62ccd9babbe3d22cbabbc5e4801b67e7afeca22d..782c61d764343739fa52e4c6188fd54835c7abb0 100644
359--- a/keyboards/draytronics/elise/keyboard.json
360+++ b/keyboards/draytronics/elise/keyboard.json
361@@ -17,6 +17,12 @@
362 "nkro": true,
363 "rgblight": true
364 },
365+ "qmk": {
366+ "locking": {
367+ "enabled": true,
368+ "resync": true
369+ }
370+ },
371 "matrix_pins": {
372 "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"],
373 "rows": ["B2", "B3", "B1", "F0", "F1"]
374diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h
375deleted file mode 100644
376index 0df48812aa316c8ecc2f76d67ebc0577348453af..0000000000000000000000000000000000000000
377--- a/keyboards/draytronics/elise_v2/config.h
378+++ /dev/null
379@@ -1,24 +0,0 @@
380-/*Copyright 2021 Blake Drayson / Draytronics
381-
382-Contact info@draytronics.co.uk
383-
384-This program is free software: you can redistribute it and/or modify
385-it under the terms of the GNU General Public License as published by
386-the Free Software Foundation, either version 2 of the License, or
387-(at your option) any later version.
388-
389-This program is distributed in the hope that it will be useful,
390-but WITHOUT ANY WARRANTY; without even the implied warranty of
391-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
392-GNU General Public License for more details.
393-
394-You should have received a copy of the GNU General Public License
395-along with this program. If not, see <http://www.gnu.org/licenses/>.
396-*/
397-
398-#pragma once
399-
400-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
401-#define LOCKING_SUPPORT_ENABLE
402-/* Locking resynchronize hack */
403-#define LOCKING_RESYNC_ENABLE
404diff --git a/keyboards/draytronics/elise_v2/keyboard.json b/keyboards/draytronics/elise_v2/keyboard.json
405index 91f34c23f878540934c75dae89f8724d060fd249..217f837e197b59113500a8ccca027798f373f674 100644
406--- a/keyboards/draytronics/elise_v2/keyboard.json
407+++ b/keyboards/draytronics/elise_v2/keyboard.json
408@@ -38,6 +38,12 @@
409 "nkro": true,
410 "rgblight": true
411 },
412+ "qmk": {
413+ "locking": {
414+ "enabled": true,
415+ "resync": true
416+ }
417+ },
418 "matrix_pins": {
419 "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"],
420 "rows": ["B2", "B3", "B1", "F0", "F1"]
421diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h
422deleted file mode 100644
423index fb8fbcaac5b52e2c20e0b08a9e14695ff173a7ac..0000000000000000000000000000000000000000
424--- a/keyboards/drewkeys/iskar/config.h
425+++ /dev/null
426@@ -1,23 +0,0 @@
427-/*
428-Copyright 2021 Drewkeys
429-
430-This program is free software: you can redistribute it and/or modify
431-it under the terms of the GNU General Public License as published by
432-the Free Software Foundation, either version 2 of the License, or
433-(at your option) any later version.
434-
435-This program is distributed in the hope that it will be useful,
436-but WITHOUT ANY WARRANTY; without even the implied warranty of
437-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
438-GNU General Public License for more details.
439-
440-You should have received a copy of the GNU General Public License
441-along with this program. If not, see <http://www.gnu.org/licenses/>.
442-*/
443-
444-#pragma once
445-
446-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
447-#define LOCKING_SUPPORT_ENABLE
448-/* Locking resynchronize hack */
449-#define LOCKING_RESYNC_ENABLE
450diff --git a/keyboards/drewkeys/iskar/keyboard.json b/keyboards/drewkeys/iskar/keyboard.json
451index c3f1aace78cafa507590b42ac1dcf3c7c20b5101..66d4ebd74d6b3769e01d198326c703a860499199 100644
452--- a/keyboards/drewkeys/iskar/keyboard.json
453+++ b/keyboards/drewkeys/iskar/keyboard.json
454@@ -19,6 +19,12 @@
455 "mousekey": true,
456 "nkro": true
457 },
458+ "qmk": {
459+ "locking": {
460+ "enabled": true,
461+ "resync": true
462+ }
463+ },
464 "matrix_pins": {
465 "cols": ["B6", "C6", "C7", "F6", "F5", "F4", "F7", "F1", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5"],
466 "rows": ["D6", "D7", "B4", "B5", "D4"]
467diff --git a/keyboards/drhigsby/bkf/config.h b/keyboards/drhigsby/bkf/config.h
468deleted file mode 100644
469index 44c0166125969326c28d0ec54ba09119def8ba91..0000000000000000000000000000000000000000
470--- a/keyboards/drhigsby/bkf/config.h
471+++ /dev/null
472@@ -1,21 +0,0 @@
473-/* Copyright 2021 drhigsby
474- *
475- * This program is free software: you can redistribute it and/or modify
476- * it under the terms of the GNU General Public License as published by
477- * the Free Software Foundation, either version 2 of the License, or
478- * (at your option) any later version.
479- *
480- * This program is distributed in the hope that it will be useful,
481- * but WITHOUT ANY WARRANTY; without even the implied warranty of
482- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
483- * GNU General Public License for more details.
484- *
485- * You should have received a copy of the GNU General Public License
486- * along with this program. If not, see <http://www.gnu.org/licenses/>.
487- */
488-#pragma once
489-
490-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
491-#define LOCKING_SUPPORT_ENABLE
492-/* Locking resynchronize hack */
493-#define LOCKING_RESYNC_ENABLE
494diff --git a/keyboards/drhigsby/bkf/keyboard.json b/keyboards/drhigsby/bkf/keyboard.json
495index 97bb5919fb7e93e7316675a1eaa810c9dcb80029..a3933c8228afc6e49054bca4e6d8b3224b9a6a04 100644
496--- a/keyboards/drhigsby/bkf/keyboard.json
497+++ b/keyboards/drhigsby/bkf/keyboard.json
498@@ -17,6 +17,12 @@
499 "mousekey": false,
500 "nkro": true
501 },
502+ "qmk": {
503+ "locking": {
504+ "enabled": true,
505+ "resync": true
506+ }
507+ },
508 "matrix_pins": {
509 "cols": ["B6", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
510 "rows": ["F6", "F7", "B1", "B3"]
511diff --git a/keyboards/drhigsby/dubba175/config.h b/keyboards/drhigsby/dubba175/config.h
512deleted file mode 100644
513index 7cfb519fe9e640fef12ce5affcd1ada19c777f32..0000000000000000000000000000000000000000
514--- a/keyboards/drhigsby/dubba175/config.h
515+++ /dev/null
516@@ -1,21 +0,0 @@
517-/* Copyright 2020 drhigsby
518- *
519- * This program is free software: you can redistribute it and/or modify
520- * it under the terms of the GNU General Public License as published by
521- * the Free Software Foundation, either version 2 of the License, or
522- * (at your option) any later version.
523- *
524- * This program is distributed in the hope that it will be useful,
525- * but WITHOUT ANY WARRANTY; without even the implied warranty of
526- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
527- * GNU General Public License for more details.
528- *
529- * You should have received a copy of the GNU General Public License
530- * along with this program. If not, see <http://www.gnu.org/licenses/>.
531- */
532-#pragma once
533-
534-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
535-#define LOCKING_SUPPORT_ENABLE
536-/* Locking resynchronize hack */
537-#define LOCKING_RESYNC_ENABLE
538diff --git a/keyboards/drhigsby/dubba175/keyboard.json b/keyboards/drhigsby/dubba175/keyboard.json
539index ad9644080634795210f527f5c605434438d7a79c..69570a1c2fabc8e9d79c9b062d4ac76720eba6ac 100644
540--- a/keyboards/drhigsby/dubba175/keyboard.json
541+++ b/keyboards/drhigsby/dubba175/keyboard.json
542@@ -16,6 +16,12 @@
543 "mousekey": true,
544 "nkro": true
545 },
546+ "qmk": {
547+ "locking": {
548+ "enabled": true,
549+ "resync": true
550+ }
551+ },
552 "matrix_pins": {
553 "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B6"],
554 "rows": ["B1", "B3", "B2", "B5"]
555diff --git a/keyboards/drhigsby/ogurec/config.h b/keyboards/drhigsby/ogurec/config.h
556deleted file mode 100644
557index 44c0166125969326c28d0ec54ba09119def8ba91..0000000000000000000000000000000000000000
558--- a/keyboards/drhigsby/ogurec/config.h
559+++ /dev/null
560@@ -1,21 +0,0 @@
561-/* Copyright 2021 drhigsby
562- *
563- * This program is free software: you can redistribute it and/or modify
564- * it under the terms of the GNU General Public License as published by
565- * the Free Software Foundation, either version 2 of the License, or
566- * (at your option) any later version.
567- *
568- * This program is distributed in the hope that it will be useful,
569- * but WITHOUT ANY WARRANTY; without even the implied warranty of
570- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
571- * GNU General Public License for more details.
572- *
573- * You should have received a copy of the GNU General Public License
574- * along with this program. If not, see <http://www.gnu.org/licenses/>.
575- */
576-#pragma once
577-
578-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
579-#define LOCKING_SUPPORT_ENABLE
580-/* Locking resynchronize hack */
581-#define LOCKING_RESYNC_ENABLE
582diff --git a/keyboards/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json
583index bddd3359d9e4f5cc2aff172715fc91e46ee075de..f3c753f2c03f9e4ca466932515f2587ef1aaaa66 100644
584--- a/keyboards/drhigsby/ogurec/info.json
585+++ b/keyboards/drhigsby/ogurec/info.json
586@@ -16,6 +16,12 @@
587 "mousekey": false,
588 "nkro": true
589 },
590+ "qmk": {
591+ "locking": {
592+ "enabled": true,
593+ "resync": true
594+ }
595+ },
596 "matrix_pins": {
597 "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
598 "rows": ["F6", "B6", "B2"]
599diff --git a/keyboards/drhigsby/packrat/config.h b/keyboards/drhigsby/packrat/config.h
600deleted file mode 100644
601index 44c0166125969326c28d0ec54ba09119def8ba91..0000000000000000000000000000000000000000
602--- a/keyboards/drhigsby/packrat/config.h
603+++ /dev/null
604@@ -1,21 +0,0 @@
605-/* Copyright 2021 drhigsby
606- *
607- * This program is free software: you can redistribute it and/or modify
608- * it under the terms of the GNU General Public License as published by
609- * the Free Software Foundation, either version 2 of the License, or
610- * (at your option) any later version.
611- *
612- * This program is distributed in the hope that it will be useful,
613- * but WITHOUT ANY WARRANTY; without even the implied warranty of
614- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
615- * GNU General Public License for more details.
616- *
617- * You should have received a copy of the GNU General Public License
618- * along with this program. If not, see <http://www.gnu.org/licenses/>.
619- */
620-#pragma once
621-
622-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
623-#define LOCKING_SUPPORT_ENABLE
624-/* Locking resynchronize hack */
625-#define LOCKING_RESYNC_ENABLE
626diff --git a/keyboards/drhigsby/packrat/keyboard.json b/keyboards/drhigsby/packrat/keyboard.json
627index a1b00f835ca87a60562012768d46ace4a837e63d..a836b0bf96d87a5f4ce964e802c11db1ede3bbe9 100644
628--- a/keyboards/drhigsby/packrat/keyboard.json
629+++ b/keyboards/drhigsby/packrat/keyboard.json
630@@ -17,6 +17,12 @@
631 "mousekey": true,
632 "nkro": true
633 },
634+ "qmk": {
635+ "locking": {
636+ "enabled": true,
637+ "resync": true
638+ }
639+ },
640 "matrix_pins": {
641 "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3"],
642 "rows": ["F7", "B1", "B6", "B2"]
643diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h
644deleted file mode 100644
645index d39c818a739bed7a7dbff6f07c86552c45c4c369..0000000000000000000000000000000000000000
646--- a/keyboards/dtisaac/cg108/config.h
647+++ /dev/null
648@@ -1,23 +0,0 @@
649-/*
650-Copyright 2021 DTIsaac
651-
652-This program is free software: you can redistribute it and/or modify
653-it under the terms of the GNU General Public License as published by
654-the Free Software Foundation, either version 2 of the License, or
655-(at your option) any later version.
656-
657-This program is distributed in the hope that it will be useful,
658-but WITHOUT ANY WARRANTY; without even the implied warranty of
659-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
660-GNU General Public License for more details.
661-
662-You should have received a copy of the GNU General Public License
663-along with this program. If not, see <http://www.gnu.org/licenses/>.
664-*/
665-
666-#pragma once
667-
668-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
669-#define LOCKING_SUPPORT_ENABLE
670-/* Locking resynchronize hack */
671-#define LOCKING_RESYNC_ENABLE
672diff --git a/keyboards/dtisaac/cg108/keyboard.json b/keyboards/dtisaac/cg108/keyboard.json
673index 703586e3d0633d02f9d40c2c011a5c01cfe6f37e..28e5563111e135689f3e2d86284102cb5cbbb525 100644
674--- a/keyboards/dtisaac/cg108/keyboard.json
675+++ b/keyboards/dtisaac/cg108/keyboard.json
676@@ -16,6 +16,12 @@
677 "mousekey": false,
678 "nkro": true
679 },
680+ "qmk": {
681+ "locking": {
682+ "enabled": true,
683+ "resync": true
684+ }
685+ },
686 "matrix_pins": {
687 "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"],
688 "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"]
689diff --git a/keyboards/dumbo/config.h b/keyboards/dumbo/config.h
690deleted file mode 100644
691index 5a4dcfdd8f1b474236238d29abb8320ae70ec8e8..0000000000000000000000000000000000000000
692--- a/keyboards/dumbo/config.h
693+++ /dev/null
694@@ -1,20 +0,0 @@
695-/*
696-Copyright 2020 Adam Naldal <adamnaldal@gmail.com>
697-This program is free software: you can redistribute it and/or modify
698-it under the terms of the GNU General Public License as published by
699-the Free Software Foundation, either version 2 of the License, or
700-(at your option) any later version.
701-This program is distributed in the hope that it will be useful,
702-but WITHOUT ANY WARRANTY; without even the implied warranty of
703-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
704-GNU General Public License for more details.
705-You should have received a copy of the GNU General Public License
706-along with this program. If not, see <http://www.gnu.org/licenses/>.
707-*/
708-
709-#pragma once
710-
711-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
712-#define LOCKING_SUPPORT_ENABLE
713-/* Locking resynchronize hack */
714-#define LOCKING_RESYNC_ENABLE
715diff --git a/keyboards/dumbo/keyboard.json b/keyboards/dumbo/keyboard.json
716index 84993a6b6d93b2f40f3d8e52ec7bd7980e28dc62..df0f1100128a2efc24b283d02011b7443378c08e 100644
717--- a/keyboards/dumbo/keyboard.json
718+++ b/keyboards/dumbo/keyboard.json
719@@ -38,6 +38,12 @@
720 "mousekey": true,
721 "extrakey": true
722 },
723+ "qmk": {
724+ "locking": {
725+ "enabled": true,
726+ "resync": true
727+ }
728+ },
729 "build": {
730 "lto": true
731 },
732diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
733index bec7fcc3dcd7a42fa3e302a4412cb5d64af71ea0..2e5656e5f8fab061f94fdba8188bfa71549ad867 100644
734--- a/keyboards/dz60/config.h
735+++ b/keyboards/dz60/config.h
736@@ -1,9 +1,4 @@
737 #pragma once
738
739-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
740-#define LOCKING_SUPPORT_ENABLE
741-/* Locking resynchronize hack */
742-#define LOCKING_RESYNC_ENABLE
743-
744 /* VIA related config */
745 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
746diff --git a/keyboards/dz60/keyboard.json b/keyboards/dz60/keyboard.json
747index a6beff0d63a520113e20fa56b0de43109736b42c..e3e74959582331ba1aa099b8ec21c416497a9f28 100644
748--- a/keyboards/dz60/keyboard.json
749+++ b/keyboards/dz60/keyboard.json
750@@ -18,6 +18,12 @@
751 "nkro": true,
752 "rgblight": true
753 },
754+ "qmk": {
755+ "locking": {
756+ "enabled": true,
757+ "resync": true
758+ }
759+ },
760 "matrix_pins": {
761 "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
762 "rows": ["D0", "D1", "D2", "D3", "D5"]
763diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h
764index 9ad357341e9de79a26a44376e5a92c89400f28cd..4e0c90ca26005834e8298d265456dab6d84d0ca9 100644
765--- a/keyboards/dztech/bocc/config.h
766+++ b/keyboards/dztech/bocc/config.h
767@@ -15,10 +15,5 @@
768 */
769 #pragma once
770
771-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
772-#define LOCKING_SUPPORT_ENABLE
773-/* Locking resynchronize hack */
774-#define LOCKING_RESYNC_ENABLE
775-
776 /* VIA related config */
777 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
778diff --git a/keyboards/dztech/bocc/keyboard.json b/keyboards/dztech/bocc/keyboard.json
779index 5d56524b3fbdff470b363ec53bc95e1940d04982..7e40fde49cb9f2b21f55688e5ae98314570e1028 100644
780--- a/keyboards/dztech/bocc/keyboard.json
781+++ b/keyboards/dztech/bocc/keyboard.json
782@@ -18,6 +18,12 @@
783 "nkro": true,
784 "rgblight": true
785 },
786+ "qmk": {
787+ "locking": {
788+ "enabled": true,
789+ "resync": true
790+ }
791+ },
792 "matrix_pins": {
793 "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
794 "rows": ["B0", "B1", "B2", "B3", "F0"]
795diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
796index 14d66caf12a9b1bcd1829467cd7bfc322bc2a8cb..c180c019a434cd682eb66d9742d65305ac69d31c 100644
797--- a/keyboards/dztech/duo_s/config.h
798+++ b/keyboards/dztech/duo_s/config.h
799@@ -18,9 +18,4 @@
800
801 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
802
803-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
804-#define LOCKING_SUPPORT_ENABLE
805-/* Locking resynchronize hack */
806-#define LOCKING_RESYNC_ENABLE
807-
808 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
809diff --git a/keyboards/dztech/duo_s/keyboard.json b/keyboards/dztech/duo_s/keyboard.json
810index 46f9b4fc349f920a6268bdaa6e997b141fd3035f..7bf8b0bfddb17e11ae9cf82af434bb73c29288c0 100644
811--- a/keyboards/dztech/duo_s/keyboard.json
812+++ b/keyboards/dztech/duo_s/keyboard.json
813@@ -42,6 +42,12 @@
814 "nkro": true,
815 "rgblight": true
816 },
817+ "qmk": {
818+ "locking": {
819+ "enabled": true,
820+ "resync": true
821+ }
822+ },
823 "matrix_pins": {
824 "cols": ["B12", "B13", "B14", "A8", "B9", "C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5", "A6", "A7"],
825 "rows": ["A15", "B3", "B4", "B5", "B11"]