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

diff --git a/keyboards/keychron/v1/ansi/ansi.c b/keyboards/keychron/v1/ansi/ansi.c
index 2db3ab782d..a78d5dd4d7 100644
--- a/keyboards/keychron/v1/ansi/ansi.c
+++ b/keyboards/keychron/v1/ansi/ansi.c
@@ -27,93 +27,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {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_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {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, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {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, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
index 2db3ab782d..a78d5dd4d7 100644
--- a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
@@ -27,93 +27,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {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_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {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, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {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, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/iso/iso.c b/keyboards/keychron/v1/iso/iso.c
index dff029055b..a1095dcc92 100644
--- a/keyboards/keychron/v1/iso/iso.c
+++ b/keyboards/keychron/v1/iso/iso.c
@@ -27,94 +27,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {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_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {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, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {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_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/iso_encoder/iso_encoder.c b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
index dff029055b..a1095dcc92 100644
--- a/keyboards/keychron/v1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
@@ -27,94 +27,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {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_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {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, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {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_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/jis/jis.c b/keyboards/keychron/v1/jis/jis.c
index 029c58fd70..d3b3f9aa90 100644
--- a/keyboards/keychron/v1/jis/jis.c
+++ b/keyboards/keychron/v1/jis/jis.c
@@ -27,97 +27,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {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_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {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_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {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_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {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, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {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_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/jis_encoder/jis_encoder.c b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
index 029c58fd70..d3b3f9aa90 100644
--- a/keyboards/keychron/v1/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
@@ -27,97 +27,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {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_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {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_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {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_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {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, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {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_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED