diff --git a/keyboards/keychron/q2/jis/config.h b/keyboards/keychron/q2/jis/config.h
index 0d811e0845..18e37b06fe 100644
--- a/keyboards/keychron/q2/jis/config.h
+++ b/keyboards/keychron/q2/jis/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 71
-
 #define SNLED27351_CURRENT_TUNE { 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D }
 
 /* Enable caps-lock LED */
diff --git a/keyboards/keychron/q2/jis/keyboard.json b/keyboards/keychron/q2/jis/keyboard.json
index 834b89332e..6e5a0b8fc2 100644
--- a/keyboards/keychron/q2/jis/keyboard.json
+++ b/keyboards/keychron/q2/jis/keyboard.json
@@ -5,21 +5,21 @@
     },
     "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, 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": 118, "y": 4, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 4, "flags": 4},
+            {"matrix": [0, 10], "x": 147, "y": 4, "flags": 4},
+            {"matrix": [0, 11], "x": 162, "y": 4, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 4, "flags": 4},
+            {"matrix": [0, 13], "x": 191, "y": 4, "flags": 4},
+            {"matrix": [3, 1], "x": 206, "y": 4, "flags": 1},
             {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
 
             {"matrix": [1, 0], "x": 4, "y": 19, "flags": 1},
@@ -31,10 +31,10 @@
             {"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, 9], "x": 140, "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, 11], "x": 169, "y": 19, "flags": 4},
+            {"matrix": [1, 12], "x": 184, "y": 19, "flags": 4},
             {"matrix": [1, 14], "x": 224, "y": 19, "flags": 1},
 
             {"matrix": [2, 0], "x": 6, "y": 34, "flags": 1},
@@ -45,12 +45,12 @@
             {"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, 8], "x": 129, "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, 11], "x": 173, "y": 34, "flags": 4},
             {"matrix": [2, 13], "x": 187, "y": 34, "flags": 4},
-            {"matrix": [1, 13], "x": 207, "y": 29, "flags": 1},
+            {"matrix": [1, 13], "x": 204, "y": 26, "flags": 1},
             {"matrix": [2, 14], "x": 224, "y": 34, "flags": 1},
 
             {"matrix": [3, 0], "x": 9, "y": 49, "flags": 1},
@@ -62,9 +62,10 @@
             {"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": 179, "y": 49, "flags": 4},
-            {"matrix": [3, 13], "x": 194, "y": 49, "flags": 1},
+            {"matrix": [3, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [3, 12], "x": 180, "y": 49, "flags": 4},
+            {"matrix": [3, 13], "x": 195, "y": 49, "flags": 1},
             {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
 
             {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
@@ -73,12 +74,12 @@
             {"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, 10], "x": 151, "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": [4, 12], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [4, 13], "x": 195, "y": 64, "flags": 1},
             {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
-            {"matrix": [4, 14], "x": 223, "y": 64, "flags": 1}
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
         ]
     },
     "layouts": {
diff --git a/keyboards/keychron/q2/jis_encoder/config.h b/keyboards/keychron/q2/jis_encoder/config.h
index 0d811e0845..18e37b06fe 100644
--- a/keyboards/keychron/q2/jis_encoder/config.h
+++ b/keyboards/keychron/q2/jis_encoder/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 71
-
 #define SNLED27351_CURRENT_TUNE { 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D, 0xC0, 0xC0, 0x5D }
 
 /* Enable caps-lock LED */
diff --git a/keyboards/keychron/q2/jis_encoder/keyboard.json b/keyboards/keychron/q2/jis_encoder/keyboard.json
index 32b691742b..11204e720f 100644
--- a/keyboards/keychron/q2/jis_encoder/keyboard.json
+++ b/keyboards/keychron/q2/jis_encoder/keyboard.json
@@ -11,21 +11,21 @@
     },
     "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, 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": 118, "y": 4, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 4, "flags": 4},
+            {"matrix": [0, 10], "x": 147, "y": 4, "flags": 4},
+            {"matrix": [0, 11], "x": 162, "y": 4, "flags": 4},
+            {"matrix": [0, 12], "x": 176, "y": 4, "flags": 4},
+            {"matrix": [0, 13], "x": 191, "y": 4, "flags": 4},
+            {"matrix": [3, 1], "x": 206, "y": 4, "flags": 1},
             {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
 
             {"matrix": [1, 0], "x": 4, "y": 19, "flags": 1},
@@ -37,10 +37,10 @@
             {"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, 9], "x": 140, "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, 11], "x": 169, "y": 19, "flags": 4},
+            {"matrix": [1, 12], "x": 184, "y": 19, "flags": 4},
             {"matrix": [1, 14], "x": 224, "y": 19, "flags": 1},
 
             {"matrix": [2, 0], "x": 6, "y": 34, "flags": 1},
@@ -51,12 +51,12 @@
             {"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, 8], "x": 129, "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, 11], "x": 173, "y": 34, "flags": 4},
             {"matrix": [2, 13], "x": 187, "y": 34, "flags": 4},
-            {"matrix": [1, 13], "x": 207, "y": 29, "flags": 1},
+            {"matrix": [1, 13], "x": 204, "y": 26, "flags": 1},
             {"matrix": [2, 14], "x": 224, "y": 34, "flags": 1},
 
             {"matrix": [3, 0], "x": 9, "y": 49, "flags": 1},
@@ -68,9 +68,10 @@
             {"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": 179, "y": 49, "flags": 4},
-            {"matrix": [3, 13], "x": 194, "y": 49, "flags": 1},
+            {"matrix": [3, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [3, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [3, 12], "x": 180, "y": 49, "flags": 4},
+            {"matrix": [3, 13], "x": 195, "y": 49, "flags": 1},
             {"matrix": [3, 14], "x": 209, "y": 49, "flags": 1},
 
             {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
@@ -79,12 +80,12 @@
             {"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, 10], "x": 151, "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": [4, 12], "x": 180, "y": 64, "flags": 1},
+            {"matrix": [4, 13], "x": 195, "y": 64, "flags": 1},
             {"matrix": [2, 12], "x": 209, "y": 64, "flags": 1},
-            {"matrix": [4, 14], "x": 223, "y": 64, "flags": 1}
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
         ]
     },
     "layouts": {