Move `LAYOUT` options for Q Pro back into seperate variants

7 files changed, 373 insertions, 371 deletions

diff --git a/keyboards/keychron/q1_pro/ansi_knob/info.json b/keyboards/keychron/q1_pro/ansi_knob/info.json
index 8ba43855f8..7bfd333649 100644
--- a/keyboards/keychron/q1_pro/ansi_knob/info.json
+++ b/keyboards/keychron/q1_pro/ansi_knob/info.json
@@ -2,5 +2,98 @@
     "usb": {
     	"pid": "0x0610",
     	"device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,15], "x":15.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,15], "x":15.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3,15], "x":15.25, "y":3.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/keychron/q1_pro/info.json b/keyboards/keychron/q1_pro/info.json
index 6c31e2f195..bb1a34b25a 100644
--- a/keyboards/keychron/q1_pro/info.json
+++ b/keyboards/keychron/q1_pro/info.json
@@ -59,190 +59,5 @@
             "splash": true,
             "solid_splash": true
         }
-    },
-    "layouts": {
-        "LAYOUT_ansi_82": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0,10], "x":10.75, "y":0},
-                {"matrix":[0,11], "x":11.75, "y":0},
-                {"matrix":[0,12], "x":12.75, "y":0},
-                {"matrix":[0,13], "x":14, "y":0},
-                {"matrix":[0,15], "x":15.25, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,15], "x":15.25, "y":1.25},
-
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,15], "x":15.25, "y":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,15], "x":15.25, "y":3.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,14], "x":14.25, "y":4.5},
-
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5}
-            ]
-        },
-        "LAYOUT_iso_83": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0,10], "x":10.75, "y":0},
-                {"matrix":[0,11], "x":11.75, "y":0},
-                {"matrix":[0,12], "x":12.75, "y":0},
-                {"matrix":[0,13], "x":14, "y":0},
-                {"matrix":[0,15], "x":15.25, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,15], "x":15.25, "y":1.25},
-
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,15], "x":15.25, "y":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,15], "x":15.25, "y":3.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,14], "x":14.25, "y":4.5},
-
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5}
-            ]
-        }
     }
 }
\ No newline at end of file
diff --git a/keyboards/keychron/q1_pro/iso_knob/info.json b/keyboards/keychron/q1_pro/iso_knob/info.json
index 0c65547081..8d96101f1b 100644
--- a/keyboards/keychron/q1_pro/iso_knob/info.json
+++ b/keyboards/keychron/q1_pro/iso_knob/info.json
@@ -2,5 +2,99 @@
     "usb": {
     	"pid": "0x0611",
     	"device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,15], "x":15.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,15], "x":15.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3,15], "x":15.25, "y":3.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/info.json b/keyboards/keychron/q2_pro/ansi_encoder/info.json
index 3287700bc8..98b0c077fb 100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/info.json
+++ b/keyboards/keychron/q2_pro/ansi_encoder/info.json
@@ -2,5 +2,83 @@
     "usb": {
     	"pid": "0x0620",
     	"device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_knob_67": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0.25},
+                {"matrix":[0,1], "x":1, "y":0.25},
+                {"matrix":[0,2], "x":2, "y":0.25},
+                {"matrix":[0,3], "x":3, "y":0.25},
+                {"matrix":[0,4], "x":4, "y":0.25},
+                {"matrix":[0,5], "x":5, "y":0.25},
+                {"matrix":[0,6], "x":6, "y":0.25},
+                {"matrix":[0,7], "x":7, "y":0.25},
+                {"matrix":[0,8], "x":8, "y":0.25},
+                {"matrix":[0,9], "x":9, "y":0.25},
+                {"matrix":[0,10], "x":10, "y":0.25},
+                {"matrix":[0,11], "x":11, "y":0.25},
+                {"matrix":[0,12], "x":12, "y":0.25},
+                {"matrix":[0,13], "x":13, "y":0.25, "w":2},
+
+                {"matrix":[0,15], "x":15.25, "y":0},
+
+                {"matrix":[1,0], "x":0, "y":1.25, "w":1.5},
+                {"matrix":[1,1], "x":1.5, "y":1.25},
+                {"matrix":[1,2], "x":2.5, "y":1.25},
+                {"matrix":[1,3], "x":3.5, "y":1.25},
+                {"matrix":[1,4], "x":4.5, "y":1.25},
+                {"matrix":[1,5], "x":5.5, "y":1.25},
+                {"matrix":[1,6], "x":6.5, "y":1.25},
+                {"matrix":[1,7], "x":7.5, "y":1.25},
+                {"matrix":[1,8], "x":8.5, "y":1.25},
+                {"matrix":[1,9], "x":9.5, "y":1.25},
+                {"matrix":[1,10], "x":10.5, "y":1.25},
+                {"matrix":[1,11], "x":11.5, "y":1.25},
+                {"matrix":[1,12], "x":12.5, "y":1.25},
+                {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5},
+                {"matrix":[1,15], "x":15.25, "y":1.25},
+
+                {"matrix":[2,0], "x":0, "y":2.25, "w":1.75},
+                {"matrix":[2,1], "x":1.75, "y":2.25},
+                {"matrix":[2,2], "x":2.75, "y":2.25},
+                {"matrix":[2,3], "x":3.75, "y":2.25},
+                {"matrix":[2,4], "x":4.75, "y":2.25},
+                {"matrix":[2,5], "x":5.75, "y":2.25},
+                {"matrix":[2,6], "x":6.75, "y":2.25},
+                {"matrix":[2,7], "x":7.75, "y":2.25},
+                {"matrix":[2,8], "x":8.75, "y":2.25},
+                {"matrix":[2,9], "x":9.75, "y":2.25},
+                {"matrix":[2,10], "x":10.75, "y":2.25},
+                {"matrix":[2,11], "x":11.75, "y":2.25},
+                {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25},
+                {"matrix":[2,15], "x":15.25, "y":2.25},
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":2.25},
+                {"matrix":[3,2], "x":2.25, "y":3.25},
+                {"matrix":[3,3], "x":3.25, "y":3.25},
+                {"matrix":[3,4], "x":4.25, "y":3.25},
+                {"matrix":[3,5], "x":5.25, "y":3.25},
+                {"matrix":[3,6], "x":6.25, "y":3.25},
+                {"matrix":[3,7], "x":7.25, "y":3.25},
+                {"matrix":[3,8], "x":8.25, "y":3.25},
+                {"matrix":[3,9], "x":9.25, "y":3.25},
+                {"matrix":[3,10], "x":10.25, "y":3.25},
+                {"matrix":[3,11], "x":11.25, "y":3.25},
+                {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75},
+                {"matrix":[3,14], "x":14.25, "y":3.5},
+
+                {"matrix":[4,0], "x":0, "y":4.25, "w":1.24},
+                {"matrix":[4,1], "x":1.24, "y":4.25, "w":1.25},
+                {"matrix":[4,2], "x":2.49, "y":4.25, "w":1.25},
+                {"matrix":[4,6], "x":3.74, "y":4.25, "w":6.25},
+                {"matrix":[4,10], "x":9.99, "y":4.25},
+                {"matrix":[4,11], "x":10.99, "y":4.25},
+                {"matrix":[4,12], "x":11.99, "y":4.25},
+                {"matrix":[4,13], "x":13.25, "y":4.5},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+                {"matrix":[4,15], "x":15.25, "y":4.5}
+            ]
+        }
     }
 }
diff --git a/keyboards/keychron/q2_pro/info.json b/keyboards/keychron/q2_pro/info.json
index 3cbf27425b..65e3eab0fc 100644
--- a/keyboards/keychron/q2_pro/info.json
+++ b/keyboards/keychron/q2_pro/info.json
@@ -58,83 +58,5 @@
             "splash": true,
             "solid_splash": true
         }
