219afaba42e6b4384f578977eadbb71a03383ecc

Author
Nick Brassel <nick@tzarc.org>
Committer
GitHub <noreply@github.com>
Date

Message

Reworked backlight keycodes. (#18961)

Co-authored-by: Ryan <fauxpark@gmail.com>

Diff

This diff is truncated to protect this page.

  1diff --git a/data/constants/keycodes/keycodes_0.0.1_lighting.hjson b/data/constants/keycodes/keycodes_0.0.1_lighting.hjson
  2index 90ed36c645dea92ecb75a635a25ee0934c57bef7..77275cec29ac78b61ef8bccf8cd0b5411bee8a21 100644
  3--- a/data/constants/keycodes/keycodes_0.0.1_lighting.hjson
  4+++ b/data/constants/keycodes/keycodes_0.0.1_lighting.hjson
  5@@ -2,31 +2,52 @@
  6     "keycodes": {
  7         "0x7800": {
  8             "group": "backlight",
  9-            "key": "BL_ON"
 10+            "key": "QK_BACKLIGHT_ON",
 11+            "aliases": [
 12+                "BL_ON"
 13+            ]
 14         },
 15         "0x7801": {
 16             "group": "backlight",
 17-            "key": "BL_OFF"
 18+            "key": "QK_BACKLIGHT_OFF",
 19+            "aliases": [
 20+                "BL_OFF"
 21+            ]
 22         },
 23         "0x7802": {
 24             "group": "backlight",
 25-            "key": "BL_DEC"
 26+            "key": "QK_BACKLIGHT_TOGGLE",
 27+            "aliases": [
 28+                "BL_TOGG"
 29+            ]
 30         },
 31         "0x7803": {
 32             "group": "backlight",
 33-            "key": "BL_INC"
 34+            "key": "QK_BACKLIGHT_DOWN",
 35+            "aliases": [
 36+                "BL_DOWN"
 37+            ]
 38         },
 39         "0x7804": {
 40             "group": "backlight",
 41-            "key": "BL_TOGG"
 42+            "key": "QK_BACKLIGHT_UP",
 43+            "aliases": [
 44+                "BL_UP"
 45+            ]
 46         },
 47         "0x7805": {
 48             "group": "backlight",
 49-            "key": "BL_STEP"
 50+            "key": "QK_BACKLIGHT_STEP",
 51+            "aliases": [
 52+                "BL_STEP"
 53+            ]
 54         },
 55         "0x7806": {
 56             "group": "backlight",
 57-            "key": "BL_BRTG"
 58+            "key": "QK_BACKLIGHT_TOGGLE_BREATHING",
 59+            "aliases": [
 60+                "BL_BRTG"
 61+            ]
 62         },
 63 
 64         "0x7820": {
 65@@ -151,4 +172,4 @@
 66             ]
 67         }
 68     }
 69-}
 70+}
 71diff --git a/docs/feature_backlight.md b/docs/feature_backlight.md
 72index 79782cf56493f17d8e741b6f25b298f297276398..24057c608f8c47b05fac281b3ef49f24d8dc443f 100644
 73--- a/docs/feature_backlight.md
 74+++ b/docs/feature_backlight.md
 75@@ -16,15 +16,15 @@ BACKLIGHT_ENABLE = yes
 76 
 77 Once enabled, the following keycodes below can be used to change the backlight level.
 78 
 79-|Key      |Description                        |
 80-|---------|-----------------------------------|
 81-|`BL_TOGG`|Turn the backlight on or off       |
 82-|`BL_STEP`|Cycle through backlight levels     |
 83-|`BL_ON`  |Set the backlight to max brightness|
 84-|`BL_OFF` |Turn the backlight off             |
 85-|`BL_INC` |Increase the backlight level       |
 86-|`BL_DEC` |Decrease the backlight level       |
 87-|`BL_BRTG`|Toggle backlight breathing         |
 88+| Key                             | Aliases   | Description                         |
 89+|---------------------------------|-----------|-------------------------------------|
 90+| `QK_BACKLIGHT_TOGGLE`           | `BL_TOGG` | Turn the backlight on or off        |
 91+| `QK_BACKLIGHT_STEP`             | `BL_STEP` | Cycle through backlight levels      |
 92+| `QK_BACKLIGHT_ON`               | `BL_ON`   | Set the backlight to max brightness |
 93+| `QK_BACKLIGHT_OFF`              | `BL_OFF`  | Turn the backlight off              |
 94+| `QK_BACKLIGHT_UP`               | `BL_UP`   | Increase the backlight level        |
 95+| `QK_BACKLIGHT_DOWN`             | `BL_DOWN` | Decrease the backlight level        |
 96+| `QK_BACKLIGHT_TOGGLE_BREATHING` | `BL_BRTG` | Toggle backlight breathing          |
 97 
 98 ## Functions :id=functions
 99 
100diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
101index 280db2a383c5497f6ebd06c2e447337228343fae..b46850742462903fe4ebe40bbd7d8588902717fd 100644
102--- a/docs/feature_led_matrix.md
103+++ b/docs/feature_led_matrix.md
104@@ -199,7 +199,7 @@ x = 224 / (NUMBER_OF_COLS - 1) * COL_POSITION
105 y =  64 / (NUMBER_OF_ROWS - 1) * ROW_POSITION
106 ```
107 
108-Where NUMBER_OF_COLS, NUMBER_OF_ROWS, COL_POSITION, & ROW_POSITION are all based on the physical layout of your keyboard, not the electrical layout. 
109+Where NUMBER_OF_COLS, NUMBER_OF_ROWS, COL_POSITION, & ROW_POSITION are all based on the physical layout of your keyboard, not the electrical layout.
110 
111diff --git a/docs/keycodes.md b/docs/keycodes.md
112index d185fe38c01dcdfe86ae9e9ecf23cbf521310888..03ac181a448f4928e56b5a81da5cd8278c4452cb 100644
113--- a/docs/keycodes.md
114+++ b/docs/keycodes.md
115@@ -278,15 +278,15 @@ See also: [Autocorrect](feature_autocorrect.md)
116 
117 See also: [Backlighting](feature_backlight.md)
118 
119-|Key      |Description                               |
120-|---------|------------------------------------------|
121-|`BL_TOGG`|Turn the backlight on or off              |
122-|`BL_STEP`|Cycle through backlight levels            |
123-|`BL_ON`  |Set the backlight to max brightness       |
124-|`BL_OFF` |Turn the backlight off                    |
125-|`BL_INC` |Increase the backlight level              |
126-|`BL_DEC` |Decrease the backlight level              |
127-|`BL_BRTG`|Toggle backlight breathing                |
128+| Key                             | Aliases   | Description                         |
129+|---------------------------------|-----------|-------------------------------------|
130+| `QK_BACKLIGHT_TOGGLE`           | `BL_TOGG` | Turn the backlight on or off        |
131+| `QK_BACKLIGHT_STEP`             | `BL_STEP` | Cycle through backlight levels      |
132+| `QK_BACKLIGHT_ON`               | `BL_ON`   | Set the backlight to max brightness |
133+| `QK_BACKLIGHT_OFF`              | `BL_OFF`  | Turn the backlight off              |
134+| `QK_BACKLIGHT_UP`               | `BL_UP`   | Increase the backlight level        |
135+| `QK_BACKLIGHT_DOWN`             | `BL_DOWN` | Decrease the backlight level        |
136+| `QK_BACKLIGHT_TOGGLE_BREATHING` | `BL_BRTG` | Toggle backlight breathing          |
137 
138 ## Bluetooth :id=bluetooth
139 
140diff --git a/keyboards/0xcb/1337/keymaps/conor/keymap.c b/keyboards/0xcb/1337/keymaps/conor/keymap.c
141index 615ca7baf8d00683a838b50231f4492fac84d8e6..2064537df11f17c3e28f8df5399cfd42fe6c694e 100644
142--- a/keyboards/0xcb/1337/keymaps/conor/keymap.c
143+++ b/keyboards/0xcb/1337/keymaps/conor/keymap.c
144@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
145 [_BLED] = LAYOUT(
146     BL_STEP, BL_BRTG, BL_TOGG,
147     BL_ON,   BL_OFF,  TO(2),
148-    BL_INC,  BL_DEC,  TO(0)
149+    BL_UP,   BL_DOWN, TO(0)
150 )
151 };
152 // clang-format on
153diff --git a/keyboards/0xcb/1337/keymaps/default/keymap.c b/keyboards/0xcb/1337/keymaps/default/keymap.c
154index 751af6f4f7d820ccab9c9158cb2a72b0fccb7b41..3f05c97da95b9d8f852359ed91bc4f3f260df885 100644
155--- a/keyboards/0xcb/1337/keymaps/default/keymap.c
156+++ b/keyboards/0xcb/1337/keymaps/default/keymap.c
157@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
158 [_BLED] = LAYOUT(
159     BL_STEP, BL_BRTG, BL_TOGG,
160     BL_ON,   BL_OFF,  TO(2),
161-    BL_INC,  BL_DEC,  TO(0)
162+    BL_UP,   BL_DOWN, TO(0)
163 )
164 };
165 // clang-format on
166diff --git a/keyboards/0xcb/1337/keymaps/jakob/keymap.c b/keyboards/0xcb/1337/keymaps/jakob/keymap.c
167index f4a075844fc878d0cc79b2191ae3c0aa1bbdddeb..4f73a1d9fdf5d671f9d288de2f25655970297d02 100644
168--- a/keyboards/0xcb/1337/keymaps/jakob/keymap.c
169+++ b/keyboards/0xcb/1337/keymaps/jakob/keymap.c
170@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
171 [_BLED] = LAYOUT(
172     BL_STEP, BL_BRTG, BL_TOGG,
173     BL_ON,   BL_OFF,  TO(2),
174-    BL_INC,  BL_DEC,  TO(0)
175+    BL_UP,   BL_DOWN, TO(0)
176 )
177 };
178 // clang-format on
179diff --git a/keyboards/0xcb/1337/keymaps/via/keymap.c b/keyboards/0xcb/1337/keymaps/via/keymap.c
180index a85670e06e42632d7ede91b2f38acfc1ec483745..f6f32b7ba1e4e7ae4f65141517bbdcdbee7db86a 100644
181--- a/keyboards/0xcb/1337/keymaps/via/keymap.c
182+++ b/keyboards/0xcb/1337/keymaps/via/keymap.c
183@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
184 [_BLED] = LAYOUT(
185     BL_STEP, BL_BRTG, BL_TOGG,
186     BL_ON,   BL_OFF,  TO(2),
187-    BL_INC,  BL_DEC,  TO(0)
188+    BL_UP,   BL_DOWN, TO(0)
189 )
190 };
191 // clang-format on
192diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
193index e62f033d5ff71bd9297c71f46655788d521528c9..c5db49007dd8514abe654e0f0b8777f2436fb1da 100644
194--- a/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
195+++ b/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
196@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
197    */
198   [2] = LAYOUT_60_ansi(
199     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, QK_BOOT,
200-    BL_TOGG, BL_INC, BL_DEC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
201+    BL_TOGG, BL_UP,  BL_DOWN,BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
202     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, KC_TRNS, KC_TRNS, KC_TRNS,
203     KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS,
204     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
205diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
206index 040fda4399701816af86dbba7bbe5fbaf63834a2..001319637bd31791cbf0c48fd42380a29794558c 100644
207--- a/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
208+++ b/keyboards/1upkeyboards/1up60hse/keymaps/via/keymap.c
209@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
210    */
211   [2] = LAYOUT_60_ansi(
212     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, QK_BOOT,
213-    BL_TOGG, BL_INC, BL_DEC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
214+    BL_TOGG, BL_UP,  BL_DOWN,BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
215     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, KC_TRNS, KC_TRNS, KC_TRNS,
216     KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS,
217     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
218diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
219index bd8ded4dcd82b4a995a7895830f94afc5a0de408..eeca330838abd2c003367675700086516a28d54c 100644
220--- a/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
221+++ b/keyboards/1upkeyboards/1up60hse/keymaps/vosechu/keymap.c
222@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
223 
224   [2] = LAYOUT_60_ansi(
225     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 , QK_BOOT,
226-    BL_TOGG , BL_INC   , BL_DEC  , BL_STEP , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ,
227+    BL_TOGG , BL_UP    , BL_DOWN , BL_STEP , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ,
228     RGB_TOG , RGB_MOD  , RGB_HUI , RGB_SAI , RGB_VAI , RGB_SPI , RGB_M_P  , RGB_M_B , RGB_M_R , RGB_M_SW , KC_TRNS , KC_TRNS , KC_TRNS ,
229     KC_TRNS , RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , RGB_SPD , RGB_M_SN , RGB_M_K , RGB_M_X , RGB_M_G  , KC_TRNS , KC_TRNS ,
230     KC_TRNS , KC_TRNS  , KC_TRNS ,           KC_TRNS           , KC_TRNS  , KC_TRNS , KC_TRNS , KC_TRNS
231diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
232index 56804c66089b55ffc6e5da75606b54893e8181eb..ec7440588dce6d6c988e841b859b3a83ccf45d4e 100644
233--- a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
234+++ b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
235@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
236 
237     [1] = LAYOUT_60_tsangan_hhkb(
238         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,
239-        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
240+        KC_CAPS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
241         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
242         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
243         _______, _______, _______,                            _______,                                     _______, _______, _______
244diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
245index 4bf0c20b12101ec8a6e717895a6c2af63e8df5e4..b1b5d06f5a516340c48fd900c7d7a9eab72d3dcc 100644
246--- a/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
247+++ b/keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
248@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
249 
250     [1] = LAYOUT_60_hhkb(
251         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,
252-        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
253+        KC_CAPS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
254         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
255         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
256                  _______, _______,                            _______,                                     _______, _______
257diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
258index 6fde5f40c7596f1c36217d6dc6b1328f93c4c05b..243df19de9b843af63f5761fa2690d31184400c7 100644
259--- a/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
260+++ b/keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
261@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
262 
263     [1] = LAYOUT_60_tsangan_hhkb(
264         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,
265-        KC_CAPS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
266+        KC_CAPS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_CLR,
267         _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, RGB_VAD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
268         _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
269         _______, _______, _______,                            _______,                                     _______, _______, _______
270diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
271index efdd7782157168c4aa433544e810b81a0d6ba6be..c8b2f84b72330c650c210ffc906c2b55b7ffcc4a 100644
272--- a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
273+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
274@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
275 
276 	LAYOUT_all(
277 		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_TRNS, KC_DEL,
278-		KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_TRNS, KC_TRNS,
279+		KC_TRNS, BL_TOGG, BL_DOWN,BL_UP,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_TRNS, KC_TRNS,
280 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
281 		KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
282 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
283diff --git a/keyboards/25keys/aleth42/keymaps/default/keymap.c b/keyboards/25keys/aleth42/keymaps/default/keymap.c
284index a95fa7acf4e6063b9cca4df7bb38ce864c42b281..e078e731d7a2ca65a9d2667e19e211758401fcc1 100644
285--- a/keyboards/25keys/aleth42/keymaps/default/keymap.c
286+++ b/keyboards/25keys/aleth42/keymaps/default/keymap.c
287@@ -99,8 +99,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
288       */
289     [_ADJUST] = LAYOUT(
290         KC_MUTE, KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
291-		_______, BL_TOGG, BL_STEP, BL_INC,  AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
292-		KC_CAPS, QK_BOOT,   BL_BRTG, BL_DEC,  _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
293+		_______, BL_TOGG, BL_STEP, BL_UP,   AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
294+		KC_CAPS, QK_BOOT,   BL_BRTG, BL_DOWN, _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
295 		KC_SLEP, _______, _______, _______, _______, _______, _______, _______
296 		),
297 };
298diff --git a/keyboards/25keys/aleth42/keymaps/via/keymap.c b/keyboards/25keys/aleth42/keymaps/via/keymap.c
299index 82fe4456f3311bdbd3f5bbf592d7c0a84665b795..707d843950705025098f91819eb2132fe08034e6 100644
300--- a/keyboards/25keys/aleth42/keymaps/via/keymap.c
301+++ b/keyboards/25keys/aleth42/keymaps/via/keymap.c
302@@ -99,8 +99,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
303       */
304     [_ADJUST] = LAYOUT(
305         KC_MUTE, KC_F1,   KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
306-		_______, BL_TOGG, BL_STEP, BL_INC,  AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
307-		KC_CAPS, QK_BOOT,   BL_BRTG, BL_DEC,  _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
308+		_______, BL_TOGG, BL_STEP, BL_UP,   AG_NORM,  RGB_TOG, RGB_HUI, AG_SWAP, RGB_SAI, RGB_VAI,  KC_F12,
309+		KC_CAPS, QK_BOOT,   BL_BRTG, BL_DOWN, _______,  RGB_MOD, RGB_HUD, _______, RGB_SAD, RGB_VAD,  _______,
310 		KC_SLEP, _______, _______, _______, _______, _______, _______, _______
311 		),
312 };
313diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
314index cef154eed0b4cad519eeed02c39f4045f7dc545b..ab2a1fa1c141fcf43b4dc92628a091029d9b02ce 100644
315--- a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
316+++ b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
317@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
318 
319   [5] = LAYOUT_ortho_3x10(
320     KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR,
321-    _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,
322+    _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP, 
323     _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______
324   )
325 
326diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json b/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
327index fbbb5a2b851639a02201008eb6352311d71bf08f..139421c44c01a0a9f5473b31517937b001227a03 100644
328--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
329+++ b/keyboards/40percentclub/gherkin/keymaps/pierrec83/keymap.json
330@@ -1 +1 @@
331diff --git a/keyboards/40percentclub/luddite/keymaps/default/keymap.c b/keyboards/40percentclub/luddite/keymaps/default/keymap.c
332index bf447d8340c173dbfed26112084f12df32013566..71a1c3897654b51f55adb5903d257329944b869a 100644
333--- a/keyboards/40percentclub/luddite/keymaps/default/keymap.c
334+++ b/keyboards/40percentclub/luddite/keymaps/default/keymap.c
335@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
336     QK_GESC, 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_BSPC,
337     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
338     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
339-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
340+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
341     KC_GRV,  _______, _______,                            _______,                            _______, _______, _______,  _______
342   )
343 };
344diff --git a/keyboards/40percentclub/luddite/keymaps/via/keymap.c b/keyboards/40percentclub/luddite/keymaps/via/keymap.c
345index 61f83e67106d46c5a397b62fe5c07d4ac5fb01ce..f8e876250a6e79b15bb82e35cbc5c825eda2b2b0 100644
346--- a/keyboards/40percentclub/luddite/keymaps/via/keymap.c
347+++ b/keyboards/40percentclub/luddite/keymaps/via/keymap.c
348@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
349   ),
350 
351   [2] = LAYOUT_60_ansi(
352-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_INC, BL_DEC, KC_TRNS,
353+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_UP,  BL_DOWN,KC_TRNS,
354     RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
355     KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
356     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
357diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
358index c1293966658ac3d4fae2f5874f6889679ac7ca3d..ed98d947e5dd1d2b81ad478cc7281aca4000faf4 100644
359--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
360+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
361@@ -23,8 +23,8 @@
362 #define KC_FN1 MO(_FN)
363 #define KC_FN2 LT(_FN, KC_CAPS)
364 
365-#define KC_BLUP BL_INC   // Backlight increase
366-#define KC_BLDN BL_DEC   // Backlight decrease
367+#define KC_BLUP BL_UP    // Backlight increase
368+#define KC_BLDN BL_DOWN  // Backlight decrease
369 #define KC_BLTOG BL_TOGG // Backlight toggle
370 #define KC_REC1 DM_REC1  // Record macro 1
371 #define KC_PLY1 DM_PLY1  // Play macro 1
372diff --git a/keyboards/8pack/keymaps/default/keymap.c b/keyboards/8pack/keymaps/default/keymap.c
373index 9637f5770263bc0e55739e822981d02ebbcc2ffd..e327d009e8489bafb12691d7b8086610a9505310 100644
374--- a/keyboards/8pack/keymaps/default/keymap.c
375+++ b/keyboards/8pack/keymaps/default/keymap.c
376@@ -7,6 +7,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
377 	),
378 	[1] = LAYOUT(
379 	    RGB_TOG, RGB_RMOD, RGB_MOD, KC_NO,
380-		QK_BOOT,   BL_DEC,   BL_INC,  BL_TOGG
381+		QK_BOOT,   BL_DOWN,  BL_UP,   BL_TOGG
382 	)
383 };
384diff --git a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
385index 2070908b8d3efe6a02600891db9f06da88819869..a6742db9bb814efe36dd8270da0ac221f718ff5d 100644
386--- a/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
387+++ b/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
388@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
389         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,
390         RGB_TOG, RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
391         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,
392-        BL_TOGG, BL_DEC,  BL_INC,  KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
393+        BL_TOGG, BL_DOWN, BL_UP,   KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
394         KC_TRNS, QK_BOOT,   KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
395     ),
396 };
397diff --git a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
398index e8433ab6ca4e2e44adc7c943f2fcfc1928d131aa..02f6a1cda0d24e4a285adc6ae6c5e7eb01df4fa5 100644
399--- a/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
400+++ b/keyboards/acekeyboard/titan60/keymaps/iso/keymap.c
401@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
402         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,
403         RGB_TOG, RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
404         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,
405-        BL_TOGG, BL_DEC,  BL_INC,  KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
406+        BL_TOGG, BL_DOWN, BL_UP,   KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS,          KC_TRNS,
407         KC_TRNS, QK_BOOT,   KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
408     ),
409 };
410diff --git a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
411index f9ae5253cc53f7ab4197ec83bf3cab7d4b5871ac..eb4006a99b7deff19b63d1acf363a150f6ee6265 100644
412--- a/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
413+++ b/keyboards/acekeyboard/titan60/keymaps/tsangan/keymap.c
414@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
415         KC_SLEP,  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,
416         RGB_TOG,  RGB_RMOD, RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_TRNS, KC_CLR,
417         KC_TRNS,  KC_VOLD,  KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,         KC_TRNS,
418-        BL_TOGG,  BL_DEC,   BL_INC,  KC_CALC, KC_MPLY, KC_MNXT, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,          KC_TRNS, KC_TRNS,
419+        BL_TOGG,  BL_DOWN,  BL_UP,   KC_CALC, KC_MPLY, KC_MNXT, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,          KC_TRNS, KC_TRNS,
420         KC_TRNS,  QK_BOOT,    KC_TRNS,                            KC_TRNS,                                     KC_STOP, KC_TRNS, KC_TRNS
421     ),
422 };
423diff --git a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c b/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
424index c9b7b953069006edf0bbb1b4fdb2ca7976a227b9..99e619279470eec16e7bb11de9005867f94646c2 100644
425--- a/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
426+++ b/keyboards/acekeyboard/titan60/keymaps/utilitarian/keymap.c
427@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
428         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,
429         RGB_TOG,  RGB_RMOD,KC_UP,   RGB_MOD, RGB_M_R, RGB_M_T, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, BS_SWAP,
430         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,
431-        BL_TOGG,  BL_DEC,  BL_INC,  KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
432+        BL_TOGG,  BL_DOWN, BL_UP,   KC_CALC, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS,
433         KC_TRNS,  KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
434     ),
435 };
436diff --git a/keyboards/acheron/shark/alpha/keymaps/default/keymap.c b/keyboards/acheron/shark/alpha/keymaps/default/keymap.c
437index a02e82257f5f18fe50b78758ae2ae23ce49c1e99..612355ec450b936f183cd748d4b5bbc5dc7f0217 100644
438--- a/keyboards/acheron/shark/alpha/keymaps/default/keymap.c
439+++ b/keyboards/acheron/shark/alpha/keymaps/default/keymap.c
440@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
441 [_LOWER] = LAYOUT_ortho_4x12(
442   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
443   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
444-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_INC , BL_DEC , _______, _______,
445+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_UP  , BL_DOWN, _______, _______,
446   _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
447 ),
448 
449@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
450   _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
451   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
452   _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
453-  _______, BL_TOGG, BL_INC,  BL_DEC , _______, _______, _______, _______, _______, _______, _______, _______
454+  _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______
455 )
456 };
457 
458diff --git a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c
459index 34a58d508f04e6e8251bd296c80f138f0e2e13c9..046e5468486f88cb7b25c6a99e82ad6dd1bdacd0 100644
460--- a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c
461+++ b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c
462@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
463 [_LOWER] = LAYOUT_ortho_4x12(
464   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
465   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
466-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_INC , BL_DEC , _______, _______,
467+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_UP  , BL_DOWN, _______, _______,
468   _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
469 ),
470 
471@@ -95,6 +95,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
472   _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
473   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
474   _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
475-  _______, BL_TOGG, BL_INC,  BL_DEC , _______, _______, _______, _______, _______, _______, _______, _______
476+  _______, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______
477 )
478 };
479diff --git a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c b/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
480index 0fd56a1a4a1930ae947f838f1cd7a631d68c5dba..6a15c93fa139dbf49acdf61a9a6561adeebe0367 100644
481--- a/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
482+++ b/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
483@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
484         KC_RCTL,    KC_VOLD, KC_VOLU, KC_MUTE, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______,       MY_LOCK,
485diff --git a/keyboards/al1/keymaps/default/keymap.c b/keyboards/al1/keymaps/default/keymap.c
486index ef0c0abf069aacc46be997e7cf5da5329bd6fe41..9ea79868e40238030b21d968e84f4d98d720eae1 100644
487--- a/keyboards/al1/keymaps/default/keymap.c
488+++ b/keyboards/al1/keymaps/default/keymap.c
489@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
490         _______, _______, _______, _______, QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
491         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                            _______, _______, _______,
492         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
493-        _______, _______, _______,                            _______,                            _______, _______, _______,          BL_TOGG, BL_DEC,  BL_INC,           _______, _______
494+        _______, _______, _______,                            _______,                            _______, _______, _______,          BL_TOGG, BL_DOWN, BL_UP,            _______, _______
495     )
496 };
497diff --git a/keyboards/al1/keymaps/splitbs/keymap.c b/keyboards/al1/keymaps/splitbs/keymap.c
498index db07e5ff25e43ba98539216daab17f4f0f612271..71f2b805449d10d3cd4e1cbe854099910bdb9166 100644
499--- a/keyboards/al1/keymaps/splitbs/keymap.c
500+++ b/keyboards/al1/keymaps/splitbs/keymap.c
501@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
502         _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
503         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                     _______, _______, _______,
504         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
505-        _______, _______, _______,                            _______,                            _______, _______, _______,                   BL_TOGG, BL_DEC,  BL_INC,           _______, _______
506+        _______, _______, _______,                            _______,                            _______, _______, _______,                   BL_TOGG, BL_DOWN, BL_UP,            _______, _______
507     )
508 };
509diff --git a/keyboards/alf/dc60/keymaps/default/keymap.c b/keyboards/alf/dc60/keymaps/default/keymap.c
510index ddc488670c1cc481532442c4114ac85373fa7b1e..68d49be983f8e9613bcc6703ea25d696ff415a6c 100644
511--- a/keyboards/alf/dc60/keymaps/default/keymap.c
512+++ b/keyboards/alf/dc60/keymaps/default/keymap.c
513@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
514       KC_ESC,  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_TRNS, KC_TRNS,
515       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,
516       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,
517-      KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
518+      KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP,   BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
519       KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS
520       ),
521 };
522diff --git a/keyboards/alf/x11/keymaps/default/keymap.c b/keyboards/alf/x11/keymaps/default/keymap.c
523index 4ba2d83a94236c3f2be353bcd9e927296b3b49ba..22d459faad7e6450d349d15d23fb2b0a25e0773f 100644
524--- a/keyboards/alf/x11/keymaps/default/keymap.c
525+++ b/keyboards/alf/x11/keymaps/default/keymap.c
526@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
527         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, QK_BOOT,
528 
529         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
530-        BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_MUTE, KC_MPLY, KC_MSTP,
531+        BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_MUTE, KC_MPLY, KC_MSTP,
532         RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
533         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______,
534         _______, _______, _______,                            _______,                            _______, _______, _______, _______,     _______, _______, _______
535diff --git a/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
536index 3c6475809d082b91ce440992fa3a704f2cd568be..41532c5d05562c13f12e52f46cf9144742f813ff 100755
537--- a/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
538+++ b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
539@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
540     [_LOWER] = LAYOUT(
541         KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
542         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS,    KC_LCBR,    KC_RCBR,          KC_PIPE,
543-        KC_F7,            KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), BL_TOGG, BL_INC,  BL_DEC,
544+        KC_F7,            KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), BL_TOGG, BL_UP,   BL_DOWN,
545         _______, _______, _______,                   _______, KC_LEFT,                         KC_DOWN, KC_UP,   KC_RGHT
546     ),
547 
548diff --git a/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
549index 467e50982ebc408f2f6c6cda6427e481ec0b8e40..23ccc2b2abb75bddc3a72da367ed32a2f7f33146 100644
550--- a/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
551+++ b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
552@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
553     ),
554     [2] = LAYOUT_625u_space(
555         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
556-        QK_BOOT,   KC_PWR,  _______, _______, KC_PSCR, KC_PAUS, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP,          _______,
557+        QK_BOOT,   KC_PWR,  _______, _______, KC_PSCR, KC_PAUS, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP,          _______,
558         KC_UP,            KC_MINS, KC_EQL,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LPRN, KC_RPRN, _______,
559         KC_LEFT, KC_DOWN, KC_RGHT,                            _______,                            _______, _______
560     ),
561diff --git a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
562index 42d79d0ade60f0740169940b4019c48bfa982b85..e32bafc4c7de94b7ecd0d5f2392fa3432da00b44 100644
563--- a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
564+++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
565@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
566     [2] = LAYOUT_ortho_275u_space(
567         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
568         KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
569-        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______,
570+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______,
571         QK_BOOT,   _______, _______, _______, _______,          _______,          _______, _______, _______, _______
572     ),
573 };
574diff --git a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
575index 3489e84a474f2704ea3663588fa00009e538c955..07e1713b66872243ffef8d1eecce8494ec85d042 100644
576--- a/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
577+++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
578@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
579     ),
580     [2] = LAYOUT_ortho_600u_space(
581         QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,
582-        _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______,
583+        _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______,
584         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
585         _______, _______, _______,                   _______,                            _______, _______, _______
586     ),
587diff --git a/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
588index 4a598d42a8a3350db402a40ecd5d9ee0edcbfca3..4a44ac6a8523b6f156002fe1400e11c421d9b670 100644
589--- a/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
590+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
591@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
592         KC_GRV,  KC_LPRN, KC_RPRN, KC_DQUO, KC_QUOT, KC_SCLN, KC_COLON,KC_UNDS, KC_PLUS, _______, _______, KC_BSPC, \
593 		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,             \
594 		_______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______,          \
595-		_______, _______, _______, _______, _______, _______, BL_INC,  BL_DEC                                      \
596+		_______, _______, _______, _______, _______, _______, BL_UP,   BL_DOWN                                     \
597 		),
598 	
599     [_ADJUST] = LAYOUT( \
600diff --git a/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c b/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
601index fd87a98d1998aa33ed79be6421a7f87e1dc10dc3..72eb2bb5c86b8dcd4c0958bc280b2234443ac2bc 100644
602--- a/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
603+++ b/keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c
604@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
605   ),
606 
607     [_ADJUST] = LAYOUT_rev41lp(
608-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  BL_DEC, BL_TOGG,          BL_BRTG,  BL_INC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
609+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  BL_DOWN,BL_TOGG,          BL_BRTG,  BL_UP,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
610     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
611     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
612                                         _______, _______, _______, _______, _______
613diff --git a/keyboards/b_sides/rev41lp/keymaps/default/keymap.c b/keyboards/b_sides/rev41lp/keymaps/default/keymap.c
614index 1e721883b2473fefd80390939f422dd58a6a33fc..8ee9053c122a9de31d52a8168a017c80eceb1396 100644
615--- a/keyboards/b_sides/rev41lp/keymaps/default/keymap.c
616+++ b/keyboards/b_sides/rev41lp/keymaps/default/keymap.c
617@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
618   ),
619 
620   [3] = LAYOUT_rev41lp(
621-    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,   BL_DEC,   BL_TOGG,            BL_BRTG,   BL_INC,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
622+    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,   BL_DOWN,  BL_TOGG,            BL_BRTG,   BL_UP,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
623     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
624     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,            QK_BOOT,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
625                                                _______, _______, _______,  _______,  _______
626diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
627index 0a43c83440a328c2de94af6e5878ab1180904aed..f942cd3484ccdc9ace06ecb9222f0631660bdbc9 100644
628--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
629+++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c
630@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
631   ),
632 
633   [_ADJUST] = LAYOUT_rev41lp(
634-    XXXXXXX,   XXXXXXX, XXXXXXX,   BL_OFF,   BL_DEC,   BL_TOGG,            BL_BRTG,   BL_INC,    BL_ON,  XXXXXXX,  XXXXXXX,  XXXXXXX,
635+    XXXXXXX,   XXXXXXX, XXXXXXX,   BL_OFF,   BL_DOWN,  BL_TOGG,            BL_BRTG,   BL_UP,     BL_ON,  XXXXXXX,  XXXXXXX,  XXXXXXX,
636     XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   BL_STEP,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
637     XXXXXXX,   UC_WINC, UC_MAC,   UC_LINX,  XXXXXXX,   XXXXXXX,            QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
638                                                _______, _______, _______,  _______,  _______
639diff --git a/keyboards/bioi/f60/keymaps/default/keymap.c b/keyboards/bioi/f60/keymaps/default/keymap.c
640index 12162579cc6dad3503ae0c8f001ab86d5ba83871..b988a17ce52d82261c5d0e866ce32e73f0fb8296 100644
641--- a/keyboards/bioi/f60/keymaps/default/keymap.c
642+++ b/keyboards/bioi/f60/keymaps/default/keymap.c
643@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
644         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_TRNS,
645         KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
646         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
647-        KC_TRNS,          BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,     KC_TRNS,
648+        KC_TRNS,          BL_TOGG, BL_UP,   BL_DOWN, BL_BRTG, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,     KC_TRNS,
649         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
650     )
651 };
652diff --git a/keyboards/bioi/f60/keymaps/via/keymap.c b/keyboards/bioi/f60/keymaps/via/keymap.c
653index 398dc16ab66bd97fba60b72db3d85e6c8d38defd..6629b91a04171d66075d3d3c75f9aaeab9809d13 100644
654--- a/keyboards/bioi/f60/keymaps/via/keymap.c
655+++ b/keyboards/bioi/f60/keymaps/via/keymap.c
656@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
657         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_TRNS, KC_TRNS,
658         KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
659         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
660-        KC_TRNS, KC_TRNS, BL_TOGG, BL_INC,  BL_DEC,  BL_BRTG, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS,
661+        KC_TRNS, KC_TRNS, BL_TOGG, BL_UP,   BL_DOWN, BL_BRTG, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS,
662         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
663     ),
664     [2] = LAYOUT_all(
665diff --git a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
666index d0be810451577fb124e165ec2c202070182e010c..5f4acc1b9dd64860e59db7868e07bb933972199a 100644
667--- a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
668+++ b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
669@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
670   ),
671 
672 [_FN1] = LAYOUT_60_ansi(
673-    BL_TOGG, BL_STEP,   BL_ON,   BL_OFF,   BL_INC,   BL_DEC,   BL_BRTG,   _______,   _______,   _______,   _______,  BL_DEC,  BL_INC,   _______, 
674+    BL_TOGG, BL_STEP,   BL_ON,   BL_OFF,   BL_UP,    BL_DOWN,  BL_BRTG,   _______,   _______,   _______,   _______,  BL_DOWN, BL_UP,    _______, 
675      _______, _______,  _______,   _______,  _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, 
676      _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, _______,          _______, 
677      _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
678diff --git a/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c b/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
679index 143fcc780f58d875a3f328050b837bb84fd4bfa8..397bf2c06360bcedd1ff2a53dd5fc6dc28c04369 100644
680--- a/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
681+++ b/keyboards/bt66tech/bt66tech60/keymaps/via/keymap.c
682@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
683   ),
684 
685   [2] = LAYOUT_60_ansi(
686-    BL_TOGG, BL_STEP,   BL_ON,   BL_OFF,   BL_INC,   BL_DEC,   BL_BRTG,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  BL_DEC,  BL_INC,   KC_TRNS, 
687+    BL_TOGG, BL_STEP,   BL_ON,   BL_OFF,   BL_UP,    BL_DOWN,  BL_BRTG,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  BL_DOWN, BL_UP,    KC_TRNS, 
688     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, 
689     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, 
690     KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
691diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
692index 992bfcb32d40d709e3b53f95e4f63e33beeac723..2481acd52aaa9e789eb10ccdf3d1108711332f9f 100644
693--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
694+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
695@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
696 
697 [_F1] = LAYOUT_all( /* Function Layer */
698   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 , _______,       _______, _______, _______, _______,
699-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
700+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
701   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,  _______,  	 	_______, _______, _______, _______,
702   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______, 	_______, _______, _______, _______,
703   _______, _______,_______,                    _______,_______,_______,        _______,_______,_______,          _______,_______,_______,    _______, _______, _______),
704diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
705index 63764a6891c7c080a28b5bad590101af20545ef9..a22cc247d6a846d762859354118885f55c3f06b8 100644
706--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
707+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
708@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
709 
710 [_F1] = LAYOUT_all( /* Function Layer */
711   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, _______, _______,		_______, _______, _______, _______,
712-  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,_______,                   _______, _______, _______, _______,
713+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_UP, BL_DOWN,BL_BRTG,_______,_______,_______,_______, _______,_______,                   _______, _______, _______, _______,
714   _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______,  	 	    _______, _______, _______, _______,
715   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______,  _______, _______, _______, _______,
716   _______, _______,_______,          _______,_______,_______,                  _______,_______,_______,           _______,_______,_______,	 _______, _______, _______),
717diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
718index 380a305abc5a86d60ed90dea2e99a243491f6ff8..aa276645ae457d5b7bd177ef3fde4a44b6f6a898 100644
719--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
720+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
721@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
722 
723 [1] = LAYOUT_all(
724   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_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
725-  KC_TRNS,    BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
726+  KC_TRNS,    BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
727   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,  	          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
728   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,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
729   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, KC_TRNS),
730diff --git a/keyboards/cannonkeys/an_c/keymaps/default/keymap.c b/keyboards/cannonkeys/an_c/keymaps/default/keymap.c
731index e82bf0bdee10e8479fa9efe17d3c0450c4685fe2..d4d5faa9cc57f15101f14818ea81d29cfcb73aa1 100644
732--- a/keyboards/cannonkeys/an_c/keymaps/default/keymap.c
733+++ b/keyboards/cannonkeys/an_c/keymaps/default/keymap.c
734@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
735     QK_GESC, 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,
736     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
737     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
738-    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
739+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
740     KC_GRV,  _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
741   )
742 };