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

6 files changed, 656 insertions, 656 deletions

diff --git a/keyboards/drop/alt/v2/v2.c b/keyboards/drop/alt/v2/v2.c
index d3bb78fd12..49ed4bfc99 100644
--- a/keyboards/drop/alt/v2/v2.c
+++ b/keyboards/drop/alt/v2/v2.c
@@ -4,111 +4,111 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-     { 1, B_2, A_2, C_2 },
-     { 1, E_3, D_3, F_3 },
-     { 1, E_4, D_4, F_4 },
-     { 1, E_5, D_5, F_5 },
-     { 1, E_6, D_6, F_6 },
-     { 1, E_7, D_7, F_7 },
-     { 1, E_8, D_8, F_8 },
-     { 1, B_13, A_13, C_13 },
-     { 0, E_1, D_1, F_1 },
-     { 0, E_2, D_2, F_2 },
-     { 0, E_3, D_3, F_3 },
-     { 0, E_4, D_4, F_4 },
-     { 0, E_5, D_5, F_5 },
-     { 0, E_6, D_6, F_6 },
-     { 0, B_7, A_7, C_7 },
-     { 1, E_2, D_2, F_2 },
-     { 1, H_3, G_3, I_3 },
-     { 1, H_4, G_4, I_4 },
-     { 1, H_5, G_5, I_5 },
-     { 1, H_6, G_6, I_6 },
-     { 1, H_7, G_7, I_7 },
-     { 1, H_8, G_8, I_8 },
-     { 0, H_1, G_1, I_1 },
-     { 0, H_2, G_2, I_2 },
-     { 0, H_3, G_3, I_3 },
-     { 0, H_4, G_4, I_4 },
-     { 0, H_5, G_5, I_5 },
-     { 0, K_11, J_11, L_11 },
-     { 0, H_6, G_6, I_6 },
-     { 0, E_7, D_7, F_7 },
-     { 1, H_2, G_2, I_2 },
-     { 1, K_3, J_3, L_3 },
-     { 1, K_4, J_4, L_4 },
-     { 1, K_5, J_5, L_5 },
-     { 1, K_6, J_6, L_6 },
-     { 1, K_7, J_7, L_7 },
-     { 1, K_8, J_8, L_8 },
-     { 0, K_1, J_1, L_1 },
-     { 0, K_2, J_2, L_2 },
-     { 0, K_3, J_3, L_3 },
-     { 0, K_4, J_4, L_4 },
-     { 0, K_5, J_5, L_5 },
-     { 0, K_6, J_6, L_6 },
-     { 0, H_7, G_7, I_7 },
-     { 1, K_2, J_2, L_2 },
-     { 1, E_9, D_9, F_9 },
-     { 1, B_9, A_9, C_9 },
-     { 1, K_9, J_9, L_9 },
-     { 1, H_9, G_9, I_9 },
-     { 1, K_12, J_12, L_12 },
-     { 1, K_13, J_13, L_13 },
-     { 0, K_9, J_9, L_9 },
-     { 0, K_10, J_10, L_10 },
-     { 0, H_10, G_10, I_10 },
-     { 0, H_11, G_11, I_11 },
-     { 0, B_11, A_11, C_11 },
-     { 0, E_11, D_11, F_11 },
-     { 0, K_7, J_7, L_7 },
-     { 1, H_10, G_10, I_10 },
-     { 1, E_10, D_10, F_10 },
-     { 1, B_10, A_10, C_10 },
-     { 1, H_12, G_12, I_12 },
-     { 0, E_10, D_10, F_10 },
-     { 0, B_10, A_10, C_10 },
-     { 0, B_12, A_12, C_12 },
-     { 0, H_12, G_12, I_12 },
-     { 0, E_12, D_12, F_12 },
-     { 1, K_11, J_11, L_11 },
-     { 1, H_11, G_11, I_11 },
-     { 1, E_11, D_11, F_11 },
-     { 1, B_11, A_11, C_11 },
-     { 1, B_12, A_12, C_12 },
-     { 1, E_12, D_12, F_12 },
-     { 1, E_13, D_13, F_13 },
-     { 1, H_13, G_13, I_13 },
-     { 0, H_9, G_9, I_9 },
-     { 0, E_9, D_9, F_9 },
-     { 0, B_9, A_9, C_9 },
-     { 0, B_13, A_13, C_13 },
-     { 0, H_13, G_13, I_13 },
-     { 0, E_13, D_13, F_13 },
-     { 0, K_13, J_13, L_13 },
-     { 0, K_12, J_12, L_12 },
-     { 0, K_8, J_8, L_8 },
-     { 0, H_8, G_8, I_8 },
-     { 0, E_8, D_8, F_8 },
-     { 0, B_8, A_8, C_8 },
-     { 0, B_6, A_6, C_6 },
-     { 0, B_5, A_5, C_5 },
-     { 0, B_4, A_4, C_4 },
-     { 0, B_3, A_3, C_3 },
-     { 0, B_2, A_2, C_2 },
-     { 0, B_1, A_1, C_1 },
-     { 0, B_14, A_14, C_14 },
-     { 1, B_8, A_8, C_8 },
-     { 1, B_7, A_7, C_7 },
-     { 1, B_6, A_6, C_6 },
-     { 1, B_5, A_5, C_5 },
-     { 1, B_4, A_4, C_4 },
-     { 1, B_3, A_3, C_3 },
-     { 1, B_1, A_1, C_1 },
-     { 1, E_1, D_1, F_1 },
-     { 1, H_1, G_1, I_1 },
-     { 1, K_1, J_1, L_1 },
-     { 1, K_10, J_10, L_10 },
+     { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+     { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+     { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+     { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+     { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+     { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+     { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
 };
 
 #endif
diff --git a/keyboards/drop/cstm65/cstm65.c b/keyboards/drop/cstm65/cstm65.c
index 1c8e6bb0bb..dff7008f59 100644
--- a/keyboards/drop/cstm65/cstm65.c
+++ b/keyboards/drop/cstm65/cstm65.c
@@ -4,76 +4,76 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1,  A_1,  C_1  },
-    { 0, B_2,  A_2,  C_2  },
-    { 0, B_3,  A_3,  C_3  },
-    { 0, B_4,  A_4,  C_4  },
-    { 0, B_5,  A_5,  C_5  },
-    { 0, B_6,  A_6,  C_6  },
-    { 0, B_7,  A_7,  C_7  },
-    { 0, B_8,  A_8,  C_8  },
-    { 0, B_9,  A_9,  C_9  },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_15, A_15, C_15 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
 
-    { 0, E_1,  D_1,  F_1  },
-    { 0, E_2,  D_2,  F_2  },
-    { 0, E_3,  D_3,  F_3  },
-    { 0, E_4,  D_4,  F_4  },
-    { 0, E_5,  D_5,  F_5  },
-    { 0, E_6,  D_6,  F_6  },
-    { 0, E_7,  D_7,  F_7  },
-    { 0, E_8,  D_8,  F_8  },
-    { 0, E_9,  D_9,  F_9  },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
 
-    { 1, B_1,  A_1,  C_1  },
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, B_12, A_12, C_12 },
-    { 1, B_13, A_13, C_13 },
-    { 1, B_14, A_14, C_14 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
 
-    { 1, E_1,  D_1,  F_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, E_14, D_14, F_14 },
+    { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
 
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10  },
-    { 1, H_11, G_11, I_11  },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10  },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11  },
 };
 #endif
diff --git a/keyboards/drop/cstm80/cstm80.c b/keyboards/drop/cstm80/cstm80.c
index e99c7801e5..6350f3a32d 100644
--- a/keyboards/drop/cstm80/cstm80.c
+++ b/keyboards/drop/cstm80/cstm80.c
@@ -4,93 +4,93 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, E_1,  D_1,  F_1  },
-    { 0, E_2,  D_2,  F_2  },
-    { 0, E_3,  D_3,  F_3  },
-    { 0, E_4,  D_4,  F_4  },
-    { 0, E_5,  D_5,  F_5  },
-    { 0, E_6,  D_6,  F_6  },
-    { 0, E_7,  D_7,  F_7  },
-    { 0, E_8,  D_8,  F_8  },
-    { 0, E_9,  D_9,  F_9  },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_1,  G_1,  I_1  },
-    { 0, H_2,  G_2,  I_2  },
-    { 0, H_3,  G_3,  I_3  },
-    { 0, H_4,  G_4,  I_4  },
-    { 0, H_5,  G_5,  I_5  },
-    { 0, H_6,  G_6,  I_6  },
-    { 0, H_7,  G_7,  I_7  },
-    { 0, H_8,  G_8,  I_8  },
-    { 0, H_9,  G_9,  I_9  },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_1,  J_1,  L_1  },
-    { 0, K_2,  J_2,  L_2  },
-    { 0, K_3,  J_3,  L_3  },
-    { 0, K_4,  J_4,  L_4  },
-    { 0, K_5,  J_5,  L_5  },
-    { 0, K_6,  J_6,  L_6  },
-    { 0, K_7,  J_7,  L_7  },
-    { 0, K_8,  J_8,  L_8  },
-    { 0, K_9,  J_9,  L_9  },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
-    { 1, B_1,  A_1,  C_1  },
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, B_12, A_12, C_12 },
-    { 1, B_13, A_13, C_13 },
-    { 1, B_14, A_14, C_14 },
-    { 1, B_15, A_15, C_15 },
-    { 1, B_16, A_16, C_16 },
-    { 1, E_1,  D_1,  F_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_6,  G_6,  I_6  },
-    { 1, H_7,  G_7,  I_7  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10 },
-    { 1, H_11, G_11, I_11 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
 };
 #endif