-    },
-    "layouts": {
-        "LAYOUT_ansi_knob_67": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0.25},
-                {"matrix":[0,1], "x":1, "y":0.25},
-                {"matrix":[0,2], "x":2, "y":0.25},
-                {"matrix":[0,3], "x":3, "y":0.25},
-                {"matrix":[0,4], "x":4, "y":0.25},
-                {"matrix":[0,5], "x":5, "y":0.25},
-                {"matrix":[0,6], "x":6, "y":0.25},
-                {"matrix":[0,7], "x":7, "y":0.25},
-                {"matrix":[0,8], "x":8, "y":0.25},
-                {"matrix":[0,9], "x":9, "y":0.25},
-                {"matrix":[0,10], "x":10, "y":0.25},
-                {"matrix":[0,11], "x":11, "y":0.25},
-                {"matrix":[0,12], "x":12, "y":0.25},
-                {"matrix":[0,13], "x":13, "y":0.25, "w":2},
-
-                {"matrix":[0,15], "x":15.25, "y":0},
-
-                {"matrix":[1,0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1,1], "x":1.5, "y":1.25},
-                {"matrix":[1,2], "x":2.5, "y":1.25},
-                {"matrix":[1,3], "x":3.5, "y":1.25},
-                {"matrix":[1,4], "x":4.5, "y":1.25},
-                {"matrix":[1,5], "x":5.5, "y":1.25},
-                {"matrix":[1,6], "x":6.5, "y":1.25},
-                {"matrix":[1,7], "x":7.5, "y":1.25},
-                {"matrix":[1,8], "x":8.5, "y":1.25},
-                {"matrix":[1,9], "x":9.5, "y":1.25},
-                {"matrix":[1,10], "x":10.5, "y":1.25},
-                {"matrix":[1,11], "x":11.5, "y":1.25},
-                {"matrix":[1,12], "x":12.5, "y":1.25},
-                {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5},
-                {"matrix":[1,15], "x":15.25, "y":1.25},
-
-                {"matrix":[2,0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2,1], "x":1.75, "y":2.25},
-                {"matrix":[2,2], "x":2.75, "y":2.25},
-                {"matrix":[2,3], "x":3.75, "y":2.25},
-                {"matrix":[2,4], "x":4.75, "y":2.25},
-                {"matrix":[2,5], "x":5.75, "y":2.25},
-                {"matrix":[2,6], "x":6.75, "y":2.25},
-                {"matrix":[2,7], "x":7.75, "y":2.25},
-                {"matrix":[2,8], "x":8.75, "y":2.25},
-                {"matrix":[2,9], "x":9.75, "y":2.25},
-                {"matrix":[2,10], "x":10.75, "y":2.25},
-                {"matrix":[2,11], "x":11.75, "y":2.25},
-                {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25},
-                {"matrix":[2,15], "x":15.25, "y":2.25},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3,2], "x":2.25, "y":3.25},
-                {"matrix":[3,3], "x":3.25, "y":3.25},
-                {"matrix":[3,4], "x":4.25, "y":3.25},
-                {"matrix":[3,5], "x":5.25, "y":3.25},
-                {"matrix":[3,6], "x":6.25, "y":3.25},
-                {"matrix":[3,7], "x":7.25, "y":3.25},
-                {"matrix":[3,8], "x":8.25, "y":3.25},
-                {"matrix":[3,9], "x":9.25, "y":3.25},
-                {"matrix":[3,10], "x":10.25, "y":3.25},
-                {"matrix":[3,11], "x":11.25, "y":3.25},
-                {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75},
-                {"matrix":[3,14], "x":14.25, "y":3.5},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":1.24},
-                {"matrix":[4,1], "x":1.24, "y":4.25, "w":1.25},
-                {"matrix":[4,2], "x":2.49, "y":4.25, "w":1.25},
-                {"matrix":[4,6], "x":3.74, "y":4.25, "w":6.25},
-                {"matrix":[4,10], "x":9.99, "y":4.25},
-                {"matrix":[4,11], "x":10.99, "y":4.25},
-                {"matrix":[4,12], "x":11.99, "y":4.25},
-                {"matrix":[4,13], "x":13.25, "y":4.5},
-                {"matrix":[4,14], "x":14.25, "y":4.5},
-                {"matrix":[4,15], "x":15.25, "y":4.5}
-            ]
-        }
     }
 }
