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

4 files changed, 330 insertions, 330 deletions

diff --git a/keyboards/keychron/q1v1/ansi/ansi.c b/keyboards/keychron/q1v1/ansi/ansi.c
index f45907eaf6..dfd2ee6087 100644
--- a/keyboards/keychron/q1v1/ansi/ansi.c
+++ b/keyboards/keychron/q1v1/ansi/ansi.c
@@ -24,93 +24,93 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+    {0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 
 };
 
diff --git a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
index 1c15ac633d..d8679ee482 100644
--- a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
@@ -24,93 +24,93 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+    {0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1v1/iso/iso.c b/keyboards/keychron/q1v1/iso/iso.c
index 109eb01282..affc41d219 100644
--- a/keyboards/keychron/q1v1/iso/iso.c
+++ b/keyboards/keychron/q1v1/iso/iso.c
@@ -24,94 +24,94 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-	{0, L_14,   J_14,   K_14},
-	{0, I_14,   G_14,   H_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+	{0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+	{0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS2,    SW1_CS2,    SW2_CS2},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
index e46a17cdc6..e1c535b318 100644
--- a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
@@ -25,94 +25,94 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, I_14,   G_14,   H_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+    {0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+    {0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS2,    SW1_CS2,    SW2_CS2},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 };
 
 #endif // RGB_MATRIX_ENABLE