Update Keychron Q1v1 (#21993)

Co-authored-by: Drashna Jaelre <drashna@live.com>

103 files changed, 1028 insertions, 789 deletions

diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json
deleted file mode 100644
index 8ff2075747..0000000000
--- a/keyboards/keychron/q1/ansi/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "keyboard_name": "Q1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0100",
-        "device_version": "1.0.0",
-        "force_nkro": true
-    },
-    "rgb_matrix": {
-        "driver": "is31fl3733"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_ansi_82": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 2], "x": 1.25, "y": 0},
-                {"matrix": [0, 3], "x": 2.25, "y": 0},
-                {"matrix": [0, 4], "x": 3.25, "y": 0},
-                {"matrix": [0, 5], "x": 4.25, "y": 0},
-                {"matrix": [0, 6], "x": 5.5, "y": 0},
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.75, "y": 0},
-                {"matrix": [0, 11], "x": 10.75, "y": 0},
-                {"matrix": [0, 12], "x": 11.75, "y": 0},
-                {"matrix": [0, 13], "x": 12.75, "y": 0},
-                {"matrix": [4, 14], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 14], "x": 15.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [3, 12], "x": 14.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
-                {"matrix": [4, 12], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q1/ansi/rules.mk b/keyboards/keychron/q1/ansi/rules.mk
deleted file mode 100644
index 0379fdb94c..0000000000
--- a/keyboards/keychron/q1/ansi/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json
deleted file mode 100644
index ef361257f0..0000000000
--- a/keyboards/keychron/q1/ansi_encoder/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "Q1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0101",
-        "device_version": "1.0.0",
-        "force_nkro": true
-    },
-    "rgb_matrix": {
-        "driver": "is31fl3733"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "E6", "pin_b": "B7"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_ansi_82": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 2], "x": 1.25, "y": 0},
-                {"matrix": [0, 3], "x": 2.25, "y": 0},
-                {"matrix": [0, 4], "x": 3.25, "y": 0},
-                {"matrix": [0, 5], "x": 4.25, "y": 0},
-                {"matrix": [0, 6], "x": 5.5, "y": 0},
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.75, "y": 0},
-                {"matrix": [0, 11], "x": 10.75, "y": 0},
-                {"matrix": [0, 12], "x": 11.75, "y": 0},
-                {"matrix": [0, 13], "x": 12.75, "y": 0},
-                {"matrix": [4, 14], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 14], "x": 15.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [3, 12], "x": 14.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
-                {"matrix": [4, 12], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q1/ansi_encoder/rules.mk b/keyboards/keychron/q1/ansi_encoder/rules.mk
deleted file mode 100644
index d60167579e..0000000000
--- a/keyboards/keychron/q1/ansi_encoder/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h
deleted file mode 100644
index 543f62f9d8..0000000000
--- a/keyboards/keychron/q1/config.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 @ Keychron(https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* RGB Matrix Driver Configuration */
-#define IS31FL3733_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
-
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID  { {0,1} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* Disable RGB lighting when PC is in suspend */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json
deleted file mode 100644
index 424ed021e1..0000000000
--- a/keyboards/keychron/q1/iso/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "keyboard_name": "Q1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0102",
-        "device_version": "1.0.0",
-        "force_nkro": true
-    },
-    "rgb_matrix": {
-        "driver": "is31fl3733"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_iso_83": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 2], "x": 1.25, "y": 0},
-                {"matrix": [0, 3], "x": 2.25, "y": 0},
-                {"matrix": [0, 4], "x": 3.25, "y": 0},
-                {"matrix": [0, 5], "x": 4.25, "y": 0},
-                {"matrix": [0, 6], "x": 5.5, "y": 0},
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.75, "y": 0},
-                {"matrix": [0, 11], "x": 10.75, "y": 0},
-                {"matrix": [0, 12], "x": 11.75, "y": 0},
-                {"matrix": [0, 13], "x": 12.75, "y": 0},
-                {"matrix": [4, 14], "x": 14, "y": 0},
-                {"matrix": [0, 14], "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, 14], "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, 14], "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 14], "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": [3, 12], "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": [4, 12], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q1/iso/rules.mk b/keyboards/keychron/q1/iso/rules.mk
deleted file mode 100644
index 0379fdb94c..0000000000
--- a/keyboards/keychron/q1/iso/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json
deleted file mode 100644
index 250cd1ffb4..0000000000
--- a/keyboards/keychron/q1/iso_encoder/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "Keychron Q1",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0103",
-        "device_version": "1.0.2",
-        "force_nkro": true
-    },
-    "rgb_matrix": {
-        "driver": "is31fl3733"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "E6", "pin_b": "B7"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_iso_83": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 2], "x": 1.25, "y": 0},
-                {"matrix": [0, 3], "x": 2.25, "y": 0},
-                {"matrix": [0, 4], "x": 3.25, "y": 0},
-                {"matrix": [0, 5], "x": 4.25, "y": 0},
-                {"matrix": [0, 6], "x": 5.5, "y": 0},
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.75, "y": 0},
-                {"matrix": [0, 11], "x": 10.75, "y": 0},
-                {"matrix": [0, 12], "x": 11.75, "y": 0},
-                {"matrix": [0, 13], "x": 12.75, "y": 0},
-                {"matrix": [4, 14], "x": 14, "y": 0},
-                {"matrix": [0, 14], "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, 14], "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, 14], "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},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"matrix": [3, 14], "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": [3, 12], "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": [4, 12], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q1/iso_encoder/rules.mk b/keyboards/keychron/q1/iso_encoder/rules.mk
deleted file mode 100644
index d994ac1fad..0000000000
--- a/keyboards/keychron/q1/iso_encoder/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-RAW_ENABLE = yes
-LTO_ENABLE = yes
-
diff --git a/keyboards/keychron/q1/q1.c b/keyboards/keychron/q1/q1.c
deleted file mode 100644
index 3df62c4339..0000000000
--- a/keyboards/keychron/q1/q1.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-const matrix_row_t matrix_mask[] = {
-    0b0111111111111101,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-    0b0111111111111111,
-};
-
-#ifdef DIP_SWITCH_ENABLE
-
-bool dip_switch_update_kb(uint8_t index, bool active) {
-    if (!dip_switch_update_user(index, active)) { return false;}
-    if (index == 0) {
-        default_layer_set(1UL << (active ? 2 : 0));
-    }
-    return true;
-}
-
-#endif // DIP_SWITCH_ENABLE
diff --git a/keyboards/keychron/q1/readme.md b/keyboards/keychron/q1/readme.md
deleted file mode 100644
index 94b7a21f5b..0000000000
--- a/keyboards/keychron/q1/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Keychron Q1
-
-![Keychron Q1](https://cdn.shopify.com/s/files/1/0059/0630/1017/t/5/assets/pf-823ebdc7--1073.jpg)
-
-A customizable 75% keyboard.
-
-* Keyboard Maintainer: [Keychron](https://github.com/keychron)
-* Hardware Supported: Keychron Q1
-* Hardware Availability: [Keychron](https://www.keychron.com)
-
-Make example for this keyboard (after setting up your build environment):
-
-  make keychron/q1/ansi:default
-
-Flashing example for this keyboard:
-
-  make keychron/q1/ansi:default:flash
-
-**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v1/ansi/ansi.c
index bc559b3541..059745a129 100644
--- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1v1/ansi/ansi.c
@@ -16,7 +16,17 @@
 
 #include "quantum.h"
 
+const matrix_row_t matrix_mask[] = {
+    0b0111111111111101,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+};
+
 #ifdef RGB_MATRIX_ENABLE
+
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
@@ -111,38 +121,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_14,   D_14,   E_14},
     {1, F_15,   D_15,   E_15},
     {1, F_16,   D_16,   E_16}
-};
-
-#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, 14 },
-		{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
-		{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 },
-		{ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 71, 57, 58 },
-		{ 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 80, 70, 13 },
-		{ 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 81 }
-	},
-	{
-        // LED Index to Physical Position
-        {0,0},           {18,0},  {33,0},  {48,0},  {62,0},  {81,0},  {95,0},   {110,0},  {125,0},  {143,0},  {158,0},  {173,0},  {187,0},  {206,0},  {224,0},
-        {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15},           {224,15},
-        {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26},           {224,26},
-        {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38},           {196,38},           {224,38},
-        {9,49},          {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49},           {185,49}, {209,52},
-        {2,61}, {20,61}, {39,61},                            {94,61},                               {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
-    },
-	{
-        // RGB LED Index to Flag
-        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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1
-	}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1/iso/config.h b/keyboards/keychron/q1v1/ansi/config.h
index cb7b05560a..5eaa1e82f1 100644
--- a/keyboards/keychron/q1/iso/config.h
+++ b/keyboards/keychron/q1v1/ansi/config.h
@@ -17,6 +17,7 @@
 #pragma once
 
 /* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 59
-#define DRIVER_2_LED_TOTAL 24
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
\ No newline at end of file
+#define RGB_MATRIX_LED_COUNT 82
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 45
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi/info.json b/keyboards/keychron/q1v1/ansi/info.json
new file mode 100644
index 0000000000..028967d608
--- /dev/null
+++ b/keyboards/keychron/q1v1/ansi/info.json
@@ -0,0 +1,190 @@
+{
+    "usb": {
+        "pid": "0x0100",
+        "device_version": "1.0.0"
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [4, 14], "x": 206, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 162, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+
+            {"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 202, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
+
+            {"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
+            {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 196, "y": 38, "flags": 1},
+            {"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
+
+            {"matrix": [4, 0], "x": 9, "y": 49, "flags": 1},
+            {"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
+            {"matrix": [3, 12], "x": 209, "y": 52, "flags": 1},
+
+            {"matrix": [5, 0], "x":2, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x":20, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x":39, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x":94, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x":147, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x":162, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x":176, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x":195, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x":209, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x":224, "y": 64, "flags": 1}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [3, 12], "x": 14.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+                {"matrix": [4, 12], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q1/ansi/keymaps/default/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/default/keymap.c
index 092d446773..092d446773 100644
--- a/keyboards/keychron/q1/ansi/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/default/keymap.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/gtg465x/README.md b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/README.md
index c2d5799bb8..c2d5799bb8 100644
--- a/keyboards/keychron/q1/ansi/keymaps/gtg465x/README.md
+++ b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/README.md
diff --git a/keyboards/keychron/q1/ansi/keymaps/gtg465x/config.h b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/config.h
index 5ac05d04c1..5ac05d04c1 100644
--- a/keyboards/keychron/q1/ansi/keymaps/gtg465x/config.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/config.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap.c
index 8da475c3c6..8da475c3c6 100644
--- a/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap_user.h b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap_user.h
index 728114d556..728114d556 100644
--- a/keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap_user.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap_user.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/gtg465x/rgb_matrix_user.c b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.c
index b7d12f9466..b7d12f9466 100644
--- a/keyboards/keychron/q1/ansi/keymaps/gtg465x/rgb_matrix_user.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/gtg465x/rgb_matrix_user.h b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.h
index dead454167..dead454167 100644
--- a/keyboards/keychron/q1/ansi/keymaps/gtg465x/rgb_matrix_user.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/gtg465x/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rules.mk
index 42ba38028d..42ba38028d 100644
--- a/keyboards/keychron/q1/ansi/keymaps/gtg465x/rules.mk
+++ b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rules.mk
diff --git a/keyboards/keychron/q1/ansi/keymaps/keychron/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/keychron/keymap.c
index e7c9fddcdc..e7c9fddcdc 100644
--- a/keyboards/keychron/q1/ansi/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/keychron/keymap.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/keychron/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/keychron/rules.mk
index 495e8907b4..495e8907b4 100644
--- a/keyboards/keychron/q1/ansi/keymaps/keychron/rules.mk
+++ b/keyboards/keychron/q1v1/ansi/keymaps/keychron/rules.mk
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/config.h b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/config.h
index bc9fe405c3..bc9fe405c3 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/config.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/config.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap.c
index 4fc8ad58e5..4fc8ad58e5 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap_user.h b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap_user.h
index 87b1baf47f..87b1baf47f 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap_user.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap_user.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/readme.md
index 8ff2dbcc2c..8ff2dbcc2c 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md
+++ b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/readme.md
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/rgb_matrix_user.c b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.c
index c6fa5f1f15..c6fa5f1f15 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/rgb_matrix_user.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/rgb_matrix_user.h b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.h
index 1fb79c0b2a..1fb79c0b2a 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/rgb_matrix_user.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/mkillewald/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rules.mk
index af720e37ee..af720e37ee 100644
--- a/keyboards/keychron/q1/ansi/keymaps/mkillewald/rules.mk
+++ b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rules.mk
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/config.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/config.h
index 4378af4f58..4378af4f58 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/config.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/config.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap.c
index 77af30c5b6..77af30c5b6 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap_user.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap_user.h
index 57ac5258c2..57ac5258c2 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/keymap_user.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap_user.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/readme.md b/keyboards/keychron/q1v1/ansi/keymaps/teimor/readme.md
index 9aa16f9a89..9aa16f9a89 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/readme.md
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/readme.md
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/rgb_matrix_user.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.c
index fbc37fb5bf..fbc37fb5bf 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/rgb_matrix_user.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/rgb_matrix_user.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.h
index 5b53b5b8ec..5b53b5b8ec 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/rgb_matrix_user.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rules.mk
index bafb40484b..bafb40484b 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/rules.mk
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rules.mk
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_mac_caps.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.c
index dfb0346ff1..dfb0346ff1 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_mac_caps.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_mac_caps.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.h
index ef552a2c2c..ef552a2c2c 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_mac_caps.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_setup.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.c
index 07257e556a..07257e556a 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_setup.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_setup.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.h
index 5d2f4acd57..5d2f4acd57 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_setup.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_user.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_user.c
index ed8120572e..ed8120572e 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_user.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_user.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_win_caps.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.c
index 1c7c438d2e..1c7c438d2e 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_win_caps.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_win_caps.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.h
index 2289cce326..2289cce326 100644
--- a/keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_win_caps.h
+++ b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.h
diff --git a/keyboards/keychron/q1/ansi/keymaps/via/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/via/keymap.c
index 6cbf71baf5..6cbf71baf5 100644
--- a/keyboards/keychron/q1/ansi/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1v1/ansi/keymaps/via/keymap.c
diff --git a/keyboards/keychron/q1/ansi/keymaps/via/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/keychron/q1/ansi/keymaps/via/rules.mk
+++ b/keyboards/keychron/q1v1/ansi/keymaps/via/rules.mk
diff --git a/keyboards/keychron/q1/ansi/readme.md b/keyboards/keychron/q1v1/ansi/readme.md
index 5cf488f048..5cf488f048 100644
--- a/keyboards/keychron/q1/ansi/readme.md
+++ b/keyboards/keychron/q1v1/ansi/readme.md
diff --git a/keyboards/keychron/q1v1/ansi/rules.mk b/keyboards/keychron/q1v1/ansi/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/keychron/q1v1/ansi/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso/iso.c b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
index 619d89dffc..21bf8a6c0b 100644
--- a/keyboards/keychron/q1/iso/iso.c
+++ b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
@@ -16,6 +16,15 @@
 
 #include "quantum.h"
 
+const matrix_row_t matrix_mask[] = {
+    0b0111111111111101,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+};
+
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
@@ -69,6 +78,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, I_11,   G_11,   H_11},
     {0, I_12,   G_12,   H_12},
     {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
     {0, I_16,   G_16,   H_16},
 
     {0, L_1,    J_1,    K_1},
@@ -83,12 +93,10 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, L_10,   J_10,   K_10},
     {0, L_11,   J_11,   K_11},
     {0, L_12,   J_12,   K_12},
-	{0, L_14,   J_14,   K_14},
-	{0, I_14,   G_14,   H_14},
+    {0, L_14,   J_14,   K_14},
     {0, L_16,   J_16,   K_16},
 
     {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
     {1, C_3,    A_3,    B_3},
     {1, C_4,    A_4,    B_4},
     {1, C_5,    A_5,    B_5},
@@ -114,36 +122,4 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_16,   D_16,   E_16}
 };
 
-#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, 14 },
-		{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
-		{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 57, 43 },
-		{ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 72, 56, 58 },
-		{ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 81, 71, 13 },
-		{ 73, 74, 75, __, __, __, 76, __, __, __, 77, 78, 79, 80, 82 }
-	},
-	{
-        // LED Index to Physical Position
-        {0,0},           {18,0},  {33,0},  {48,0},  {62,0},  {81,0},  {95,0},   {110,0},  {125,0},  {143,0},  {158,0},  {173,0},  {187,0},  {206,0},  {224,0},
-        {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15},           {224,15},
-        {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26},                     {224,26},
-        {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {187,38}, {203,32},           {224,38},
-        {2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49},           {185,49}, {209,52},
-        {2,61}, {20,61}, {39,61}, {94,61},                            {147,61},                               {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
-	},
-	{
-        // RGB LED Index to Flag
-        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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,           4,         1, 1, 1, 1, 1, 1
-	}
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1/ansi/config.h b/keyboards/keychron/q1v1/ansi_encoder/config.h
index c6d4e44c87..e608b42c8d 100644
--- a/keyboards/keychron/q1/ansi/config.h
+++ b/keyboards/keychron/q1v1/ansi_encoder/config.h
@@ -17,6 +17,7 @@
 #pragma once
 
 /* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 59
-#define DRIVER_2_LED_TOTAL 23
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
\ No newline at end of file
+#define RGB_MATRIX_LED_COUNT 82
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v1/ansi_encoder/info.json b/keyboards/keychron/q1v1/ansi_encoder/info.json
new file mode 100644
index 0000000000..786c297fd3
--- /dev/null
+++ b/keyboards/keychron/q1v1/ansi_encoder/info.json
@@ -0,0 +1,196 @@
+{
+    "usb": {
+        "pid": "0x0101",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "E6", "pin_b": "B7"}
+        ]
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [4, 14], "x": 206, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 162, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+
+            {"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 202, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
+
+            {"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
+            {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 196, "y": 38, "flags": 1},
+            {"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
+
+            {"matrix": [4, 0], "x": 9, "y": 49, "flags": 1},
+            {"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
+            {"matrix": [3, 12], "x": 209, "y": 52, "flags": 1},
+
+            {"matrix": [5, 0], "x":2, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x":20, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x":39, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x":94, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x":147, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x":162, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x":176, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x":195, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x":209, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x":224, "y": 64, "flags": 1}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [3, 12], "x": 14.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+                {"matrix": [4, 12], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1v1/ansi_encoder/keymaps/default/keymap.c
index a4febc93c7..a4febc93c7 100644
--- a/keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1v1/ansi_encoder/keymaps/default/keymap.c
diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1v1/ansi_encoder/keymaps/default/rules.mk
index a40474b4d5..a40474b4d5 100644
--- a/keyboards/keychron/q1/ansi_encoder/keymaps/default/rules.mk
+++ b/keyboards/keychron/q1v1/ansi_encoder/keymaps/default/rules.mk
diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1v1/ansi_encoder/keymaps/keychron/keymap.c
index 88d0b49efd..88d0b49efd 100644
--- a/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q1v1/ansi_encoder/keymaps/keychron/keymap.c
diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1v1/ansi_encoder/keymaps/keychron/rules.mk
index 9cf1a9b56c..9cf1a9b56c 100644
--- a/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/rules.mk
+++ b/keyboards/keychron/q1v1/ansi_encoder/keymaps/keychron/rules.mk
diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1v1/ansi_encoder/keymaps/via/keymap.c
index 9372a1d814..9372a1d814 100644
--- a/keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1v1/ansi_encoder/keymaps/via/keymap.c
diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1v1/ansi_encoder/keymaps/via/rules.mk
index f1adcab005..f1adcab005 100644
--- a/keyboards/keychron/q1/ansi_encoder/keymaps/via/rules.mk
+++ b/keyboards/keychron/q1v1/ansi_encoder/keymaps/via/rules.mk
diff --git a/keyboards/keychron/q1/ansi_encoder/readme.md b/keyboards/keychron/q1v1/ansi_encoder/readme.md
index b89c9ad7ad..b89c9ad7ad 100644
--- a/keyboards/keychron/q1/ansi_encoder/readme.md
+++ b/keyboards/keychron/q1v1/ansi_encoder/readme.md
diff --git a/keyboards/keychron/q1v1/ansi_encoder/rules.mk b/keyboards/keychron/q1v1/ansi_encoder/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/keychron/q1v1/ansi_encoder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keychron/q1v1/config.h b/keyboards/keychron/q1v1/config.h
new file mode 100644
index 0000000000..93452f86fd
--- /dev/null
+++ b/keyboards/keychron/q1v1/config.h
@@ -0,0 +1,37 @@
+/* Copyright 2021 @ Keychron(https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* RGB Matrix Driver Configuration */
+#define IS31FL3733_DRIVER_COUNT 2
+#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_GND_VCC
+
+/* DIP switch */
+#define DIP_SWITCH_MATRIX_GRID  { {0,1} }
+
+/* Disable DIP switch in matrix data */
+#define MATRIX_MASKED
+
+/* Encoder Configuration*/
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Disable RGB lighting when PC is in suspend */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/info.json b/keyboards/keychron/q1v1/info.json
new file mode 100644
index 0000000000..26c846927b
--- /dev/null
+++ b/keyboards/keychron/q1v1/info.json
@@ -0,0 +1,54 @@
+{
+    "keyboard_name": "Keychron Q1v1",
+    "manufacturer": "Keychron",
+    "maintainer": "lalalademaxiya1",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "dip_switch": true,
+        "extrakey": true,
+        "lto": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
+    },
+    "processor": "atmega32u4",
+    "rgb_matrix": {
+        "animations": {
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "is31fl3733"
+    },
+    "url": "https://github.com/Keychron",
+    "usb": {
+        "force_nkro": true,
+        "vid": "0x3434"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q1/ansi_encoder/config.h b/keyboards/keychron/q1v1/iso/config.h
index 28bbea9087..b6a2563986 100644
--- a/keyboards/keychron/q1/ansi_encoder/config.h
+++ b/keyboards/keychron/q1v1/iso/config.h
@@ -17,6 +17,7 @@
 #pragma once
 
 /* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 59
-#define DRIVER_2_LED_TOTAL 23
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT 83
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 44
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/info.json b/keyboards/keychron/q1v1/iso/info.json
new file mode 100644
index 0000000000..2bd353803e
--- /dev/null
+++ b/keyboards/keychron/q1v1/iso/info.json
@@ -0,0 +1,192 @@
+{
+    "usb": {
+        "pid": "0x0102",
+        "device_version": "1.0.0"
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [4, 14], "x": 206, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 162, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+
+            {"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
+
+            {"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
+            {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 203, "y": 32, "flags": 1},
+            {"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
+
+            {"matrix": [4, 0], "x": 2, "y": 49, "flags": 1},
+            {"matrix": [4, 1], "x": 18, "y": 49, "flags": 4},
+            {"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
+            {"matrix": [3, 12], "x": 209, "y": 52, "flags": 1},
+
+            {"matrix": [5, 0], "x": 2, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 20, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 39, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 94, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 147, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 162, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 176, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+                {"matrix": [0, 14], "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, 14], "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, 14], "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "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": [3, 12], "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": [4, 12], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q1/ansi/ansi.c b/keyboards/keychron/q1v1/iso/iso.c
index ee586fef93..97ba2bce5b 100644
--- a/keyboards/keychron/q1/ansi/ansi.c
+++ b/keyboards/keychron/q1v1/iso/iso.c
@@ -16,8 +16,16 @@
 
 #include "quantum.h"
 
-#ifdef RGB_MATRIX_ENABLE
+const matrix_row_t matrix_mask[] = {
+    0b0111111111111101,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+};
 
+#ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
@@ -70,7 +78,6 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, I_11,   G_11,   H_11},
     {0, I_12,   G_12,   H_12},
     {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
     {0, I_16,   G_16,   H_16},
 
     {0, L_1,    J_1,    K_1},
@@ -85,10 +92,12 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, L_10,   J_10,   K_10},
     {0, L_11,   J_11,   K_11},
     {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
+	{0, L_14,   J_14,   K_14},
+	{0, I_14,   G_14,   H_14},
     {0, L_16,   J_16,   K_16},
 
     {1, C_1,    A_1,    B_1},
+    {1, C_2,    A_2,    B_2},
     {1, C_3,    A_3,    B_3},
     {1, C_4,    A_4,    B_4},
     {1, C_5,    A_5,    B_5},
@@ -112,7 +121,6 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_14,   D_14,   E_14},
     {1, F_15,   D_15,   E_15},
     {1, F_16,   D_16,   E_16}
-
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q1/iso/keymaps/default/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/default/keymap.c
index 080e2839c8..080e2839c8 100644
--- a/keyboards/keychron/q1/iso/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1v1/iso/keymaps/default/keymap.c
diff --git a/keyboards/keychron/q1/iso/keymaps/keychron/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/keychron/keymap.c
index d641f62c3f..d641f62c3f 100644
--- a/keyboards/keychron/q1/iso/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q1v1/iso/keymaps/keychron/keymap.c
diff --git a/keyboards/keychron/q1/iso/keymaps/keychron/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/keychron/rules.mk
index 495e8907b4..495e8907b4 100644
--- a/keyboards/keychron/q1/iso/keymaps/keychron/rules.mk
+++ b/keyboards/keychron/q1v1/iso/keymaps/keychron/rules.mk
diff --git a/keyboards/keychron/q1/iso/keymaps/kubahorak/README.md b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/README.md
index 3cfae17543..3cfae17543 100644
--- a/keyboards/keychron/q1/iso/keymaps/kubahorak/README.md
+++ b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/README.md
diff --git a/keyboards/keychron/q1/iso/keymaps/kubahorak/config.h b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/config.h
index 55dbb74d4a..55dbb74d4a 100644
--- a/keyboards/keychron/q1/iso/keymaps/kubahorak/config.h
+++ b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/config.h
diff --git a/keyboards/keychron/q1/iso/keymaps/kubahorak/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap.c
index 479988dfa9..479988dfa9 100644
--- a/keyboards/keychron/q1/iso/keymaps/kubahorak/keymap.c
+++ b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap.c
diff --git a/keyboards/keychron/q1/iso/keymaps/kubahorak/keymap_user.h b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap_user.h
index 728114d556..728114d556 100644
--- a/keyboards/keychron/q1/iso/keymaps/kubahorak/keymap_user.h
+++ b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap_user.h
diff --git a/keyboards/keychron/q1/iso/keymaps/kubahorak/rgb_matrix_user.c b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.c
index 638aa77eb0..638aa77eb0 100644
--- a/keyboards/keychron/q1/iso/keymaps/kubahorak/rgb_matrix_user.c
+++ b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.c
diff --git a/keyboards/keychron/q1/iso/keymaps/kubahorak/rgb_matrix_user.h b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.h
index dead454167..dead454167 100644
--- a/keyboards/keychron/q1/iso/keymaps/kubahorak/rgb_matrix_user.h
+++ b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.h
diff --git a/keyboards/keychron/q1/iso/keymaps/kubahorak/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rules.mk
index af720e37ee..af720e37ee 100644
--- a/keyboards/keychron/q1/iso/keymaps/kubahorak/rules.mk
+++ b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rules.mk
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/config.h b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/config.h
index bc9fe405c3..bc9fe405c3 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/config.h
+++ b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/config.h
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap.c
index f86a84e468..f86a84e468 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c
+++ b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap.c
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap_user.h b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap_user.h
index 87b1baf47f..87b1baf47f 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap_user.h
+++ b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap_user.h
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/readme.md
index 25d835b1c0..25d835b1c0 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md
+++ b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/readme.md
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c
index c6fa5f1f15..c6fa5f1f15 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c
+++ b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h
index 1fb79c0b2a..1fb79c0b2a 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h
+++ b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h
diff --git a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rules.mk
index af720e37ee..af720e37ee 100644
--- a/keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rules.mk
+++ b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rules.mk
diff --git a/keyboards/keychron/q1/iso/keymaps/via/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/via/keymap.c
index 4d9f158e1e..4d9f158e1e 100644
--- a/keyboards/keychron/q1/iso/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1v1/iso/keymaps/via/keymap.c
diff --git a/keyboards/keychron/q1/iso/keymaps/via/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/keychron/q1/iso/keymaps/via/rules.mk
+++ b/keyboards/keychron/q1v1/iso/keymaps/via/rules.mk
diff --git a/keyboards/keychron/q1/iso/keymaps/victorsavu3/config.h b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/config.h
index 02f08db4a7..02f08db4a7 100644
--- a/keyboards/keychron/q1/iso/keymaps/victorsavu3/config.h
+++ b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/config.h
diff --git a/keyboards/keychron/q1/iso/keymaps/victorsavu3/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/keymap.c
index 5256c97dca..5256c97dca 100644
--- a/keyboards/keychron/q1/iso/keymaps/victorsavu3/keymap.c
+++ b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/keymap.c
diff --git a/keyboards/keychron/q1/iso/keymaps/victorsavu3/readme.md b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/readme.md
index c96130816e..c96130816e 100644
--- a/keyboards/keychron/q1/iso/keymaps/victorsavu3/readme.md
+++ b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/readme.md
diff --git a/keyboards/keychron/q1/iso/keymaps/victorsavu3/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/rules.mk
index 853c414ec7..853c414ec7 100644
--- a/keyboards/keychron/q1/iso/keymaps/victorsavu3/rules.mk
+++ b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/rules.mk
diff --git a/keyboards/keychron/q1/iso/readme.md b/keyboards/keychron/q1v1/iso/readme.md
index 777ce04773..777ce04773 100644
--- a/keyboards/keychron/q1/iso/readme.md
+++ b/keyboards/keychron/q1v1/iso/readme.md
diff --git a/keyboards/keychron/q1v1/iso/rules.mk b/keyboards/keychron/q1v1/iso/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/keychron/q1v1/iso/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q1/iso_encoder/config.h b/keyboards/keychron/q1v1/iso_encoder/config.h
index 33916cf8c4..0907aa14af 100644
--- a/keyboards/keychron/q1/iso_encoder/config.h
+++ b/keyboards/keychron/q1v1/iso_encoder/config.h
@@ -17,9 +17,7 @@
 #pragma once
 
 /* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 59
-#define DRIVER_2_LED_TOTAL 24
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#define RGB_MATRIX_LED_COUNT 83
 
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 44
diff --git a/keyboards/keychron/q1v1/iso_encoder/info.json b/keyboards/keychron/q1v1/iso_encoder/info.json
new file mode 100644
index 0000000000..780fc7ae82
--- /dev/null
+++ b/keyboards/keychron/q1v1/iso_encoder/info.json
@@ -0,0 +1,199 @@
+{
+    "usb": {
+        "pid": "0x0103",
+        "device_version": "1.0.2"
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "E6", "pin_b": "B7"}
+        ]
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 33, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 62, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 81, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 95, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 110, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 125, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 143, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 158, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 187, "y": 0, "flags": 1},
+            {"matrix": [4, 14], "x": 206, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 15, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 44, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 59, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 73, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 103, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 118, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 132, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 147, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 162, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 176, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 198, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+
+            {"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 51, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 110, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 125, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 140, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 154, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 184, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
+
+            {"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
+            {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 40, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 114, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 129, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 143, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 158, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 173, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 203, "y": 32, "flags": 1},
+            {"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
+
+            {"matrix": [4, 0], "x": 2, "y": 49, "flags": 1},
+            {"matrix": [4, 1], "x": 18, "y": 49, "flags": 4},
+            {"matrix": [4, 2], "x": 33, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 77, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 151, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 165, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 185, "y": 49, "flags": 1},
+            {"matrix": [3, 12], "x": 209, "y": 52, "flags": 1},
+
+            {"matrix": [5, 0], "x": 2, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 20, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 39, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 94, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 147, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 162, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 176, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 195, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 209, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+                {"matrix": [0, 14], "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, 14], "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, 14], "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "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": [3, 12], "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": [4, 12], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
index c6b091fff1..7e01214430 100644
--- a/keyboards/keychron/q1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
@@ -16,6 +16,15 @@
 
 #include "quantum.h"
 
+const matrix_row_t matrix_mask[] = {
+    0b0111111111111101,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+    0b0111111111111111,
+};
+
 #ifdef RGB_MATRIX_ENABLE
 
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
@@ -115,36 +124,4 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_16,   D_16,   E_16}
 };
 
-#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, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
-        { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 57, 43 },
-        { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 72, 56, 58 },
-        { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 81, 71, 13 },
-        { 73, 74, 75, __, __, __, 76, __, __, __, 77, 78, 79, 80, 82 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {18,0},  {33,0},  {48,0},  {62,0},  {81,0},  {95,0},  {110,0},  {125,0},  {143,0},  {158,0},  {173,0},  {187,0},  {206,0},            {224,0},
-        {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15},           {224,15},
-        {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26},                     {224,26},
-        {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {187,38}, {203,32},           {224,38},
-        {2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49},           {185,49}, {209,52},
-        {2,61}, {20,61}, {39,61}, {94,61},                            {147,61},                               {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
-    },
-    {
-        // RGB LED Index to Flag
-        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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,           4,         1, 1, 1, 1, 1, 1
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1v1/iso_encoder/keymaps/default/keymap.c
index 237d9a3f1e..237d9a3f1e 100644
--- a/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1v1/iso_encoder/keymaps/default/keymap.c
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1v1/iso_encoder/keymaps/default/rules.mk
index a40474b4d5..a40474b4d5 100644
--- a/keyboards/keychron/q1/iso_encoder/keymaps/default/rules.mk
+++ b/keyboards/keychron/q1v1/iso_encoder/keymaps/default/rules.mk
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1v1/iso_encoder/keymaps/keychron/keymap.c
index b007e56fba..b007e56fba 100644
--- a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q1v1/iso_encoder/keymaps/keychron/keymap.c
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1v1/iso_encoder/keymaps/keychron/rules.mk
index 2d17902f98..2d17902f98 100644
--- a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/rules.mk
+++ b/keyboards/keychron/q1v1/iso_encoder/keymaps/keychron/rules.mk
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1v1/iso_encoder/keymaps/via/keymap.c
index 47f04d8a29..47f04d8a29 100644
--- a/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1v1/iso_encoder/keymaps/via/keymap.c
diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1v1/iso_encoder/keymaps/via/rules.mk
index 4253f570f0..4253f570f0 100644
--- a/keyboards/keychron/q1/iso_encoder/keymaps/via/rules.mk
+++ b/keyboards/keychron/q1v1/iso_encoder/keymaps/via/rules.mk
diff --git a/keyboards/keychron/q1/iso_encoder/readme.md b/keyboards/keychron/q1v1/iso_encoder/readme.md
index 66db24a197..66db24a197 100644
--- a/keyboards/keychron/q1/iso_encoder/readme.md
+++ b/keyboards/keychron/q1v1/iso_encoder/readme.md
diff --git a/keyboards/keychron/q1v1/iso_encoder/rules.mk b/keyboards/keychron/q1v1/iso_encoder/rules.mk
new file mode 100644
index 0000000000..6968c52335
--- /dev/null
+++ b/keyboards/keychron/q1v1/iso_encoder/rules.mk
@@ -0,0 +1,2 @@
+# This file intentionally left blank
+
diff --git a/keyboards/keychron/q1v1/q1v1.c b/keyboards/keychron/q1v1/q1v1.c
new file mode 100644
index 0000000000..2ed907adb9
--- /dev/null
+++ b/keyboards/keychron/q1v1/q1v1.c
@@ -0,0 +1,73 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef DIP_SWITCH_ENABLE
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+    if (!dip_switch_update_user(index, active)) { return false;}
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 2 : 0));
+    }
+    return true;
+}
+
+#endif // DIP_SWITCH_ENABLE
+
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) { return false; }
+    switch (keycode) {
+#ifdef RGB_MATRIX_ENABLE
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+#endif
+    }
+    return true;
+}
+
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { return false; }
+    // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+           RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+    return true;
+}
+
+#endif // CAPS_LOCK_LED_INDEX
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/readme.md b/keyboards/keychron/q1v1/readme.md
new file mode 100644
index 0000000000..af54da8195
--- /dev/null
+++ b/keyboards/keychron/q1v1/readme.md
@@ -0,0 +1,27 @@
+# Keychron Q1v1
+
+![Keychron Q1v1](https://i.imgur.com/BbJNGLY.jpg)
+
+A customizable 75% keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q1v1
+* Hardware Availability: [Keychron Q1v1 QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q1-qmk-custom-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keychron/q1v1/ansi:default
+    make keychron/q1v1/ansi_encoder:default
+    make keychron/q1v1/iso:default
+    make keychron/q1v1/iso_encoder:default
+
+Flashing example for this keyboard:
+
+    make keychron/q1v1/ansi:default:flash
+    make keychron/q1v1/ansi_encoder:default:flash
+    make keychron/q1v1/iso:default:flash
+    make keychron/q1v1/iso_encoder:default:flash
+
+**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file