Keychron QMK Configurator Refactor (#16034)

5 files changed, 173 insertions, 180 deletions

diff --git a/keyboards/keychron/q2/rev_0113/info.json b/keyboards/keychron/q2/rev_0113/info.json
new file mode 100644
index 0000000000..151f42455d
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/info.json
@@ -0,0 +1,161 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_iso_68": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0.25},
+                {"label":"1!", "x":1, "y":0.25},
+                {"label":"2\"", "x":2, "y":0.25},
+                {"label":"3\u00a3", "x":3, "y":0.25},
+                {"label":"4$", "x":4, "y":0.25},
+                {"label":"5%", "x":5, "y":0.25},
+                {"label":"6^", "x":6, "y":0.25},
+                {"label":"7&", "x":7, "y":0.25},
+                {"label":"8*", "x":8, "y":0.25},
+                {"label":"9(", "x":9, "y":0.25},
+                {"label":"0)", "x":10, "y":0.25},
+                {"label":"-_", "x":11, "y":0.25},
+                {"label":"=+", "x":12, "y":0.25},
+                {"label":"Backspace", "x":13, "y":0.25, "w":2},
+                {"label":"Mute", "x":15.25, "y":0},
+
+                {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.25},
+                {"label":"W", "x":2.5, "y":1.25},
+                {"label":"E", "x":3.5, "y":1.25},
+                {"label":"R", "x":4.5, "y":1.25},
+                {"label":"T", "x":5.5, "y":1.25},
+                {"label":"Y", "x":6.5, "y":1.25},
+                {"label":"U", "x":7.5, "y":1.25},
+                {"label":"I", "x":8.5, "y":1.25},
+                {"label":"O", "x":9.5, "y":1.25},
+                {"label":"P", "x":10.5, "y":1.25},
+                {"label":"[{", "x":11.5, "y":1.25},
+                {"label":"]}", "x":12.5, "y":1.25},
+                {"label":"Delete", "x":15.25, "y":1.25},
+
+                {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":2.25},
+                {"label":"S", "x":2.75, "y":2.25},
+                {"label":"D", "x":3.75, "y":2.25},
+                {"label":"F", "x":4.75, "y":2.25},
+                {"label":"G", "x":5.75, "y":2.25},
+                {"label":"H", "x":6.75, "y":2.25},
+                {"label":"J", "x":7.75, "y":2.25},
+                {"label":"K", "x":8.75, "y":2.25},
+                {"label":"L", "x":9.75, "y":2.25},
+                {"label":";:", "x":10.75, "y":2.25},
+                {"label":"'@", "x":11.75, "y":2.25},
+                {"label":"#~", "x":12.75, "y":2.25},
+                {"label":"Enter", "x":13.75, "y":1.25, "w":1.25, "h":2},
+                {"label":"Home", "x":15.25, "y":2.25},
+
+                {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3.25},
+                {"label":"Z", "x":2.25, "y":3.25},
+                {"label":"X", "x":3.25, "y":3.25},
+                {"label":"C", "x":4.25, "y":3.25},
+                {"label":"V", "x":5.25, "y":3.25},
+                {"label":"B", "x":6.25, "y":3.25},
+                {"label":"N", "x":7.25, "y":3.25},
+                {"label":"M", "x":8.25, "y":3.25},
+                {"label":",<", "x":9.25, "y":3.25},
+                {"label":".>", "x":10.25, "y":3.25},
+                {"label":"/?", "x":11.25, "y":3.25},
+                {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+                {"label":"Up", "x":14.25, "y":3.5},
+
+                {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":4.25},
+                {"label":"Fn1", "x":11, "y":4.25},
+                {"label":"Fn2", "x":12, "y":4.25},
+                {"label":"Left", "x":13.25, "y":4.5},
+                {"label":"Down", "x":14.25, "y":4.5},
+                {"label":"Right", "x":15.25, "y":4.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0.75},
+                {"label":"1!", "x":1, "y":0.75},
+                {"label":"2\"", "x":2, "y":0.75},
+                {"label":"3\u00a3", "x":3, "y":0.75},
+                {"label":"4$", "x":4, "y":0.75},
+                {"label":"5%", "x":5, "y":0.75},
+                {"label":"6^", "x":6, "y":0.75},
+                {"label":"7&", "x":7, "y":0.75},
+                {"label":"8*", "x":8, "y":0.75},
+                {"label":"9(", "x":9, "y":0.75},
+                {"label":"0)", "x":10, "y":0.75},
+                {"label":"-_", "x":11, "y":0.75},
+                {"label":"=+", "x":12, "y":0.75},
+                {"label":"Backspace", "x":13, "y":0.75, "w":2},
+                {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
+                {"label":"Mute", "x":15.25, "y":0.5},
+                {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
+
+                {"label":"Tab", "x":0, "y":1.75, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.75},
+                {"label":"W", "x":2.5, "y":1.75},
+                {"label":"E", "x":3.5, "y":1.75},
+                {"label":"R", "x":4.5, "y":1.75},
+                {"label":"T", "x":5.5, "y":1.75},
+                {"label":"Y", "x":6.5, "y":1.75},
+                {"label":"U", "x":7.5, "y":1.75},
+                {"label":"I", "x":8.5, "y":1.75},
+                {"label":"O", "x":9.5, "y":1.75},
+                {"label":"P", "x":10.5, "y":1.75},
+                {"label":"[{", "x":11.5, "y":1.75},
+                {"label":"]}", "x":12.5, "y":1.75},
+                {"label":"Delete", "x":15.25, "y":1.75},
+
+                {"label":"Caps Lock", "x":0, "y":2.75, "w":1.75},
+                {"label":"A", "x":1.75, "y":2.75},
+                {"label":"S", "x":2.75, "y":2.75},
+                {"label":"D", "x":3.75, "y":2.75},
+                {"label":"F", "x":4.75, "y":2.75},
+                {"label":"G", "x":5.75, "y":2.75},
+                {"label":"H", "x":6.75, "y":2.75},
+                {"label":"J", "x":7.75, "y":2.75},
+                {"label":"K", "x":8.75, "y":2.75},
+                {"label":"L", "x":9.75, "y":2.75},
+                {"label":";:", "x":10.75, "y":2.75},
+                {"label":"'@", "x":11.75, "y":2.75},
+                {"label":"#~", "x":12.75, "y":2.75},
+                {"label":"Enter", "x":13.75, "y":1.75, "w":1.25, "h":2},
+                {"label":"Home", "x":15.25, "y":2.75},
+
+                {"label":"Shift", "x":0, "y":3.75, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3.75},
+                {"label":"Z", "x":2.25, "y":3.75},
+                {"label":"X", "x":3.25, "y":3.75},
+                {"label":"C", "x":4.25, "y":3.75},
+                {"label":"V", "x":5.25, "y":3.75},
+                {"label":"B", "x":6.25, "y":3.75},
+                {"label":"N", "x":7.25, "y":3.75},
+                {"label":"M", "x":8.25, "y":3.75},
+                {"label":",<", "x":9.25, "y":3.75},
+                {"label":".>", "x":10.25, "y":3.75},
+                {"label":"/?", "x":11.25, "y":3.75},
+                {"label":"Shift", "x":12.25, "y":3.75, "w":1.75},
+                {"label":"Up", "x":14.25, "y":4},
+
+                {"label":"Ctrl", "x":0, "y":4.75, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4.75, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4.75, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4.75, "w":6.25},
+                {"label":"Alt", "x":10, "y":4.75},
+                {"label":"Fn1", "x":11, "y":4.75},
+                {"label":"Fn2", "x":12, "y":4.75},
+                {"label":"Left", "x":13.25, "y":5},
+                {"label":"Down", "x":14.25, "y":5},
+                {"label":"Right", "x":15.25, "y":5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/info.json b/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
deleted file mode 100644
index 8448d4c995..0000000000
--- a/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "keyboard_name": "Keychron Q2",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "layouts": {
-        "LAYOUT_iso_68": {
-            "layout": [
-            {"label":"Mute", "x":15.25, "y":0},
-
-            {"label":"Esc", "x":0, "y":0.25},
-            {"label":"!", "x":1, "y":0.25},
-            {"label":"@", "x":2, "y":0.25},
-            {"label":"", "x":3, "y":0.25},
-            {"label":"$", "x":4, "y":0.25},
-            {"label":"%", "x":5, "y":0.25},
-            {"label":"^", "x":6, "y":0.25},
-            {"label":"&", "x":7, "y":0.25},
-            {"label":"*", "x":8, "y":0.25},
-            {"label":"(", "x":9, "y":0.25},
-            {"label":")", "x":10, "y":0.25},
-            {"label":"_", "x":11, "y":0.25},
-            {"label":"+", "x":12, "y":0.25},
-            {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
-            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
-            {"label":"Q", "x":1.5, "y":1.25},
-            {"label":"W", "x":2.5, "y":1.25},
-            {"label":"E", "x":3.5, "y":1.25},
-            {"label":"R", "x":4.5, "y":1.25},
-            {"label":"T", "x":5.5, "y":1.25},
-            {"label":"Y", "x":6.5, "y":1.25},
-            {"label":"U", "x":7.5, "y":1.25},
-            {"label":"I", "x":8.5, "y":1.25},
-            {"label":"O", "x":9.5, "y":1.25},
-            {"label":"P", "x":10.5, "y":1.25},
-            {"label":"{", "x":11.5, "y":1.25},
-            {"label":"}", "x":12.5, "y":1.25},
-            {"label":"Delete", "x":15.25, "y":1.25},
-
-            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
-            {"label":"A", "x":1.75, "y":2.25},
-            {"label":"S", "x":2.75, "y":2.25},
-            {"label":"D", "x":3.75, "y":2.25},
-            {"label":"F", "x":4.75, "y":2.25},
-            {"label":"G", "x":5.75, "y":2.25},
-            {"label":"H", "x":6.75, "y":2.25},
-            {"label":"J", "x":7.75, "y":2.25},
-            {"label":"K", "x":8.75, "y":2.25},
-            {"label":"L", "x":9.75, "y":2.25},
-            {"label":":", "x":10.75, "y":2.25},
-            {"label":"\"", "x":11.75, "y":2.25},
-            {"label":"#~", "x":12.75, "y":2.25},
-            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
-            {"label":"Home", "x":15.25, "y":2.25},
-
-            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
-            {"label":"|", "x":1.25, "y":3.25},
-            {"label":"Z", "x":2.25, "y":3.25},
-            {"label":"X", "x":3.25, "y":3.25},
-            {"label":"C", "x":4.25, "y":3.25},
-            {"label":"V", "x":5.25, "y":3.25},
-            {"label":"B", "x":6.25, "y":3.25},
-            {"label":"N", "x":7.25, "y":3.25},
-            {"label":"M", "x":8.25, "y":3.25},
-            {"label":"<", "x":9.25, "y":3.25},
-            {"label":">", "x":10.25, "y":3.25},
-            {"label":"?", "x":11.25, "y":3.25},
-            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
-            {"label":"Up", "x":14.25, "y":3.5},
-
-            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
-            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
-            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
-            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
-            {"label":"Alt", "x":10, "y":4.25},
-            {"label":"Fn1", "x":11, "y":4.25},
-            {"label":"Fn2", "x":12, "y":4.25},
-            {"label":"Left", "x":13.25, "y":4.5},
-            {"label":"Down", "x":14.25, "y":4.5},
-            {"label":"Right", "x":15.25, "y":4.5} ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/info.json b/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
deleted file mode 100644
index 6111f83d23..0000000000
--- a/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "keyboard_name": "Keychron Q2",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "layouts": {
-        "LAYOUT_iso_68": {
-            "layout": [
-            {"label":"Mute", "x":15.25, "y":0, "w":0.75},
-            {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
-            {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
-
-            {"label":"Esc", "x":0, "y":0.25},
-            {"label":"!", "x":1, "y":0.25},
-            {"label":"@", "x":2, "y":0.25},
-            {"label":"", "x":3, "y":0.25},
-            {"label":"$", "x":4, "y":0.25},
-            {"label":"%", "x":5, "y":0.25},
-            {"label":"^", "x":6, "y":0.25},
-            {"label":"&", "x":7, "y":0.25},
-            {"label":"*", "x":8, "y":0.25},
-            {"label":"(", "x":9, "y":0.25},
-            {"label":")", "x":10, "y":0.25},
-            {"label":"_", "x":11, "y":0.25},
-            {"label":"+", "x":12, "y":0.25},
-            {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
-            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
-            {"label":"Q", "x":1.5, "y":1.25},
-            {"label":"W", "x":2.5, "y":1.25},
-            {"label":"E", "x":3.5, "y":1.25},
-            {"label":"R", "x":4.5, "y":1.25},
-            {"label":"T", "x":5.5, "y":1.25},
-            {"label":"Y", "x":6.5, "y":1.25},
-            {"label":"U", "x":7.5, "y":1.25},
-            {"label":"I", "x":8.5, "y":1.25},
-            {"label":"O", "x":9.5, "y":1.25},
-            {"label":"P", "x":10.5, "y":1.25},
-            {"label":"{", "x":11.5, "y":1.25},
-            {"label":"}", "x":12.5, "y":1.25},
-            {"label":"Delete", "x":15.25, "y":1.25},
-
-            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
-            {"label":"A", "x":1.75, "y":2.25},
-            {"label":"S", "x":2.75, "y":2.25},
-            {"label":"D", "x":3.75, "y":2.25},
-            {"label":"F", "x":4.75, "y":2.25},
-            {"label":"G", "x":5.75, "y":2.25},
-            {"label":"H", "x":6.75, "y":2.25},
-            {"label":"J", "x":7.75, "y":2.25},
-            {"label":"K", "x":8.75, "y":2.25},
-            {"label":"L", "x":9.75, "y":2.25},
-            {"label":":", "x":10.75, "y":2.25},
-            {"label":"\"", "x":11.75, "y":2.25},
-            {"label":"#~", "x":12.75, "y":2.25},
-            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
-            {"label":"Home", "x":15.25, "y":2.25},
-
-            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
-            {"label":"|", "x":1.25, "y":3.25},
-            {"label":"Z", "x":2.25, "y":3.25},
-            {"label":"X", "x":3.25, "y":3.25},
-            {"label":"C", "x":4.25, "y":3.25},
-            {"label":"V", "x":5.25, "y":3.25},
-            {"label":"B", "x":6.25, "y":3.25},
-            {"label":"N", "x":7.25, "y":3.25},
-            {"label":"M", "x":8.25, "y":3.25},
-            {"label":"<", "x":9.25, "y":3.25},
-            {"label":">", "x":10.25, "y":3.25},
-            {"label":"?", "x":11.25, "y":3.25},
-            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
-            {"label":"Up", "x":14.25, "y":3.5},
-
-            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
-            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
-            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
-            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
-            {"label":"Alt", "x":10, "y":4.25},
-            {"label":"Fn1", "x":11, "y":4.25},
-            {"label":"Fn2", "x":12, "y":4.25},
-            {"label":"Left", "x":13.25, "y":4.5},
-            {"label":"Down", "x":14.25, "y":4.5},
-            {"label":"Right", "x":15.25, "y":4.5} ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
index 9c7ad72be7..4e3b431bdf 100644
--- a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
@@ -37,39 +37,39 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,            KC_VOLD, KC_MUTE, KC_VOLU,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
-        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [WIN_BASE] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,            KC_VOLD, KC_MUTE, KC_VOLU,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [_FN1] = LAYOUT_all(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
         KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN2] = LAYOUT_all(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
         KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN3] = LAYOUT_all(
-        KC_WAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,   KC_TRNS,          KC_TRNS,
+        KC_WAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,   KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
         KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
 #if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
diff --git a/keyboards/keychron/q2/rev_0113/rev_0113.h b/keyboards/keychron/q2/rev_0113/rev_0113.h
index 21d20463e9..3b0b2d3377 100644
--- a/keyboards/keychron/q2/rev_0113/rev_0113.h
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.h
@@ -21,11 +21,11 @@
 #define XXX KC_NO
 
 #define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,\
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K47, K0E, K48,\
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1E,\
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D,      K2E,\
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
-    K40, K41, K42,                K46, K47, K48,      K4A, K4B, K4C, K4D, K2C, K4E \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K2C, K4E \
 ) { \
     { K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, }, \
     { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E, }, \