diff --git a/keyboards/drop/ctrl/v2/v2.c b/keyboards/drop/ctrl/v2/v2.c
index 0c1d8210c6..81689dc78a 100644
--- a/keyboards/drop/ctrl/v2/v2.c
+++ b/keyboards/drop/ctrl/v2/v2.c
@@ -4,125 +4,125 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-     { 1, B_2, A_2, C_2 },
-     { 1, E_3, D_3, F_3 },
-     { 1, E_4, D_4, F_4 },
-     { 1, E_5, D_5, F_5 },
-     { 1, B_6, A_6, C_6 },
-     { 1, E_7, D_7, F_7 },
-     { 1, E_8, D_8, F_8 },
-     { 0, E_1, D_1, F_1 },
-     { 0, E_2, D_2, F_2 },
-     { 0, E_3, D_3, F_3 },
-     { 0, E_4, D_4, F_4 },
-     { 0, E_5, D_5, F_5 },
-     { 0, E_6, D_6, F_6 },
-     { 0, E_7, D_7, F_7 },
-     { 0, E_8, D_8, F_8 },
-     { 0, E_9, D_9, F_9 },
-     { 1, H_1, G_1, I_1 },
-     { 1, H_2, G_2, I_2 },
-     { 1, H_3, G_3, I_3 },
-     { 1, H_4, G_4, I_4 },
-     { 1, H_5, G_5, I_5 },
-     { 1, H_6, G_6, I_6 },
-     { 1, H_7, G_7, I_7 },
-     { 1, H_8, G_8, I_8 },
-     { 0, H_1, G_1, I_1 },
-     { 0, H_2, G_2, I_2 },
-     { 0, H_3, G_3, I_3 },
-     { 0, H_4, G_4, I_4 },
-     { 0, H_5, G_5, I_5 },
-     { 0, H_6, G_6, I_6 },
-     { 0, H_7, G_7, I_7 },
-     { 0, H_8, G_8, I_8 },
-     { 0, H_9, G_9, I_9 },
-     { 1, K_1, J_1, L_1 },
-     { 1, K_2, J_2, L_2 },
-     { 1, K_3, J_3, L_3 },
-     { 1, K_4, J_4, L_4 },
-     { 1, K_5, J_5, L_5 },
-     { 1, K_6, J_6, L_6 },
-     { 1, K_7, J_7, L_7 },
-     { 1, K_8, J_8, L_8 },
-     { 0, K_1, J_1, L_1 },
-     { 0, K_2, J_2, L_2 },
-     { 0, K_3, J_3, L_3 },
-     { 0, K_4, J_4, L_4 },
-     { 0, K_5, J_5, L_5 },
-     { 0, K_6, J_6, L_6 },
-     { 0, K_7, J_7, L_7 },
-     { 0, K_8, J_8, L_8 },
-     { 0, K_9, J_9, L_9 },
-     { 1, E_1, D_1, F_1 },
-     { 1, E_2, D_2, F_2 },
-     { 1, K_13, J_13, L_13 },
-     { 1, K_12, J_12, L_12 },
-     { 1, K_11, J_11, L_11 },
-     { 1, E_6, D_6, F_6 },
-     { 1, K_10, J_10, L_10 },
-     { 1, K_9, J_9, L_9 },
-     { 0, K_16, J_16, L_16 },
-     { 0, K_15, J_15, L_15 },
-     { 0, K_14, J_14, L_14 },
-     { 0, K_13, J_13, L_13 },
-     { 0, K_12, J_12, L_12 },
-     { 1, E_14, D_14, F_14 },
-     { 1, E_13, D_13, F_13 },
-     { 1, H_12, G_12, I_12 },
-     { 1, E_12, D_12, F_12 },
-     { 1, E_11, D_11, F_11 },
-     { 1, E_10, D_10, F_10 },
-     { 1, E_9, D_9, F_9 },
-     { 1, H_9, G_9, I_9 },
-     { 0, H_16, G_16, I_16 },
-     { 0, H_15, G_15, I_15 },
-     { 0, H_14, G_14, I_14 },
-     { 0, H_13, G_13, I_13 },
-     { 0, H_11, G_11, I_11 },
-     { 1, K_14, J_14, L_14 },
-     { 1, H_14, G_14, I_14 },
-     { 1, H_13, G_13, I_13 },
-     { 1, H_10, G_10, I_10 },
-     { 0, E_16, D_16, F_16 },
-     { 0, E_15, D_15, F_15 },
-     { 0, E_14, D_14, F_14 },
-     { 0, E_13, D_13, F_13 },
-     { 0, H_12, G_12, I_12 },
-     { 0, E_12, D_12, F_12 },
-     { 0, E_11, D_11, F_11 },
-     { 0, B_11, A_11, C_11 },
-     { 0, B_12, A_12, C_12 },
-     { 0, B_13, A_13, C_13 },
-     { 0, B_14, A_14, C_14 },
-     { 0, B_15, A_15, C_15 },
-     { 0, B_16, A_16, C_16 },
-     { 1, B_9, A_9, C_9 },
-     { 1, B_10, A_10, C_10 },
-     { 1, B_11, A_11, C_11 },
-     { 1, B_12, A_12, C_12 },
-     { 1, B_13, A_13, C_13 },
-     { 1, B_14, A_14, C_14 },
-     { 1, B_15, A_15, C_15 },
-     { 1, K_15, J_15, L_15 },
-     { 1, E_15, D_15, F_15 },
-     { 1, H_15, G_15, I_15 },
-     { 1, B_1, A_1, C_1 },
-     { 1, B_3, A_3, C_3 },
-     { 1, B_4, A_4, C_4 },
-     { 1, B_5, A_5, C_5 },
-     { 1, B_7, A_7, C_7 },
-     { 1, B_8, A_8, C_8 },
-     { 0, B_1, A_1, C_1 },
-     { 0, B_2, A_2, C_2 },
-     { 0, B_3, A_3, C_3 },
-     { 0, B_5, A_5, C_5 },
-     { 0, B_6, A_6, C_6 },
-     { 0, B_8, A_8, C_8 },
-     { 0, B_10, A_10, C_10 },
-     { 0, H_10, G_10, I_10 },
-     { 0, K_10, J_10, L_10 },
-     { 0, E_10, D_10, F_10 },
+     { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+     { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+     { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+     { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+     { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 1, SW11_CS14, SW10_CS14, SW12_CS14 },
+     { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+     { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+     { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 1, SW11_CS15, SW10_CS15, SW12_CS15 },
+     { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+     { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+     { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
 };
 
 #endif
diff --git a/keyboards/drop/sense75/sense75.c b/keyboards/drop/sense75/sense75.c
index bbe5a3aa47..1130cf1279 100644
--- a/keyboards/drop/sense75/sense75.c
+++ b/keyboards/drop/sense75/sense75.c
@@ -5,131 +5,131 @@
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 // top underglow sd2-sd17
-    { 0, B_2,  A_2,  C_2  },
-    { 0, B_3,  A_3,  C_3  },
-    { 0, B_5,  A_5,  C_5  },
-    { 0, B_6,  A_6,  C_6  },
-    { 0, B_7,  A_7,  C_7  },
-    { 0, B_9,  A_9,  C_9  },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_16, A_16, C_16 },
-    { 1, B_12, A_12, C_12 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
 
 // sd1 + function + sd18
-    { 0, B_1,  A_1,  C_1  },
-    { 0, E_2,  D_2,  F_2  },
-    { 0, E_3,  D_3,  F_3  },
-    { 0, E_4,  D_4,  F_4  },
-    { 0, E_5,  D_5,  F_5  },
-    { 0, E_6,  D_6,  F_6  },
-    { 0, E_7,  D_7,  F_7  },
-    { 0, E_8,  D_8,  F_8  },
-    { 0, E_9,  D_9,  F_9  },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
     // <enc gap>
-    { 1, B_13, A_13, C_13 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
 
 // sd45 + num + sd20
-    { 0, H_1,  G_1,  I_1  },
-    { 0, H_2,  G_2,  I_2  },
-    { 0, H_3,  G_3,  I_3  },
-    { 0, H_4,  G_4,  I_4  },
-    { 0, H_5,  G_5,  I_5  },
-    { 0, H_6,  G_6,  I_6  },
-    { 0, H_7,  G_7,  I_7  },
-    { 0, H_8,  G_8,  I_8  },
-    { 0, H_9,  G_9,  I_9  },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_16, G_16, I_16 },
-    { 1, B_15, A_15, C_15 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
 
 // 44+ qwer 21
-    { 0, K_1,  J_1,  L_1  },
-    { 0, K_2,  J_2,  L_2  },
-    { 0, K_3,  J_3,  L_3  },
-    { 0, K_4,  J_4,  L_4  },
-    { 0, K_5,  J_5,  L_5  },
-    { 0, K_6,  J_6,  L_6  },
-    { 0, K_7,  J_7,  L_7  },
-    { 0, K_8,  J_8,  L_8  },
-    { 0, K_9,  J_9,  L_9  },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
-    { 1, B_16, A_16, C_16 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
 
 // asdf
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, E_14, D_14, F_14 },
-    { 1, H_15, G_15, I_15 },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
 
 // 43 + zxcv + 22
-    { 1, B_1,  A_1,  C_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, H_12, G_12, I_12 },
-    { 1, H_13, G_13, I_13 },
-    { 1, H_14, G_14, I_14 },
-    { 1, E_15, D_15, F_15 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
 
 // 41 + mods + 23
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_6,  G_6,  I_6  },
-    { 1, H_7,  G_7,  I_7  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10 },
-    { 1, H_11, G_11, I_11 },
-    { 1, E_16, D_16, F_16 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 1, SW5_CS16, SW4_CS16, SW6_CS16 },
 
 // bottom underglow 24 - 39
-    { 1, K_2,  J_2,  L_2  },
-    { 1, K_3,  J_3,  L_3  },
-    { 1, K_4,  J_4,  L_4  },
-    { 1, K_6,  J_6,  L_6  },
-    { 1, K_10, J_10, L_10 },
-    { 1, K_13, J_13, L_13 },
-    { 1, K_15, J_15, L_15 },
-    { 1, H_16, G_16, I_16 }
+    { 1, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 1, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 1, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 1, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 1, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 1, SW8_CS16, SW7_CS16, SW9_CS16 }
 };
 #endif
diff --git a/keyboards/drop/shift/v2/v2.c b/keyboards/drop/shift/v2/v2.c
index cbfbeda429..4715d7b81b 100644
--- a/keyboards/drop/shift/v2/v2.c
+++ b/keyboards/drop/shift/v2/v2.c
@@ -5,172 +5,172 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-     { 0, K_1,  J_1,  L_1  },// LED1
-     { 0, K_2,  J_2,  L_2  },
-     { 0, K_3,  J_3,  L_3  },
-     { 0, K_4,  J_4,  L_4  },
-     { 0, K_5,  J_5,  L_5  },
-     { 0, K_7,  J_7,  L_7  },
-     { 0, K_8,  J_8,  L_8  },
-     { 0, K_9,  J_9,  L_9  },
-     { 0, K_10, J_10, L_10 },// LED9
-     { 1, K_1,  J_1,  L_1  },// LED10
-     { 1, K_2,  J_2,  L_2  },// LED11
-     { 1, K_3,  J_3,  L_3  },// LED12
-     { 1, K_4,  J_4,  L_4  },// LED13
-     { 1, K_9,  J_9,  L_9  },// LED18
-     { 1, K_5,  J_5,  L_5  },// LED15
-     { 1, K_6,  J_6,  L_6  },// LED19
-     { 1, K_7,  J_7,  L_7  },// LED16
-     { 1, K_8,  J_8,  L_8  },// LED20
-     { 0, H_1,  G_1,  I_1  },//start2
-     { 0, H_11, G_11, I_11 },
-     { 0, H_2,  G_2,  I_2  },
-     { 0, H_3,  G_3,  I_3  },
-     { 0, H_4,  G_4,  I_4  },
-     { 0, H_5,  G_5,  I_5  },
-     { 0, H_6,  G_6,  I_6  },
-     { 0, H_7,  G_7,  I_7  },
-     { 0, H_8,  G_8,  I_8  },
-     { 0, H_9,  G_9,  I_9  },
-     { 0, H_10, G_10, I_10 },
-     { 1, E_1,  D_1,  F_1  },
-     { 1, E_2,  D_2,  F_2  },
-     { 1, E_4,  D_4,  F_4  },
-     { 1, E_5,  D_5,  F_5  },
-     { 1, E_6,  D_6,  F_6  },
-     { 1, E_7,  D_7,  F_7  },
-     { 1, E_8,  D_8,  F_8  },
-     { 0, E_1,  D_1,  F_1  },
-     { 0, E_2,  D_2,  F_2  },
-     { 0, E_3,  D_3,  F_3  },
-     { 0, E_4,  D_4,  F_4  },
-     { 0, E_5,  D_5,  F_5  },
-     { 0, E_6,  D_6,  F_6  },
-     { 0, E_7,  D_7,  F_7  },
-     { 0, E_8,  D_8,  F_8  },
-     { 0, E_9,  D_9,  F_9  },
-     { 0, E_10, D_10, F_10 },
-     { 1, B_1,  A_1,  C_1  },
-     { 1, B_2,  A_2,  C_2  },
-     { 1, B_3,  A_3,  C_3  },
-     { 1, B_4,  A_4,  C_4  },
-     { 1, B_5,  A_5,  C_5  },
-     { 1, B_6,  A_6,  C_6  },
-     { 1, B_7,  A_7,  C_7  },
-     { 1, B_8,  A_8,  C_8  },
-     { 0, B_1,  A_1,  C_1  },
-     { 0, B_2,  A_2,  C_2  },
-     { 0, B_3,  A_3,  C_3  },
-     { 0, B_4,  A_4,  C_4  },
-     { 0, B_5,  A_5,  C_5  },
-     { 0, B_6,  A_6,  C_6  },
-     { 0, B_7,  A_7,  C_7  },
-     { 0, B_8,  A_8,  C_8  },
-     { 0, B_9,  A_9,  C_9  },
-     { 0, B_10, A_10, C_10 },
-     { 1, B_9,  A_9,  C_9  },
-     { 1, B_10, A_10, C_10 },
-     { 1, B_11, A_11, C_11 },
-     { 1, B_13, A_13, C_13 },
-     { 1, B_14, A_14, C_14 },
-     { 1, B_15, A_15, C_15 },
-     { 1, B_16, A_16, C_16 },
-     { 0, B_11, A_11, C_11 },
-     { 0, B_12, A_12, C_12 },
-     { 0, B_13, A_13, C_13 },
-     { 0, H_13, G_13, I_13 },
-     { 0, H_14, G_14, I_14 },
-     { 0, B_14, A_14, C_14 },
-     { 0, E_15, D_15, F_15 },
-     { 0, B_15, A_15, C_15 },
-     { 0, B_16, A_16, C_16 },
-     { 1, E_9,  D_9,  F_9  },
-     { 1, E_10, D_10, F_10 },
-     { 1, E_11, D_11, F_11 },
-     { 1, E_12, D_12, F_12 },
-     { 1, E_13, D_13, F_13 },
-     { 1, E_14, D_14, F_14 },
-     { 1, E_15, D_15, F_15 },
-     { 1, H_16, G_16, I_16 },
-     { 0, E_11, D_11, F_11 },//start6
-     { 0, E_12, D_12, F_12 },
-     { 0, E_13, D_13, F_13 },
-     { 0, E_14, D_14, F_14 },
-     { 1, H_9,  G_9,  I_9  },
-     { 1, H_10, G_10, I_10 },
-     { 1, H_11, G_11, I_11 },
-     { 1, H_12, G_12, I_12 },
-     { 1, H_13, G_13, I_13 },
-     { 1, H_14, G_14, I_14 },
-     { 1, H_15, G_15, I_15 },
-     { 2, H_1,  G_1,  I_1  },//start underglow
-     { 2, K_1,  J_1,  L_1  },
-     { 2, B_1,  A_1,  C_1  },
-     { 2, E_1,  D_1,  F_1  },
-     { 2, E_2,  D_2,  F_2  },
-     { 2, B_2,  A_2,  C_2  },
-     { 2, B_3,  A_3,  C_3  },
-     { 2, E_3,  D_3,  F_3  },
-     { 2, E_4,  D_4,  F_4  },
-     { 2, B_4,  A_4,  C_4  },
-     { 2, B_5,  A_5,  C_5  },
-     { 2, E_5,  D_5,  F_5  },
-     { 2, E_6,  D_6,  F_6  },
-     { 2, B_6,  A_6,  C_6  },
-     { 2, B_7,  A_7,  C_7  },
-     { 2, E_7,  D_7,  F_7  },
-     { 2, E_8,  D_8,  F_8  },
-     { 2, B_8,  A_8,  C_8  },
-     { 2, B_9,  A_9,  C_9  },
-     { 2, E_9,  D_9,  F_9  },
-     { 2, E_10, D_10, F_10 },
-     { 2, B_10, A_10, C_10 },
-     { 2, B_11, A_11, C_11 },//125
-     { 2, E_11, D_11, F_11 },
-     { 2, E_12, D_12, F_12 },
-     { 2, B_12, A_12, C_12 },
-     { 2, B_13, A_13, C_13 },
-     { 2, E_13, D_13, F_13 },
-     { 2, E_14, D_14, F_14 },
-     { 2, B_14, A_14, C_14 },
-     { 2, B_15, A_15, C_15 },
-     { 2, E_15, D_15, F_15 },
-     { 2, E_16, D_16, F_16 },
-     { 2, B_16, A_16, C_16 },
-     { 2, H_16, G_16, I_16 },
-     { 2, K_16, J_16, L_16 },
-     { 2, K_15, J_15, L_15 },
-     { 2, H_15, G_15, I_15 },
-     { 2, H_14, G_14, I_14 },
-     { 2, K_14, J_14, L_14 },
-     { 2, K_13, J_13, L_13 },
-     { 2, H_13, G_13, I_13 },
-     { 2, H_12, G_12, I_12 },
-     { 2, K_12, J_12, L_12 },
-     { 2, K_11, J_11, L_11 },
-     { 2, H_11, G_11, I_11 },
-     { 2, H_10, G_10, I_10 },
-     { 2, K_10, J_10, L_10 },
-     { 2, K_9,  J_9,  L_9  },
-     { 2, H_9,  G_9,  I_9  },
-     { 2, H_8,  G_8,  I_8  },
-     { 2, K_8,  J_8,  L_8  },
-     { 2, K_7,  J_7,  L_7  },
-     { 2, H_7,  G_7,  I_7  },
-     { 2, H_6,  G_6,  I_6  },
-     { 2, K_6,  J_6,  L_6  },
-     { 2, K_5,  J_5,  L_5  },
-     { 2, H_5,  G_5,  I_5  },
-     { 2, H_4,  G_4,  I_4  },
-     { 2, K_4,  J_4,  L_4  },
-     { 2, K_3,  J_3,  L_3  },
-     { 2, H_3,  G_3,  I_3  },
-     { 2, H_2,  G_2,  I_2  },
-     { 2, K_2,  J_2,  L_2  },
-     { 1, K_10, J_10, L_10 },
-     { 1, K_11, J_11, L_11 },
-     { 1, E_3,  D_3,  F_3  },
+     { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },// LED1
+     { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+     { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+     { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+     { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+     { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+     { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+     { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+     { 0, SW11_CS10, SW10_CS10, SW12_CS10 },// LED9
+     { 1, SW11_CS1,  SW10_CS1,  SW12_CS1  },// LED10
+     { 1, SW11_CS2,  SW10_CS2,  SW12_CS2  },// LED11
+     { 1, SW11_CS3,  SW10_CS3,  SW12_CS3  },// LED12
+     { 1, SW11_CS4,  SW10_CS4,  SW12_CS4  },// LED13
+     { 1, SW11_CS9,  SW10_CS9,  SW12_CS9  },// LED18
+     { 1, SW11_CS5,  SW10_CS5,  SW12_CS5  },// LED15
+     { 1, SW11_CS6,  SW10_CS6,  SW12_CS6  },// LED19
+     { 1, SW11_CS7,  SW10_CS7,  SW12_CS7  },// LED16
+     { 1, SW11_CS8,  SW10_CS8,  SW12_CS8  },// LED20
+     { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },//start2
+     { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+     { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+     { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+     { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+     { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+     { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+     { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+     { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+     { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+     { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+     { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+     { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+     { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+     { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+     { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+     { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+     { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+     { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+     { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+     { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+     { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+     { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+     { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+     { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+     { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+     { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+     { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+     { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+     { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+     { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+     { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+     { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+     { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+     { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+     { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+     { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+     { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+     { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+     { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+     { 0, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+     { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+     { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+     { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+     { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 1, SW8_CS16, SW7_CS16, SW9_CS16 },
+     { 0, SW5_CS11, SW4_CS11, SW6_CS11 },//start6
+     { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+     { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 2, SW8_CS1,  SW7_CS1,  SW9_CS1  },//start underglow
+     { 2, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+     { 2, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+     { 2, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+     { 2, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+     { 2, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+     { 2, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+     { 2, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+     { 2, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+     { 2, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+     { 2, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+     { 2, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+     { 2, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+     { 2, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+     { 2, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+     { 2, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+     { 2, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+     { 2, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+     { 2, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+     { 2, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+     { 2, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 2, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 2, SW2_CS11, SW1_CS11, SW3_CS11 },//125
+     { 2, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 2, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 2, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 2, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 2, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 2, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 2, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 2, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 2, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 2, SW5_CS16, SW4_CS16, SW6_CS16 },
+     { 2, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 2, SW8_CS16, SW7_CS16, SW9_CS16 },
+     { 2, SW11_CS16, SW10_CS16, SW12_CS16 },
+     { 2, SW11_CS15, SW10_CS15, SW12_CS15 },
+     { 2, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 2, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 2, SW11_CS14, SW10_CS14, SW12_CS14 },
+     { 2, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 2, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 2, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 2, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 2, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 2, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 2, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 2, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 2, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+     { 2, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+     { 2, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+     { 2, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+     { 2, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+     { 2, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+     { 2, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+     { 2, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+     { 2, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+     { 2, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+     { 2, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+     { 2, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+     { 2, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+     { 2, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+     { 2, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+     { 2, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+     { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
 };
 
 bool rgb_matrix_indicators_kb(void) {