[Keyboard] Update Keychron Q5 (#22575)

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

19 files changed, 516 insertions, 349 deletions

diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c
index 26cebc996e..1b74c0eef9 100644
--- a/keyboards/keychron/q5/ansi/ansi.c
+++ b/keyboards/keychron/q5/ansi/ansi.c
@@ -132,36 +132,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, L_7,    J_7,    K_7}
 };
 
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17 },
-        { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, __, 33, 34, 35 },
-        { 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 70, 51, 52, 53 },
-        { 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 18, 66, 36, 67, 68, 69 },
-        { 71, __, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, __, 82, 83, 84, 85, 86 },
-        { 87, 88, 89, __, __, 99, 90, __, __, __, 91, 92, 93, 94, 95, 96, 97, 98 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {12,0},  {24,0},  {36,0},  {48,0},  {60,0},  {72,0},  {84,0},  {97,0},   {109,0},  {121,0},  {133,0},  {145,0},  {157,0},  {169,0},  {188,0},  {200,0},  {212,0},  {224,0},
-        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {84,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
-        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26}, {166,26},           {188,26}, {200,26}, {212,26},
-        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38},           {161,38},           {188,38}, {200,38}, {212,38}, {224,32},
-        {8,49},          {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49},           {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
-        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    4, 4, 4, 4,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
-        1, 1, 1,          1,          1, 1, 1, 1, 1, 1, 1, 1, 1
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi/config.h b/keyboards/keychron/q5/ansi/config.h
index 9ed58dd522..86df6f3056 100644
--- a/keyboards/keychron/q5/ansi/config.h
+++ b/keyboards/keychron/q5/ansi/config.h
@@ -16,13 +16,8 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 55
-#define DRIVER_2_LED_TOTAL 45
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 54
 
 /* Enable num-lock LED */
-// #define NUM_LOCK_LED_INDEX 33
+#define NUM_LOCK_LED_INDEX 33
diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
index 8795957c45..399b5873da 100644
--- a/keyboards/keychron/q5/ansi/info.json
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -1,18 +1,112 @@
 {
-    "keyboard_name": "Keychron Q5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0150",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 12, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 36, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 60, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 72, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 84, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 97, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 109, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 121, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 145, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 157, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 188, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 200, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 212, "y": 0, "flags": 1},
+            {"matrix": [3, 12], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 12, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 36, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 84, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 97, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 109, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 121, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 133, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 145, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 163, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 200, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 15, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 91, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 103, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 115, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 127, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 139, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 151, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 166, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+            {"matrix": [3, 0], "x": 5, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 21, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 57, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 81, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 94, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 130, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 161, "y": 38, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+            {"matrix": [4, 0], "x": 8, "y": 49, "flags": 1},
+            {"matrix": [4, 2], "x": 27, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 39, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 51, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 63, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 88, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 152, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 172, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 49, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 17, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 32, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 77, "y": 61, "flags": 1},
+            {"matrix": [5, 10], "x": 121, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 133, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 145, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 160, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 172, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 200, "y": 61, "flags": 1},
+            {"matrix": [5, 17], "x": 212, "y": 61, "flags": 1},
+            {"matrix": [5, 5], "x": 224, "y": 55, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0150"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_100": {
             "layout": [
@@ -107,7 +201,6 @@
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
                 {"matrix": [4, 16], "x": 16.5, "y": 4.25},
                 {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
                 {"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},
@@ -124,4 +217,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/ansi/rules.mk b/keyboards/keychron/q5/ansi/rules.mk
index 465dfa9348..c0d1417299 100644
--- a/keyboards/keychron/q5/ansi/rules.mk
+++ b/keyboards/keychron/q5/ansi/rules.mk
@@ -1,19 +1,4 @@
-# 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 USB 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
index 90a9310c64..646deb1115 100644
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
@@ -134,36 +134,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, L_7,    J_7,    K_7}
 };
 
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        {  0, __,  1,  2,  3,  4, __,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
-        { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, __, 31, 32, 33 },
-        { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 68, 49, 50, 51 },
-        { 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 16, 64, 34, 65, 66, 67 },
-        { 69, __, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, __, 80, 81, 82, 83, 84 },
-        { 85, 86, 87, __, __, 97, 88, __, __, __, 89, 90, 91, 92, 93, 94, 95, 96 }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},           {24,0},  {36,0},  {48,0},  {60,0},  {78,0},  {90,0},  {103,0},  {115,0},  {133,0},  {145,0},  {157,0},  {169,0},            {184,0},  {196,0},  {208,0},  {224,0},
-        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
-        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26}, {166,26},           {188,26}, {200,26}, {212,26},
-        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38},           {161,38},           {188,38}, {200,38}, {212,38}, {224,32},
-        {8,49},          {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49},           {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
-        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
-    },
-    {
-        // RGB LED Index to Flag
-        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    4, 4, 4, 4,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 4, 4, 4, 1
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi_encoder/config.h b/keyboards/keychron/q5/ansi_encoder/config.h
index 3986c11a02..dc0853bc34 100644
--- a/keyboards/keychron/q5/ansi_encoder/config.h
+++ b/keyboards/keychron/q5/ansi_encoder/config.h
@@ -16,16 +16,8 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 53
-#define DRIVER_2_LED_TOTAL 45
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 52
 
 /* Enable num-lock LED */
-// #define NUM_LOCK_LED_INDEX 31
+#define NUM_LOCK_LED_INDEX 31
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
index ae4a58e55d..479ef38e72 100644
--- a/keyboards/keychron/q5/ansi_encoder/info.json
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -1,23 +1,120 @@
 {
-    "keyboard_name": "Keychron Q5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0151",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 36, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 60, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 78, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 90, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 103, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 115, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 145, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 157, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 184, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 196, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 208, "y": 0, "flags": 1},
+            {"matrix": [3, 12], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 12, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 36, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 85, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 97, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 109, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 121, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 133, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 145, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 163, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 200, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 15, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 15, "flags": 4},
+
+            {"matrix": [2, 0], "x": 3, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 91, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 103, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 115, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 127, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 139, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 151, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 166, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+
+            {"matrix": [3, 0], "x": 5, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 21, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 57, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 81, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 94, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 130, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 161, "y": 38, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+
+            {"matrix": [4, 0], "x": 8, "y": 49, "flags": 1},
+            {"matrix": [4, 2], "x": 27, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 39, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 51, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 63, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 88, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 152, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 172, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 49, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 17, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 32, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 77, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 121, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 133, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 145, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 160, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 172, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 184, "y": 64, "flags": 4},
+            {"matrix": [5, 16], "x": 200, "y": 61, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 61, "flags": 4},
+            {"matrix": [5, 5], "x": 224, "y": 55, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0151"
+    },
     "layouts": {
         "LAYOUT_ansi_98": {
             "layout": [
@@ -110,7 +207,6 @@
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
                 {"matrix": [4, 16], "x": 16.5, "y": 4.25},
                 {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
                 {"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},
@@ -127,4 +223,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/ansi_encoder/rules.mk b/keyboards/keychron/q5/ansi_encoder/rules.mk
index 4c6e5bebf0..c0d1417299 100644
--- a/keyboards/keychron/q5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q5/ansi_encoder/rules.mk
@@ -1,20 +1,4 @@
-# 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 USB 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/keychron/q5/config.h b/keyboards/keychron/q5/config.h
index d9f5cfa76b..240baeea6c 100644
--- a/keyboards/keychron/q5/config.h
+++ b/keyboards/keychron/q5/config.h
@@ -26,9 +26,6 @@
 #define MATRIX_COL_PINS \
     { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
@@ -45,58 +42,5 @@
 /* turn off effects when suspended */
 #define RGB_MATRIX_SLEEP
 
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// 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
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
+/* Encoder Configuration*/
+#define ENCODER_DEFAULT_POS 0x3
\ No newline at end of file
diff --git a/keyboards/keychron/q5/info.json b/keyboards/keychron/q5/info.json
new file mode 100644
index 0000000000..243f70ddf1
--- /dev/null
+++ b/keyboards/keychron/q5/info.json
@@ -0,0 +1,53 @@
+{
+    "manufacturer": "Keychron",
+    "keyboard_name": "Keychron Q5",
+    "maintainer": "lalalademaxiya1",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "processor": "STM32L432",
+    "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": "snled27351"
+    },
+    "url": "https://github.com/Keychron",
+    "usb": {
+        "vid": "0x3434"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/iso/config.h b/keyboards/keychron/q5/iso/config.h
index df775f11f1..43c25dc78b 100644
--- a/keyboards/keychron/q5/iso/config.h
+++ b/keyboards/keychron/q5/iso/config.h
@@ -16,13 +16,8 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 55
-#define DRIVER_2_LED_TOTAL 46
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 53
 
 /* Enable num-lock LED */
-// #define NUM_LOCK_LED_INDEX 33
+#define NUM_LOCK_LED_INDEX 33
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
index 2cc2ce9640..35ba9f9d04 100644
--- a/keyboards/keychron/q5/iso/info.json
+++ b/keyboards/keychron/q5/iso/info.json
@@ -1,18 +1,118 @@
 {
-    "keyboard_name": "Keychron Q5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0152",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 12, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 36, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 60, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 72, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 85, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 97, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 109, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 121, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 145, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 157, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 188, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 200, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 212, "y": 0, "flags": 1},
+            {"matrix": [3, 12], "x": 224, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 12, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 36, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 85, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 97, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 109, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 121, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 133, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 145, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 163, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 200, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 15, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 15, "flags": 4},
+
+            {"matrix": [2, 0], "x": 3, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 91, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 103, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 115, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 127, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 139, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 151, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+
+            {"matrix": [3, 0], "x": 5, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 21, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 57, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 81, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 94, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 130, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 154, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 170, "y": 34, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+
+            {"matrix": [4, 0], "x": 3, "y": 49, "flags": 1},
+            {"matrix": [4, 1], "x": 15, "y": 49, "flags": 4},
+            {"matrix": [4, 2], "x": 27, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 39, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 51, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 63, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 88, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 152, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 172, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 49, "flags": 4},
+
+            {"matrix": [5, 0], "x": 1, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 17, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 32, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 77, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 121, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 133, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 145, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 160, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 172, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 200, "y": 61, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 61, "flags": 4},
+            {"matrix": [5, 5], "x": 224, "y": 55, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0152"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_iso_101": {
             "layout": [
@@ -125,4 +225,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c
index 48fdcb7363..e5a6399f7a 100644
--- a/keyboards/keychron/q5/iso/iso.c
+++ b/keyboards/keychron/q5/iso/iso.c
@@ -135,36 +135,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, L_7,    J_7,    K_7}
 };
 
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        {  0,  1,  2,  3,  4,  5,   6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17 },
-        { 19, 20, 21, 22, 23, 24,  25, 26, 27, 28, 29, 30, 31, 32, __, 33, 34, 35 },
-        { 37, 38, 39, 40, 41, 42,  43, 44, 45, 46, 47, 48, 49, 66, 70, 50, 51, 52 },
-        { 53, 54, 55, 56, 57, 58,  59, 60, 61, 62, 63, 64, 18, 65, 36, 67, 68, 69 },
-        { 71, 72, 73, 74, 75, 76,  77, 78, 79, 80, 81, 82, __, 83, 84, 85, 86, 87 },
-        { 88, 89, 90, __, __, 100, 91, __, __, __, 92, 93, 94, 95, 96, 97, 98, 99 },
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},  {12,0},  {24,0},  {36,0},  {48,0},  {60,0},  {72,0},  {85,0},  {97,0},   {109,0},  {121,0},  {133,0},  {145,0},  {157,0},  {169,0},  {188,0},  {200,0},  {212,0},  {224,0},
-        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
-        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26},                     {188,26}, {200,26}, {212,26},
-        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38}, {154,38}, {170,34},           {188,38}, {200,38}, {212,38}, {224,32},
-        {3,49}, {15,49}, {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49},           {152,49}, {172,52}, {188,49}, {200,49}, {212,49},
-        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    4, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 4, 4, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso/rules.mk b/keyboards/keychron/q5/iso/rules.mk
index 465dfa9348..c0d1417299 100644
--- a/keyboards/keychron/q5/iso/rules.mk
+++ b/keyboards/keychron/q5/iso/rules.mk
@@ -1,19 +1,4 @@
-# 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 USB 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/keychron/q5/iso_encoder/config.h b/keyboards/keychron/q5/iso_encoder/config.h
index 3a786cbb39..9611480fad 100644
--- a/keyboards/keychron/q5/iso_encoder/config.h
+++ b/keyboards/keychron/q5/iso_encoder/config.h
@@ -16,16 +16,8 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 53
-#define DRIVER_2_LED_TOTAL 46
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 51
 
 /* Enable num-lock LED */
-// #define NUM_LOCK_LED_INDEX 31
+#define NUM_LOCK_LED_INDEX 31
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
index a425cf3145..10e6767eaf 100644
--- a/keyboards/keychron/q5/iso_encoder/info.json
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -1,23 +1,117 @@
 {
-    "keyboard_name": "Keychron Q5",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0153",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "C14", "pin_b": "A2"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 24, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 36, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 48, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 60, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 78, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 90, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 103, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 115, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 133, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 145, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 157, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 169, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 184, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 196, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 208, "y": 0, "flags": 1},
+            {"matrix": [3, 12], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 1},
+            {"matrix": [1, 1], "x": 12, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 24, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 36, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 85, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 97, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 109, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 121, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 133, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 145, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 163, "y": 15, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 200, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 15, "flags": 4},
+            {"matrix": [3, 14], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 91, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 103, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 115, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 127, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 139, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 151, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 188, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 200, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+            {"matrix": [3, 0], "x": 5, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 21, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 33, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 57, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 81, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 94, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 118, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 130, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 154, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 170, "y": 34, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+            {"matrix": [4, 0], "x": 3, "y": 49, "flags": 1},
+            {"matrix": [4, 1], "x": 15, "y": 49, "flags": 4},
+            {"matrix": [4, 2], "x": 27, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 39, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 51, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 63, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 88, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 136, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 152, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 172, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 49, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 17, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 32, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 77, "y": 61, "flags": 4},
+            {"matrix": [5, 10], "x": 121, "y": 61, "flags": 1},
+            {"matrix": [5, 11], "x": 133, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 145, "y": 61, "flags": 1},
+            {"matrix": [5, 13], "x": 160, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 172, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 200, "y": 61, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 61, "flags": 4},
+            {"matrix": [5, 5], "x": 224, "y": 55, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0153"
+    },
     "layouts": {
         "LAYOUT_iso_99": {
             "layout": [
@@ -38,7 +132,6 @@
                 {"matrix": [0, 16], "x": 16.25, "y": 0},
                 {"matrix": [0, 17], "x": 17.25, "y": 0},
                 {"matrix": [3, 12], "x": 18.5, "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},
@@ -57,7 +150,6 @@
                 {"matrix": [1, 16], "x": 16.5, "y": 1.25},
                 {"matrix": [1, 17], "x": 17.5, "y": 1.25},
                 {"matrix": [3, 14], "x": 18.5, "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},
@@ -74,7 +166,6 @@
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
                 {"matrix": [2, 16], "x": 16.5, "y": 2.25},
                 {"matrix": [2, 17], "x": 17.5, "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},
@@ -93,7 +184,6 @@
                 {"matrix": [3, 16], "x": 16.5, "y": 3.25},
                 {"matrix": [3, 17], "x": 17.5, "y": 3.25},
                 {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
-
                 {"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},
@@ -111,7 +201,6 @@
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
                 {"matrix": [4, 16], "x": 16.5, "y": 4.25},
                 {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-
                 {"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},
@@ -128,4 +217,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
index 65b5c40c5a..887931c054 100644
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
@@ -133,36 +133,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, L_7,    J_7,    K_7}
 };
 
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        {  0, __,  1,  2,  3,  4, __,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
-        { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, __, 31, 32, 33 },
-        { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 64, 68, 48, 49, 50 },
-        { 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 16, 63, 34, 65, 66, 67 },
-        { 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, __, 81, 82, 83, 84, 85 },
-        { 86, 87, 88, __, __, 98, 89, __, __, __, 90, 91, 92, 93, 94, 95, 96, 97 },
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},           {24,0},  {36,0},  {48,0},  {60,0},  {78,0},  {90,0},  {103,0},  {115,0},  {133,0},  {145,0},  {157,0},  {169,0},            {184,0},  {196,0},  {208,0},  {224,0},
-        {0,15}, {12,15}, {24,15}, {36,15}, {48,15}, {60,15}, {72,15}, {85,15}, {97,15},  {109,15}, {121,15}, {133,15}, {145,15}, {163,15},           {188,15}, {200,15}, {212,15}, {224,15},
-        {3,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {91,26}, {103,26}, {115,26}, {127,26}, {139,26}, {151,26},                     {188,26}, {200,26}, {212,26},
-        {5,38}, {21,38}, {33,38}, {45,38}, {57,38}, {69,38}, {81,38}, {94,38}, {106,38}, {118,38}, {130,38}, {142,38}, {154,38}, {170,34},           {188,38}, {200,38}, {212,38}, {224,32},
-        {3,49}, {15,49}, {27,49}, {39,49}, {51,49}, {63,49}, {75,49}, {88,49}, {100,49}, {112,49}, {124,49}, {136,49}, {152,49},           {172,52}, {188,49}, {200,49}, {212,49},
-        {1,61}, {17,61}, {32,61},                            {77,61},                              {121,61}, {133,61}, {145,61}, {160,64}, {172,64}, {184,64}, {200,61}, {212,61}, {224,55},
-    },
-    {
-        // RGB LED Index to Flag
-        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    4, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 4, 4, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso_encoder/rules.mk b/keyboards/keychron/q5/iso_encoder/rules.mk
index 4c6e5bebf0..c0d1417299 100644
--- a/keyboards/keychron/q5/iso_encoder/rules.mk
+++ b/keyboards/keychron/q5/iso_encoder/rules.mk
@@ -1,20 +1,4 @@
-# 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 USB 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/keychron/q5/readme.md b/keyboards/keychron/q5/readme.md
index ac59839258..b78473cd2c 100644
--- a/keyboards/keychron/q5/readme.md
+++ b/keyboards/keychron/q5/readme.md
@@ -1,19 +1,27 @@
 # Keychron Q5
 
+![Keychron Q5](https://i.imgur.com/hgBjdtTh.jpg)
+
 A customizable 96% keyboard.
 
 * Keyboard Maintainer: [Keychron](https://github.com/keychron)
 * Hardware Supported: Keychron Q5
-* Hardware Availability: [Keychron](https://www.keychron.com)
+* Hardware Availability: [Keychron Q5 QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q5-qmk-custom-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
-  make keychron/q5/ansi:default
+    make keychron/q5/ansi:default
+    make keychron/q5/ansi_encoder:default
+    make keychron/q5/iso:default
+    make keychron/q5/iso_encoder:default
 
 Flashing example for this keyboard:
 
-  make keychron/q5/ansi:default:flash
+    make keychron/q5/ansi:default:flash
+    make keychron/q5/ansi_encoder:default:flash
+    make keychron/q5/iso:default:flash
+    make keychron/q5/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).
+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