Merge branch 'develop'

12 files changed, 436 insertions, 179 deletions

diff --git a/keyboards/keychron/v2/ansi/ansi.c b/keyboards/keychron/v2/ansi/ansi.c
index 722aa27b47..ea92662c59 100644
--- a/keyboards/keychron/v2/ansi/ansi.c
+++ b/keyboards/keychron/v2/ansi/ansi.c
@@ -99,34 +99,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
     {1, CB6_CA16,   CB4_CA16,   CB5_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, 65, 42, 43 },
-        { 44, __, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, __, 55, 56 },
-        { 57, 58, 59, __, __, __, 60, __, __, __, 61, 62, 63, 64, 66 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {15,0},  {29,0},  {44,0},  {59,0},  {73,0},  {88,0},  {103,0},  {118,0},  {132,0},  {147,0},  {162,0},  {176,0},  {198,0},            {224,0},  // {244,-4}
-        {4,15}, {22,15}, {37,15}, {51,15}, {66,15}, {81,15}, {95,15}, {110,15}, {125,15}, {140,15}, {154,15}, {169,15}, {184,15}, {202,15},           {224,15},
-        {6,30}, {26,30}, {40,30}, {55,30}, {70,30}, {84,30}, {99,30}, {114,30}, {129,30}, {143,30}, {158,30}, {173,30},           {196,30},           {224,30},
-        {9,45},          {33,45}, {48,45}, {62,45}, {77,45}, {92,45}, {106,45}, {121,45}, {136,45}, {151,45}, {165,45},           {185,45}, {209,49},
-        {2,60}, {20,60}, {39,60},                            {94,60},                               {147,60}, {162,60}, {176,60}, {195,64}, {209,64}, {224,64}
-    },
-    {
-        // RGB LED Index to Flag
-        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,    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/v2/ansi/keyboard.json b/keyboards/keychron/v2/ansi/keyboard.json
index bc09cb8a27..962bcaee98 100644
--- a/keyboards/keychron/v2/ansi/keyboard.json
+++ b/keyboards/keychron/v2/ansi/keyboard.json
@@ -23,6 +23,77 @@
     "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 44, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 73, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 88, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 103, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 118, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 147, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 162, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 198, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 4, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 51, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 66, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 81, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 95, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 110, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 125, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 140, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 154, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 169, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 184, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 202, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 6, "y": 30, "flags": 8},
+            {"matrix": [2, 1], "x": 26, "y": 30, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 30, "flags": 4},
+            {"matrix": [2, 3], "x": 55, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 70, "y": 30, "flags": 4},
+            {"matrix": [2, 5], "x": 84, "y": 30, "flags": 4},
+            {"matrix": [2, 6], "x": 99, "y": 30, "flags": 4},
+            {"matrix": [2, 7], "x": 114, "y": 30, "flags": 4},
+            {"matrix": [2, 8], "x": 129, "y": 30, "flags": 4},
+            {"matrix": [2, 9], "x": 143, "y": 30, "flags": 4},
+            {"matrix": [2, 10], "x": 158, "y": 30, "flags": 4},
+            {"matrix": [2, 11], "x": 173, "y": 30, "flags": 4},
+            {"matrix": [2, 13], "x": 196, "y": 30, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 30, "flags": 1},
+            {"matrix": [3, 0], "x": 9, "y": 45, "flags": 1},
+            {"matrix": [3, 2], "x": 33, "y": 45, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 45, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 45, "flags": 4},
+            {"matrix": [3, 5], "x": 77, "y": 45, "flags": 4},
+            {"matrix": [3, 6], "x": 92, "y": 45, "flags": 4},
+            {"matrix": [3, 7], "x": 106, "y": 45, "flags": 4},
+            {"matrix": [3, 8], "x": 121, "y": 45, "flags": 4},
+            {"matrix": [3, 9], "x": 136, "y": 45, "flags": 4},
+            {"matrix": [3, 10], "x": 151, "y": 45, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 45, "flags": 4},
+            {"matrix": [3, 13], "x": 185, "y": 45, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 60, "flags": 1},
+            {"matrix": [4, 1], "x": 20, "y": 60, "flags": 1},
+            {"matrix": [4, 2], "x": 39, "y": 60, "flags": 1},
+            {"matrix": [4, 6], "x": 94, "y": 60, "flags": 4},
+            {"matrix": [4, 10], "x": 147, "y": 60, "flags": 1},
+            {"matrix": [4, 11], "x": 162, "y": 60, "flags": 1},
+            {"matrix": [4, 12], "x": 176, "y": 60, "flags": 1},
+            {"matrix": [4, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_67": {
             "layout": [
diff --git a/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
index 6203483285..ea92662c59 100644
--- a/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
@@ -99,34 +99,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
     {1, CB6_CA16,   CB4_CA16,   CB5_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, 65, 42, 43 },
-        { 44, __, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, __, 55, 56 },
-        { 57, 58, 59, __, __, __, 60, __, __, __, 61, 62, 63, 64, 66 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {15,0},  {29,0},  {44,0},  {59,0},  {73,0},  {88,0},  {103,0},  {118,0},  {132,0},  {147,0},  {162,0},  {176,0},  {198,0},            {224,0},  // {244,-4}
-        {4,15}, {22,15}, {37,15}, {51,15}, {66,15}, {81,15}, {95,15}, {110,15}, {125,15}, {140,15}, {154,15}, {169,15}, {184,15}, {202,15},           {224,15},
-        {6,30}, {26,30}, {40,30}, {55,30}, {70,30}, {84,30}, {99,30}, {114,30}, {129,30}, {143,30}, {158,30}, {173,30},           {196,30},           {224,30},
-        {9,45},          {33,45}, {48,45}, {62,45}, {77,45}, {92,45}, {106,45}, {121,45}, {136,45}, {151,45}, {165,45},           {185,45}, {209,49},
-        {2,60}, {20,60}, {39,60},                            {94,60},                               {147,60}, {162,60}, {176,60}, {195,64}, {209,64}, {224,64}
-    },
-    {
-        // RGB LED Index to Flag
-        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/v2/ansi_encoder/keyboard.json b/keyboards/keychron/v2/ansi_encoder/keyboard.json
index 6752d14b15..42b6814781 100644
--- a/keyboards/keychron/v2/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/v2/ansi_encoder/keyboard.json
@@ -29,6 +29,77 @@
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 44, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 73, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 88, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 103, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 118, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 147, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 162, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 198, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 4, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 51, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 66, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 81, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 95, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 110, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 125, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 140, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 154, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 169, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 184, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 202, "y": 15, "flags": 4},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 6, "y": 30, "flags": 8},
+            {"matrix": [2, 1], "x": 26, "y": 30, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 30, "flags": 4},
+            {"matrix": [2, 3], "x": 55, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 70, "y": 30, "flags": 4},
+            {"matrix": [2, 5], "x": 84, "y": 30, "flags": 4},
+            {"matrix": [2, 6], "x": 99, "y": 30, "flags": 4},
+            {"matrix": [2, 7], "x": 114, "y": 30, "flags": 4},
+            {"matrix": [2, 8], "x": 129, "y": 30, "flags": 4},
+            {"matrix": [2, 9], "x": 143, "y": 30, "flags": 4},
+            {"matrix": [2, 10], "x": 158, "y": 30, "flags": 4},
+            {"matrix": [2, 11], "x": 173, "y": 30, "flags": 4},
+            {"matrix": [2, 13], "x": 196, "y": 30, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 30, "flags": 1},
+            {"matrix": [3, 0], "x": 9, "y": 45, "flags": 1},
+            {"matrix": [3, 2], "x": 33, "y": 45, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 45, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 45, "flags": 4},
+            {"matrix": [3, 5], "x": 77, "y": 45, "flags": 4},
+            {"matrix": [3, 6], "x": 92, "y": 45, "flags": 4},
+            {"matrix": [3, 7], "x": 106, "y": 45, "flags": 4},
+            {"matrix": [3, 8], "x": 121, "y": 45, "flags": 4},
+            {"matrix": [3, 9], "x": 136, "y": 45, "flags": 4},
+            {"matrix": [3, 10], "x": 151, "y": 45, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 45, "flags": 4},
+            {"matrix": [3, 13], "x": 185, "y": 45, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 60, "flags": 1},
+            {"matrix": [4, 1], "x": 20, "y": 60, "flags": 1},
+            {"matrix": [4, 2], "x": 39, "y": 60, "flags": 1},
+            {"matrix": [4, 6], "x": 94, "y": 60, "flags": 4},
+            {"matrix": [4, 10], "x": 147, "y": 60, "flags": 1},
+            {"matrix": [4, 11], "x": 162, "y": 60, "flags": 1},
+            {"matrix": [4, 12], "x": 176, "y": 60, "flags": 1},
+            {"matrix": [4, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_67": {
             "layout": [
diff --git a/keyboards/keychron/v2/iso/iso.c b/keyboards/keychron/v2/iso/iso.c
index aca0879838..b5a5193892 100644
--- a/keyboards/keychron/v2/iso/iso.c
+++ b/keyboards/keychron/v2/iso/iso.c
@@ -100,34 +100,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
     {1, CB6_CA16,   CB4_CA16,   CB5_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, 42, 28 },
-        { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 66, 41, 43 },
-        { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, 57 },
-        { 58, 59, 60, __, __, __, 61, __, __, __, 62, 63, 64, 65, 67 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {15,0},  {29,0},  {44,0},  {59,0},  {73,0},  {88,0},  {103,0},  {118,0},  {132,0},  {147,0},  {162,0},  {176,0},  {198,0},            {224,0},
-        {4,15}, {22,15}, {37,15}, {51,15}, {66,15}, {81,15}, {95,15}, {110,15}, {125,15}, {140,15}, {154,15}, {169,15}, {184,15},                     {224,15},
-        {6,30}, {26,30}, {40,30}, {55,30}, {70,30}, {84,30}, {99,30}, {114,30}, {129,30}, {143,30}, {158,30}, {173,30}, {187,30}, {204,23},           {224,30},
-        {2,45}, {18,45}, {33,45}, {48,45}, {62,45}, {77,45}, {92,45}, {106,45}, {121,45}, {136,45}, {151,45}, {165,45},           {185,45}, {209,49},
-        {2,60}, {20,60}, {39,60},                            {94,60},                               {147,60}, {162,60}, {176,60}, {195,64}, {209,64}, {224,64}
-    },
-    {
-        // RGB LED Index to Flag
-        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/v2/iso/keyboard.json b/keyboards/keychron/v2/iso/keyboard.json
index 89bdb51a65..f430c50270 100644
--- a/keyboards/keychron/v2/iso/keyboard.json
+++ b/keyboards/keychron/v2/iso/keyboard.json
@@ -23,6 +23,78 @@
     "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 44, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 73, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 88, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 103, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 118, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 147, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 162, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 198, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 4, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 51, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 66, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 81, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 95, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 110, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 125, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 140, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 154, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 169, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 184, "y": 15, "flags": 4},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 6, "y": 30, "flags": 8},
+            {"matrix": [2, 1], "x": 26, "y": 30, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 30, "flags": 4},
+            {"matrix": [2, 3], "x": 55, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 70, "y": 30, "flags": 4},
+            {"matrix": [2, 5], "x": 84, "y": 30, "flags": 4},
+            {"matrix": [2, 6], "x": 99, "y": 30, "flags": 4},
+            {"matrix": [2, 7], "x": 114, "y": 30, "flags": 4},
+            {"matrix": [2, 8], "x": 129, "y": 30, "flags": 4},
+            {"matrix": [2, 9], "x": 143, "y": 30, "flags": 4},
+            {"matrix": [2, 10], "x": 158, "y": 30, "flags": 4},
+            {"matrix": [2, 11], "x": 173, "y": 30, "flags": 4},
+            {"matrix": [2, 13], "x": 187, "y": 30, "flags": 4},
+            {"matrix": [1, 13], "x": 204, "y": 23, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 30, "flags": 1},
+            {"matrix": [3, 0], "x": 2, "y": 45, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 45, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 45, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 45, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 45, "flags": 4},
+            {"matrix": [3, 5], "x": 77, "y": 45, "flags": 4},
+            {"matrix": [3, 6], "x": 92, "y": 45, "flags": 4},
+            {"matrix": [3, 7], "x": 106, "y": 45, "flags": 4},
+            {"matrix": [3, 8], "x": 121, "y": 45, "flags": 4},
+            {"matrix": [3, 9], "x": 136, "y": 45, "flags": 4},
+            {"matrix": [3, 10], "x": 151, "y": 45, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 45, "flags": 4},
+            {"matrix": [3, 13], "x": 185, "y": 45, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 60, "flags": 1},
+            {"matrix": [4, 1], "x": 20, "y": 60, "flags": 1},
+            {"matrix": [4, 2], "x": 39, "y": 60, "flags": 1},
+            {"matrix": [4, 6], "x": 94, "y": 60, "flags": 4},
+            {"matrix": [4, 10], "x": 147, "y": 60, "flags": 1},
+            {"matrix": [4, 11], "x": 162, "y": 60, "flags": 1},
+            {"matrix": [4, 12], "x": 176, "y": 60, "flags": 1},
+            {"matrix": [4, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_iso_68": {
             "layout": [
diff --git a/keyboards/keychron/v2/iso_encoder/iso_encoder.c b/keyboards/keychron/v2/iso_encoder/iso_encoder.c
index aca0879838..5911f9d9c1 100644
--- a/keyboards/keychron/v2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v2/iso_encoder/iso_encoder.c
@@ -101,33 +101,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB6_CA16,   CB4_CA16,   CB5_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, 42, 28 },
-        { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 66, 41, 43 },
-        { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, 57 },
-        { 58, 59, 60, __, __, __, 61, __, __, __, 62, 63, 64, 65, 67 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {15,0},  {29,0},  {44,0},  {59,0},  {73,0},  {88,0},  {103,0},  {118,0},  {132,0},  {147,0},  {162,0},  {176,0},  {198,0},            {224,0},
-        {4,15}, {22,15}, {37,15}, {51,15}, {66,15}, {81,15}, {95,15}, {110,15}, {125,15}, {140,15}, {154,15}, {169,15}, {184,15},                     {224,15},
-        {6,30}, {26,30}, {40,30}, {55,30}, {70,30}, {84,30}, {99,30}, {114,30}, {129,30}, {143,30}, {158,30}, {173,30}, {187,30}, {204,23},           {224,30},
-        {2,45}, {18,45}, {33,45}, {48,45}, {62,45}, {77,45}, {92,45}, {106,45}, {121,45}, {136,45}, {151,45}, {165,45},           {185,45}, {209,49},
-        {2,60}, {20,60}, {39,60},                            {94,60},                               {147,60}, {162,60}, {176,60}, {195,64}, {209,64}, {224,64}
-    },
-    {
-        // RGB LED Index to Flag
-        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/v2/iso_encoder/keyboard.json b/keyboards/keychron/v2/iso_encoder/keyboard.json
index 89ce2714f1..4dd36fdda4 100644
--- a/keyboards/keychron/v2/iso_encoder/keyboard.json
+++ b/keyboards/keychron/v2/iso_encoder/keyboard.json
@@ -29,6 +29,78 @@
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 44, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 73, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 88, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 103, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 118, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 147, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 162, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 198, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 4, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 51, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 66, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 81, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 95, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 110, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 125, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 140, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 154, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 169, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 184, "y": 15, "flags": 4},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 6, "y": 30, "flags": 8},
+            {"matrix": [2, 1], "x": 26, "y": 30, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 30, "flags": 4},
+            {"matrix": [2, 3], "x": 55, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 70, "y": 30, "flags": 4},
+            {"matrix": [2, 5], "x": 84, "y": 30, "flags": 4},
+            {"matrix": [2, 6], "x": 99, "y": 30, "flags": 4},
+            {"matrix": [2, 7], "x": 114, "y": 30, "flags": 4},
+            {"matrix": [2, 8], "x": 129, "y": 30, "flags": 4},
+            {"matrix": [2, 9], "x": 143, "y": 30, "flags": 4},
+            {"matrix": [2, 10], "x": 158, "y": 30, "flags": 4},
+            {"matrix": [2, 11], "x": 173, "y": 30, "flags": 4},
+            {"matrix": [2, 13], "x": 187, "y": 30, "flags": 4},
+            {"matrix": [1, 13], "x": 204, "y": 23, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 30, "flags": 1},
+            {"matrix": [3, 0], "x": 2, "y": 45, "flags": 1},
+            {"matrix": [3, 1], "x": 18, "y": 45, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 45, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 45, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 45, "flags": 4},
+            {"matrix": [3, 5], "x": 77, "y": 45, "flags": 4},
+            {"matrix": [3, 6], "x": 92, "y": 45, "flags": 4},
+            {"matrix": [3, 7], "x": 106, "y": 45, "flags": 4},
+            {"matrix": [3, 8], "x": 121, "y": 45, "flags": 4},
+            {"matrix": [3, 9], "x": 136, "y": 45, "flags": 4},
+            {"matrix": [3, 10], "x": 151, "y": 45, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 45, "flags": 4},
+            {"matrix": [3, 13], "x": 185, "y": 45, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 60, "flags": 1},
+            {"matrix": [4, 1], "x": 20, "y": 60, "flags": 1},
+            {"matrix": [4, 2], "x": 39, "y": 60, "flags": 1},
+            {"matrix": [4, 6], "x": 94, "y": 60, "flags": 4},
+            {"matrix": [4, 10], "x": 147, "y": 60, "flags": 1},
+            {"matrix": [4, 11], "x": 162, "y": 60, "flags": 1},
+            {"matrix": [4, 12], "x": 176, "y": 60, "flags": 1},
+            {"matrix": [4, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_iso_68": {
             "layout": [
diff --git a/keyboards/keychron/v2/jis/jis.c b/keyboards/keychron/v2/jis/jis.c
index 1269d9b1e6..1664a5f703 100644
--- a/keyboards/keychron/v2/jis/jis.c
+++ b/keyboards/keychron/v2/jis/jis.c
@@ -101,34 +101,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
     {1, CB6_CA16,   CB4_CA16,   CB5_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, 15 },
-        { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 43, 29 },
-        { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 69, 42, 44 },
-        { 45, 14, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 },
-        { 59, 60, 61, 62, __, __, 63, __, __, 64, 65, 66, 67, 68, 70 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,4},  {15,4},  {29,4},  {44,4},  {59,4},  {73,4},  {88,4},  {103,4},  {117,4},  {132,4},  {146,4},  {161,4},  {176,4},  {190,4},  {205,4},  {224,0},
-        {4,19}, {22,19}, {37,19}, {51,19}, {66,19}, {81,19}, {95,19}, {110,19}, {125,19}, {139,19}, {154,19}, {168,19}, {183,19},                     {224,19},
-        {6,34}, {26,34}, {40,34}, {55,34}, {70,34}, {84,34}, {99,34}, {114,34}, {128,34}, {143,34}, {158,34}, {172,34}, {187,34}, {207,29},           {224,34},
-        {9,49},          {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {150,49}, {165,49}, {179,49}, {194,49}, {209,49},
-        {2,64}, {18,64}, {35,64}, {51,64},                   {92,64},                     {134,64}, {150,64}, {165,64}, {179,64}, {194,64}, {209,64}, {223,64},
-    },
-    {
-        // RGB LED Index to Flag
-        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/v2/jis/keyboard.json b/keyboards/keychron/v2/jis/keyboard.json
index 01beaf31ac..96b19c7372 100644
--- a/keyboards/keychron/v2/jis/keyboard.json
+++ b/keyboards/keychron/v2/jis/keyboard.json
@@ -23,6 +23,81 @@
     "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 4, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 4, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 4, "flags": 4},
+            {"matrix": [0, 3], "x": 44, "y": 4, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 4, "flags": 4},
+            {"matrix": [0, 5], "x": 73, "y": 4, "flags": 4},
+            {"matrix": [0, 6], "x": 88, "y": 4, "flags": 4},
+            {"matrix": [0, 7], "x": 103, "y": 4, "flags": 4},
+            {"matrix": [0, 8], "x": 117, "y": 4, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 4, "flags": 4},
+            {"matrix": [0, 10], "x": 146, "y": 4, "flags": 4},
+            {"matrix": [0, 11], "x": 161, "y": 4, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 4, "flags": 4},
+            {"matrix": [0, 13], "x": 190, "y": 4, "flags": 4},
+            {"matrix": [3, 1], "x": 205, "y": 4, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 4, "y": 19, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 19, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 19, "flags": 4},
+            {"matrix": [1, 3], "x": 51, "y": 19, "flags": 4},
+            {"matrix": [1, 4], "x": 66, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 81, "y": 19, "flags": 4},
+            {"matrix": [1, 6], "x": 95, "y": 19, "flags": 4},
+            {"matrix": [1, 7], "x": 110, "y": 19, "flags": 4},
+            {"matrix": [1, 8], "x": 125, "y": 19, "flags": 4},
+            {"matrix": [1, 9], "x": 139, "y": 19, "flags": 4},
+            {"matrix": [1, 10], "x": 154, "y": 19, "flags": 4},
+            {"matrix": [1, 11], "x": 168, "y": 19, "flags": 4},
+            {"matrix": [1, 12], "x": 183, "y": 19, "flags": 4},
+            {"matrix": [1, 14], "x": 224, "y": 19, "flags": 1},
+            {"matrix": [2, 0], "x": 6, "y": 34, "flags": 8},
+            {"matrix": [2, 1], "x": 26, "y": 34, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 34, "flags": 4},
+            {"matrix": [2, 3], "x": 55, "y": 34, "flags": 4},
+            {"matrix": [2, 4], "x": 70, "y": 34, "flags": 4},
+            {"matrix": [2, 5], "x": 84, "y": 34, "flags": 4},
+            {"matrix": [2, 6], "x": 99, "y": 34, "flags": 4},
+            {"matrix": [2, 7], "x": 114, "y": 34, "flags": 4},
+            {"matrix": [2, 8], "x": 128, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 143, "y": 34, "flags": 4},
+            {"matrix": [2, 10], "x": 158, "y": 34, "flags": 4},
+            {"matrix": [2, 11], "x": 172, "y": 34, "flags": 4},
+            {"matrix": [2, 13], "x": 187, "y": 34, "flags": 4},
+            {"matrix": [1, 13], "x": 207, "y": 29, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 34, "flags": 1},
+            {"matrix": [3, 0], "x": 9, "y": 49, "flags": 1},
+            {"matrix": [3, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [3, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [3, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [3, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [3, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [3, 10], "x": 150, "y": 49, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [3, 12], "x": 179, "y": 49, "flags": 4},
+            {"matrix": [3, 13], "x": 194, "y": 49, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 35, "y": 64, "flags": 1},
+            {"matrix": [4, 3], "x": 51, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 134, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 150, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 165, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 179, "y": 64, "flags": 1},
+            {"matrix": [4, 13], "x": 194, "y": 64, "flags": 1},
+            {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [4, 14], "x": 223, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_jis_71": {
             "layout": [
diff --git a/keyboards/keychron/v2/jis_encoder/jis_encoder.c b/keyboards/keychron/v2/jis_encoder/jis_encoder.c
index 85aaf165f6..1664a5f703 100644
--- a/keyboards/keychron/v2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v2/jis_encoder/jis_encoder.c
@@ -101,34 +101,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
     {1, CB6_CA16,   CB4_CA16,   CB5_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, 15 },
-        { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 43, 29 },
-        { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 69, 42, 44 },
-        { 45, 14, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 },
-        { 59, 60, 61, 62, __, __, 63, __, __, 64, 65, 66, 67, 68, 70 },
-    },
-    {
-        // LED Index to Physical Position
-        {0,4},  {15,4},  {29,4},  {44,4},  {59,4},  {73,4},  {88,4},  {103,4},  {117,4},  {132,4},  {146,4},  {161,4},  {176,4},  {190,4},  {205,4},  {224,0},
-        {4,19}, {22,19}, {37,19}, {51,19}, {66,19}, {81,19}, {95,19}, {110,19}, {125,19}, {139,19}, {154,19}, {168,19}, {183,19},                     {224,19},
-        {6,34}, {26,34}, {40,34}, {55,34}, {70,34}, {84,34}, {99,34}, {114,34}, {128,34}, {143,34}, {158,34}, {172,34}, {187,34}, {207,29},           {224,34},
-        {9,49},          {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {150,49}, {165,49}, {179,49}, {194,49}, {209,49},
-        {2,64}, {18,64}, {35,64}, {51,64},                   {92,64},                     {134,64}, {150,64}, {165,64}, {179,64}, {194,64}, {209,64}, {223,64},
-    },
-    {
-        // RGB LED Index to Flag
-        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/v2/jis_encoder/keyboard.json b/keyboards/keychron/v2/jis_encoder/keyboard.json
index d8a540953c..105b5b6724 100644
--- a/keyboards/keychron/v2/jis_encoder/keyboard.json
+++ b/keyboards/keychron/v2/jis_encoder/keyboard.json
@@ -29,6 +29,81 @@
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 4, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 4, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 4, "flags": 4},
+            {"matrix": [0, 3], "x": 44, "y": 4, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 4, "flags": 4},
+            {"matrix": [0, 5], "x": 73, "y": 4, "flags": 4},
+            {"matrix": [0, 6], "x": 88, "y": 4, "flags": 4},
+            {"matrix": [0, 7], "x": 103, "y": 4, "flags": 4},
+            {"matrix": [0, 8], "x": 117, "y": 4, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 4, "flags": 4},
+            {"matrix": [0, 10], "x": 146, "y": 4, "flags": 4},
+            {"matrix": [0, 11], "x": 161, "y": 4, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 4, "flags": 4},
+            {"matrix": [0, 13], "x": 190, "y": 4, "flags": 4},
+            {"matrix": [3, 1], "x": 205, "y": 4, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 4, "y": 19, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 19, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 19, "flags": 4},
+            {"matrix": [1, 3], "x": 51, "y": 19, "flags": 4},
+            {"matrix": [1, 4], "x": 66, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 81, "y": 19, "flags": 4},
+            {"matrix": [1, 6], "x": 95, "y": 19, "flags": 4},
+            {"matrix": [1, 7], "x": 110, "y": 19, "flags": 4},
+            {"matrix": [1, 8], "x": 125, "y": 19, "flags": 4},
+            {"matrix": [1, 9], "x": 139, "y": 19, "flags": 4},
+            {"matrix": [1, 10], "x": 154, "y": 19, "flags": 4},
+            {"matrix": [1, 11], "x": 168, "y": 19, "flags": 4},
+            {"matrix": [1, 12], "x": 183, "y": 19, "flags": 4},
+            {"matrix": [1, 14], "x": 224, "y": 19, "flags": 1},
+            {"matrix": [2, 0], "x": 6, "y": 34, "flags": 8},
+            {"matrix": [2, 1], "x": 26, "y": 34, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 34, "flags": 4},
+            {"matrix": [2, 3], "x": 55, "y": 34, "flags": 4},
+            {"matrix": [2, 4], "x": 70, "y": 34, "flags": 4},
+            {"matrix": [2, 5], "x": 84, "y": 34, "flags": 4},
+            {"matrix": [2, 6], "x": 99, "y": 34, "flags": 4},
+            {"matrix": [2, 7], "x": 114, "y": 34, "flags": 4},
+            {"matrix": [2, 8], "x": 128, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 143, "y": 34, "flags": 4},
+            {"matrix": [2, 10], "x": 158, "y": 34, "flags": 4},
+            {"matrix": [2, 11], "x": 172, "y": 34, "flags": 4},
+            {"matrix": [2, 13], "x": 187, "y": 34, "flags": 4},
+            {"matrix": [1, 13], "x": 207, "y": 29, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 34, "flags": 1},
+            {"matrix": [3, 0], "x": 9, "y": 49, "flags": 1},
+            {"matrix": [3, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [3, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [3, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [3, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [3, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [3, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [3, 10], "x": 150, "y": 49, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [3, 12], "x": 179, "y": 49, "flags": 4},
+            {"matrix": [3, 13], "x": 194, "y": 49, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 18, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 35, "y": 64, "flags": 1},
+            {"matrix": [4, 3], "x": 51, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 92, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 134, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 150, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 165, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 179, "y": 64, "flags": 1},
+            {"matrix": [4, 13], "x": 194, "y": 64, "flags": 1},
+            {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [4, 14], "x": 223, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_jis_71": {
             "layout": [