\ No newline at end of file
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/info.json b/keyboards/keychron/q3_pro/ansi_encoder/info.json
index a2a0bfc562..50b57d199e 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/info.json
+++ b/keyboards/keychron/q3_pro/ansi_encoder/info.json
@@ -2,5 +2,113 @@
     "usb": {
     	"pid": "0x0630",
     	"device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_92": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0.25},
+
+                {"matrix":[0,1], "x":1.25, "y":0},
+                {"matrix":[0,2], "x":3.25, "y":0},
+                {"matrix":[0,3], "x":4.25, "y":0},
+                {"matrix":[0,4], "x":5.25, "y":0},
+                {"matrix":[0,5], "x":6.25, "y":0},
+                {"matrix":[0,6], "x":7.75, "y":0},
+                {"matrix":[0,7], "x":8.75, "y":0},
+                {"matrix":[0,8], "x":9.75, "y":0},
+                {"matrix":[0,9], "x":10.75, "y":0},
+                {"matrix":[0,10], "x":12.25, "y":0},
+                {"matrix":[0,11], "x":13.25, "y":0},
+                {"matrix":[0,12], "x":14.25, "y":0},
+                {"matrix":[0,13], "x":15.25, "y":0},
+                {"matrix":[0,14], "x":16.5, "y":0},
+                {"matrix":[0,15], "x":17.5, "y":0},
+                {"matrix":[0,16], "x":18.5, "y":0},
+
+                {"matrix":[1,0], "x":1.25, "y":1.25},
+                {"matrix":[1,1], "x":2.25, "y":1.25},
+                {"matrix":[1,2], "x":3.25, "y":1.25},
+                {"matrix":[1,3], "x":4.25, "y":1.25},
+                {"matrix":[1,4], "x":5.25, "y":1.25},
+                {"matrix":[1,5], "x":6.25, "y":1.25},
+                {"matrix":[1,6], "x":7.25, "y":1.25},
+                {"matrix":[1,7], "x":8.25, "y":1.25},
+                {"matrix":[1,8], "x":9.25, "y":1.25},
+                {"matrix":[1,9], "x":10.25, "y":1.25},
+                {"matrix":[1,10], "x":11.25, "y":1.25},
+                {"matrix":[1,11], "x":12.25, "y":1.25},
+                {"matrix":[1,12], "x":13.25, "y":1.25},
+                {"matrix":[1,13], "x":14.25, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":16.5, "y":1.25},
+                {"matrix":[1,15], "x":17.5, "y":1.25},
+                {"matrix":[1,16], "x":18.5, "y":1.25},
+
+                {"matrix":[1,17], "x":0, "y":1.5},
+
+                {"matrix":[2,0], "x":1.25, "y":2.25, "w":1.5},
+                {"matrix":[2,1], "x":2.75, "y":2.25},
+                {"matrix":[2,2], "x":3.75, "y":2.25},
+                {"matrix":[2,3], "x":4.75, "y":2.25},
+                {"matrix":[2,4], "x":5.75, "y":2.25},
+                {"matrix":[2,5], "x":6.75, "y":2.25},
+                {"matrix":[2,6], "x":7.75, "y":2.25},
+                {"matrix":[2,7], "x":8.75, "y":2.25},
+                {"matrix":[2,8], "x":9.75, "y":2.25},
+                {"matrix":[2,9], "x":10.75, "y":2.25},
+                {"matrix":[2,10], "x":11.75, "y":2.25},
+                {"matrix":[2,11], "x":12.75, "y":2.25},
+                {"matrix":[2,12], "x":13.75, "y":2.25},
+                {"matrix":[2,13], "x":14.75, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":16.5, "y":2.25},
+                {"matrix":[2,15], "x":17.5, "y":2.25},
+                {"matrix":[2,16], "x":18.5, "y":2.25},
+
+                {"matrix":[3,17], "x":0, "y":2.75},
+
+                {"matrix":[3,0], "x":1.25, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":3, "y":3.25},
+                {"matrix":[3,2], "x":4, "y":3.25},
+                {"matrix":[3,3], "x":5, "y":3.25},
+                {"matrix":[3,4], "x":6, "y":3.25},
+                {"matrix":[3,5], "x":7, "y":3.25},
+                {"matrix":[3,6], "x":8, "y":3.25},
+                {"matrix":[3,7], "x":9, "y":3.25},
+                {"matrix":[3,8], "x":10, "y":3.25},
+                {"matrix":[3,9], "x":11, "y":3.25},
+                {"matrix":[3,10], "x":12, "y":3.25},
+                {"matrix":[3,11], "x":13, "y":3.25},
+                {"matrix":[3,13], "x":14, "y":3.25, "w":2.25},
+
+                {"matrix":[4,17], "x":0, "y":4},
+
+                {"matrix":[4,0], "x":1.25, "y":4.25, "w":2.25},
+                {"matrix":[4,2], "x":3.5, "y":4.25},
+                {"matrix":[4,3], "x":4.5, "y":4.25},
+                {"matrix":[4,4], "x":5.5, "y":4.25},
+                {"matrix":[4,5], "x":6.5, "y":4.25},
+                {"matrix":[4,6], "x":7.5, "y":4.25},
+                {"matrix":[4,7], "x":8.5, "y":4.25},
+                {"matrix":[4,8], "x":9.5, "y":4.25},
+                {"matrix":[4,9], "x":10.5, "y":4.25},
+                {"matrix":[4,10], "x":11.5, "y":4.25},
+                {"matrix":[4,11], "x":12.5, "y":4.25},
+                {"matrix":[4,13], "x":13.5, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":17.5, "y":4.25},
+
+                {"matrix":[5,17], "x":0, "y":5.25},
+
+                {"matrix":[5,0], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5,1], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5,2], "x":3.75, "y":5.25, "w":1.25},
+                {"matrix":[5,6], "x":5, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":15, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":16.5, "y":5.25},
+                {"matrix":[5,15], "x":17.5, "y":5.25},
+                {"matrix":[5,16], "x":18.5, "y":5.25}
+            ]
+        }
     }
 }
