f3bae5680843dae8a59cf90b5ac6535da632f42c
- Author
- Ryan <fauxpark@gmail.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Update keycodes for keyboards with RGB Matrix (#24484)
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c
2index 86e3f440feee8ee6a02a7b1fdc3a6faf1bdd3fa9..ff93f51ee4f950f43c68d690083bd6087a85ec1a 100644
3--- a/keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c
4+++ b/keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c
5@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
6 ),
7
8 [1] = LAYOUT_1x5(
9- RGB_TOG, RGB_MOD, KC_TRNS, RGB_VAD, RGB_VAI
10+ RM_TOGG, RM_NEXT, KC_TRNS, RM_VALD, RM_VALU
11 )
12 };
13
14diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c
15index 9e39f9d3e381484722f1493740fa3e4e2aee8226..2f0ac1976e915306ed5c126e8581e918d914204e 100644
16--- a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c
17+++ b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c
18@@ -18,7 +18,7 @@
19
20 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 [0] = LAYOUT(
22- RGB_TOG,
23+ RM_TOGG,
24 KC_1, KC_2, KC_3, KC_4,
25 KC_5, KC_6, KC_7, KC_8
26 )
27@@ -26,6 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
28
29 #if defined(ENCODER_MAP_ENABLE)
30 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
31- [0] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)}
32+ [0] = { ENCODER_CCW_CW(RM_PREV, RM_NEXT)}
33 };
34 #endif
35diff --git a/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c
36index e7be96bd8132594c44647565b6fa7a2fd6e5eefb..79c99fd7db436dfdd72e7e6d9ecba69903a33402 100644
37--- a/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c
38+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c
39@@ -24,9 +24,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
40 MO(1), KC_P0, KC_PDOT, KC_PENT
41 ),
42 [1] = LAYOUT_ortho_4x4(
43- RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
44- RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
45- RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS,
46+ RM_TOGG, RM_HUEU, RM_SATU, RM_VALU,
47+ RM_NEXT, RM_HUED, RM_SATD, RM_VALD,
48+ RM_SPDD, RM_SPDU, KC_TRNS, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
50 )
51 };
52diff --git a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
53index bc0d37eca055de215b14ef9b9b114be109cbcf5f..72445452bc1cecce94c85d8858d1dae53ece7551 100644
54--- a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
55+++ b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
56@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
57 * `-----------------------------------------------------------------------------------'
58 */
59 [_ONE] = LAYOUT_ortho_4x12 (
60- RGB_TOG,
61+ RM_TOGG,
62 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
63 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
64 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
65@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
66 */
67 [_FOUR] = LAYOUT_ortho_4x12 (
68 KC_MUTE,
69- _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
70+ _______, QK_BOOT, _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, KC_DEL ,
71 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
72 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
73 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
74@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
75
76 #if defined(ENCODER_MAP_ENABLE)
77 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
78- [_ONE] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
79+ [_ONE] = { ENCODER_CCW_CW(RM_PREV, RM_NEXT) },
80 [_TWO] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
81 [_THREE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
82 [_FOUR] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
83diff --git a/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
84index bd66c00bff8e07fdaebca6b1bfbebd2281e0b4d8..40b3c520e0bad37e62c20b649a5a55b2e8d95e44 100644
85--- a/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
86+++ b/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
87@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
88 * `-----------------------------------------------------------------------------------'
89 */
90 [_ONE] = LAYOUT_ortho_5x12 (
91- RGB_TOG,
92+ RM_TOGG,
93 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
94 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
95 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
96@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
97
98 #if defined(ENCODER_MAP_ENABLE)
99 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
100- [_ONE] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
101+ [_ONE] = { ENCODER_CCW_CW(RM_PREV, RM_NEXT) },
102 [_TWO] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
103 [_THREE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
104 [_FOUR] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
105diff --git a/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c
106index 8a83e83b52972782be093181e7aa57a44c474c70..5d1c82a0233f41bf42f41b3341e67abf48a960b5 100644
107--- a/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c
108+++ b/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c
109@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
110 [2] = LAYOUT_all(
111 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,
112 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,
113- 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, KC_TRNS,
114- KC_TRNS, 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, KC_TRNS,
115+ RM_TOGG, RM_NEXT, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
116+ KC_TRNS, KC_TRNS, RM_PREV, RM_HUED, RM_SATD, RM_VALD, RM_SPDD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS,
117 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
118 ),
119
120diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c
121index 22e1a4c0d99e532c7d089c17ef4b139e186bf523..ddb7f98869ff5fa229a036738e4b2a6420a54d36 100644
122--- a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c
123+++ b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c
124@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
125 [2] = LAYOUT_60_ansi_split_bs_rshift(
126 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,
127 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,
128- 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,
129- 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, KC_TRNS,
130+ RM_TOGG, RM_NEXT, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS, KC_TRNS,
131+ KC_TRNS, RM_PREV, RM_HUED, RM_SATD, RM_VALD, RM_SPDD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS,
132 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
133 )
134 };
135diff --git a/keyboards/1upkeyboards/super16/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16/keymaps/default/keymap.c
136index 4414a658c5d8fe544be9a5981cf35e2a2ffee74e..640687c790825625b602b95f79c36c75e67c4597 100644
137--- a/keyboards/1upkeyboards/super16/keymaps/default/keymap.c
138+++ b/keyboards/1upkeyboards/super16/keymaps/default/keymap.c
139@@ -17,9 +17,9 @@
140
141 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
142 [0] = LAYOUT_ortho_4x4( /* Base */
143- RGB_TOG, KC_1, KC_U, KC_P,
144- RGB_MOD, KC_1, KC_U, KC_P,
145- RGB_TOG, KC_1, KC_U, KC_P,
146- RGB_MOD, KC_1, KC_U, KC_P
147+ RM_TOGG, KC_1, KC_U, KC_P,
148+ RM_NEXT, KC_1, KC_U, KC_P,
149+ RM_TOGG, KC_1, KC_U, KC_P,
150+ RM_NEXT, KC_1, KC_U, KC_P
151 ),
152 };
153diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c
154index ba6d6c4d71943180450fe842a47a418b13083ae9..ac30909566d44a58dd5c4bca64bb4103e5069a41 100644
155--- a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c
156+++ b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c
157@@ -25,9 +25,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
158 ),
159
160 [1] = LAYOUT_ortho_4x4( /* Fn Layer */
161- RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
162- RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
163- RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS,
164+ RM_TOGG, RM_HUEU, RM_SATU, RM_VALU,
165+ RM_NEXT, RM_HUED, RM_SATD, RM_VALD,
166+ RM_SPDD, RM_SPDU, KC_TRNS, KC_TRNS,
167 KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
168 ),
169 };
170diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
171index 14168ee7004549ed39b59ac6b3dcc8c8aefc732c..6ccf21e18ff11613880356900246dc4999208557 100644
172--- a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
173+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
174@@ -25,9 +25,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
175 ),
176
177 [1] = LAYOUT_ortho_4x4(
178- RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
179- RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
180- RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS,
181+ RM_TOGG, RM_HUEU, RM_SATU, RM_VALU,
182+ RM_NEXT, RM_HUED, RM_SATD, RM_VALD,
183+ RM_SPDD, RM_SPDU, KC_TRNS, KC_TRNS,
184 KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
185 )
186 };
187@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
188
189 #if defined(ENCODER_MAP_ENABLE)
190 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
191- [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
192+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RM_VALD, RM_VALU) },
193 [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
194 };
195 #endif
196diff --git a/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c b/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c
197index d720096ad317cc7d661d213652a2444d5999333e..6c2698b4f89b8e055efdf3cd9e11fb1fde44abf7 100644
198--- a/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c
199+++ b/keyboards/4pplet/perk60_iso/keymaps/default/keymap.c
200@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
201 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,
202 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
203 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
204- KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, KC_TRNS, KC_TRNS, KC_TRNS,
205+ KC_TRNS, RM_TOGG, RM_NEXT, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, RGB_M_P, RGB_M_B, RGB_M_R, KC_TRNS, KC_TRNS, KC_TRNS,
206 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
207 };
208diff --git a/keyboards/abko/ak84bt/keymaps/default/keymap.c b/keyboards/abko/ak84bt/keymaps/default/keymap.c
209index 48fab8614b095652bb6e00bf250c8f10dc61f38d..6e4c85ac142cadeeb0f529fc02921617a3cfdcc5 100644
210--- a/keyboards/abko/ak84bt/keymaps/default/keymap.c
211+++ b/keyboards/abko/ak84bt/keymaps/default/keymap.c
212@@ -33,10 +33,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
213 ),
214 [_FnLay] = LAYOUT(
215 QK_BOOT, KC_MY_COMPUTER, KC_WWW_HOME, KC_CALCULATOR, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL, XXXXXXX,
216- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD,
217+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RM_NEXT,
218 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
219 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
220- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, XXXXXXX,
221- XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, _______, XXXXXXX, RGB_SPD, RGB_VAD, RGB_SPI
222+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RM_VALU, XXXXXXX,
223+ XXXXXXX, XXXXXXX, XXXXXXX, RM_TOGG, XXXXXXX, _______, XXXXXXX, RM_SPDD, RM_VALD, RM_SPDU
224 )
225 };
226diff --git a/keyboards/acheron/apollo/87h/delta/keymaps/default/keymap.c b/keyboards/acheron/apollo/87h/delta/keymaps/default/keymap.c
227index 3ad45e367940c23c234b3d6e70ffbdbc1e9d9661..94f049f55c4bb5d998159f584940cf2e7121942d 100755
228--- a/keyboards/acheron/apollo/87h/delta/keymaps/default/keymap.c
229+++ b/keyboards/acheron/apollo/87h/delta/keymaps/default/keymap.c
230@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
231 QK_BOOT, 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,
232 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,
233 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,
234- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
235- KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
236+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
237+ KC_TRNS, RM_TOGG, RM_NEXT, RM_HUED, RM_SATD, RM_VALD, RM_SPDD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
238 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
239 ),
240 [2] = LAYOUT_tkl_ansi(
241diff --git a/keyboards/acheron/apollo/87h/gamma/keymaps/default/keymap.c b/keyboards/acheron/apollo/87h/gamma/keymaps/default/keymap.c
242index 3ad45e367940c23c234b3d6e70ffbdbc1e9d9661..94f049f55c4bb5d998159f584940cf2e7121942d 100755
243--- a/keyboards/acheron/apollo/87h/gamma/keymaps/default/keymap.c
244+++ b/keyboards/acheron/apollo/87h/gamma/keymaps/default/keymap.c
245@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
246 QK_BOOT, 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,
247 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,
248 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,
249- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
250- KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
251+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
252+ KC_TRNS, RM_TOGG, RM_NEXT, RM_HUED, RM_SATD, RM_VALD, RM_SPDD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
253 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
254 ),
255 [2] = LAYOUT_tkl_ansi(
256diff --git a/keyboards/acheron/apollo/87htsc/keymaps/default/keymap.c b/keyboards/acheron/apollo/87htsc/keymaps/default/keymap.c
257index f814960810b32dfc05b7d4a341bb52686d653c57..44404bbc4c2ef895aa5b35a7c321fd7f5d186805 100755
258--- a/keyboards/acheron/apollo/87htsc/keymaps/default/keymap.c
259+++ b/keyboards/acheron/apollo/87htsc/keymaps/default/keymap.c
260@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
261 QK_BOOT, 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,
262 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,
263 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,
264- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
265- KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
266+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
267+ KC_TRNS, RM_TOGG, RM_NEXT, RM_HUED, RM_SATD, RM_VALD, RM_SPDD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
268 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
269 ),
270 [2] = LAYOUT_tkl_ansi_tsangan(
271diff --git a/keyboards/acheron/apollo/88htsc/keymaps/default/keymap.c b/keyboards/acheron/apollo/88htsc/keymaps/default/keymap.c
272index abed7e6fbe68ca3aa27d6e7aa63e9f50dfd84089..023ddef74c563bab8825e4a4bab8b7df158a22fe 100755
273--- a/keyboards/acheron/apollo/88htsc/keymaps/default/keymap.c
274+++ b/keyboards/acheron/apollo/88htsc/keymaps/default/keymap.c
275@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
276 QK_BOOT, 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,
277 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,
278 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,
279- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
280- KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
281+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
282+ KC_TRNS, RM_TOGG, RM_NEXT, RM_HUED, RM_SATD, RM_VALD, RM_SPDD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
283 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
284 ),
285 [2] = LAYOUT_tkl_f13_ansi_tsangan(
286diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.json b/keyboards/adm42/rev4/keymaps/default/keymap.json
287index 72eb7d50de476a5a6d4185257b63a0554506964c..dce2405bc0666f3ab43056d2cf434c4ca23a6d7f 100644
288--- a/keyboards/adm42/rev4/keymaps/default/keymap.json
289+++ b/keyboards/adm42/rev4/keymaps/default/keymap.json
290@@ -29,9 +29,9 @@
291 "KC_CAPS", "_______", "_______", "_______", "_______", "KC_CAPS"
292 ],
293 [
294- "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RGB_M_B", "RGB_VAD", "RGB_VAI", "RGB_SAD", "RGB_SAI", "XXXXXXX",
295- "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "RGB_HUD", "RGB_HUI", "XXXXXXX",
296- "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RGB_M_P", "RGB_SPD", "RGB_SPI", "XXXXXXX", "XXXXXXX", "XXXXXXX",
297+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RGB_M_B", "RM_VALD", "RM_VALU", "RM_SATD", "RM_SATU", "XXXXXXX",
298+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RM_TOGG", "RM_NEXT", "RM_PREV", "RM_HUED", "RM_HUEU", "XXXXXXX",
299+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RGB_M_P", "RM_SPDD", "RM_SPDU", "XXXXXXX", "XXXXXXX", "XXXXXXX",
300 "XXXXXXX", "XXXXXXX", "XXXXXXX", "MO(5)", "XXXXXXX", "XXXXXXX"
301 ],
302 [
303diff --git a/keyboards/adpenrose/akemipad/keymaps/default/keymap.c b/keyboards/adpenrose/akemipad/keymaps/default/keymap.c
304index 7226b85f2c9aab1f41c6f68fc4743876eb1c1687..ad71e0281f6c10ac0a7a9ba4d64581b59794fd0f 100644
305--- a/keyboards/adpenrose/akemipad/keymaps/default/keymap.c
306+++ b/keyboards/adpenrose/akemipad/keymaps/default/keymap.c
307@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
308 #if defined(ENCODER_MAP_ENABLE)
309 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
310 [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
311- [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
312- [2] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
313- [3] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
314+ [1] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU) },
315+ [2] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) },
316+ [3] = { ENCODER_CCW_CW(RM_VALD, RM_VALU) }
317 };
318 #endif
319diff --git a/keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c b/keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c
320index 080df8d18243448380f4d4fb89a9c2f791882f4a..3f76587dde6eed1bc9d6bb8322892d6bfae04334 100644
321--- a/keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c
322+++ b/keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c
323@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
324 #if defined(ENCODER_MAP_ENABLE)
325 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
326 [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
327- [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
328- [2] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
329- [3] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
330+ [1] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU) },
331+ [2] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) },
332+ [3] = { ENCODER_CCW_CW(RM_VALD, RM_VALU) }
333 };
334 #endif
335diff --git a/keyboards/akko/5108/keymaps/default/keymap.c b/keyboards/akko/5108/keymaps/default/keymap.c
336index ef92432ff57f45af689d3d472ad320b5345ba50d..588d895cd3ced1547f75559e2b1b6e2cfec46ab1 100644
337--- a/keyboards/akko/5108/keymaps/default/keymap.c
338+++ b/keyboards/akko/5108/keymaps/default/keymap.c
339@@ -46,11 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
340
341 [WIN_FN] = LAYOUT( /* FN */
342 _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
343- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
344- _______, _______,TG(WIN_W),_______,_______,_______,_______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
345- _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______,
346- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______,
347- _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______),
348+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______, _______, _______, _______, _______, _______, _______, _______,
349+ _______, _______,TG(WIN_W),_______,_______,_______,_______, _______, _______, DF(MAC_B),_______,_______, _______, RM_NEXT, _______, _______, _______, _______, _______, _______, _______,
350+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, _______, _______, RM_HUEU, _______, _______, _______,
351+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALU, _______, _______, _______, _______,
352+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RM_SATD, RM_VALD, RM_SATU, _______, _______),
353
354 [MAC_B] = LAYOUT( /* Base */
355 KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU,
356@@ -70,10 +70,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
357
358 [MAC_FN] = LAYOUT( /* FN */
359 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______,
360- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
361- _______, _______,TG(MAC_W),_______,_______,_______,_______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
362- _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______,
363- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______,
364- _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______)
365+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______, _______, _______, _______, _______, _______, _______, _______,
366+ _______, _______,TG(MAC_W),_______,_______,_______,_______, _______, _______, DF(WIN_B),_______,_______, _______, RM_NEXT, _______, _______, _______, _______, _______, _______, _______,
367+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, _______, _______, RM_HUEU, _______, _______, _______,
368+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALU, _______, _______, _______, _______,
369+ _______, _______, _______, _______, _______, _______, _______, _______, RM_SATD, RM_VALD, RM_SATU, _______, _______)
370 };
371 // clang-format on
372diff --git a/keyboards/akko/acr87/keymaps/default/keymap.c b/keyboards/akko/acr87/keymaps/default/keymap.c
373index 88bfbc8e1fdc1596b4c596a70d783a35fb2d4871..51f21a0097778bbbea8b856bcce03feab3e11b70 100644
374--- a/keyboards/akko/acr87/keymaps/default/keymap.c
375+++ b/keyboards/akko/acr87/keymaps/default/keymap.c
376@@ -47,11 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
377
378 [WIN_FN] = LAYOUT( /* FN */
379 _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______, _______, _______, _______, _______, _______,
380- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
381- _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
382- _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI,
383- _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI,
384- _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI),
385+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______, _______, _______, _______,
386+ _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RM_NEXT, _______, _______, _______,
387+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, _______, _______, RM_HUEU,
388+ _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RM_VALU,
389+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RM_SATD, RM_VALD, RM_SATU),
390
391 [MAC_B] = LAYOUT( /* Base */
392 KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS,
393@@ -70,10 +70,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
394 _______, _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D),
395 [MAC_FN] = LAYOUT( /* FN */
396 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,
397- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
398- _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
399- _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI,
400- _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI,
401- _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI)
402+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______, _______, _______, _______,
403+ _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RM_NEXT, _______, _______, _______,
404+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, _______, _______, RM_HUEU,
405+ _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RM_VALU,
406+ _______, _______, _______, _______, _______, _______, _______, _______, RM_SATD, RM_VALD, RM_SATU)
407 };
408 // clang-format on
409diff --git a/keyboards/akko/top40/keymaps/default/keymap.c b/keyboards/akko/top40/keymaps/default/keymap.c
410index fb9df1623552108e837bbff8f47f7aff5b9ea0fd..8f06ab969e44058a04de5c91fb173ad3a9c6b5b1 100644
411--- a/keyboards/akko/top40/keymaps/default/keymap.c
412+++ b/keyboards/akko/top40/keymaps/default/keymap.c
413@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
414
415 [_FN] = LAYOUT( /* Fn */
416 _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
417- _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END, RGB_TOG, RGB_MOD,
418- _______, _______, _______, KC_CALC, _______, AG_TOGG, _______, KC_MUTE, KC_VOLD, KC_VOLU, RGB_VAI, _______,
419- _______, GU_TOGG, _______, _______, _______, _______, RGB_SPI, RGB_VAD, RGB_SAI)
420+ _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END, RM_TOGG, RM_NEXT,
421+ _______, _______, _______, KC_CALC, _______, AG_TOGG, _______, KC_MUTE, KC_VOLD, KC_VOLU, RM_VALU, _______,
422+ _______, GU_TOGG, _______, _______, _______, _______, RM_SPDU, RM_VALD, RM_SATU)
423 };
424diff --git a/keyboards/alpaca/wfeclipse/keymaps/default/keymap.c b/keyboards/alpaca/wfeclipse/keymaps/default/keymap.c
425index 3849b2889c13f5a061630ee240a35a6483bded3d..548db39a1086a410c7bf1a1287e35fd859fd2609 100644
426--- a/keyboards/alpaca/wfeclipse/keymaps/default/keymap.c
427+++ b/keyboards/alpaca/wfeclipse/keymaps/default/keymap.c
428@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
429 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_PSCR, KC_SCRL, KC_PAUS,
430 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_MPRV, QK_BOOT,
431 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_MPLY, KC_TRNS,
432- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, KC_TRNS, KC_MNXT, KC_TRNS,
433- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_HUD, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS
434+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RM_HUEU, KC_TRNS, KC_MNXT, KC_TRNS,
435+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RM_PREV, RM_HUED, RM_TOGG, KC_TRNS, KC_TRNS, KC_TRNS
436 )
437 };
438diff --git a/keyboards/arrowmechanics/wings/keymaps/default/keymap.c b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
439index 949219b820bfa8ad841d80569f4573728acec8f3..6e0a6a18dcb2bafd7135bf2e57f518a557924d22 100644
440--- a/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
441+++ b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
442@@ -10,7 +10,7 @@ enum layers {
443 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
444 [BASE] = LAYOUT(
445 KC_VOLU, 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_EQL, KC_PSCR, KC_DEL,
446- KC_VOLD, KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, RGB_MOD, KC_BTN1, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC,
447+ KC_VOLD, KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, RM_NEXT, KC_BTN1, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC,
448 KC_MPLY, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, C(KC_C), C(KC_V), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
449 KC_MNXT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, C(KC_Z), C(KC_Y), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
450 KC_MPRV, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME,
451@@ -20,6 +20,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
452
453 #if defined(ENCODER_MAP_ENABLE)
454 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
455- [BASE] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
456+ [BASE] = { ENCODER_CCW_CW(RM_HUEU, RM_HUED), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
457 };
458 #endif
459diff --git a/keyboards/ashwing66/keymaps/default/keymap.c b/keyboards/ashwing66/keymaps/default/keymap.c
460index 2b317e19ebab84bfe201dfb4e703d9b3f947e89c..304f888742b8bac38a817ac7c7acfffc1d542365 100644
461--- a/keyboards/ashwing66/keymaps/default/keymap.c
462+++ b/keyboards/ashwing66/keymaps/default/keymap.c
463@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
464 KC_LBRC,KC_PSCR,KC_CAPS ,MO(_LAYERB),KC_LGUI ,KC_LALT ,KC_SPC ,KC_PGDN ,KC_PGUP ,KC_ENT ,KC_BSPC ,MO(_LAYERC),KC_INS ,KC_DEL ,KC_BSLS ,KC_RBRC
465 ),
466 [_LAYERB] = LAYOUT_5x16(
467- KC_ESC ,RGB_TOG,RGB_RMOD,RGB_MOD ,RGB_VAD ,RGB_VAI ,RGB_SPD ,RGB_SPI ,RGB_HUD ,RGB_HUI ,RGB_SAD ,RGB_SAI ,
468+ KC_ESC ,RM_TOGG,RM_PREV ,RM_NEXT ,RM_VALD ,RM_VALU ,RM_SPDD ,RM_SPDU ,RM_HUED ,RM_HUEU ,RM_SATD ,RM_SATU ,
469 KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_Y ,KC_BTN1 ,KC_MS_U ,KC_BTN2 ,KC_P ,KC_EQL ,
470 KC_LCTL,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,KC_H ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_SCLN ,KC_QUOT ,
471 KC_LSFT,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_LBRC ,KC_MUTE ,KC_RBRC ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT ,
472@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
473 #if defined(ENCODER_MAP_ENABLE)
474 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
475 [_LAYERA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
476- [_LAYERB] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)},
477- [_LAYERC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
478+ [_LAYERB] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU)},
479+ [_LAYERC] = { ENCODER_CCW_CW(RM_VALD, RM_VALU)}
480 };
481 #endif
482diff --git a/keyboards/atlantis/ak81_ve/keymaps/default/keymap.c b/keyboards/atlantis/ak81_ve/keymaps/default/keymap.c
483index 59c23c97d361588b0dd0861952dca86add569bdc..afe041d515e596215e99dcf8c4e552f0c4facf11 100644
484--- a/keyboards/atlantis/ak81_ve/keymaps/default/keymap.c
485+++ b/keyboards/atlantis/ak81_ve/keymaps/default/keymap.c
486@@ -27,11 +27,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
487 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
488
489 [1] = LAYOUT(
490- KC_SYSTEM_SLEEP, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, RGB_TOG,
491- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI,
492- _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_VAI,
493- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD,
494- _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, RGB_HUI, RGB_SPD,
495- _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI)
496+ KC_SYSTEM_SLEEP, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, RM_TOGG,
497+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDU,
498+ _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RM_VALU,
499+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALD,
500+ _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, RM_HUEU, RM_SPDD,
501+ _______, _______, _______, _______, _______, _______, RM_SATD, RM_HUED, RM_SATU)
502
503 };
504diff --git a/keyboards/atlantis/ps17/keymaps/default/keymap.c b/keyboards/atlantis/ps17/keymaps/default/keymap.c
505index 36042fbb1872a7a622b0ea95e98b67f85cd7eac5..26fe6b30662bbdde5ed9964ce80a54e56c4ea610 100644
506--- a/keyboards/atlantis/ps17/keymaps/default/keymap.c
507+++ b/keyboards/atlantis/ps17/keymaps/default/keymap.c
508@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
509 KC_KP_0, KC_PDOT
510 ),
511 [1] = LAYOUT(
512- RGB_MOD,
513+ RM_NEXT,
514 TO(2), KC_TRNS, KC_TRNS, KC_TRNS,
515 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
516 KC_TRNS, KC_TRNS, KC_TRNS,
517@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
518 KC_TRNS, KC_TRNS
519 ),
520 [2] = LAYOUT(
521- RGB_MOD,
522+ RM_NEXT,
523 TO(3), KC_TRNS, KC_TRNS, KC_TRNS,
524 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
525 KC_TRNS, KC_TRNS, KC_TRNS,
526@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
527 KC_TRNS, KC_TRNS
528 ),
529 [3] = LAYOUT(
530- RGB_MOD,
531+ RM_NEXT,
532 TO(0), KC_TRNS, KC_TRNS, KC_TRNS,
533 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
534 KC_TRNS, KC_TRNS, KC_TRNS,
535@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
536 #if defined(ENCODER_MAP_ENABLE)
537 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
538 [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
539- [1] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
540+ [1] = { ENCODER_CCW_CW(RM_HUEU, RM_HUED) },
541 [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
542 [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
543 };
544diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
545index b1bd74957dbb397914ea78c001e741e46e77702d..e5e0ba1207baa2c901aaecaaf3f30b3ae0f6583c 100644
546--- a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
547+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
548@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
549
550 [LAYER_LOWER] = LAYOUT(
551diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
552index c3aa67a944a59759cc3a4a14cc51dee374e72cc4..ba8028104e00aa87bc05c83b54199a232d5c151a 100644
553--- a/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
554+++ b/keyboards/bastardkb/charybdis/3x6/keymaps/default/keymap.c
555@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
556
557 [LAYER_LOWER] = LAYOUT(
558diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
559index 304e9fc9a483ca47daa1c04796366d1980f686eb..f440dac8cb7bceb1220f82a51cc277aa39dd72a7 100644
560--- a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
561+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
562@@ -46,11 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
563diff --git a/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/keymap.c
564index 2e5564f5e931139f640c8a203d65d5b6fae61db1..4ac52309880bc49fb66f0f572062c523ffed2897 100644
565--- a/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/keymap.c
566+++ b/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/keymap.c
567@@ -46,11 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
568diff --git a/keyboards/bastardkb/scylla/keymaps/default/keymap.c b/keyboards/bastardkb/scylla/keymaps/default/keymap.c
569index 10adac4126c5c67975a4198d11f0550c5cb5fe58..8e9b0190d471cd41e28b73f6a9f4446ebd680ad2 100644
570--- a/keyboards/bastardkb/scylla/keymaps/default/keymap.c
571+++ b/keyboards/bastardkb/scylla/keymaps/default/keymap.c
572@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
573
574 [2] = LAYOUT_split_4x6_5(KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
575 //---------------------------------------------------------//--------------------------------------------------------------//
576- _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE,
577+ _______, _______, RM_PREV, RM_TOGG, RM_NEXT, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE,
578 //---------------------------------------------------------//--------------------------------------------------------------//
579 _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
580 //---------------------------------------------------------//--------------------------------------------------------------//
581diff --git a/keyboards/bastardkb/skeletyl/keymaps/default/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/default/keymap.c
582index 56e56d9a434cb069d3e9397c012d0eb925ec2fd3..1f49629c888a9c4572d2909d7a95363c7997959d 100644
583--- a/keyboards/bastardkb/skeletyl/keymaps/default/keymap.c
584+++ b/keyboards/bastardkb/skeletyl/keymaps/default/keymap.c
585@@ -60,9 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
586 //,-----------------------------------------------------. ,-----------------------------------------------------.
587 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
588 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
589- RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
590+ RM_HUEU, RM_SATU, RM_VALU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
591 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
592- RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
593+ RM_HUED, RM_SATD, RM_VALD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
594 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
595 KC_LGUI, KC_SPC, _______, _______, KC_ENT, KC_RALT
596 //`--------------------------' `--------------------------'
597diff --git a/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c b/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c
598index 551aea127f1b3d3e3e2d8082395715d27cef8f92..d87e9c2a4400f1ebdc6927e2e9754497574d4644 100644
599--- a/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c
600+++ b/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c
601@@ -60,9 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
602 //,-----------------------------------------------------. ,-----------------------------------------------------.
603 QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
604 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
605- RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
606+ RM_TOGG, RM_HUEU, RM_SATU, RM_VALU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
607 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
608- RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
609+ RM_NEXT, RM_HUED, RM_SATD, RM_VALD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
610 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
611 KC_LGUI, KC_SPC, _______, _______, KC_ENT, KC_RALT
612 //`--------------------------' `--------------------------'
613diff --git a/keyboards/binepad/bnk9/keymaps/default/keymap.c b/keyboards/binepad/bnk9/keymaps/default/keymap.c
614index 9ae1e4541f62362623ad16e811647f2de25c81b0..60b021059927498282905eda584f33fed835ec0f 100644
615--- a/keyboards/binepad/bnk9/keymaps/default/keymap.c
616+++ b/keyboards/binepad/bnk9/keymaps/default/keymap.c
617@@ -11,10 +11,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
618 KC_P7, KC_P8, LT(1, KC_P9)
619 ),
620 [1] = LAYOUT(
621- RGB_TOG,
622- RGB_HUI, RGB_SAI, RGB_SPI,
623- RGB_HUD, RGB_SAD, RGB_SPD,
624- RGB_RMOD, RGB_MOD, _______
625+ RM_TOGG,
626+ RM_HUEU, RM_SATU, RM_SPDU,
627+ RM_HUED, RM_SATD, RM_SPDD,
628+ RM_PREV, RM_NEXT, _______
629 )
630 };
631
632@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
633
634 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
635 [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
636- [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
637+ [1] = { ENCODER_CCW_CW(RM_VALD, RM_VALU) }
638 };
639
640 #endif
641diff --git a/keyboards/blockboy/ac980mini/keymaps/default/keymap.c b/keyboards/blockboy/ac980mini/keymaps/default/keymap.c
642index b5541ed23e2bd728d6787a6e5c0d4acf68c4eddd..0194281ebfa409abd09ace2d8ed34299b9e8f587 100644
643--- a/keyboards/blockboy/ac980mini/keymaps/default/keymap.c
644+++ b/keyboards/blockboy/ac980mini/keymaps/default/keymap.c
645@@ -40,14 +40,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
646 ),
647 // RGB Control
648 [1] = LAYOUT(
649- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, RGB_SPI, _______, _______,
650+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RM_TOGG, RM_SPDU, _______, _______,
651 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
652 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
653- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______,
654- _______, _______, _______, _______, _______, MO(2), _______, RGB_MOD, RGB_HUI, RGB_SAI, _______, _______, _______
655+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALU, _______, _______, _______,
656+ _______, _______, _______, _______, _______, MO(2), _______, RM_NEXT, RM_HUEU, RM_SATU, _______, _______, _______
657 ),
658 [2] = LAYOUT(
659- QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
660+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
661 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
662 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
663 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
664diff --git a/keyboards/boardsource/beiwagon/keymaps/default/keymap.c b/keyboards/boardsource/beiwagon/keymaps/default/keymap.c
665index 584ada483041debff221f1ba414cf116a0519794..4f799550e1c3acf358a31ac9a4ccc213b067f96b 100644
666--- a/keyboards/boardsource/beiwagon/keymaps/default/keymap.c
667+++ b/keyboards/boardsource/beiwagon/keymaps/default/keymap.c
668@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
669 KC_0, KC_PENT,RAISE
670 ),
671 [_RAISE] = LAYOUT(
672- KC_7, KC_8, RGB_TOG,
673- KC_4, KC_5, RGB_MOD,
674+ KC_7, KC_8, RM_TOGG,
675+ KC_4, KC_5, RM_NEXT,
676 KC_1, KC_2, KC_3,
677 KC_0, KC_PENT,_______
678 )
679diff --git a/keyboards/boardsource/equals/60/keymaps/default/keymap.c b/keyboards/boardsource/equals/60/keymaps/default/keymap.c
680index 48e26a4094748fcf51d188f98a8d91d941d71eb4..b744ea6c4c330724cc84740b88ae4df97e178b20 100644
681--- a/keyboards/boardsource/equals/60/keymaps/default/keymap.c
682+++ b/keyboards/boardsource/equals/60/keymaps/default/keymap.c
683@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
684 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
685 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
686 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
687- KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_RGHT, RGB_MOD, RGB_TOG
688+ KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_RGHT, RM_NEXT, RM_TOGG
689 ),
690 [_RAISE] = LAYOUT_ortho_5x12(
691 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
692diff --git a/keyboards/boardsource/equals/avr/keymaps/default/keymap.c b/keyboards/boardsource/equals/avr/keymaps/default/keymap.c
693index 99a049214b147045ada380f6509d5688652e87da..6cac7e1a0fe78b294b2ba5a42e6e88c103689009 100644
694--- a/keyboards/boardsource/equals/avr/keymaps/default/keymap.c
695+++ b/keyboards/boardsource/equals/avr/keymaps/default/keymap.c
696@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
697 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
698 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
699 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
700- KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, CK_TOGG, RGB_MOD, RGB_TOG
701+ KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, CK_TOGG, RM_NEXT, RM_TOGG
702 ),
703 [_RAISE] = LAYOUT_ortho_5x12(
704 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
705diff --git a/keyboards/boardsource/lulu/keymaps/default/keymap.c b/keyboards/boardsource/lulu/keymaps/default/keymap.c
706index cbee1401ed5652e8ff220f41f184b83ea4ffbe66..9c1ed869efde29310eec521461a4ba2b7facb74a 100644
707--- a/keyboards/boardsource/lulu/keymaps/default/keymap.c
708+++ b/keyboards/boardsource/lulu/keymaps/default/keymap.c
709@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
710 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | |
711 * |------+------+------+------+------+------| |------+------+------+------+------+------|
712 * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | |
713- * |------+------+------+------+------+------|RGB_TOG| | ] |------+------+------+------+------+------|
714+ * |------+------+------+------+------+------|RM_TOGG| | ] |------+------+------+------+------+------|
715 * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ |
716 * `-----------------------------------------/ / \ \-----------------------------------------'
717 * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI |
718@@ -74,10 +74,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
719 */
720
721 [_RAISE] = LAYOUT(
722- RGB_MOD, RGB_RMOD,RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
723+ RM_NEXT, RM_PREV, RM_SATU, RM_SATD, RM_VALU, RM_VALD, _______, _______, _______, _______, _______, _______,
724 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
725 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX,
726- KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
727+ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RM_TOGG, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
728 _______, _______, _______, _______, _______, _______, _______, _______
729 ),
730 /* ADJUST
731diff --git a/keyboards/boardsource/sessanta/keymaps/default/keymap.json b/keyboards/boardsource/sessanta/keymaps/default/keymap.json
732index b99333c46d779646297b325734b9170222fd7416..d8fb2f8e4a999b14c2c5dc1b4bca1a8c766af54e 100644
733--- a/keyboards/boardsource/sessanta/keymaps/default/keymap.json
734+++ b/keyboards/boardsource/sessanta/keymaps/default/keymap.json
735@@ -12,8 +12,8 @@
736 ],
737 [
738 "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_F13",
739- "QK_RBT", "RGB_MOD", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_TOG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
740- "EE_CLR", "RGB_RMOD", "RGB_VAD", "RGB_HUD", "RGB_SAD", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
741+ "QK_RBT", "RM_NEXT", "RM_VALU", "RM_HUEU", "RM_SATU", "RM_TOGG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
742+ "EE_CLR", "RM_PREV", "RM_VALD", "RM_HUED", "RM_SATD", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
743 "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
744 "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______"
745 ]
746diff --git a/keyboards/boardsource/technik_o/keymaps/default/keymap.c b/keyboards/boardsource/technik_o/keymaps/default/keymap.c
747index a43d930c4f3a070332b067a3d2a95b3e6b5c3dca..42992691905df567c7b03f0b8527bea7f705c485 100644
748--- a/keyboards/boardsource/technik_o/keymaps/default/keymap.c
749+++ b/keyboards/boardsource/technik_o/keymaps/default/keymap.c
750@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
751 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
752 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
753 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
754- RGB_TOG, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
755+ RM_TOGG, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
756 ),
757 [_RAISE] = LAYOUT_ortho_4x12(
758 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
759@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
760 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
761 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
762 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
763- RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
764+ RM_NEXT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
765 )
766 };
767
768diff --git a/keyboards/boardsource/technik_s/keymaps/default/keymap.c b/keyboards/boardsource/technik_s/keymaps/default/keymap.c
769index bae6438d15c7c0df4ee887460885f9d7e1e7c5b5..9c215f99e24f86a10f0ba922cda77bfdafcc7d1b 100644
770--- a/keyboards/boardsource/technik_s/keymaps/default/keymap.c
771+++ b/keyboards/boardsource/technik_s/keymaps/default/keymap.c
772@@ -30,12 +30,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
773 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
774 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
775 KC_LSFT,KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_ENT ,
776- RGB_TOG, KC_LCTL, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_RIGHT
777+ RM_TOGG, KC_LCTL, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_RIGHT
778 ),
779 [_RAISE] = LAYOUT(
780 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
781 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
782- RGB_MOD, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
783+ RM_NEXT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
784 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD
785 ),
786 [_LOWER] = LAYOUT(
787diff --git a/keyboards/boardsource/the_q/keymaps/default/keymap.json b/keyboards/boardsource/the_q/keymaps/default/keymap.json
788index 69aa6f86296841591c244c3330a66d72775ebd45..5cd91661d0357028999a83139d7d769fffd922b9 100644
789--- a/keyboards/boardsource/the_q/keymaps/default/keymap.json
790+++ b/keyboards/boardsource/the_q/keymaps/default/keymap.json
791@@ -16,9 +16,9 @@
792 "_______", "_______", "_______", "_______", "_______", "_______"
793 ],
794 [
795- "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_MOD", "RGB_TOG", "_______",
796- "EE_CLR", "_______", "_______", "_______", "_______", "_______", "RGB_VAD", "RGB_HUD", "RGB_SAD", "RGB_RMOD", "_______", "_______",
797- "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
798+ "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "RM_VALU", "RM_HUEU", "RM_SATU", "RM_NEXT", "RM_TOGG", "_______",
799+ "EE_CLR", "_______", "_______", "_______", "_______", "_______", "RM_VALD", "RM_HUED", "RM_SATD", "RM_PREV", "_______", "_______",
800+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
801 "_______", "_______", "_______", "_______", "_______", "_______"
802 ]
803 ]
804diff --git a/keyboards/boardsource/unicorne/keymaps/default/keymap.json b/keyboards/boardsource/unicorne/keymaps/default/keymap.json
805index 1980bc3c873e76ece8df2138cd9e7278c2d0eb32..1aa2917778832993e6f4e42480421331fa6510f2 100644
806--- a/keyboards/boardsource/unicorne/keymaps/default/keymap.json
807+++ b/keyboards/boardsource/unicorne/keymaps/default/keymap.json
808@@ -16,8 +16,8 @@
809 "_______", "_______", "_______", "_______", "_______", "_______"
810 ],
811 [
812- "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_MOD", "RGB_TOG", "_______",
813- "EE_CLR", "_______", "_______", "_______", "_______", "_______", "RGB_VAD", "RGB_HUD", "RGB_SAD", "RGB_RMOD", "CK_TOGG", "_______",
814+ "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "RM_VALU", "RM_HUEU", "RM_SATU", "RM_NEXT", "RM_TOGG", "_______",
815+ "EE_CLR", "_______", "_______", "_______", "_______", "_______", "RM_VALD", "RM_HUED", "RM_SATD", "RM_PREV", "CK_TOGG", "_______",
816 "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
817 "_______", "_______", "_______", "_______", "_______", "_______"
818 ]
819diff --git a/keyboards/boston_meetup/2019/keymaps/default/keymap.c b/keyboards/boston_meetup/2019/keymaps/default/keymap.c
820index b4d7280640245b903022e99a7311702efac69f1c..ea6555663669e9aff8095a1ccf1170b79f941a9c 100644
821--- a/keyboards/boston_meetup/2019/keymaps/default/keymap.c
822+++ b/keyboards/boston_meetup/2019/keymaps/default/keymap.c
823@@ -78,9 +78,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
824 */
825 [_RAISE] = LAYOUT(
826 KC_NUM,
827- RGB_TOG, RGB_MOD, RGB_RMOD, XXXXXXX,
828- _______, RGB_HUI, RGB_SAI, RGB_VAI,
829- _______, RGB_HUD, RGB_SAD, RGB_VAD
830+ RM_TOGG, RM_NEXT, RM_PREV, XXXXXXX,
831+ _______, RM_HUEU, RM_SATU, RM_VALU,
832+ _______, RM_HUED, RM_SATD, RM_VALD
833
834 ),
835
836diff --git a/keyboards/bubble75/hotswap/keymaps/default/keymap.c b/keyboards/bubble75/hotswap/keymaps/default/keymap.c
837index 7ce1f6bf91c688be1fbc1810f3f435dba83018fe..1f878ebe32ebd90bdc2ef4d8917c456122dd8960 100644
838--- a/keyboards/bubble75/hotswap/keymaps/default/keymap.c
839+++ b/keyboards/bubble75/hotswap/keymaps/default/keymap.c
840@@ -15,11 +15,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
841
842 [1] = LAYOUT(
843 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
844- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI,
845- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD,
846- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
847- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_HUD,
848- _______, _______, _______, RGB_MOD, RGB_TOG, _______, RGB_SPD, RGB_VAD, RGB_SPI),
849+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SATU,
850+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SATD,
851+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUEU,
852+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALU, RM_HUED,
853+ _______, _______, _______, RM_NEXT, RM_TOGG, _______, RM_SPDD, RM_VALD, RM_SPDU),
854
855 [2] = LAYOUT(
856 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
857diff --git a/keyboards/canary/canary60rgb/keymaps/default/keymap.c b/keyboards/canary/canary60rgb/keymaps/default/keymap.c
858index 094595130fa48ac34c450c9ec6c6c4a128d9c870..f57f83b933f5d90ad205e9e9453b38dbedb93043 100644
859--- a/keyboards/canary/canary60rgb/keymaps/default/keymap.c
860+++ b/keyboards/canary/canary60rgb/keymaps/default/keymap.c
861@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
862 ),
863 [2] = LAYOUT(
864 _______, 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,
865- _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
866- _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, EE_CLR,
867+ _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, _______, _______, _______, _______, QK_BOOT,
868+ _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDU, RM_SPDD, _______, _______, EE_CLR,
869 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
870 _______, _______, _______, _______, _______, _______, _______, _______, _______
871 ),
872diff --git a/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c
873index b0270d17f90d8cef196a4f8c33d972b6b722a034..27725440e44a7557ef517dced1571eceb9e630df 100644
874--- a/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c
875+++ b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c
876@@ -29,10 +29,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
877 [1] = LAYOUT_tkl_ansi(
878 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R,
879
880- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
881- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
882+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUEU, RM_SATU, RM_VALU,
883+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUED, RM_SATD, RM_VALD,
884 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
885- _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_SPD,
886- _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_TOG, RGB_MOD
887+ _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RM_SPDD,
888+ _______, _______, _______, _______, _______, _______, _______, _______, RM_PREV, RM_TOGG, RM_NEXT
889 )
890 };
891diff --git a/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c
892index 4bae95ed07607b3d6423583ec753469562119402..c13c244a3d2c164841492515622b608d007499dc 100644
893--- a/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c
894+++ b/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c
895@@ -29,10 +29,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
896 [1] = LAYOUT_tkl_iso(
897 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R,
898
899- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
900- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
901+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUEU, RM_SATU, RM_VALU,
902+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUED, RM_SATD, RM_VALD,
903 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
904 _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
905- _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_TOG, RGB_MOD
906+ _______, _______, _______, _______, _______, _______, _______, _______, RM_PREV, RM_TOGG, RM_NEXT
907 )
908 };