LED drivers: update keyboard LED configs (#23073)

* IS31FL3733: update keyboard LED config

* IS31FL3736: update keyboard LED config

* IS31FL3737: update keyboard LED config

* IS31FL3741: update keyboard LED config

* IS31FL3743A: update keyboard LED config

* AW20216S: update keyboard LED config

* SNLED27351: update keyboard LED config

5 files changed, 396 insertions, 396 deletions

diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c
index c666f9198f..4818c99005 100644
--- a/keyboards/kbdfans/bella/rgb/rgb.c
+++ b/keyboards/kbdfans/bella/rgb/rgb.c
@@ -16,106 +16,106 @@
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},    /* RGB6 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},    /* RGB32 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},    /* RGB45 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},    /* RGB58 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},    /* RGB71 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},    /* RGB84 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},    /* RGB97 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},    /* RGB7 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},    /* RGB20 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},    /* RGB33 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},    /* RGB46 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},    /* RGB59 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},    /* RGB72 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},    /* RGB85 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},    /* RGB6 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},    /* RGB32 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},    /* RGB45 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},    /* RGB58 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},    /* RGB71 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},    /* RGB84 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},    /* RGB97 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},    /* RGB7 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},    /* RGB20 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},    /* RGB33 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},    /* RGB46 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},    /* RGB59 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},    /* RGB72 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},    /* RGB85 */
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},    /* RGB5 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},    /* RGB18 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},    /* RGB31 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},    /* RGB44 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},    /* RGB57 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},    /* RGB70 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},    /* RGB83 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},    /* RGB96 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},    /* RGB8 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},    /* RGB21 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},    /* RGB34 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},    /* RGB47 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},    /* RGB60 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},    /* RGB73 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},    /* RGB86 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},    /* RGB5 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},    /* RGB18 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},    /* RGB31 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},    /* RGB44 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},    /* RGB57 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},    /* RGB70 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},    /* RGB83 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},    /* RGB96 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},    /* RGB8 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},    /* RGB21 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},    /* RGB34 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},    /* RGB47 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},    /* RGB60 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},    /* RGB73 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},    /* RGB86 */
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},    /* RGB4 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},    /* RGB17 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},    /* RGB30 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},    /* RGB43 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},    /* RGB56 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},    /* RGB69 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},    /* RGB82 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},    /* RGB95 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},    /* RGB9 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},    /* RGB22 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},    /* RGB35 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},    /* RGB48 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},    /* RGB61 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},    /* RGB74 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},    /* RGB87 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},    /* RGB4 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},    /* RGB17 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},    /* RGB30 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},    /* RGB43 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},    /* RGB56 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},    /* RGB69 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},    /* RGB82 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},    /* RGB95 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},    /* RGB9 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},    /* RGB22 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},    /* RGB35 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},    /* RGB48 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},    /* RGB61 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},    /* RGB74 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},    /* RGB87 */
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},    /* RGB3 */
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},    /* RGB16 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},    /* RGB29*/
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},    /* RGB42 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},    /* RGB55 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},    /* RGB68 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},    /* RGB81 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},    /* RGB94 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},    /* RGB10 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},    /* RGB23 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},    /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},    /* RGB49 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},    /* RGB62 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},    /* RGB88 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},    /* RGB3 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},    /* RGB16 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},    /* RGB29*/
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},    /* RGB42 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},    /* RGB55 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},    /* RGB68 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},    /* RGB81 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},    /* RGB94 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},    /* RGB10 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},    /* RGB23 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},    /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},    /* RGB49 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},    /* RGB62 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},    /* RGB88 */
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},    /* RGB2 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},    /* RGB28 */
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},    /* RGB41 */
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},    /* RGB54 */
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},    /* RGB67 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},    /* RGB80 */
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},    /* RGB93 */
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},    /* RGB11 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},    /* RGB24 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},    /* RGB37 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},    /* RGB50 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},    /* RGB63 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},    /* RGB76 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},    /* RGB2 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},    /* RGB28 */
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},    /* RGB41 */
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},    /* RGB54 */
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},    /* RGB67 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},    /* RGB80 */
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},    /* RGB93 */
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},    /* RGB11 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},    /* RGB24 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},    /* RGB37 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},    /* RGB50 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},    /* RGB63 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},    /* RGB76 */
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},    /* RGB1 */
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},    /* RGB14 */
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},    /* RGB27 */
-    {0, CS36_SW8, CS35_SW8, CS34_SW8},    /* RGB103 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},    /* RGB38 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},    /* RGB51 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},    /* RGB64 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},    /* RGB77 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},    /* RGB90 */
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},    /* RGB1 */
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},    /* RGB14 */
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},    /* RGB27 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34},    /* RGB103 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},    /* RGB38 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},    /* RGB51 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},    /* RGB64 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},    /* RGB77 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},    /* RGB90 */
 
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},    /* RGB110 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2},    /* RGB19 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},    /* RGB108 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},    /* RGB98 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9},    /* RGB112 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8},    /* RGB99 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},    /* RGB107 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},    /* RGB100 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},    /* RGB89 */
-    {0, CS33_SW9, CS32_SW9, CS31_SW9},    /* RGB115 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9},    /* RGB116 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},    /* RGB25 */
-    {0, CS3_SW9, CS2_SW9, CS1_SW9},    /* RGB105 */
-    {0, CS3_SW4, CS2_SW4, CS1_SW4},    /* RGB40 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},    /* RGB110 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},    /* RGB19 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},    /* RGB108 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},    /* RGB98 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},    /* RGB112 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22},    /* RGB99 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},    /* RGB107 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},    /* RGB100 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},    /* RGB89 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31},    /* RGB115 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34},    /* RGB116 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},    /* RGB25 */
+    {0, SW9_CS3, SW9_CS2, SW9_CS1},    /* RGB105 */
+    {0, SW4_CS3, SW4_CS2, SW4_CS1},    /* RGB40 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
index b4fc00765f..8d9349e295 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
+++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
@@ -16,107 +16,107 @@
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},    /* RGB6 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},    /* RGB32 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},    /* RGB45 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},    /* RGB58 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},    /* RGB71 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},    /* RGB84 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},    /* RGB97 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},    /* RGB7 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},    /* RGB20 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},    /* RGB33 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},    /* RGB46 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},    /* RGB59 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},    /* RGB72 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},    /* RGB85 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},    /* RGB6 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},    /* RGB32 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},    /* RGB45 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},    /* RGB58 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},    /* RGB71 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},    /* RGB84 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},    /* RGB97 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},    /* RGB7 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},    /* RGB20 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},    /* RGB33 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},    /* RGB46 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},    /* RGB59 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},    /* RGB72 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},    /* RGB85 */
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},    /* RGB5 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},    /* RGB18 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},    /* RGB31 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},    /* RGB44 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},    /* RGB57 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},    /* RGB70 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},    /* RGB83 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},    /* RGB96 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},    /* RGB8 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},    /* RGB21 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},    /* RGB34 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},    /* RGB47 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},    /* RGB60 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},    /* RGB73 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},    /* RGB86 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},    /* RGB5 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},    /* RGB18 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},    /* RGB31 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},    /* RGB44 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},    /* RGB57 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},    /* RGB70 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},    /* RGB83 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},    /* RGB96 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},    /* RGB8 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},    /* RGB21 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},    /* RGB34 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},    /* RGB47 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},    /* RGB60 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},    /* RGB73 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},    /* RGB86 */
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},    /* RGB4 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},    /* RGB17 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},    /* RGB30 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},    /* RGB43 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},    /* RGB56 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},    /* RGB69 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},    /* RGB82 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},    /* RGB95 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},    /* RGB9 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},    /* RGB22 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},    /* RGB35 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},    /* RGB48 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},    /* RGB61 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},    /* RGB74 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},    /* RGB87 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},    /* RGB4 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},    /* RGB17 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},    /* RGB30 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},    /* RGB43 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},    /* RGB56 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},    /* RGB69 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},    /* RGB82 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},    /* RGB95 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},    /* RGB9 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},    /* RGB22 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},    /* RGB35 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},    /* RGB48 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},    /* RGB61 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},    /* RGB74 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},    /* RGB87 */
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},    /* RGB3 */
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},    /* RGB16 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},    /* RGB29*/
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},    /* RGB42 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},    /* RGB55 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},    /* RGB68 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},    /* RGB81 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},    /* RGB94 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},    /* RGB10 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},    /* RGB23 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},    /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},    /* RGB49 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},    /* RGB62 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},    /* RGB88 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},    /* RGB3 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},    /* RGB16 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},    /* RGB29*/
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},    /* RGB42 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},    /* RGB55 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},    /* RGB68 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},    /* RGB81 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},    /* RGB94 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},    /* RGB10 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},    /* RGB23 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},    /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},    /* RGB49 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},    /* RGB62 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},    /* RGB88 */
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},    /* RGB2 */
-    {0, CS6_SW2, CS5_SW2, CS4_SW2},    /* RGB15 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},    /* RGB28 */
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},    /* RGB41 */
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},    /* RGB54 */
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},    /* RGB67 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},    /* RGB80 */
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},    /* RGB93 */
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},    /* RGB11 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},    /* RGB24 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},    /* RGB37 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},    /* RGB50 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},    /* RGB63 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},    /* RGB76 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},    /* RGB2 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4},    /* RGB15 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},    /* RGB28 */
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},    /* RGB41 */
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},    /* RGB54 */
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},    /* RGB67 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},    /* RGB80 */
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},    /* RGB93 */
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},    /* RGB11 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},    /* RGB24 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},    /* RGB37 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},    /* RGB50 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},    /* RGB63 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},    /* RGB76 */
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},    /* RGB1 */
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},    /* RGB14 */
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},    /* RGB27 */
-    {0, CS36_SW8, CS35_SW8, CS34_SW8},    /* RGB103 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},    /* RGB38 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},    /* RGB51 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},    /* RGB64 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},    /* RGB77 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},    /* RGB90 */
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},    /* RGB1 */
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},    /* RGB14 */
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},    /* RGB27 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34},    /* RGB103 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},    /* RGB38 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},    /* RGB51 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},    /* RGB64 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},    /* RGB77 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},    /* RGB90 */
 
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},    /* RGB110 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2},    /* RGB19 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},    /* RGB108 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},    /* RGB98 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9},    /* RGB112 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8},    /* RGB99 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},    /* RGB107 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},    /* RGB100 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},    /* RGB89 */
-    {0, CS33_SW9, CS32_SW9, CS31_SW9},    /* RGB115 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9},    /* RGB116 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},    /* RGB25 */
-    {0, CS3_SW9, CS2_SW9, CS1_SW9},    /* RGB105 */
-    {0, CS3_SW4, CS2_SW4, CS1_SW4},    /* RGB40 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},    /* RGB110 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},    /* RGB19 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},    /* RGB108 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},    /* RGB98 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},    /* RGB112 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22},    /* RGB99 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},    /* RGB107 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},    /* RGB100 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},    /* RGB89 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31},    /* RGB115 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34},    /* RGB116 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},    /* RGB25 */
+    {0, SW9_CS3, SW9_CS2, SW9_CS1},    /* RGB105 */
+    {0, SW4_CS3, SW4_CS2, SW4_CS1},    /* RGB40 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/boop65/rgb/rgb.c b/keyboards/kbdfans/boop65/rgb/rgb.c
index b8145382c7..f70c92812f 100644
--- a/keyboards/kbdfans/boop65/rgb/rgb.c
+++ b/keyboards/kbdfans/boop65/rgb/rgb.c
@@ -19,97 +19,97 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW6, CS2_SW6, CS1_SW6},
-    {0, CS39_SW2, CS38_SW2, CS37_SW2},
-    {0, CS39_SW3, CS38_SW3, CS37_SW3},
-    {0, CS39_SW4, CS38_SW4, CS37_SW4},
-    {0, CS39_SW5, CS38_SW5, CS37_SW5},
-    {0, CS39_SW7, CS38_SW7, CS37_SW7},
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37},
 
 /* underglow */
 
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},
-    {0, CS39_SW1, CS38_SW1, CS37_SW1},
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 5910d0cf7b..0b40afadf9 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -19,78 +19,78 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
-
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
-
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
-
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
-
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW6, CS2_SW6, CS1_SW6},
-//    {0, CS39_SW1, CS38_SW1, CS37_SW1},
-    {0, CS39_SW2, CS38_SW2, CS37_SW2},
-    {0, CS39_SW3, CS38_SW3, CS37_SW3},
-    {0, CS39_SW4, CS38_SW4, CS37_SW4},
-    {0, CS39_SW5, CS38_SW5, CS37_SW5},
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
+
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
+
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
+
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
+
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+//    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}
 
 };
 
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
index 31b2e1a256..7aec00cbdc 100644
--- a/keyboards/kbdfans/kbdmini/kbdmini.c
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -1,61 +1,61 @@
 #include "quantum.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_9,  A_9,  C_9  }, //LA33
