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, 210 insertions, 210 deletions

diff --git a/keyboards/keychron/q9/ansi/ansi.c b/keyboards/keychron/q9/ansi/ansi.c
index 0034c79c78..e00c7f7e9d 100644
--- a/keyboards/keychron/q9/ansi/ansi.c
+++ b/keyboards/keychron/q9/ansi/ansi.c
@@ -27,61 +27,61 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16,   J_16,   K_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_14,   J_14,   K_14},
-    {0, L_13,   J_13,   K_13},
-    {0, L_12,   J_12,   K_12},
-    {0, L_11,   J_11,   K_11},
-    {0, L_10,   J_10,   K_10},
-    {0, L_9,    J_9,    K_9},
-    {0, L_8,    J_8,    K_8},
-    {0, L_7,    J_7,    K_7},
-    {0, L_6,    J_6,    K_6},
-    {0, L_5,    J_5,    K_5},
-    {0, L_4,    J_4,    K_4},
-    {0, L_3,    J_3,    K_3},
-    {0, L_2,    J_2,    K_2},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {0, C_16,   A_16,   B_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_14,   A_14,   B_14},
-    {0, C_13,   A_13,   B_13},
-    {0, C_12,   A_12,   B_12},
-    {0, C_11,   A_11,   B_11},
-    {0, C_10,   A_10,   B_10},
-    {0, C_9,    A_9,    B_9},
-    {0, C_8,    A_8,    B_8},
-    {0, C_7,    A_7,    B_7},
-    {0, C_6,    A_6,    B_6},
-    {0, C_5,    A_5,    B_5},
-    {0, C_3,    A_3,    B_3},
-    {0, C_2,    A_2,    B_2},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
 
-    {0, I_16,   G_16,   H_16},
-    {0, I_14,   G_14,   H_14},
-    {0, I_13,   G_13,   H_13},
-    {0, I_12,   G_12,   H_12},
-    {0, I_11,   G_11,   H_11},
-    {0, I_10,   G_10,   H_10},
-    {0, I_9,    G_9,    H_9},
-    {0, I_8,    G_8,    H_8},
-    {0, I_7,    G_7,    H_7},
-    {0, I_6,    G_6,    H_6},
-    {0, I_5,    G_5,    H_5},
-    {0, I_3,    G_3,    H_3},
-    {0, I_2,    G_2,    H_2},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
 
-    {0, F_16,   D_16,   E_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_14,   D_14,   E_14},
-    {0, F_10,   D_10,   E_10},
-    {0, F_6,    D_6,    E_6},
-    {0, F_5,    D_5,    E_5},
-    {0, F_4,    D_4,    E_4},
-    {0, F_3,    D_3,    E_3},
-    {0, F_2,    D_2,    E_2},
-    {0, C_4,    A_4,    B_4}
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
index 0034c79c78..e00c7f7e9d 100644
--- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
@@ -27,61 +27,61 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16,   J_16,   K_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_14,   J_14,   K_14},
-    {0, L_13,   J_13,   K_13},
-    {0, L_12,   J_12,   K_12},
-    {0, L_11,   J_11,   K_11},
-    {0, L_10,   J_10,   K_10},
-    {0, L_9,    J_9,    K_9},
-    {0, L_8,    J_8,    K_8},
-    {0, L_7,    J_7,    K_7},
-    {0, L_6,    J_6,    K_6},
-    {0, L_5,    J_5,    K_5},
-    {0, L_4,    J_4,    K_4},
-    {0, L_3,    J_3,    K_3},
-    {0, L_2,    J_2,    K_2},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {0, C_16,   A_16,   B_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_14,   A_14,   B_14},
-    {0, C_13,   A_13,   B_13},
-    {0, C_12,   A_12,   B_12},
-    {0, C_11,   A_11,   B_11},
-    {0, C_10,   A_10,   B_10},
-    {0, C_9,    A_9,    B_9},
-    {0, C_8,    A_8,    B_8},
-    {0, C_7,    A_7,    B_7},
-    {0, C_6,    A_6,    B_6},
-    {0, C_5,    A_5,    B_5},
-    {0, C_3,    A_3,    B_3},
-    {0, C_2,    A_2,    B_2},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
 
-    {0, I_16,   G_16,   H_16},
-    {0, I_14,   G_14,   H_14},
-    {0, I_13,   G_13,   H_13},
-    {0, I_12,   G_12,   H_12},
-    {0, I_11,   G_11,   H_11},
-    {0, I_10,   G_10,   H_10},
-    {0, I_9,    G_9,    H_9},
-    {0, I_8,    G_8,    H_8},
-    {0, I_7,    G_7,    H_7},
-    {0, I_6,    G_6,    H_6},
-    {0, I_5,    G_5,    H_5},
-    {0, I_3,    G_3,    H_3},
-    {0, I_2,    G_2,    H_2},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
 