diff --git a/keyboards/keychron/q3_pro/info.json b/keyboards/keychron/q3_pro/info.json
index 7837a1306a..93b771951b 100644
--- a/keyboards/keychron/q3_pro/info.json
+++ b/keyboards/keychron/q3_pro/info.json
@@ -59,113 +59,5 @@
             "splash": true,
             "solid_splash": true
         }
-    },
-    "layouts": {
-        "LAYOUT_ansi_92": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0.25},
-
-                {"matrix":[0,1], "x":1.25, "y":0},
-                {"matrix":[0,2], "x":3.25, "y":0},
-                {"matrix":[0,3], "x":4.25, "y":0},
-                {"matrix":[0,4], "x":5.25, "y":0},
-                {"matrix":[0,5], "x":6.25, "y":0},
-                {"matrix":[0,6], "x":7.75, "y":0},
-                {"matrix":[0,7], "x":8.75, "y":0},
-                {"matrix":[0,8], "x":9.75, "y":0},
-                {"matrix":[0,9], "x":10.75, "y":0},
-                {"matrix":[0,10], "x":12.25, "y":0},
-                {"matrix":[0,11], "x":13.25, "y":0},
-                {"matrix":[0,12], "x":14.25, "y":0},
-                {"matrix":[0,13], "x":15.25, "y":0},
-                {"matrix":[0,14], "x":16.5, "y":0},
-                {"matrix":[0,15], "x":17.5, "y":0},
-                {"matrix":[0,16], "x":18.5, "y":0},
-
-                {"matrix":[1,0], "x":1.25, "y":1.25},
-                {"matrix":[1,1], "x":2.25, "y":1.25},
-                {"matrix":[1,2], "x":3.25, "y":1.25},
-                {"matrix":[1,3], "x":4.25, "y":1.25},
-                {"matrix":[1,4], "x":5.25, "y":1.25},
-                {"matrix":[1,5], "x":6.25, "y":1.25},
-                {"matrix":[1,6], "x":7.25, "y":1.25},
-                {"matrix":[1,7], "x":8.25, "y":1.25},
-                {"matrix":[1,8], "x":9.25, "y":1.25},
-                {"matrix":[1,9], "x":10.25, "y":1.25},
-                {"matrix":[1,10], "x":11.25, "y":1.25},
-                {"matrix":[1,11], "x":12.25, "y":1.25},
-                {"matrix":[1,12], "x":13.25, "y":1.25},
-                {"matrix":[1,13], "x":14.25, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":16.5, "y":1.25},
-                {"matrix":[1,15], "x":17.5, "y":1.25},
-                {"matrix":[1,16], "x":18.5, "y":1.25},
-
-                {"matrix":[1,17], "x":0, "y":1.5},
-
-                {"matrix":[2,0], "x":1.25, "y":2.25, "w":1.5},
-                {"matrix":[2,1], "x":2.75, "y":2.25},
-                {"matrix":[2,2], "x":3.75, "y":2.25},
-                {"matrix":[2,3], "x":4.75, "y":2.25},
-                {"matrix":[2,4], "x":5.75, "y":2.25},
-                {"matrix":[2,5], "x":6.75, "y":2.25},
-                {"matrix":[2,6], "x":7.75, "y":2.25},
-                {"matrix":[2,7], "x":8.75, "y":2.25},
-                {"matrix":[2,8], "x":9.75, "y":2.25},
-                {"matrix":[2,9], "x":10.75, "y":2.25},
-                {"matrix":[2,10], "x":11.75, "y":2.25},
-                {"matrix":[2,11], "x":12.75, "y":2.25},
-                {"matrix":[2,12], "x":13.75, "y":2.25},
-                {"matrix":[2,13], "x":14.75, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":16.5, "y":2.25},
-                {"matrix":[2,15], "x":17.5, "y":2.25},
-                {"matrix":[2,16], "x":18.5, "y":2.25},
-
-                {"matrix":[3,17], "x":0, "y":2.75},
-
-                {"matrix":[3,0], "x":1.25, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":3, "y":3.25},
-                {"matrix":[3,2], "x":4, "y":3.25},
-                {"matrix":[3,3], "x":5, "y":3.25},
-                {"matrix":[3,4], "x":6, "y":3.25},
-                {"matrix":[3,5], "x":7, "y":3.25},
-                {"matrix":[3,6], "x":8, "y":3.25},
-                {"matrix":[3,7], "x":9, "y":3.25},
-                {"matrix":[3,8], "x":10, "y":3.25},
-                {"matrix":[3,9], "x":11, "y":3.25},
-                {"matrix":[3,10], "x":12, "y":3.25},
-                {"matrix":[3,11], "x":13, "y":3.25},
-                {"matrix":[3,13], "x":14, "y":3.25, "w":2.25},
-
-                {"matrix":[4,17], "x":0, "y":4},
-
-                {"matrix":[4,0], "x":1.25, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":3.5, "y":4.25},
-                {"matrix":[4,3], "x":4.5, "y":4.25}