Merge branch 'develop'

12 files changed, 526 insertions, 198 deletions

diff --git a/keyboards/keychron/v1/ansi/ansi.c b/keyboards/keychron/v1/ansi/ansi.c
index a78d5dd4d7..b3b96c26a4 100644
--- a/keyboards/keychron/v1/ansi/ansi.c
+++ b/keyboards/keychron/v1/ansi/ansi.c
@@ -115,37 +115,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
     {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, __, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, __, 29 },
-        { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, __, 44 },
-        { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, __, 57, __, 58 },
-        { 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, __, 70, 71, __ },
-        { 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 80, 81 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {18,0},  {33,0},  {48,0},  {62,0},  {81,0},  {95,0},  {110,0},  {125,0},  {143,0},  {158,0},  {173,0},  {187,0},  {206,0},            {224,0},
-        {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15},           {224,15},
-        {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26},           {224,26},
-        {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38},           {196,38},           {224,38},
-        {9,49},          {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49},           {185,49}, {209,52},
-        {2,61}, {20,61}, {39,61},                            {94,61},                               {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v1/ansi/keyboard.json b/keyboards/keychron/v1/ansi/keyboard.json
index d4bbca78de..09242fb595 100644
--- a/keyboards/keychron/v1/ansi/keyboard.json
+++ b/keyboards/keychron/v1/ansi/keyboard.json
@@ -18,6 +18,92 @@
         "dip_switch": true,
         "rgb_matrix": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 206, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 162, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 202, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 224, "y": 26, "flags": 1},
+            {"matrix": [3, 0], "x": 6, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 196, "y": 38, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 38, "flags": 1},
+            {"matrix": [4, 0], "x": 9, "y": 49, "flags": 1},
+            {"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 2, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 20, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 39, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 94, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 147, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 162, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 176, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_82": {
             "layout": [
diff --git a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
index a78d5dd4d7..b3b96c26a4 100644
--- a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
@@ -115,37 +115,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
     {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, __, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, __, 29 },
-        { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, __, 44 },
-        { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, __, 57, __, 58 },
-        { 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, __, 70, 71, __ },
-        { 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 80, 81 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {18,0},  {33,0},  {48,0},  {62,0},  {81,0},  {95,0},  {110,0},  {125,0},  {143,0},  {158,0},  {173,0},  {187,0},  {206,0},            {224,0},
-        {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15},           {224,15},
-        {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26},           {224,26},
-        {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38},           {196,38},           {224,38},
-        {9,49},          {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49},           {185,49}, {209,52},
-        {2,61}, {20,61}, {39,61},                            {94,61},                               {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v1/ansi_encoder/keyboard.json b/keyboards/keychron/v1/ansi_encoder/keyboard.json
index 62bbeb9d5d..cd62b128a0 100644
--- a/keyboards/keychron/v1/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/v1/ansi_encoder/keyboard.json
@@ -24,6 +24,92 @@
         "dip_switch": true,
         "rgb_matrix": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 206, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 162, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 202, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 224, "y": 26, "flags": 1},
+            {"matrix": [3, 0], "x": 6, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 196, "y": 38, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 38, "flags": 1},
+            {"matrix": [4, 0], "x": 9, "y": 49, "flags": 1},
+            {"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 2, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 20, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 39, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 94, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 147, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 162, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 176, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_82": {
             "layout": [
diff --git a/keyboards/keychron/v1/iso/iso.c b/keyboards/keychron/v1/iso/iso.c
index a1095dcc92..4cb877f918 100644
--- a/keyboards/keychron/v1/iso/iso.c
+++ b/keyboards/keychron/v1/iso/iso.c
@@ -116,37 +116,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
     {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, __, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, __, 29 },
-        { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 57, __, 43 },
-        { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, __, 58 },
-        { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, __, 71, 72, __ },
-        { 73, 74, 75, __, __, __, 76, __, __, __, 77, 78, 79, 80, 81, 82 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {18,0},  {33,0},  {48,0},  {62,0},  {81,0},  {95,0},  {110,0},  {125,0},  {143,0},  {158,0},  {173,0},  {187,0},  {206,0},            {224,0},
-        {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15},           {224,15},
-        {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26},                     {224,26},
-        {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {187,38}, {203,32},           {224,38},
-        {2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49},           {185,49}, {209,52},
-        {2,61}, {20,61}, {39,61},                            {94,61},                               {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v1/iso/keyboard.json b/keyboards/keychron/v1/iso/keyboard.json
index 6e307ea4df..43376e3077 100644
--- a/keyboards/keychron/v1/iso/keyboard.json
+++ b/keyboards/keychron/v1/iso/keyboard.json
@@ -18,6 +18,93 @@
         "rgb_matrix": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 206, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 162, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 224, "y": 26, "flags": 1},
+            {"matrix": [3, 0], "x": 6, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 203, "y": 32, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 38, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 49, "flags": 1},
+            {"matrix": [4, 1], "x": 18, "y": 49, "flags": 4},
+            {"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 2, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 20, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 39, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 94, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 147, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 162, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 176, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_iso_83": {
             "layout": [
diff --git a/keyboards/keychron/v1/iso_encoder/iso_encoder.c b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
index a1095dcc92..4cb877f918 100644
--- a/keyboards/keychron/v1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
@@ -116,37 +116,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
     {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, __, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, __, 29 },
-        { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 57, __, 43 },
-        { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, __, 58 },
-        { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, __, 71, 72, __ },
-        { 73, 74, 75, __, __, __, 76, __, __, __, 77, 78, 79, 80, 81, 82 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {18,0},  {33,0},  {48,0},  {62,0},  {81,0},  {95,0},  {110,0},  {125,0},  {143,0},  {158,0},  {173,0},  {187,0},  {206,0},            {224,0},
-        {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15},           {224,15},
-        {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26},                     {224,26},
-        {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {187,38}, {203,32},           {224,38},
-        {2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49},           {185,49}, {209,52},
-        {2,61}, {20,61}, {39,61},                            {94,61},                               {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v1/iso_encoder/keyboard.json b/keyboards/keychron/v1/iso_encoder/keyboard.json
index 077cb045b2..b095d4d436 100644
--- a/keyboards/keychron/v1/iso_encoder/keyboard.json
+++ b/keyboards/keychron/v1/iso_encoder/keyboard.json
@@ -24,6 +24,93 @@
         "encoder": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 206, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 162, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 224, "y": 26, "flags": 1},
+            {"matrix": [3, 0], "x": 6, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 203, "y": 32, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 38, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 49, "flags": 1},
+            {"matrix": [4, 1], "x": 18, "y": 49, "flags": 4},
+            {"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 2, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 20, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 39, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 94, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 147, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 162, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 176, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_iso_83": {
             "layout": [
diff --git a/keyboards/keychron/v1/jis/jis.c b/keyboards/keychron/v1/jis/jis.c
index d3b3f9aa90..04839ff24a 100644
--- a/keyboards/keychron/v1/jis/jis.c
+++ b/keyboards/keychron/v1/jis/jis.c
@@ -119,37 +119,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
     {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, __, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
-        { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 58, __, 44 },
-        { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, __, 57, __, 59 },
-        { 60, __, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, __ },
-        { 74, 75, 76, 77, __, __, 78, __, __, 79, 80, 81, 82, 83, 84, 85 },
-    },
-    {
-        // LED Index to Physical Position
-        {0,  0},           {18,  0}, {33,  0}, {48,  0}, {62,  0}, {81,  0}, {95,   0}, {110,  0}, {125,  0}, {143,  0}, {158,  0}, {173,  0}, {187,  0}, {205,  0}, {224,  0},
-        {0, 15}, {15, 15}, {29, 15}, {44, 15}, {59, 15}, {73, 15}, {88, 15}, {103, 15}, {117, 15}, {132, 15}, {147, 15}, {161, 15}, {176, 15}, {191, 15}, {205, 15}, {224, 15},
-        {4, 28}, {22, 28}, {37, 28}, {51, 28}, {66, 28}, {81, 28}, {95, 28}, {110, 28}, {125, 28}, {139, 28}, {154, 28}, {169, 28}, {183, 28},                       {224, 28},
-        {6, 40}, {26, 40}, {40, 40}, {55, 40}, {70, 40}, {84, 40}, {99, 40}, {114, 40}, {128, 40}, {143, 40}, {158, 40}, {172, 40}, {187, 40}, {207, 36},            {224, 40},
-        {9, 52},           {33, 52}, {48, 52}, {62, 52}, {77, 52}, {92, 52}, {106, 52}, {121, 52}, {136, 52}, {150, 52}, {165, 52}, {180, 52}, {194, 52}, {209, 52},
-        {2, 64}, {18, 64}, {35, 64},                     {51, 64},                      { 92, 64}, {134, 64}, {150, 64}, {165, 64}, {180, 64}, {194, 64}, {209, 64}, {224, 64},
-    },
-    {
-        // RGB LED Index to Flag
-        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
-        1, 1, 1, 1,       4,       1, 1, 1, 1, 1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v1/jis/keyboard.json b/keyboards/keychron/v1/jis/keyboard.json
index a6a43a75da..e02699c03c 100644
--- a/keyboards/keychron/v1/jis/keyboard.json
+++ b/keyboards/keychron/v1/jis/keyboard.json
@@ -18,6 +18,96 @@
         "rgb_matrix": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 205, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 117, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 161, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 191, "y": 15, "flags": 4},
+            {"matrix": [1, 14], "x": 205, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 4, "y": 28, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 28, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 28, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 28, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 28, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 28, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 28, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 28, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 28, "flags": 4},
+            {"matrix": [2, 9], "x": 139, "y": 28, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 28, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 28, "flags": 4},
+            {"matrix": [2, 12], "x": 183, "y": 28, "flags": 4},
+            {"matrix": [2, 15], "x": 224, "y": 28, "flags": 1},
+            {"matrix": [3, 0], "x": 6, "y": 40, "flags": 8},
+            {"matrix": [3, 1], "x": 26, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 128, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 172, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 4},
+            {"matrix": [2, 13], "x": 207, "y": 36, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 40, "flags": 1},
+            {"matrix": [4, 0], "x": 9, "y": 52, "flags": 1},
+            {"matrix": [4, 2], "x": 33, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 150, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 52, "flags": 4},
+            {"matrix": [4, 12], "x": 180, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 194, "y": 52, "flags": 1},
+            {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 35, "y": 64, "flags": 1},
+            {"matrix": [5, 3], "x": 51, "y": 64, "flags": 1},
+            {"matrix": [5, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [5, 9], "x": 134, "y": 64, "flags": 1},
+            {"matrix": [5, 10], "x": 150, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 165, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 194, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_jis_86": {
             "layout": [
diff --git a/keyboards/keychron/v1/jis_encoder/jis_encoder.c b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
index d3b3f9aa90..04839ff24a 100644
--- a/keyboards/keychron/v1/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
@@ -119,37 +119,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
     {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, __, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
-        { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 58, __, 44 },
-        { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, __, 57, __, 59 },
-        { 60, __, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, __ },
-        { 74, 75, 76, 77, __, __, 78, __, __, 79, 80, 81, 82, 83, 84, 85 },
-    },
-    {
-        // LED Index to Physical Position
-        {0,  0},           {18,  0}, {33,  0}, {48,  0}, {62,  0}, {81,  0}, {95,   0}, {110,  0}, {125,  0}, {143,  0}, {158,  0}, {173,  0}, {187,  0}, {205,  0}, {224,  0},
-        {0, 15}, {15, 15}, {29, 15}, {44, 15}, {59, 15}, {73, 15}, {88, 15}, {103, 15}, {117, 15}, {132, 15}, {147, 15}, {161, 15}, {176, 15}, {191, 15}, {205, 15}, {224, 15},
-        {4, 28}, {22, 28}, {37, 28}, {51, 28}, {66, 28}, {81, 28}, {95, 28}, {110, 28}, {125, 28}, {139, 28}, {154, 28}, {169, 28}, {183, 28},                       {224, 28},
-        {6, 40}, {26, 40}, {40, 40}, {55, 40}, {70, 40}, {84, 40}, {99, 40}, {114, 40}, {128, 40}, {143, 40}, {158, 40}, {172, 40}, {187, 40}, {207, 36},            {224, 40},
-        {9, 52},           {33, 52}, {48, 52}, {62, 52}, {77, 52}, {92, 52}, {106, 52}, {121, 52}, {136, 52}, {150, 52}, {165, 52}, {180, 52}, {194, 52}, {209, 52},
-        {2, 64}, {18, 64}, {35, 64},                     {51, 64},                      { 92, 64}, {134, 64}, {150, 64}, {165, 64}, {180, 64}, {194, 64}, {209, 64}, {224, 64},
-    },
-    {
-        // RGB LED Index to Flag
-        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
-        1, 1, 1, 1,       4,       1, 1, 1, 1, 1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v1/jis_encoder/keyboard.json b/keyboards/keychron/v1/jis_encoder/keyboard.json
index 4e39e3d4a8..3a89e69153 100644
--- a/keyboards/keychron/v1/jis_encoder/keyboard.json
+++ b/keyboards/keychron/v1/jis_encoder/keyboard.json
@@ -24,6 +24,96 @@
         "encoder": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 205, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 117, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 161, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 191, "y": 15, "flags": 4},
+            {"matrix": [1, 14], "x": 205, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 4, "y": 28, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 28, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 28, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 28, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 28, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 28, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 28, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 28, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 28, "flags": 4},
+            {"matrix": [2, 9], "x": 139, "y": 28, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 28, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 28, "flags": 4},
+            {"matrix": [2, 12], "x": 183, "y": 28, "flags": 4},
+            {"matrix": [2, 15], "x": 224, "y": 28, "flags": 1},
+            {"matrix": [3, 0], "x": 6, "y": 40, "flags": 8},
+            {"matrix": [3, 1], "x": 26, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 128, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 172, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 4},
+            {"matrix": [2, 13], "x": 207, "y": 36, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 40, "flags": 1},
+            {"matrix": [4, 0], "x": 9, "y": 52, "flags": 1},
+            {"matrix": [4, 2], "x": 33, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 150, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 52, "flags": 4},
+            {"matrix": [4, 12], "x": 180, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 194, "y": 52, "flags": 1},
+            {"matrix": [4, 14], "x": 209, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 35, "y": 64, "flags": 1},
+            {"matrix": [5, 3], "x": 51, "y": 64, "flags": 1},
+            {"matrix": [5, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [5, 9], "x": 134, "y": 64, "flags": 1},
+            {"matrix": [5, 10], "x": 150, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 165, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 194, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_jis_86": {
             "layout": [