7cbff9d921879ef3c54837cb2ffc455e019f45b4

Author
Ryan <fauxpark@gmail.com>
Committer
GitHub <noreply@github.com>
Date

Message

Deprecate `KC_LOCK` for `QK_LOCK` (#18796)

Diff

This diff is truncated to protect this page.

  1diff --git a/docs/feature_key_lock.md b/docs/feature_key_lock.md
  2index 76813942298cadf04888cfa6b30499fada8a0b89..d5ad1708c74e85fe368d8f608df77aeffbb12409 100644
  3--- a/docs/feature_key_lock.md
  4+++ b/docs/feature_key_lock.md
  5@@ -2,17 +2,17 @@
  6 
  7 Sometimes you may find yourself needing to hold down a specific key for a long period of time. Key Lock holds down the next key you press for you. Press it again, and it will be released.
  8 
  9-Let's say you need to type in ALL CAPS for a few sentences. Hit `KC_LOCK`, and then Shift. Now, Shift will be considered held until you tap it again. You can think of Key Lock as Caps Lock, but supercharged.
 10+Let's say you need to type in ALL CAPS for a few sentences. Hit `QK_LOCK`, and then Shift. Now, Shift will be considered held until you tap it again. You can think of Key Lock as Caps Lock, but supercharged.
 11 
 12 ## Usage
 13 
 14-First, enable Key Lock by setting `KEY_LOCK_ENABLE = yes` in your `rules.mk`. Then pick a key in your keymap and assign it the keycode `KC_LOCK`.
 15+First, enable Key Lock by setting `KEY_LOCK_ENABLE = yes` in your `rules.mk`. Then pick a key in your keymap and assign it the keycode `QK_LOCK`.
 16 
 17 ## Keycodes
 18 
 19 |Keycode  |Description                                                   |
 20 |---------|--------------------------------------------------------------|
 21-|`KC_LOCK`|Hold down the next key pressed, until the key is pressed again|
 22+|`QK_LOCK`|Hold down the next key pressed, until the key is pressed again|
 23 
 24 ## Caveats
 25 
 26diff --git a/docs/keycodes.md b/docs/keycodes.md
 27index b0409327c8f665bbadb19c55c7df608fb5c6337d..5565e0c22c7ccc846247f232e8af83add6f9e806 100644
 28--- a/docs/keycodes.md
 29+++ b/docs/keycodes.md
 30@@ -305,7 +305,7 @@ See also: [Key Lock](feature_key_lock.md)
 31 
 32 |Key      |Description                                                   |
 33 |---------|--------------------------------------------------------------|
 34-|`KC_LOCK`|Hold down the next key pressed, until the key is pressed again|
 35+|`QK_LOCK`|Hold down the next key pressed, until the key is pressed again|
 36 
 37 ## Layer Switching :id=layer-switching
 38 
 39diff --git a/keyboards/0xc7/61key/keymaps/default/keymap.c b/keyboards/0xc7/61key/keymaps/default/keymap.c
 40index eb0579d8f8fcfc1618831140513b4826eacc3fb6..06e39c1baaee26382db9c4e4c34d62c4d5315a8d 100644
 41--- a/keyboards/0xc7/61key/keymaps/default/keymap.c
 42+++ b/keyboards/0xc7/61key/keymaps/default/keymap.c
 43@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 44         KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
 45         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,
 46         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS,
 47-        KC_TRNS, KC_TRNS, KC_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
 48+        KC_TRNS, KC_TRNS, QK_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
 49     )
 50 };
 51diff --git a/keyboards/0xc7/61key/keymaps/via/keymap.c b/keyboards/0xc7/61key/keymaps/via/keymap.c
 52index 404a8baffb1eb6f7837ab37ca8fd48ac3156ac32..cc8e40c196ed0442fbb7cf829b1da8a7b26c68d3 100644
 53--- a/keyboards/0xc7/61key/keymaps/via/keymap.c
 54+++ b/keyboards/0xc7/61key/keymaps/via/keymap.c
 55@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 56         KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS,
 57         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,
 58         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS,
 59-        KC_TRNS, KC_TRNS, KC_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
 60+        KC_TRNS, KC_TRNS, QK_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL))
 61     ),
 62     [2] = LAYOUT_60_ansi(
 63         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 64diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c
 65index 25e2e0193370c2a823d6a26647eb0ebbdc3d28b9..b169ce32386cfcac715f77953d3558398cac8ef5 100644
 66--- a/keyboards/contra/keymaps/maxr1998/keymap.c
 67+++ b/keyboards/contra/keymaps/maxr1998/keymap.c
 68@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 69  */
 70 [_FN] = {
 71   {_______, _______, _______, _______, _______, _______, _______, DE_UDIA, _______, DE_ODIA, _______, KC_DEL },
 72-  {KC_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______},
 73+  {QK_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______},
 74   {_______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______},
 75   {_______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END }
 76 },
 77diff --git a/keyboards/crkbd/keymaps/edvorakjp/keymap.c b/keyboards/crkbd/keymaps/edvorakjp/keymap.c
 78index f3b801da68ad6eb30757147d103abd98c54dcec0..66c39783fd1376737837215c8f0bfdb819120431 100644
 79--- a/keyboards/crkbd/keymaps/edvorakjp/keymap.c
 80+++ b/keyboards/crkbd/keymaps/edvorakjp/keymap.c
 81@@ -5,12 +5,6 @@
 82 
 83 #include "edvorakjp.h"
 84 
 85-/*
 86- * enum custom_keycodes {
 87- *   KC_LOCK = NEW_SAFE_RANGE,
 88- * };
 89- */
 90-
 91 #define LAYOUT_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__)
 92 
 93 // clang-format off
 94diff --git a/keyboards/dumbpad/v0x/keymaps/default/keymap.c b/keyboards/dumbpad/v0x/keymaps/default/keymap.c
 95index c0627e7490825c4aae532d0cee9af186b989045e..9787c24f0f55ffe47907586c568225816d37cb23 100644
 96--- a/keyboards/dumbpad/v0x/keymaps/default/keymap.c
 97+++ b/keyboards/dumbpad/v0x/keymaps/default/keymap.c
 98@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 99                     _______,     _______,     _______,      QK_BOOT,
100                     _______,     _______,     _______,      KC_KP_PLUS,
101                     _______,     _______,     _______,      KC_KP_MINUS,
102-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
103+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
104     ),
105 };
106 
107diff --git a/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c b/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
108index bc762bc0f2bad05f225ad73088b2423a96282911..a0f4e3a6690f166f7d605fafdcd44dbfd3c0bb2b 100644
109--- a/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
110+++ b/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
111@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
112         _______,     _______,     _______,      QK_BOOT,
113         _______,     _______,     _______,      KC_KP_PLUS,
114         _______,     _______,     _______,      KC_KP_MINUS,
115-        _______,     _______,     _______,      KC_EQL,         KC_LOCK
116+        _______,     _______,     _______,      KC_EQL,         QK_LOCK
117   ),
118 };
119 
120diff --git a/keyboards/dumbpad/v1x/keymaps/default/keymap.c b/keyboards/dumbpad/v1x/keymaps/default/keymap.c
121index c0627e7490825c4aae532d0cee9af186b989045e..9787c24f0f55ffe47907586c568225816d37cb23 100644
122--- a/keyboards/dumbpad/v1x/keymaps/default/keymap.c
123+++ b/keyboards/dumbpad/v1x/keymaps/default/keymap.c
124@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
125                     _______,     _______,     _______,      QK_BOOT,
126                     _______,     _______,     _______,      KC_KP_PLUS,
127                     _______,     _______,     _______,      KC_KP_MINUS,
128-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
129+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
130     ),
131 };
132 
133diff --git a/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
134index b21ac95849bbe17147ddd1d657f3c511231a8b7b..805815253a26a9550b7f754f7d6f7192b9e21eda 100644
135--- a/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
136+++ b/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
137@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
138                     _______,     _______,     _______,      QK_BOOT,
139                     _______,     _______,     _______,      KC_KP_PLUS,
140                     _______,     _______,     _______,      KC_KP_MINUS,
141-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
142+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
143     ),
144 };
145 
146diff --git a/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
147index 84d23f665a7949ee7d862bde0da50277450aceeb..94f5b55b8dbfb5c03cf04c60c79097b1bac2c76b 100644
148--- a/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
149+++ b/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
150@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
151                     _______,     _______,     _______,      QK_BOOT,
152                     _______,     _______,     _______,      KC_KP_PLUS,
153                     _______,     _______,     _______,      KC_KP_MINUS,
154-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
155+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
156     ),
157 
158     [2] = LAYOUT(
159diff --git a/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c b/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
160index 00f4500469e7d1a551b3edd60e301ea75c2748b5..a1db187d2ba4a78b89d8ceba0d21c7c36261af5f 100644
161--- a/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
162+++ b/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
163@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
164                     _______,     _______,     _______,      QK_BOOT,
165                     _______,     _______,     _______,      KC_KP_PLUS,
166                     _______,     _______,     _______,      KC_KP_MINUS,
167-        KC_LOCK,    _______,     _______,     _______,      KC_EQL
168+        QK_LOCK,    _______,     _______,     _______,      KC_EQL
169     ),
170 
171     [2] = LAYOUT(
172diff --git a/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
173index bc762bc0f2bad05f225ad73088b2423a96282911..a0f4e3a6690f166f7d605fafdcd44dbfd3c0bb2b 100644
174--- a/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
175+++ b/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
176@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
177         _______,     _______,     _______,      QK_BOOT,
178         _______,     _______,     _______,      KC_KP_PLUS,
179         _______,     _______,     _______,      KC_KP_MINUS,
180-        _______,     _______,     _______,      KC_EQL,         KC_LOCK
181+        _______,     _______,     _______,      KC_EQL,         QK_LOCK
182   ),
183 };
184 
185diff --git a/keyboards/dz60/keymaps/split_space_arrows/keymap.c b/keyboards/dz60/keymaps/split_space_arrows/keymap.c
186index f256d25c1491ed8a81d0de17e7a391c2cc585ba8..0ac20ea480959e26dcaa17349866bb778c995456 100644
187--- a/keyboards/dz60/keymaps/split_space_arrows/keymap.c
188+++ b/keyboards/dz60/keymaps/split_space_arrows/keymap.c
189@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
190         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,
191         KC_TAB,  KC_NO,   KC_HOME,       KC_UP,               KC_END,          KC_NO,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,   KC_NO,   KC_NO,   KC_NO,  KC_NO,
192         KC_CAPS, KC_NO,   KC_LEFT,       KC_DOWN,             KC_RIGHT,        KC_NO,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_NO,   KC_NO,   KC_ENT,
193-        KC_LSFT, KC_MPRV, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN,   KC_AUDIO_VOL_UP, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_LOCK, KC_PGUP, KC_INS,
194+        KC_LSFT, KC_MPRV, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN,   KC_AUDIO_VOL_UP, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,    QK_LOCK, KC_PGUP, KC_INS,
195         KC_MEH,  KC_LALT, KC_LGUI,       KC_MEDIA_PLAY_PAUSE, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN,  KC_END
196     ),
197 
198diff --git a/keyboards/dz60/keymaps/split_space_arrows/rules.mk b/keyboards/dz60/keymaps/split_space_arrows/rules.mk
199index 81c7b3f263148a80593af3bcec8c14649bc99bd4..e30193dab9fd1ab343b1c7bc535f4ed8ea1eecf3 100644
200--- a/keyboards/dz60/keymaps/split_space_arrows/rules.mk
201+++ b/keyboards/dz60/keymaps/split_space_arrows/rules.mk
202@@ -4,4 +4,4 @@ BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
203 MOUSEKEY_ENABLE = yes       # Mouse keys
204 EXTRAKEY_ENABLE = yes       # Audio control and System control
205 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
206-KEY_LOCK_ENABLE = yes       # Enables use of KC_LOCK
207+KEY_LOCK_ENABLE = yes
208diff --git a/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c b/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
209index ecbfd8ed84513608f8e723e92a2fb6146b42fd5e..a2cba4fe678e3b9a2ae1dddc14061f81da99e90e 100644
210--- a/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
211+++ b/keyboards/dz60/keymaps/twschum_b_4_10/keymap.c
212@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
213     // |--------------||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|------------------||
214     //
215     // |------2.25--------|---Z----|---X----|---C----|---V----|---B----|---N----|---M----|---,----|---.----||----1.75------|--------|--------||
216-          KC_LSFT,         KC_MPRV, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, XXXXXXX, XXXXXXX,     KC_LOCK,     KC_PGUP,  KC_INS,
217+          KC_LSFT,         KC_MPRV, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, XXXXXXX, XXXXXXX,     QK_LOCK,     KC_PGUP,  KC_INS,
218     // |------------------|--------|--------|--------|--------|--------|--------|--------|--------|--------||--------------|--------|--------||
219     //
220     // |---1.25---|---1.25---||---1.25---||--------2.75----------||---1.25---|------2.25--------||--------|--------|--------|--------|--------|
221diff --git a/keyboards/dz60/keymaps/twschum_b_4_10/rules.mk b/keyboards/dz60/keymaps/twschum_b_4_10/rules.mk
222index b3e56546acd90597458cb79cd88d3b70eaa2d931..932a64748d93ef5954efbda003ea100f429cfb24 100644
223--- a/keyboards/dz60/keymaps/twschum_b_4_10/rules.mk
224+++ b/keyboards/dz60/keymaps/twschum_b_4_10/rules.mk
225@@ -9,7 +9,7 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
226 NKRO_ENABLE = yes           # USB Nkey Rollover
227 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
228 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
229-KEY_LOCK_ENABLE = yes       # Enables use of KC_LOCK
230+KEY_LOCK_ENABLE = yes
231 
232 # Enables including users/twschum/twschum.h
233 USER_NAME := twschum
234diff --git a/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c
235index 57cee64884955fd3610e9007bdf125efbbcfb28d..4ebe59d947ea15608085566488081e2358b76cff 100644
236--- a/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c
237+++ b/keyboards/edi/hardlight/mk1/keymaps/default/keymap.c
238@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
239   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9,
240   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_PAUS, KC_KP_4, KC_KP_5,   KC_KP_6,
241   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_ENT,  KC_KP_1, KC_KP_2,   KC_KP_3,
242-  KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
243+  KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
244   ),
245 
246 /* RAISE
247diff --git a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
248index d52275fec2ff208ff370d8455c2facd974b9c3f0..88beb9be46ccd84dd10d8f3ef58c5cac645160bd 100644
249--- a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
250+++ b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
251@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
252   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9,
253   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_PAUS, KC_KP_4, KC_KP_5,   KC_KP_6,
254   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_ENT,  KC_KP_1, KC_KP_2,   KC_KP_3,
255-  KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
256+  KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
257   ),
258 
259 /* RAISE
260diff --git a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
261index 84760dd21907614683042c501b2d361197c53dd3..bae4fce2c4156da5c63a25cc33dbe3db110aa881 100644
262--- a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
263+++ b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
264@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
265   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9,
266   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_KP_4, KC_KP_5,   KC_KP_6,
267   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_PAUS, KC_KP_1, KC_KP_2,   KC_KP_3,
268-  KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
269+  KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
270   ),
271 
272 /* RAISE
273diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk b/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk
274index 9c24dadd78f9188a6d094699f210a248ca997ac0..785b3df8bea32ad3bdd09dfda9451173234acb1b 100755
275--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk
276+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/rules.mk
277@@ -3,7 +3,7 @@ EXTRAKEY_ENABLE  = yes # Audio control and System control
278 COMMAND_ENABLE   = yes # Commands for debug and configuration
279 NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
280 SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
281-KEY_LOCK_ENABLE  = yes # Enable the KC_LOCK key
282+KEY_LOCK_ENABLE  = yes
283 TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
284 CONSOLE_ENABLE   = yes  # Console for debug
285 
286diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
287index a7f524fa430ef7d373f6607314195ba46ae0e48d..75832dcf8e8ff97ab377ea6758bfa8ac935a352a 100644
288--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
289+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
290@@ -3,7 +3,7 @@ EXTRAKEY_ENABLE  = yes # Audio control and System control
291 COMMAND_ENABLE   = yes # Commands for debug and configuration
292 NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
293 SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard
294-KEY_LOCK_ENABLE  = yes # Enable the KC_LOCK key
295+KEY_LOCK_ENABLE  = yes
296 TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
297 CONSOLE_ENABLE   = yes  # Console for debug
298 
299diff --git a/keyboards/gh60/revc/keymaps/bluezio/keymap.c b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
300index cabe0b28fd09a68e954d66a469f1db9dc4356bd7..facb0a49d389a8fd104a0e23633a626d586292a5 100644
301--- a/keyboards/gh60/revc/keymaps/bluezio/keymap.c
302+++ b/keyboards/gh60/revc/keymaps/bluezio/keymap.c
303@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
304         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, \
305         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,\
306         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,\
307-        KC_LSFT, KC_LOCK, KC_Z,    KC_X,    KC_C,  KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
308+        KC_LSFT, QK_LOCK, KC_Z,    KC_X,    KC_C,  KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
309         KC_HYPR, KC_LGUI, KC_LALT, LT(1, KC_SPC),                                           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
310 
311     /* 1: spacefn with WASD arrows/navigation block and extra space key for
312diff --git a/keyboards/gh60/revc/keymaps/maxr1998/keymap.c b/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
313index 4a1ad54b41b287845c8938929e0f5f55af910a4a..3abadf0404001a1a7856798402674147a87e1015 100644
314--- a/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
315+++ b/keyboards/gh60/revc/keymaps/maxr1998/keymap.c
316@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
317   LAYOUT(
318     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,\
319     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NO,  \
320-    KC_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HOME, KC_ENT, \
321+    QK_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HOME, KC_ENT, \
322     KC_LSFT, KC_BSLS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,\
323     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_NO,   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
324   /* 1: fn */
325diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c
326index c341bdf0b618a74043baace48e6705cec138821c..139cd1f5106cb474a17fe85c9d10cd8ff0e460b7 100644
327--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c
328+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/keymap.c
329@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
330      KC_T,   KC_TAB,  KC_Q,    KC_W,  KC_E,    KC_R,                                          KC_Y,    KC_U,     KC_I,         KC_O,   KC_P,    KC_BSLS,
331      KC_G,   KC_LCTL, KC_A,    KC_S,  KC_D,    KC_F,                                          KC_H,    KC_J,     KC_K,         KC_L,   KC_SCLN, KC_QUOT,
332      KC_B,   KC_LSFT, KC_Z,    KC_X,  KC_C,    KC_V,                                          KC_N,    KC_M,     KC_COMM,      KC_DOT, KC_SLSH, KC_RSFT,
333-                      KC_LOCK,        KC_LALT, KC_SPC, KC_ENT,  KC_GRV,    TG(GAME), _______, _______, _______,                KC_EQL,
334+                      QK_LOCK,        KC_LALT, KC_SPC, KC_ENT,  KC_GRV,    TG(GAME), _______, _______, _______,                KC_EQL,
335                                                        KC_BSPC, KC_F5,     KC_F6,    _______
336   ),
337 };
338diff --git a/keyboards/handwired/snatchpad/keymaps/default/keymap.c b/keyboards/handwired/snatchpad/keymaps/default/keymap.c
339index a473d4778bc896d9b0b53994f0c11e856ce13665..db8305129dc2ae1e58feb2aead772122db5decf4 100644
340--- a/keyboards/handwired/snatchpad/keymaps/default/keymap.c
341+++ b/keyboards/handwired/snatchpad/keymaps/default/keymap.c
342@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
343     KC_MUTE,          KC_MPLY
344   ),
345   [1] = LAYOUT(
346-    KC_LOCK, KC_UP  , _______,
347+    QK_LOCK, KC_UP  , _______,
348     KC_LEFT, KC_DOWN, KC_RGHT,
349     KC_BTN1,          KC_BTN2
350   ),
351diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
352index aae83fc7a841749d4f4851c56da12b0e12e90a3c..3ff95a3c6ec107b462bf36d5b9e4c6ca064c658b 100644
353--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
354+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
355@@ -1,11 +1,6 @@
356 #pragma once
357 
358 #include "edvorakjp.h"
359-/*
360- * enum custom_keycodes {
361- *   KC_LOCK = NEW_SAFE_RANGE,
362- * };
363- */
364 
365 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
366 
367diff --git a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
368index 20f836cd12f31ce92d999629c332db9fbc155a68..6798e9e625ec9e01947637173aedb1f1309db7ce 100644
369--- a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
370+++ b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
371@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
372 
373     [FCTN] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYRQ,
374                     //-------------------------------//
375-                    KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
376+                    KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
377                     //-------------------------------//
378                     KC_PAUS, RGB_VAI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
379                     //-------------------------------//
380diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
381index 013d6c00a5e37e6369b5dd59b663e577291b4bbd..d0df36b5f9622c4100ed338ae7c4f98de46c9a8a 100644
382--- a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
383+++ b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
384@@ -1,12 +1,6 @@
385 #include QMK_KEYBOARD_H
386 #include "edvorakjp.h"
387 
388-/*
389- * enum custom_keycodes {
390- *   KC_LOCK = NEW_SAFE_RANGE,
391- * };
392- */
393-
394 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
395 #define __KC_TRNS_x6__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
396 
397diff --git a/keyboards/keebio/iris/keymaps/nstickney/keymap.c b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
398index 2738ed28279fff208cd8e4cec40386247fb3be37..eca6ce70931fb987bb16a87d67a0a7ef24d3222e 100644
399--- a/keyboards/keebio/iris/keymaps/nstickney/keymap.c
400+++ b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
401@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
402 
403     [FCTN] = LAYOUT(
404         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYRQ,
405-        KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
406+        KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
407         KC_PAUS, RGB_VAI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
408         _______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, KC_F11, KC_F12, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______,
409         _______, _______, _______, _______, _______, _______
410diff --git a/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
411index 2d4685c53a0644ab701e6b624c53d07e327e5c5d..5607f8d0d9e8748c5eee4b2c1cbdbb97044cc3e2 100644
412--- a/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
413+++ b/keyboards/keyboardio/atreus/keymaps/replicaJunction/keymap.c
414@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
415 [L_GAMING] = LAYOUT(
416     _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
417     _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,
418-    _______,_______,KC_C,   KC_D,   _______,_______,KC_LOCK,_______,_______,_______,_______,_______,
419+    _______,_______,KC_C,   KC_D,   _______,_______,QK_LOCK,_______,_______,_______,_______,_______,
420     _______,KC_TAB, KC_LALT,KC_LSFT,KC_SPC, KC_LCTL,KC_LALT,KC_BSPC,KC_BTN1,KC_BTN2,KC_BTN3,_______
421 ),
422 
423diff --git a/keyboards/kprepublic/bm43hsrgb/rules.mk b/keyboards/kprepublic/bm43hsrgb/rules.mk
424index 30dc2eaefe2997780f9bb2815ae36b312c1e00c0..296559b4743a3c61b9c3d3a62c154326e6b824ae 100755
425--- a/keyboards/kprepublic/bm43hsrgb/rules.mk
426+++ b/keyboards/kprepublic/bm43hsrgb/rules.mk
427@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
428 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
429 AUDIO_ENABLE = no           # Audio output
430 
431-KEY_LOCK_ENABLE = no        # Enable KC_LOCK support
432+KEY_LOCK_ENABLE = no
433diff --git a/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c b/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
434index c15ba47ebb19e319ad25640f079dca4fea9adf7b..86e13395ee4a06041509c7dcc0036e334f4b4492 100644
435--- a/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
436+++ b/keyboards/kprepublic/jj40/keymaps/fun40/keymap.c
437@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
438  */
439 [_RAISE] = LAYOUT_ortho_4x12( \
440   KC_CAPS, KC_MINS, KC_PLUS, KC_EQL,  KC_LPRN, KC_RPRN, _______, KC_7,  KC_8,    KC_9, KC_BSPC, KC_DEL, \
441-  KC_LOCK,  KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4,  KC_5,    KC_6, _______, _______, \
442+  QK_LOCK,  KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4,  KC_5,    KC_6, _______, _______, \
443   KC_INS, KC_GRV, KC_BSLS, KC_PIPE,  KC_LCBR, KC_RCBR, _______, KC_1,  KC_2,    KC_3, KC_DOT, _______, \
444   KC_LCTL, _______, KC_LALT, _______, _______, _______, _______, _______, KC_0, _______, KC_HOME, KC_END \
445 )
446diff --git a/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c b/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
447index 0d8adbffbc17e5788b902a0f87f07a28b57118a3..1d23e5afe097273c35852ed1660401d81cfed238 100644
448--- a/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
449+++ b/keyboards/kprepublic/jj40/keymaps/oscillope/keymap.c
450@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
451   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
452   KC_INS,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \
453   QK_BOOT, KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \
454-  _______, _______, _______, _______, KC_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \
455+  _______, _______, _______, _______, QK_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \
456 ),
457 
458 /* Raise
459diff --git a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
460index afd66347d55785ebf795f187e3c09fe1a8115cfe..506d3b68979e2be2880881a45b6183b96270c054 100644
461--- a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
462+++ b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
463@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
464 [_FN] = LAYOUT(
465   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F10,  KC_F11,  KC_F12,
466   _______, _______, _______, _______, _______, _______, _______, DE_UDIA, KC_F9,   DE_ODIA, _______, KC_DEL,
467-  KC_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_SW,RGB_M_SN,_______, _______,
468+  QK_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_SW,RGB_M_SN,_______, _______,
469   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______,
470   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,      _______,     XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END
471 ),
472diff --git a/keyboards/moonlander/keymaps/jjerrell/keymap.c b/keyboards/moonlander/keymaps/jjerrell/keymap.c
473index 012b7736789007438dc1ff1a9c8581a4870562af..ee6226177f69b95b926c2bae89e3e796eafd5036 100644
474--- a/keyboards/moonlander/keymaps/jjerrell/keymap.c
475+++ b/keyboards/moonlander/keymaps/jjerrell/keymap.c
476@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
477         KC_TAB,  __________________QWERTY_L1__________________, KC_SLSH,
478         KC_LALT, __________________QWERTY_L2__________________, KC_BSLS,
479         KC_LSFT, __________________QWERTY_L3__________________,
480-        KC_LGUI, MACRO_1, MACRO_2, MACRO_3, MACRO_4,   KC_LOCK,
481+        KC_LGUI, MACRO_1, MACRO_2, MACRO_3, MACRO_4,   QK_LOCK,
482                                     KC_SPC, KC_BTN2, MO(_LOWER)
483     ),
484     [_GAME_LOWER] = LAYOUT_moonlander_gamepad(
485@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
486         KC_TAB,  __________________QWERTY_L1__________________, KC_SLSH,
487         KC_LALT, __________________QWERTY_L2__________________, KC_BSLS,
488         KC_LSFT, __________________QWERTY_L3__________________,
489-        KC_LGUI, MACRO_5, MACRO_6, MACRO_7, MACRO_8,   KC_LOCK,
490+        KC_LGUI, MACRO_5, MACRO_6, MACRO_7, MACRO_8,   QK_LOCK,
491                                     KC_SPC, KC_BTN2, MO(_LOWER)
492     )
493 };
494diff --git a/keyboards/mschwingen/modelm/keymaps/default/keymap.c b/keyboards/mschwingen/modelm/keymaps/default/keymap.c
495index 97b154fb53c30bd8425c43fed52be964dd94f3e7..8e28b4e449f08216f0ab7805bbc9ea3116fdcb10 100644
496--- a/keyboards/mschwingen/modelm/keymaps/default/keymap.c
497+++ b/keyboards/mschwingen/modelm/keymaps/default/keymap.c
498@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
499     // Space:  Media Play / Pause
500     // m: enter mouse layer
501     _______,          DM_PLY1, DM_PLY2, DM_REC1, DM_REC2, DM_RSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
502-    KC_LOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
503+    QK_LOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
504     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
505     KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______,
506     _______, _______, _______, _______, _______, _______, _______, _______, TG(_MS), _______, _______, _______,          _______,          KC_VOLU,          _______, _______, _______, _______,
507diff --git a/keyboards/neokeys/g67/element_hs/rules.mk b/keyboards/neokeys/g67/element_hs/rules.mk
508index 574f0067fbc42867dc8c9d655a8c0ad61d10ec1f..8670b7f8741b2b4443a917e4a4a4d3af10484969 100644
509--- a/keyboards/neokeys/g67/element_hs/rules.mk
510+++ b/keyboards/neokeys/g67/element_hs/rules.mk
511@@ -17,6 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
512 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
513 AUDIO_ENABLE = no           # Audio output
514 
515-KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support
516+KEY_LOCK_ENABLE = yes
517 
518 LAYOUTS = 65_ansi_blocker
519diff --git a/keyboards/neokeys/g67/hotswap/rules.mk b/keyboards/neokeys/g67/hotswap/rules.mk
520index 574f0067fbc42867dc8c9d655a8c0ad61d10ec1f..8670b7f8741b2b4443a917e4a4a4d3af10484969 100644
521--- a/keyboards/neokeys/g67/hotswap/rules.mk
522+++ b/keyboards/neokeys/g67/hotswap/rules.mk
523@@ -17,6 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
524 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
525 AUDIO_ENABLE = no           # Audio output
526 
527-KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support
528+KEY_LOCK_ENABLE = yes
529 
530 LAYOUTS = 65_ansi_blocker
531diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c
532index 8fb5d0db26c0acaa1a0a63916fb6bf3092e4b7c1..399acccbd4619b86deba23674294b195013f587d 100644
533--- a/keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c
534+++ b/keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c
535@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
536       SIX_TRNS,                                              _______,     _______, SIX_TRNS,
537       KC_LCTL,  FOUR_TRNS,                          _______, KC_F6,         _______, SIX_TRNS,
538       KC_LSFT,  KC_Z,    FOUR_TRNS,                          KC_F5,         _______, SIX_TRNS,
539-      KC_ENT,   _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),     _______, SIX_TRNS
540+      KC_ENT,   _______, QK_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),     _______, SIX_TRNS
541   ),
542 
543   [GAME_ARROW] = LAYOUT_wrapper(
544@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
545       _______,  _______, KC_UP,   _______,  _______, _______, _______,     _______, SIX_TRNS,
546       KC_LCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  _______, _______, KC_F6,       _______, SIX_TRNS,
547       KC_LSFT,  KC_Z,    FOUR_TRNS,                           KC_F5,       _______, SIX_TRNS,
548-      KC_ENT,   _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),    _______, SIX_TRNS
549+      KC_ENT,   _______, QK_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),    _______, SIX_TRNS
550   )
551 };
552 
553diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c
554index e745acf498111009a085b1053e46fef9e6295b96..0731595767137d8555fbc3a4f3c0aefa33ca3269 100644
555--- a/keyboards/planck/keymaps/gunp/keymap.c
556+++ b/keyboards/planck/keymaps/gunp/keymap.c
557@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
558   OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), MC(KC_W), KC_DELETE,    KC_APP
559 ),
560 [LY_1101] = LAYOUT_gunp(
561-  SANDBOX,   XXXXXXX,    AU_TOG,       KC_LOCK,    RGB_TOG,       QK_BOOT,
562+  SANDBOX,   XXXXXXX,    AU_TOG,       QK_LOCK,    RGB_TOG,       QK_BOOT,
563   KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DB_TOGG,
564   KC_SLEP,   KC_NUM,     DM_REC1,      DM_PLY1,    XXXXXXX,       EE_CLR,
565   KC_PWR,    KC_SCRL,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT
566diff --git a/keyboards/planck/keymaps/vifon/keymap.c b/keyboards/planck/keymaps/vifon/keymap.c
567index 6d6d11020dcee951e01af75a4ace6bcb113d895a..692919754235f35dfa278aa3c8fb98255d17b4fa 100644
568--- a/keyboards/planck/keymaps/vifon/keymap.c
569+++ b/keyboards/planck/keymaps/vifon/keymap.c
570@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
571         ),
572     [_DYN] = LAYOUT_planck_mit( /* special */
573         KM_HOLD,  DYN_REC_START1, DYN_MACRO_PLAY1, _______, _______,    _______, _______, KC_APP,  KC_INS,  _______, KC_PSCR, KC_PAUS,
574-        KC_LOCK,  DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM,
575+        QK_LOCK,  DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM,
576         KM_SHLK,  _______,        _______,         _______, _______,    _______, _______, _______, _______, _______, _______, _______,
577         _______,  _______,        _______,         _______, KM_PP_GAME,      DF(_QW),     DF(_PP), _______, _______, _______, _______
578         ),
579diff --git a/keyboards/playkbtw/helen80/rules.mk b/keyboards/playkbtw/helen80/rules.mk
580index d29ae3dafa931e1d6cd9d7c5345becc56ec13478..9b01a362026fb8cd82b7ab179b835f0121ebc156 100644
581--- a/keyboards/playkbtw/helen80/rules.mk
582+++ b/keyboards/playkbtw/helen80/rules.mk
583@@ -18,6 +18,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
584 AUDIO_ENABLE = no           # Audio output
585 LTO_ENABLE = yes
586 
587-KEY_LOCK_ENABLE = no      # Enable KC_LOCK support
588+KEY_LOCK_ENABLE = no
589 
590 LAYOUTS = tkl_ansi
591diff --git a/keyboards/preonic/keymaps/kjwon15/keymap.c b/keyboards/preonic/keymaps/kjwon15/keymap.c
592index 45db32be925e481206cac600b9cbace2ef8e731e..99c29d584916db83c9260317bf248f3a8295e051 100644
593--- a/keyboards/preonic/keymaps/kjwon15/keymap.c
594+++ b/keyboards/preonic/keymaps/kjwon15/keymap.c
595@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
596  */
597 [_ADJUST] = LAYOUT_preonic_grid(
598   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
599-  KC_LOCK, QK_BOOT, CK_TOGG, MU_MOD,  QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \
600+  QK_LOCK, QK_BOOT, CK_TOGG, MU_MOD,  QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \
601   _______, AU_ON,   AU_OFF,  KC_BTN2, KC_BTN1, AG_NORM, AG_SWAP, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_ACL0, \
602   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_ACL1, \
603   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ACL2  \
604diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
605index 4cde20a7ef32cf510b374554bf5efbe22fdefcc1..3d1974b8ac6acf551f63b95b3a033666a7301424 100644
606--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
607+++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
608@@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
609     _______, _______,        _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \
610     KC_LCTL, _______,        _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \
611     KC_LSFT, KC_Z,           _______, _______, _______, _______,                    _______, _______, _______, _______, _______, KC_LGUI, \
612-    KC_ENT,  TG(GAME_ARROW), KC_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
613+    KC_ENT,  TG(GAME_ARROW), QK_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
614 ),
615 /* Gaming Arrow mode (Raise)
616  * Turns wasd into arrows
617@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
618     _______, _______, KC_UP,   _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \
619     KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                    _______, _______, _______, _______, _______, _______, \
620     KC_LSFT, KC_Z,    _______, _______, _______, _______,                    _______, _______, _______, _______, _______, KC_LGUI, \
621-    KC_ENT,  _______, KC_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
622+    KC_ENT,  _______, QK_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
623 )
624 };
625 
626diff --git a/keyboards/winry/winry25tc/rules.mk b/keyboards/winry/winry25tc/rules.mk
627index b0352b513cd0be8be4ba33f5825ab3c3f713dd8d..53a67bd4aedde7e94c23034528368e857081a8e6 100644
628--- a/keyboards/winry/winry25tc/rules.mk
629+++ b/keyboards/winry/winry25tc/rules.mk
630@@ -16,4 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
631 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
632 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
633 
634-KEY_LOCK_ENABLE = yes     # Enable KC_LOCK support
635+KEY_LOCK_ENABLE = yes
636diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
637index dcd1ac563fb9fc876484281c218452258a1027a3..241d07275e7da8514c7437f8200cd73b45ad8675 100644
638--- a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
639+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
640@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
641     KC_TAB,  KC_K,    KC_DOT,  KC_O,    KC_COMM,  N_Y,    DM_REC2,  DM_PLY2, KC_V,   KC_G,    KC_C,    KC_L,    N_SS,   N_Z,     KC_TRNS,
642     MO(_3),  KC_H,    KC_A,    KC_E,    KC_I,     KC_U,   N_UNDO,   DM_RSTP, KC_D,   KC_T,    KC_R,    KC_N,    KC_S,   KC_F,    MO(_3),
643     KC_LSFT, KC_X,    KC_Q,    N_AE,    N_UE,     N_OE,   N_COPY,   N_CUT,   KC_B,   KC_P,    KC_W,    KC_M,    KC_J,   KC_RSFT, KC_RSFT,
644-    KC_LCTL, MO(_4),  KC_TRNS, KC_LGUI, KC_LALT,  KC_SPC, N_PASTE,  KC_SPC,  KC_SPC, MO(_4),  KC_RCTL, KC_TRNS, KC_TRNS,KC_LOCK, MO(_7)
645+    KC_LCTL, MO(_4),  KC_TRNS, KC_LGUI, KC_LALT,  KC_SPC, N_PASTE,  KC_SPC,  KC_SPC, MO(_4),  KC_RCTL, KC_TRNS, KC_TRNS,QK_LOCK, MO(_7)
646   ),
647 
648 /* Layer 3
649diff --git a/keyboards/ymdk/ymd40/v2/rules.mk b/keyboards/ymdk/ymd40/v2/rules.mk
650index 7c64cc042f6280144dd4b9bb3219e4c8a8af7e36..3a34f2d80ad730bc40071b4c6ac79c7872653101 100644
651--- a/keyboards/ymdk/ymd40/v2/rules.mk
652+++ b/keyboards/ymdk/ymd40/v2/rules.mk
653@@ -17,7 +17,7 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
654 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
655 AUDIO_ENABLE = no           # Audio output
656 
657-KEY_LOCK_ENABLE = no        # Enable KC_LOCK support
658+KEY_LOCK_ENABLE = no
659 
660 AUDIO_SUPPORTED = no
661 
662diff --git a/keyboards/ymdk/ymd75/rev3/rules.mk b/keyboards/ymdk/ymd75/rev3/rules.mk
663index 258c4d3ff6a551274c50a1ac1d76dfd12030380c..14d8f08c35013e57523ee674736b5eb55539f529 100644
664--- a/keyboards/ymdk/ymd75/rev3/rules.mk
665+++ b/keyboards/ymdk/ymd75/rev3/rules.mk
666@@ -16,4 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
667 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
668 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
669 AUDIO_ENABLE = no           # Audio output
670-KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support
671+KEY_LOCK_ENABLE = yes
672diff --git a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
673index e970c1b6953f46bab498c682d77f0232f5281646..7c9b4f59e472e52205218644e757df290cc13626 100644
674--- a/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
675+++ b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
676@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
677 		_______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, BL_OFF,  BL_ON,   BL_DEC,   BL_INC,       _______,     _______, _______, _______, _______,  \
678 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD,  RGB_VAI,      KC_MUTE,     _______, KC_VOLU, _______, _______,  \
679 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,  BL_TOGG,                   KC_MPRV, KC_MPLY, KC_MNXT, _______,  \
680-		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     KC_PGUP, _______, KC_VOLD, _______, KC_LOCK,  \
681+		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     KC_PGUP, _______, KC_VOLD, _______, QK_LOCK,  \
682 		_______,  _______, KC_RALT,                               _______,                           _______,      _______,    KC_HOME, KC_PGDN, KC_END,  _______, _______            \
683 	)
684 };