-    {0, F_16,   D_16,   E_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_14,   D_14,   E_14},
-    {0, F_10,   D_10,   E_10},
-    {0, F_6,    D_6,    E_6},
-    {0, F_5,    D_5,    E_5},
-    {0, F_4,    D_4,    E_4},
-    {0, F_3,    D_3,    E_3},
-    {0, F_2,    D_2,    E_2},
-    {0, C_4,    A_4,    B_4}
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso/iso.c b/keyboards/keychron/q9/iso/iso.c
index e6a06b3909..f059b4bf58 100644
--- a/keyboards/keychron/q9/iso/iso.c
+++ b/keyboards/keychron/q9/iso/iso.c
@@ -27,62 +27,62 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16, J_16, K_16}, // Tab
-    {0, L_15, J_15, K_15}, // Q
-    {0, L_14, J_14, K_14}, // W
-    {0, L_13, J_13, K_13}, // E
-    {0, L_12, J_12, K_12}, // R
-    {0, L_11, J_11, K_11}, // T
-    {0, L_10, J_10, K_10}, // Y
-    {0, L_9,  J_9,  K_9},  // U
-    {0, L_8,  J_8,  K_8},  // I
-    {0, L_7,  J_7,  K_7},  // O
-    {0, L_6,  J_6,  K_6},  // P
-    {0, L_5,  J_5,  K_5},  // [
-    {0, L_4,  J_4,  K_4},  // ]
-    {0, L_2,  J_2,  K_2},  // Del
+    {0, CB12_CA16, CB10_CA16, CB11_CA16}, // Tab
+    {0, CB12_CA15, CB10_CA15, CB11_CA15}, // Q
+    {0, CB12_CA14, CB10_CA14, CB11_CA14}, // W
+    {0, CB12_CA13, CB10_CA13, CB11_CA13}, // E
+    {0, CB12_CA12, CB10_CA12, CB11_CA12}, // R
+    {0, CB12_CA11, CB10_CA11, CB11_CA11}, // T
+    {0, CB12_CA10, CB10_CA10, CB11_CA10}, // Y
+    {0, CB12_CA9,  CB10_CA9,  CB11_CA9},  // U
+    {0, CB12_CA8,  CB10_CA8,  CB11_CA8},  // I
+    {0, CB12_CA7,  CB10_CA7,  CB11_CA7},  // O
+    {0, CB12_CA6,  CB10_CA6,  CB11_CA6},  // P
+    {0, CB12_CA5,  CB10_CA5,  CB11_CA5},  // [
+    {0, CB12_CA4,  CB10_CA4,  CB11_CA4},  // ]
+    {0, CB12_CA2,  CB10_CA2,  CB11_CA2},  // Del
 
-    {0, C_16, A_16, B_16}, // CapsLock
-    {0, C_15, A_15, B_15}, // A
-    {0, C_14, A_14, B_14}, // S
-    {0, C_13, A_13, B_13}, // D
-    {0, C_12, A_12, B_12}, // F
-    {0, C_11, A_11, B_11}, // G
-    {0, C_10, A_10, B_10}, // H
-    {0, C_9,  A_9,  B_9},  // J
-    {0, C_8,  A_8,  B_8},  // K
-    {0, C_7,  A_7,  B_7},  // L
-    {0, C_6,  A_6,  B_6},  // ;
-    {0, C_5,  A_5,  B_5},  // '
-    {0, C_3,  A_3,  B_3},  // #
-    {0, L_3,  J_3,  K_3},  // Enter
-    {0, C_2,  A_2,  B_2},  // Home
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // CapsLock
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // A
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // S
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // D
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // G
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // H
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // J
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // K
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // L
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // ;
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // '
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // #
+    {0, CB12_CA3,  CB10_CA3,  CB11_CA3},  // Enter
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Home
 
-    {0, I_16, G_16, H_16}, // LeftShift
-    {0, I_15, G_15, H_15}, // |
-    {0, I_14, G_14, H_14}, // Z
-    {0, I_13, G_13, H_13}, // X
-    {0, I_12, G_12, H_12}, // C
-    {0, I_11, G_11, H_11}, // V
-    {0, I_10, G_10, H_10}, // B
-    {0, I_9,  G_9,  H_9},  // N
-    {0, I_8,  G_8,  H_8},  // M
-    {0, I_7,  G_7,  H_7},  // ,
-    {0, I_6,  G_6,  H_6},  // .
-    {0, I_5,  G_5,  H_5},  // ?
-    {0, I_3,  G_3,  H_3},  // RightShift
-    {0, I_2,  G_2,  H_2},  // Up
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // LeftShift
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // |
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Z
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // X
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // C
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // V
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // B
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // N
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // M
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // ,
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // .
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ?
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // RightShift
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Up
 