-    { 0, B_10, A_10, C_10 }, //LA37
-    { 0, B_11, A_11, C_11 }, //LA41
-    { 0, B_12, A_12, C_12 }, //LA45
-    { 0, B_13, A_13, C_13 }, //LA49
-    { 0, B_14, A_14, C_14 }, //LA53
-    { 0, B_15, A_15, C_15 }, //LA57
-    { 0, B_6,  A_6,  C_6  }, //LA21
-    { 0, B_5,  A_5,  C_5  }, //LA17
-    { 0, B_4,  A_4,  C_4  }, //LA13
-    { 0, B_3,  A_3,  C_3  }, //LA9
-    { 0, B_2,  A_2,  C_2  }, //LA5
-    { 0, B_1,  A_1,  C_1  }, //LA1
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  }, //LA33
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 }, //LA37
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 }, //LA41
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 }, //LA45
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 }, //LA49
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 }, //LA53
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 }, //LA57
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  }, //LA21
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  }, //LA17
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  }, //LA13
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  }, //LA9
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  }, //LA5
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  }, //LA1
 
-    { 0, E_9,  D_9,  F_9  }, //LA34
-    { 0, E_10, D_10, F_10 }, //LA38
-    { 0, E_11, D_11, F_11 }, //LA42
-    { 0, E_12, D_12, F_12 }, //LA46
-    { 0, E_13, D_13, F_13 }, //LA50
-    { 0, E_14, D_14, F_14 }, //LA54
-    { 0, E_15, D_15, F_15 }, //LA58
-    { 0, E_6,  D_6,  F_6  }, //LA22
-    { 0, E_5,  D_5,  F_5  }, //LA18
-    { 0, E_4,  D_4,  F_4  }, //LA14
-    { 0, E_3,  D_3,  F_3  }, //LA10
-    { 0, E_2,  D_2,  F_2  }, //LA6
-    { 0, E_1,  D_1,  F_1  }, //LA2
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  }, //LA34
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 }, //LA38
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 }, //LA42
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 }, //LA46
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 }, //LA50
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 }, //LA54
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 }, //LA58
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  }, //LA22
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  }, //LA18
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  }, //LA14
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  }, //LA10
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  }, //LA6
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  }, //LA2
 
