Migrate `g_led_config` to DD (K6) (#25607)

8 files changed, 453 insertions, 138 deletions

diff --git a/keyboards/keychron/v6/ansi/ansi.c b/keyboards/keychron/v6/ansi/ansi.c
index 2e055e57af..c8dc8c95c6 100644
--- a/keyboards/keychron/v6/ansi/ansi.c
+++ b/keyboards/keychron/v6/ansi/ansi.c
@@ -139,34 +139,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
     {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,  12,  __,  13,  14,  15,  39,  40, 16 },
-        { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  32,  33,  34,  35,  36,  37,  38, 17 },
-        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  53,  54,  55,  56,  57,  58,  59, 18 },
-        { 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,  __,  73,  60,  77,  76,  74,  75, 19 },
-        { 78, __, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,  __,  89,  93,  90, 107,  91,  92, __ },
-        { 94, 95, 96, __, __, __, 97, __, __, __, 98, 99, 100, 101, 102, 103, 104, 105, 106, __ },
-    },
-    {
-        {0,0},           {21,0},  {31,0},  {42,0},  {52,0},  {68,0},  {78,0},  {89,0},   {99,0},   {115,0},  {125,0},  {136,0},  {146,0},  {159,0},  {169,0},  {180,0},  {193,0},  {203,0},  {214,0},  {224,0},
-        {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {63,15}, {73,15}, {83,15},  {94,15},  {104,15}, {115,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
-        {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {89,27},  {99,27},  {109,27}, {120,27}, {130,27}, {143,27}, {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27},
-        {4,40}, {18,40}, {29,40}, {39,40}, {50,40}, {60,40}, {70,40}, {81,40}, {91,40},  {102,40}, {112,40}, {123,40},           {139,40},                               {193,40}, {203,40}, {214,40}, {224,34},
-        {7,52},          {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {76,52}, {86,52},  {96,52},  {107,52}, {117,52},           {137,52},           {169,52},           {193,52}, {203,52}, {214,52},
-        {1,64}, {14,64}, {27,64},                            {66,64},                              {105,64}, {118,64}, {131,64}, {145,64}, {159,64}, {169,64}, {180,64}, {198,64},           {214,64}, {224,58},
-    },
-    {
-        1,    1, 1, 1, 1, 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, 1, 8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,          4, 4, 4, 4,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,    4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1, 1,    4, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v6/ansi/keyboard.json b/keyboards/keychron/v6/ansi/keyboard.json
index e68f3cdec8..6733c196b7 100644
--- a/keyboards/keychron/v6/ansi/keyboard.json
+++ b/keyboards/keychron/v6/ansi/keyboard.json
@@ -18,6 +18,118 @@
         "rgb_matrix": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 21, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 31, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 42, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 52, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 68, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 78, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 89, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 99, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 115, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 136, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 146, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 159, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 180, "y": 0, "flags": 1},
+            {"matrix": [0, 19], "x": 193, "y": 0, "flags": 1},
+            {"matrix": [1, 19], "x": 203, "y": 0, "flags": 1},
+            {"matrix": [2, 19], "x": 214, "y": 0, "flags": 1},
+            {"matrix": [3, 19], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 10, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 21, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 31, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 42, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 52, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 63, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 83, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 94, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 104, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 115, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 125, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 141, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 159, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 169, "y": 15, "flags": 1},
+            {"matrix": [1, 16], "x": 180, "y": 15, "flags": 1},
+            {"matrix": [1, 17], "x": 193, "y": 15, "flags": 8},
+            {"matrix": [1, 18], "x": 203, "y": 15, "flags": 4},
+            {"matrix": [0, 17], "x": 214, "y": 15, "flags": 4},
+            {"matrix": [0, 18], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1},
+            {"matrix": [2, 1], "x": 16, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 26, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 36, "y": 27, "flags": 4},
+            {"matrix": [2, 4], "x": 47, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 57, "y": 27, "flags": 4},
+            {"matrix": [2, 6], "x": 68, "y": 27, "flags": 4},
+            {"matrix": [2, 7], "x": 78, "y": 27, "flags": 4},
+            {"matrix": [2, 8], "x": 89, "y": 27, "flags": 4},
+            {"matrix": [2, 9], "x": 99, "y": 27, "flags": 4},
+            {"matrix": [2, 10], "x": 109, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 120, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 130, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 143, "y": 27, "flags": 4},
+            {"matrix": [2, 14], "x": 159, "y": 27, "flags": 1},
+            {"matrix": [2, 15], "x": 169, "y": 27, "flags": 1},
+            {"matrix": [2, 16], "x": 180, "y": 27, "flags": 1},
+            {"matrix": [2, 17], "x": 193, "y": 27, "flags": 4},
+            {"matrix": [2, 18], "x": 203, "y": 27, "flags": 4},
+            {"matrix": [3, 14], "x": 214, "y": 27, "flags": 4},
+            {"matrix": [3, 0], "x": 4, "y": 40, "flags": 8},
+            {"matrix": [3, 1], "x": 18, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 29, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 39, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 50, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 60, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 70, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 81, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 91, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 102, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 112, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 123, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 139, "y": 40, "flags": 1},
+            {"matrix": [3, 17], "x": 193, "y": 40, "flags": 4},
+            {"matrix": [3, 18], "x": 203, "y": 40, "flags": 4},
+            {"matrix": [3, 16], "x": 214, "y": 40, "flags": 4},
+            {"matrix": [3, 15], "x": 224, "y": 34, "flags": 4},
+            {"matrix": [4, 0], "x": 7, "y": 52, "flags": 1},
+            {"matrix": [4, 2], "x": 23, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 34, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 44, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 65, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 76, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 96, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 117, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 137, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 169, "y": 52, "flags": 1},
+            {"matrix": [4, 17], "x": 193, "y": 52, "flags": 4},
+            {"matrix": [4, 18], "x": 203, "y": 52, "flags": 4},
+            {"matrix": [4, 14], "x": 214, "y": 52, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 14, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 27, "y": 64, "flags": 1},
+            {"matrix": [5, 6], "x": 66, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 105, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 118, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 131, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 145, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 159, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 169, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [5, 17], "x": 198, "y": 64, "flags": 1},
+            {"matrix": [5, 18], "x": 214, "y": 64, "flags": 4},
+            {"matrix": [4, 16], "x": 224, "y": 58, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_108": {
             "layout": [
diff --git a/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
index 1ebf947912..fa08ec41aa 100644
--- a/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
@@ -141,37 +141,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
     {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
-
-#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,  39,  40, 16 },
-        { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  32,  33,  34,  35,  36,  37,  38, 17 },
-        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  53,  54,  55,  56,  57,  58,  59, 18 },
-        { 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,  __,  73,  60,  77,  76,  74,  75, 19 },
-        { 78, __, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,  __,  89,  93,  90, 107,  91,  92, __ },
-        { 94, 95, 96, __, __, __, 97, __, __, __, 98, 99, 100, 101, 102, 103, 104, 105, 106, __ },
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {13,0},  {24,0},  {34,0},  {45,0},  {57,0},  {68,0},  {78,0},  {89,0},  {102,0},  {112,0},  {123,0},  {133,0},            {159,0},  {169,0},  {180,0},  {193,0},  {203,0},  {214,0},  {224,0},
-        {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {63,15}, {73,15}, {83,15}, {94,15},  {104,15}, {115,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
-        {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {89,27}, {99,27},  {109,27}, {120,27}, {130,27}, {143,27}, {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27},
-        {4,40}, {18,40}, {29,40}, {39,40}, {50,40}, {60,40}, {70,40}, {81,40}, {91,40}, {102,40}, {112,40}, {123,40},           {139,40},                               {193,40}, {203,40}, {214,40}, {224,34},
-        {7,52},          {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {76,52}, {86,52}, {96,52},  {107,52}, {117,52},           {137,52},           {169,52},           {193,52}, {203,52}, {214,52},
-        {1,64}, {14,64}, {27,64},                            {66,64},                             {105,64}, {118,64}, {131,64}, {145,64}, {159,64}, {169,64}, {180,64}, {198,64},           {214,64}, {224,58},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 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, 1, 8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,          4, 4, 4, 4,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,    4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1, 1,    4, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v6/ansi_encoder/keyboard.json b/keyboards/keychron/v6/ansi_encoder/keyboard.json
index 6ccc6d415b..3427c3e633 100644
--- a/keyboards/keychron/v6/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/v6/ansi_encoder/keyboard.json
@@ -8,9 +8,6 @@
         "pid": "0x0361",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
@@ -27,6 +24,119 @@
         "encoder": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "driver": "snled27351",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 13, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 34, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 45, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 57, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 68, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 78, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 89, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 102, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 112, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 123, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 159, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 180, "y": 0, "flags": 1},
+            {"matrix": [0, 19], "x": 193, "y": 0, "flags": 1},
+            {"matrix": [1, 19], "x": 203, "y": 0, "flags": 1},
+            {"matrix": [2, 19], "x": 214, "y": 0, "flags": 1},
+            {"matrix": [3, 19], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 10, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 21, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 31, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 42, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 52, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 63, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 83, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 94, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 104, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 115, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 125, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 141, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 159, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 169, "y": 15, "flags": 1},
+            {"matrix": [1, 16], "x": 180, "y": 15, "flags": 1},
+            {"matrix": [1, 17], "x": 193, "y": 15, "flags": 8},
+            {"matrix": [1, 18], "x": 203, "y": 15, "flags": 4},
+            {"matrix": [0, 17], "x": 214, "y": 15, "flags": 4},
+            {"matrix": [0, 18], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1},
+            {"matrix": [2, 1], "x": 16, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 26, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 36, "y": 27, "flags": 4},
+            {"matrix": [2, 4], "x": 47, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 57, "y": 27, "flags": 4},
+            {"matrix": [2, 6], "x": 68, "y": 27, "flags": 4},
+            {"matrix": [2, 7], "x": 78, "y": 27, "flags": 4},
+            {"matrix": [2, 8], "x": 89, "y": 27, "flags": 4},
+            {"matrix": [2, 9], "x": 99, "y": 27, "flags": 4},
+            {"matrix": [2, 10], "x": 109, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 120, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 130, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 143, "y": 27, "flags": 4},
+            {"matrix": [2, 14], "x": 159, "y": 27, "flags": 1},
+            {"matrix": [2, 15], "x": 169, "y": 27, "flags": 1},
+            {"matrix": [2, 16], "x": 180, "y": 27, "flags": 1},
+            {"matrix": [2, 17], "x": 193, "y": 27, "flags": 4},
+            {"matrix": [2, 18], "x": 203, "y": 27, "flags": 4},
+            {"matrix": [3, 14], "x": 214, "y": 27, "flags": 4},
+            {"matrix": [3, 0], "x": 4, "y": 40, "flags": 8},
+            {"matrix": [3, 1], "x": 18, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 29, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 39, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 50, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 60, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 70, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 81, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 91, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 102, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 112, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 123, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 139, "y": 40, "flags": 1},
+            {"matrix": [3, 17], "x": 193, "y": 40, "flags": 4},
+            {"matrix": [3, 18], "x": 203, "y": 40, "flags": 4},
+            {"matrix": [3, 16], "x": 214, "y": 40, "flags": 4},
+            {"matrix": [3, 15], "x": 224, "y": 34, "flags": 4},
+            {"matrix": [4, 0], "x": 7, "y": 52, "flags": 1},
+            {"matrix": [4, 2], "x": 23, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 34, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 44, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 65, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 76, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 96, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 117, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 137, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 169, "y": 52, "flags": 1},
+            {"matrix": [4, 17], "x": 193, "y": 52, "flags": 4},
+            {"matrix": [4, 18], "x": 203, "y": 52, "flags": 4},
+            {"matrix": [4, 14], "x": 214, "y": 52, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 14, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 27, "y": 64, "flags": 1},
+            {"matrix": [5, 6], "x": 66, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 105, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 118, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 131, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 145, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 159, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 169, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [5, 17], "x": 198, "y": 64, "flags": 1},
+            {"matrix": [5, 18], "x": 214, "y": 64, "flags": 4},
+            {"matrix": [4, 16], "x": 224, "y": 58, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_109": {
             "layout": [
diff --git a/keyboards/keychron/v6/iso/iso.c b/keyboards/keychron/v6/iso/iso.c
index cc9dbd8c23..0675e47a3b 100644
--- a/keyboards/keychron/v6/iso/iso.c
+++ b/keyboards/keychron/v6/iso/iso.c
@@ -142,37 +142,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
     {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
-
-#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,  39,  40,  16 },
-        { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  32,  33,  34,  35,  36,  37,  38,  17 },
-        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  53,  73,  54,  55,  56,  57,  58,  18 },
-        { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,  __,  72,  59,  77,  76,  74,  75,  19 },
-        { 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,  __,  90,  94,  91,  108, 92,  93,  __ },
-        { 95, 96, 97, __, __, __, 98, __, __, __, 99, 100, 101, 102, 103, 104, 105, 106, 107, __ },
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},           {21,0},  {31,0},  {42,0},  {52,0},  {68,0},  {78,0},  {89,0},  {99,0},   {115,0},  {125,0},  {136,0},  {146,0},  {159,0},  {169,0},  {180,0},  {193,0},  {203,0},  {214,0},  {224,0},
-        {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {63,15}, {73,15}, {83,15}, {94,15},  {104,15}, {115,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
-        {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {89,27}, {99,27},  {109,27}, {120,27}, {130,27},           {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27},
-        {4,40}, {18,40}, {29,40}, {39,40}, {50,40}, {60,40}, {70,40}, {81,40}, {91,40}, {102,40}, {112,40}, {123,40}, {133,40}, {147,36},                               {193,40}, {203,40}, {214,40}, {224,34},
-        {1,52}, {13,52}, {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {76,52}, {86,52}, {96,52},  {107,52}, {117,52},           {137,52},           {169,52},           {193,52}, {203,52}, {214,52},
-        {1,64}, {14,64}, {27,64},                            {66,64},                             {105,64}, {118,64}, {131,64}, {145,64}, {159,64}, {169,64}, {180,64}, {198,64},           {214,64}, {224,58},
-    },
-    {
-        // RGB LED Index to Flag
-        1,    1, 1, 1, 1, 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, 1, 8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 1, 4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,          4, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,    4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1, 1,    4, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v6/iso/keyboard.json b/keyboards/keychron/v6/iso/keyboard.json
index e2f17e4f6e..9310919456 100644
--- a/keyboards/keychron/v6/iso/keyboard.json
+++ b/keyboards/keychron/v6/iso/keyboard.json
@@ -8,9 +8,6 @@
         "pid": "0x0362",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "features": {
@@ -21,6 +18,120 @@
         "rgb_matrix": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "driver": "snled27351",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 21, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 31, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 42, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 52, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 68, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 78, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 89, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 99, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 115, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 136, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 146, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 159, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 180, "y": 0, "flags": 1},
+            {"matrix": [0, 19], "x": 193, "y": 0, "flags": 1},
+            {"matrix": [1, 19], "x": 203, "y": 0, "flags": 1},
+            {"matrix": [2, 19], "x": 214, "y": 0, "flags": 1},
+            {"matrix": [3, 19], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 10, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 21, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 31, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 42, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 52, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 63, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 83, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 94, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 104, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 115, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 125, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 141, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 159, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 169, "y": 15, "flags": 1},
+            {"matrix": [1, 16], "x": 180, "y": 15, "flags": 1},
+            {"matrix": [1, 17], "x": 193, "y": 15, "flags": 8},
+            {"matrix": [1, 18], "x": 203, "y": 15, "flags": 4},
+            {"matrix": [0, 17], "x": 214, "y": 15, "flags": 4},
+            {"matrix": [0, 18], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1},
+            {"matrix": [2, 1], "x": 16, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 26, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 36, "y": 27, "flags": 4},
+            {"matrix": [2, 4], "x": 47, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 57, "y": 27, "flags": 4},
+            {"matrix": [2, 6], "x": 68, "y": 27, "flags": 4},
+            {"matrix": [2, 7], "x": 78, "y": 27, "flags": 4},
+            {"matrix": [2, 8], "x": 89, "y": 27, "flags": 4},
+            {"matrix": [2, 9], "x": 99, "y": 27, "flags": 4},
+            {"matrix": [2, 10], "x": 109, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 120, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 130, "y": 27, "flags": 4},
+            {"matrix": [2, 14], "x": 159, "y": 27, "flags": 1},
+            {"matrix": [2, 15], "x": 169, "y": 27, "flags": 1},
+            {"matrix": [2, 16], "x": 180, "y": 27, "flags": 1},
+            {"matrix": [2, 17], "x": 193, "y": 27, "flags": 4},
+            {"matrix": [2, 18], "x": 203, "y": 27, "flags": 4},
+            {"matrix": [3, 14], "x": 214, "y": 27, "flags": 4},
+            {"matrix": [3, 0], "x": 4, "y": 40, "flags": 8},
+            {"matrix": [3, 1], "x": 18, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 29, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 39, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 50, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 60, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 70, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 81, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 91, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 102, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 112, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 123, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 133, "y": 40, "flags": 4},
+            {"matrix": [2, 13], "x": 147, "y": 36, "flags": 1},
+            {"matrix": [3, 17], "x": 193, "y": 40, "flags": 4},
+            {"matrix": [3, 18], "x": 203, "y": 40, "flags": 4},
+            {"matrix": [3, 16], "x": 214, "y": 40, "flags": 4},
+            {"matrix": [3, 15], "x": 224, "y": 34, "flags": 4},
+            {"matrix": [4, 0], "x": 1, "y": 52, "flags": 1},
+            {"matrix": [4, 1], "x": 13, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 23, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 34, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 44, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 65, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 76, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 96, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 117, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 137, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 169, "y": 52, "flags": 1},
+            {"matrix": [4, 17], "x": 193, "y": 52, "flags": 4},
+            {"matrix": [4, 18], "x": 203, "y": 52, "flags": 4},
+            {"matrix": [4, 14], "x": 214, "y": 52, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 14, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 27, "y": 64, "flags": 1},
+            {"matrix": [5, 6], "x": 66, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 105, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 118, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 131, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 145, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 159, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 169, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [5, 17], "x": 198, "y": 64, "flags": 1},
+            {"matrix": [5, 18], "x": 214, "y": 64, "flags": 4},
+            {"matrix": [4, 16], "x": 224, "y": 58, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_iso_109": {
             "layout": [
diff --git a/keyboards/keychron/v6/iso_encoder/iso_encoder.c b/keyboards/keychron/v6/iso_encoder/iso_encoder.c
index f1a8e18acf..0675e47a3b 100644
--- a/keyboards/keychron/v6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v6/iso_encoder/iso_encoder.c
@@ -142,37 +142,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
     {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
-
-#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,  39,  40,  16 },
-        { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  32,  33,  34,  35,  36,  37,  38,  17 },
-        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  53,  73,  54,  55,  56,  57,  58,  18 },
-        { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,  __,  72,  59,  77,  76,  74,  75,  19 },
-        { 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,  __,  90,  94,  91,  108, 92,  93,  __ },
-        { 95, 96, 97, __, __, __, 98, __, __, __, 99, 100, 101, 102, 103, 104, 105, 106, 107, __ },
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {13,0},  {24,0},  {34,0},  {45,0},  {57,0},  {68,0},  {78,0},  {89,0},  {102,0},  {112,0},  {123,0},  {133,0},            {159,0},  {169,0},  {180,0},  {193,0},  {203,0},  {214,0},  {224,0},
-        {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {63,15}, {73,15}, {83,15}, {94,15},  {104,15}, {115,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
-        {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {89,27}, {99,27},  {109,27}, {120,27}, {130,27}, {159,27},           {169,27}, {180,27}, {193,27}, {203,27}, {214,27},
-        {4,40}, {18,40}, {29,40}, {39,40}, {50,40}, {60,40}, {70,40}, {81,40}, {91,40}, {102,40}, {112,40}, {123,40}, {133,40}, {147,36},                               {193,40}, {203,40}, {214,40}, {224,34},
-        {1,52}, {13,52}, {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {76,52}, {86,52}, {96,52},  {107,52}, {117,52},           {137,52},           {169,52},           {193,52}, {203,52}, {214,52},
-        {1,64}, {14,64}, {27,64},                            {66,64},                             {105,64}, {118,64}, {131,64}, {145,64}, {159,64}, {169,64}, {180,64}, {198,64},           {214,64}, {224,58},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 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, 1, 8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 1, 4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,          4, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,    4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1, 1,    4, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v6/iso_encoder/keyboard.json b/keyboards/keychron/v6/iso_encoder/keyboard.json
index d7469b54e0..858c33a692 100644
--- a/keyboards/keychron/v6/iso_encoder/keyboard.json
+++ b/keyboards/keychron/v6/iso_encoder/keyboard.json
@@ -8,9 +8,6 @@
         "pid": "0x0363",
         "device_version": "1.0.0"
     },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
@@ -27,6 +24,120 @@
         "encoder": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "driver": "snled27351",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 13, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 34, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 45, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 57, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 68, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 78, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 89, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 102, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 112, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 123, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 159, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 180, "y": 0, "flags": 1},
+            {"matrix": [0, 19], "x": 193, "y": 0, "flags": 1},
+            {"matrix": [1, 19], "x": 203, "y": 0, "flags": 1},
+            {"matrix": [2, 19], "x": 214, "y": 0, "flags": 1},
+            {"matrix": [3, 19], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 10, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 21, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 31, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 42, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 52, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 63, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 83, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 94, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 104, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 115, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 125, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 141, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 159, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 169, "y": 15, "flags": 1},
+            {"matrix": [1, 16], "x": 180, "y": 15, "flags": 1},
+            {"matrix": [1, 17], "x": 193, "y": 15, "flags": 8},
+            {"matrix": [1, 18], "x": 203, "y": 15, "flags": 4},
+            {"matrix": [0, 17], "x": 214, "y": 15, "flags": 4},
+            {"matrix": [0, 18], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1},
+            {"matrix": [2, 1], "x": 16, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 26, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 36, "y": 27, "flags": 4},
+            {"matrix": [2, 4], "x": 47, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 57, "y": 27, "flags": 4},
+            {"matrix": [2, 6], "x": 68, "y": 27, "flags": 4},
+            {"matrix": [2, 7], "x": 78, "y": 27, "flags": 4},
+            {"matrix": [2, 8], "x": 89, "y": 27, "flags": 4},
+            {"matrix": [2, 9], "x": 99, "y": 27, "flags": 4},
+            {"matrix": [2, 10], "x": 109, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 120, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 130, "y": 27, "flags": 4},
+            {"matrix": [2, 14], "x": 159, "y": 27, "flags": 1},
+            {"matrix": [2, 15], "x": 169, "y": 27, "flags": 1},
+            {"matrix": [2, 16], "x": 180, "y": 27, "flags": 1},
+            {"matrix": [2, 17], "x": 193, "y": 27, "flags": 4},
+            {"matrix": [2, 18], "x": 203, "y": 27, "flags": 4},
+            {"matrix": [3, 14], "x": 214, "y": 27, "flags": 4},
+            {"matrix": [3, 0], "x": 4, "y": 40, "flags": 8},
+            {"matrix": [3, 1], "x": 18, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 29, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 39, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 50, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 60, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 70, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 81, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 91, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 102, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 112, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 123, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 133, "y": 40, "flags": 4},
+            {"matrix": [2, 13], "x": 147, "y": 36, "flags": 1},
+            {"matrix": [3, 17], "x": 193, "y": 40, "flags": 4},
+            {"matrix": [3, 18], "x": 203, "y": 40, "flags": 4},
+            {"matrix": [3, 16], "x": 214, "y": 40, "flags": 4},
+            {"matrix": [3, 15], "x": 224, "y": 34, "flags": 4},
+            {"matrix": [4, 0], "x": 1, "y": 52, "flags": 1},
+            {"matrix": [4, 1], "x": 13, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 23, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 34, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 44, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 65, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 76, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 96, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 117, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 137, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 169, "y": 52, "flags": 1},
+            {"matrix": [4, 17], "x": 193, "y": 52, "flags": 4},
+            {"matrix": [4, 18], "x": 203, "y": 52, "flags": 4},
+            {"matrix": [4, 14], "x": 214, "y": 52, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 14, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 27, "y": 64, "flags": 1},
+            {"matrix": [5, 6], "x": 66, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 105, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 118, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 131, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 145, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 159, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 169, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [5, 17], "x": 198, "y": 64, "flags": 1},
+            {"matrix": [5, 18], "x": 214, "y": 64, "flags": 4},
+            {"matrix": [4, 16], "x": 224, "y": 58, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_iso_110": {
             "layout": [