-    {0, F_16, D_16, E_16}, // LeftCtrl
-    {0, F_15, D_15, E_15}, // LeftWin
-    {0, F_14, D_14, E_14}, // LeftAlt
-    {0, F_10, D_10, E_10}, // Space
-    {0, F_6,  D_6,  E_6},  // RightAlt
-    {0, F_5,  D_5,  E_5},  // Fn1
-    {0, F_4,  D_4,  E_4},  // Fn2
-    {0, F_3,  D_3,  E_3},  // Left
-    {0, F_2,  D_2,  E_2},  // Down
-    {0, C_4,  A_4,  B_4}   // Right
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // LeftCtrl
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftWin
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftAlt
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // Space
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // RightAlt
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // Fn1
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // Fn2
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4}   // Right
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.c b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
index d607880eb2..1fdb4fc8cb 100644
--- a/keyboards/keychron/q9/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
@@ -27,62 +27,62 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16, J_16, K_16}, // Tab
-    {0, L_15, J_15, K_15}, // Q
-    {0, L_14, J_14, K_14}, // W
-    {0, L_13, J_13, K_13}, // E
-    {0, L_12, J_12, K_12}, // R
-    {0, L_11, J_11, K_11}, // T
-    {0, L_10, J_10, K_10}, // Y
-    {0, L_9,  J_9,  K_9},  // U
-    {0, L_8,  J_8,  K_8},  // I
-    {0, L_7,  J_7,  K_7},  // O
-    {0, L_6,  J_6,  K_6},  // P
-    {0, L_5,  J_5,  K_5},  // [
-    {0, L_4,  J_4,  K_4},  // ]
-    // {0, L_2,  J_2,  K_2},  // Mute
+    {0, CB12_CA16, CB10_CA16, CB11_CA16}, // Tab
+    {0, CB12_CA15, CB10_CA15, CB11_CA15}, // Q
+    {0, CB12_CA14, CB10_CA14, CB11_CA14}, // W
+    {0, CB12_CA13, CB10_CA13, CB11_CA13}, // E
+    {0, CB12_CA12, CB10_CA12, CB11_CA12}, // R
+    {0, CB12_CA11, CB10_CA11, CB11_CA11}, // T
+    {0, CB12_CA10, CB10_CA10, CB11_CA10}, // Y
+    {0, CB12_CA9,  CB10_CA9,  CB11_CA9},  // U
+    {0, CB12_CA8,  CB10_CA8,  CB11_CA8},  // I
+    {0, CB12_CA7,  CB10_CA7,  CB11_CA7},  // O
+    {0, CB12_CA6,  CB10_CA6,  CB11_CA6},  // P
+    {0, CB12_CA5,  CB10_CA5,  CB11_CA5},  // [
+    {0, CB12_CA4,  CB10_CA4,  CB11_CA4},  // ]
+    // {0, CB12_CA2,  CB10_CA2,  CB11_CA2},  // Mute
 
-    {0, C_16, A_16, B_16}, // CapsLock
-    {0, C_15, A_15, B_15}, // A
-    {0, C_14, A_14, B_14}, // S
-    {0, C_13, A_13, B_13}, // D
-    {0, C_12, A_12, B_12}, // F
-    {0, C_11, A_11, B_11}, // G
-    {0, C_10, A_10, B_10}, // H
-    {0, C_9,  A_9,  B_9},  // J
-    {0, C_8,  A_8,  B_8},  // K
-    {0, C_7,  A_7,  B_7},  // L
-    {0, C_6,  A_6,  B_6},  // ;
-    {0, C_5,  A_5,  B_5},  // '
-    {0, C_3,  A_3,  B_3},  // #
-    {0, L_3,  J_3,  K_3},  // Enter
-    {0, C_2,  A_2,  B_2},  // Home
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // CapsLock
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // A
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // S
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // D
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // G
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // H
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // J
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // K
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // L
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // ;
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // '
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // #
+    {0, CB12_CA3,  CB10_CA3,  CB11_CA3},  // Enter
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Home
 
-    {0, I_16, G_16, H_16}, // LeftShift
-    {0, I_15, G_15, H_15}, // |
-    {0, I_14, G_14, H_14}, // Z
-    {0, I_13, G_13, H_13}, // X
-    {0, I_12, G_12, H_12}, // C
-    {0, I_11, G_11, H_11}, // V
-    {0, I_10, G_10, H_10}, // B
-    {0, I_9,  G_9,  H_9},  // N
-    {0, I_8,  G_8,  H_8},  // M
-    {0, I_7,  G_7,  H_7},  // ,
-    {0, I_6,  G_6,  H_6},  // .
-    {0, I_5,  G_5,  H_5},  // ?
-    {0, I_3,  G_3,  H_3},  // RightShift
-    {0, I_2,  G_2,  H_2},  // Up
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // LeftShift
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // |
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Z
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // X
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // C
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // V
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // B
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // N
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // M
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // ,
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // .
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ?
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // RightShift
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Up
 
-    {0, F_16, D_16, E_16}, // LeftCtrl
-    {0, F_15, D_15, E_15}, // LeftWin
-    {0, F_14, D_14, E_14}, // LeftAlt
-    {0, F_10, D_10, E_10}, // Space
-    {0, F_6,  D_6,  E_6},  // RightAlt
-    {0, F_5,  D_5,  E_5},  // Fn1
-    {0, F_4,  D_4,  E_4},  // Fn2
-    {0, F_3,  D_3,  E_3},  // Left
-    {0, F_2,  D_2,  E_2},  // Down
-    {0, C_4,  A_4,  B_4}   // Right
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // LeftCtrl
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftWin
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftAlt
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // Space
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // RightAlt
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // Fn1
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // Fn2
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4}   // Right
 };
 
 #endif // RGB_MATRIX_ENABLE