-    { 0, H_9,  G_9,  I_9  }, //LA35
-    { 0, H_10, G_10, I_10 }, //LA39
-    { 0, H_11, G_11, I_11 }, //LA43
-    { 0, H_12, G_12, I_12 }, //LA47
-    { 0, H_13, G_13, I_13 }, //LA51
-    { 0, H_14, G_14, I_14 }, //LA55
-    { 0, H_15, G_15, I_15 }, //LA59
-    { 0, H_6,  G_6,  I_6  }, //LA23
-    { 0, H_5,  G_5,  I_5  }, //LA19
-    { 0, H_4,  G_4,  I_4  }, //LA15
-    { 0, H_3,  G_3,  I_3  }, //LA11
-    { 0, H_2,  G_2,  I_2  }, //LA7
-    { 0, H_1,  G_1,  I_1  }, //LA3
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  }, //LA35
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 }, //LA39
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 }, //LA43
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 }, //LA47
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 }, //LA51
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 }, //LA55
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 }, //LA59
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  }, //LA23
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  }, //LA19
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  }, //LA15
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  }, //LA11
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  }, //LA7
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  }, //LA3
 
-    { 0, K_9,  J_9,  L_9  }, //LA36
-    { 0, K_10, J_10, L_10 }, //LA40
-    { 0, K_11, J_11, L_11 }, //LA44
-    { 0, K_12, J_12, L_12 }, //LA48
-    { 0, K_13, J_13, L_13 }, //LA52
-    { 0, K_14, J_14, L_14 }, //LA56
-    { 0, K_15, J_15, L_15 }, //LA60
-    { 0, K_6,  J_6,  L_6  }, //LA24
-    { 0, K_5,  J_5,  L_5  }, //LA20
-    { 0, K_4,  J_4,  L_4  }, //LA16
-    { 0, K_3,  J_3,  L_3  }, //LA12
-    { 0, K_2,  J_2,  L_2  }, //LA8
-    { 0, K_1,  J_1,  L_1  }  //LA4
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  }, //LA36
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 }, //LA40
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 }, //LA44
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 }, //LA48
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 }, //LA52
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 }, //LA56
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 }, //LA60
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  }, //LA24
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  }, //LA20
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  }, //LA16
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  }, //LA12
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  }, //LA8
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  }  //LA4
 };
 
 led_config_t g_led_config = {