[Keyboard] Update Keychron Q8 (#22578)

* Update Q8

* Run `qmk format-json` and remove `RGB_MATRIX_LED_COUNT`

* Update keyboards/keychron/q8/ansi_encoder/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/keychron/q8/iso/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

---------

Co-authored-by: Ryan <fauxpark@gmail.com>

19 files changed, 405 insertions, 337 deletions

diff --git a/keyboards/keychron/q8/ansi/ansi.c b/keyboards/keychron/q8/ansi/ansi.c
index 3bb10b383d..12cd9f9378 100644
--- a/keyboards/keychron/q8/ansi/ansi.c
+++ b/keyboards/keychron/q8/ansi/ansi.c
@@ -103,33 +103,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_1,    D_1,    E_1}
 };
 
-#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, 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, 57 },
-        { 58, 59, 60, 61, __, __, 62, 63, 64, 65, __, __, 66, 67, 68 },
-    },
-    {
-        // LED Index to Physical Position
-        {7,1},  {20,1},  {33,0},  {48,3},  {61,6},  {74,8 }, {87,11},  {106,11}, {119,8},  {132,6},  {145,3},  {160,0},  {173,1},  {193,1},            {220,0},
-        {7,14}, {24,14}, {39,14}, {52,17}, {65,20}, {78,22}, {103,25}, {116,22}, {129,20}, {142,17}, {155,14}, {170,14}, {183,14}, {200,14},           {222,16},
-        {6,27}, {24,27}, {39,28}, {52,30}, {65,33}, {78,36},           {109,37}, {122,34}, {135,32}, {148,29}, {162,27}, {176,27}, {197,27},           {224,29},
-        {7,40},          {28,40}, {43,42}, {56,44}, {69,47}, {82,50},  {102,52}, {115,49}, {128,46}, {141,44}, {154,41}, {169,40}, {187,40}, {209,43},
-        {0,53}, {17,53}, {42,55},          {65,60},          {86,64},  {107,64},           {131,59},           {156,54},           {196,56}, {209,56}, {222,56},
-    },
-    {
-        // RGB LED Index to Flag
-        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,
-        8, 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, 4,    1,    1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/ansi/config.h b/keyboards/keychron/q8/ansi/config.h
index cd2d037bb3..9cd663a216 100644
--- a/keyboards/keychron/q8/ansi/config.h
+++ b/keyboards/keychron/q8/ansi/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 34
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 30
diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index f733004270..2580b4163e 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -1,23 +1,85 @@
 {
-    "keyboard_name": "Keychron Q8",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0180",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 1, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 3, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 6, "flags": 4},
+            {"matrix": [0, 5], "x": 74, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 87, "y": 11, "flags": 4},
+            {"matrix": [0, 7], "x": 106, "y": 11, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 8, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 4},
+            {"matrix": [0, 10], "x": 145, "y": 3, "flags": 4},
+            {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 173, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 193, "y": 1, "flags": 1},
+            {"matrix": [0, 14], "x": 220, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 65, "y": 20, "flags": 4},
+            {"matrix": [1, 5], "x": 78, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 103, "y": 25, "flags": 4},
+            {"matrix": [1, 7], "x": 116, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 129, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 155, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 170, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 183, "y": 14, "flags": 4},
+            {"matrix": [1, 13], "x": 200, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 222, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 27, "flags": 8},
+            {"matrix": [2, 1], "x": 24, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 28, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 33, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 36, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 37, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 176, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 197, "y": 27, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 29, "flags": 1},
+
+            {"matrix": [3, 0], "x": 7, "y": 40, "flags": 1},
+            {"matrix": [3, 2], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 43, "y": 42, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 44, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 82, "y": 50, "flags": 4},
+            {"matrix": [3, 7], "x": 102, "y": 52, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 128, "y": 46, "flags": 4},
+            {"matrix": [3, 10], "x": 141, "y": 44, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 169, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 43, "flags": 1},
+
+            {"matrix": [4, 0], "x": 0, "y": 53, "flags": 1},
+            {"matrix": [4, 1], "x": 17, "y": 53, "flags": 1},
+            {"matrix": [4, 2], "x": 42, "y": 55, "flags": 1},
+            {"matrix": [4, 3], "x": 65, "y": 60, "flags": 4},
+            {"matrix": [4, 6], "x": 86, "y": 64, "flags": 1},
+            {"matrix": [4, 7], "x": 107, "y": 64, "flags": 1},
+            {"matrix": [4, 8], "x": 131, "y": 59, "flags": 4},
+            {"matrix": [4, 9], "x": 156, "y": 54, "flags": 1},
+            {"matrix": [4, 12], "x": 196, "y": 56, "flags": 1},
+            {"matrix": [4, 13], "x": 209, "y": 56, "flags": 1},
+            {"matrix": [4, 14], "x": 222, "y": 56, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0180"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
@@ -97,4 +159,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk
index cf31e094cb..7ff128fa69 100644
--- a/keyboards/keychron/q8/ansi/rules.mk
+++ b/keyboards/keychron/q8/ansi/rules.mk
@@ -1,14 +1 @@
-# 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
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
index 3bb10b383d..12cd9f9378 100644
--- a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
@@ -103,33 +103,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_1,    D_1,    E_1}
 };
 
-#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, 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, 57 },
-        { 58, 59, 60, 61, __, __, 62, 63, 64, 65, __, __, 66, 67, 68 },
-    },
-    {
-        // LED Index to Physical Position
-        {7,1},  {20,1},  {33,0},  {48,3},  {61,6},  {74,8 }, {87,11},  {106,11}, {119,8},  {132,6},  {145,3},  {160,0},  {173,1},  {193,1},            {220,0},
-        {7,14}, {24,14}, {39,14}, {52,17}, {65,20}, {78,22}, {103,25}, {116,22}, {129,20}, {142,17}, {155,14}, {170,14}, {183,14}, {200,14},           {222,16},
-        {6,27}, {24,27}, {39,28}, {52,30}, {65,33}, {78,36},           {109,37}, {122,34}, {135,32}, {148,29}, {162,27}, {176,27}, {197,27},           {224,29},
-        {7,40},          {28,40}, {43,42}, {56,44}, {69,47}, {82,50},  {102,52}, {115,49}, {128,46}, {141,44}, {154,41}, {169,40}, {187,40}, {209,43},
-        {0,53}, {17,53}, {42,55},          {65,60},          {86,64},  {107,64},           {131,59},           {156,54},           {196,56}, {209,56}, {222,56},
-    },
-    {
-        // RGB LED Index to Flag
-        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,
-        8, 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, 4,    1,    1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/ansi_encoder/config.h b/keyboards/keychron/q8/ansi_encoder/config.h
index 63d16c21af..9cd663a216 100644
--- a/keyboards/keychron/q8/ansi_encoder/config.h
+++ b/keyboards/keychron/q8/ansi_encoder/config.h
@@ -16,13 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 34
-#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 30
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index ccf9453d53..b3f82637db 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -1,28 +1,91 @@
 {
-    "keyboard_name": "Keychron Q8",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0181",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
-    },
-    "diode_direction": "ROW2COL",
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "B5", "pin_b": "A10"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 1, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 3, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 6, "flags": 4},
+            {"matrix": [0, 5], "x": 74, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 87, "y": 11, "flags": 4},
+            {"matrix": [0, 7], "x": 106, "y": 11, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 8, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 4},
+            {"matrix": [0, 10], "x": 145, "y": 3, "flags": 4},
+            {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 173, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 193, "y": 1, "flags": 1},
+            {"matrix": [0, 14], "x": 220, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 65, "y": 20, "flags": 4},
+            {"matrix": [1, 5], "x": 78, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 103, "y": 25, "flags": 4},
+            {"matrix": [1, 7], "x": 116, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 129, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 155, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 170, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 183, "y": 14, "flags": 4},
+            {"matrix": [1, 13], "x": 200, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 222, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 27, "flags": 8},
+            {"matrix": [2, 1], "x": 24, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 28, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 33, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 36, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 37, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 176, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 197, "y": 27, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 29, "flags": 1},
+
+            {"matrix": [3, 0], "x": 7, "y": 40, "flags": 1},
+            {"matrix": [3, 2], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 43, "y": 42, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 44, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 82, "y": 50, "flags": 4},
+            {"matrix": [3, 7], "x": 102, "y": 52, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 128, "y": 46, "flags": 4},
+            {"matrix": [3, 10], "x": 141, "y": 44, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 169, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 43, "flags": 1},
+
+            {"matrix": [4, 0], "x": 0, "y": 53, "flags": 1},
+            {"matrix": [4, 1], "x": 17, "y": 53, "flags": 1},
+            {"matrix": [4, 2], "x": 42, "y": 55, "flags": 1},
+            {"matrix": [4, 3], "x": 65, "y": 60, "flags": 4},
+            {"matrix": [4, 6], "x": 86, "y": 64, "flags": 1},
+            {"matrix": [4, 7], "x": 107, "y": 64, "flags": 1},
+            {"matrix": [4, 8], "x": 131, "y": 59, "flags": 4},
+            {"matrix": [4, 9], "x": 156, "y": 54, "flags": 1},
+            {"matrix": [4, 12], "x": 196, "y": 56, "flags": 1},
+            {"matrix": [4, 13], "x": 209, "y": 56, "flags": 1},
+            {"matrix": [4, 14], "x": 222, "y": 56, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0181"
+    },
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
@@ -87,7 +150,6 @@
                 {"matrix": [3, 12], "x": 14.25, "y": 3.25},
                 {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 14], "x": 17.25, "y": 3.5},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
@@ -102,4 +164,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk
index 5d77f09971..6e7633bfe0 100644
--- a/keyboards/keychron/q8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q8/ansi_encoder/rules.mk
@@ -1,15 +1 @@
-# 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
+# This file intentionally left blank
diff --git a/keyboards/keychron/q8/config.h b/keyboards/keychron/q8/config.h
index 7ecbf40b23..c7929db001 100644
--- a/keyboards/keychron/q8/config.h
+++ b/keyboards/keychron/q8/config.h
@@ -40,62 +40,8 @@
 /* Disable DIP switch in matrix data */
 #define MATRIX_MASKED
 
-/* Turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
+/* Encoder Configuration */
+#define ENCODER_DEFAULT_POS 0x3
 
-// 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
+/* Turn off effects when suspended */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
\ No newline at end of file
diff --git a/keyboards/keychron/q8/info.json b/keyboards/keychron/q8/info.json
new file mode 100644
index 0000000000..7f98bf537c
--- /dev/null
+++ b/keyboards/keychron/q8/info.json
@@ -0,0 +1,60 @@
+{
+    "manufacturer": "Keychron",
+    "keyboard_name": "Keychron Q8",
+    "maintainer": "lalalademaxiya1",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 5
+    },
+    "eeprom": {
+        "wear_levling": {
+            "backing_size": 4096
+        }  
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "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/q8/iso/config.h b/keyboards/keychron/q8/iso/config.h
index 99ba64d713..7a10ce6d65 100644
--- a/keyboards/keychron/q8/iso/config.h
+++ b/keyboards/keychron/q8/iso/config.h
@@ -16,10 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 35
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 29
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index 28d586984e..fe87955c39 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -1,23 +1,86 @@
 {
-    "keyboard_name": "Keychron Q8",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0182",
-        "device_version": "1.0.0"
-    },
     "rgb_matrix": {
-        "driver": "snled27351"
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 1, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 3, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 6, "flags": 4},
+            {"matrix": [0, 5], "x": 74, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 87, "y": 11, "flags": 4},
+            {"matrix": [0, 7], "x": 106, "y": 11, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 8, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 4},
+            {"matrix": [0, 10], "x": 145, "y": 3, "flags": 4},
+            {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 173, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 193, "y": 1, "flags": 1},
+            {"matrix": [0, 14], "x": 220, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 65, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 78, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 103, "y": 25, "flags": 4},
+            {"matrix": [1, 7], "x": 116, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 129, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 155, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 186, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 222, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 27, "flags": 8},
+            {"matrix": [2, 1], "x": 24, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 33, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 35, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 37, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 31, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 176, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 189, "y": 27, "flags": 4},
+            {"matrix": [1, 13], "x": 207, "y": 22, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 29, "flags": 1},
+
+            {"matrix": [3, 0], "x": 0, "y": 40, "flags": 1},
+            {"matrix": [3, 1], "x": 15, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 43, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 44, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 82, "y": 49, "flags": 4},
+            {"matrix": [3, 7], "x": 102, "y": 51, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 128, "y": 46, "flags": 4},
+            {"matrix": [3, 10], "x": 141, "y": 43, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 169, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 43, "flags": 1},
+
+            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 1},
+            {"matrix": [4, 1], "x": 17, "y": 52, "flags": 1},
+            {"matrix": [4, 2], "x": 42, "y": 54, "flags": 1},
+            {"matrix": [4, 3], "x": 65, "y": 59, "flags": 1},
+            {"matrix": [4, 6], "x": 86, "y": 63, "flags": 1},
+            {"matrix": [4, 7], "x": 104, "y": 64, "flags": 1},
+            {"matrix": [4, 8], "x": 129, "y": 59, "flags": 1},
+            {"matrix": [4, 9], "x": 153, "y": 54, "flags": 1},
+            {"matrix": [4, 12], "x": 196, "y": 56, "flags": 1},
+            {"matrix": [4, 13], "x": 209, "y": 56, "flags": 1},
+            {"matrix": [4, 14], "x": 222, "y": 59, "flags": 1}
+        ]
     },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0182"
     },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
@@ -83,7 +146,6 @@
                 {"matrix": [3, 12], "x": 14.25, "y": 3.25},
                 {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 14], "x": 17.25, "y": 3.5},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
@@ -98,4 +160,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q8/iso/iso.c b/keyboards/keychron/q8/iso/iso.c
index dbcefd76c0..55020c0c2b 100644
--- a/keyboards/keychron/q8/iso/iso.c
+++ b/keyboards/keychron/q8/iso/iso.c
@@ -103,33 +103,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_1,    D_1,    E_1}
 };
 
-#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, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 42, 28 },
-        { 29, 30, 31, 32, 33, 34, __, 35, 36, 37, 38, 39, 40, 41, 43 },
-        { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 },
-        { 59, 60, 61, 62, __, __, 63, 64, 65, 66, __, __, 67, 68, 69 },
-    },
-    {
-        // LED Index to Physical Position
-        {7,1},  {20,1},  {33,0},  {48,3},  {61,6},  {74,8},  {87,11},  {106,11}, {119,8},  {132,6},  {145,3},  {160,0},  {173,1},  {193,1},            {220,0},
-        {7,14}, {24,14}, {39,14}, {52,17}, {65,19}, {78,22}, {103,25}, {116,22}, {129,20}, {142,17}, {155,14}, {172,14}, {186,14},                     {222,16},
-        {6,27}, {24,27}, {39,27}, {52,30}, {65,33}, {78,35}, {109,37}, {122,34}, {135,31}, {148,29}, {162,27}, {176,27}, {189,27}, {207,22},           {224,29},
-        {0,40}, {15,40}, {28,40}, {43,41}, {56,44}, {69,47}, {82,49},  {102,51}, {115,49}, {128,46}, {141,43}, {154,41}, {169,40}, {187,40}, {209,43},
-        {0,52}, {17,52}, {42,54},          {65,59},          {86,63},  {104,64},           {129,59},           {153,54},           {196,56}, {209,56}, {222,59},
-    },
-    {
-        // RGB LED Index to Flag
-        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,
-        8, 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,
-        1, 1, 1,    1,    1,    1, 1,    1,    1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk
index cf31e094cb..7ff128fa69 100644
--- a/keyboards/keychron/q8/iso/rules.mk
+++ b/keyboards/keychron/q8/iso/rules.mk
@@ -1,14 +1 @@
-# 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
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q8/iso_encoder/config.h b/keyboards/keychron/q8/iso_encoder/config.h
index cdda41df5d..7a10ce6d65 100644
--- a/keyboards/keychron/q8/iso_encoder/config.h
+++ b/keyboards/keychron/q8/iso_encoder/config.h
@@ -16,13 +16,5 @@
 
 #pragma once
 
-/* RGB Matrix Configuration */
-#define DRIVER_1_LED_TOTAL 35
-#define DRIVER_2_LED_TOTAL 35
-#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 29
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index 0d96f3f193..46a93ec63b 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -1,28 +1,92 @@
 {
-    "keyboard_name": "Keychron Q8",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "usb": {
-        "vid": "0x3434",
-        "pid": "0x0183",
-        "device_version": "1.0.0"
-    },
-    "rgb_matrix": {
-        "driver": "snled27351"
-    },
-    "matrix_pins": {
-        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
-        "rows": ["B4", "B3", "A15", "A14", "A13"]
-    },
-    "diode_direction": "ROW2COL",
     "encoder": {
+        "enabled": true,
         "rotary": [
             {"pin_a": "B5", "pin_b": "A10"}
         ]
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 1, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 3, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 6, "flags": 4},
+            {"matrix": [0, 5], "x": 74, "y": 8, "flags": 4},
+            {"matrix": [0, 6], "x": 87, "y": 11, "flags": 4},
+            {"matrix": [0, 7], "x": 106, "y": 11, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 8, "flags": 4},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 4},
+            {"matrix": [0, 10], "x": 145, "y": 3, "flags": 4},
+            {"matrix": [0, 11], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 173, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 193, "y": 1, "flags": 1},
+            {"matrix": [0, 14], "x": 220, "y": 0, "flags": 1},
+
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 39, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 65, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 78, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 103, "y": 25, "flags": 4},
+            {"matrix": [1, 7], "x": 116, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 129, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 155, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 186, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 222, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 27, "flags": 8},
+            {"matrix": [2, 1], "x": 24, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 33, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 35, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 37, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 34, "flags": 4},
+            {"matrix": [2, 9], "x": 135, "y": 31, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 176, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 189, "y": 27, "flags": 4},
+            {"matrix": [1, 13], "x": 207, "y": 22, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 29, "flags": 1},
+
+            {"matrix": [3, 0], "x": 0, "y": 40, "flags": 1},
+            {"matrix": [3, 1], "x": 15, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 43, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 44, "flags": 4},
+            {"matrix": [3, 5], "x": 69, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 82, "y": 49, "flags": 4},
+            {"matrix": [3, 7], "x": 102, "y": 51, "flags": 4},
+            {"matrix": [3, 8], "x": 115, "y": 49, "flags": 4},
+            {"matrix": [3, 9], "x": 128, "y": 46, "flags": 4},
+            {"matrix": [3, 10], "x": 141, "y": 43, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 169, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 187, "y": 40, "flags": 1},
+            {"matrix": [3, 14], "x": 209, "y": 43, "flags": 1},
+
+            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 1},
+            {"matrix": [4, 1], "x": 17, "y": 52, "flags": 1},
+            {"matrix": [4, 2], "x": 42, "y": 54, "flags": 1},
+            {"matrix": [4, 3], "x": 65, "y": 59, "flags": 1},
+            {"matrix": [4, 6], "x": 86, "y": 63, "flags": 1},
+            {"matrix": [4, 7], "x": 104, "y": 64, "flags": 1},
+            {"matrix": [4, 8], "x": 129, "y": 59, "flags": 1},
+            {"matrix": [4, 9], "x": 153, "y": 54, "flags": 1},
+            {"matrix": [4, 12], "x": 196, "y": 56, "flags": 1},
+            {"matrix": [4, 13], "x": 209, "y": 56, "flags": 1},
+            {"matrix": [4, 14], "x": 222, "y": 59, "flags": 1}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0183"
+    },
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
@@ -103,4 +167,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.c b/keyboards/keychron/q8/iso_encoder/iso_encoder.c
index dbcefd76c0..55020c0c2b 100644
--- a/keyboards/keychron/q8/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q8/iso_encoder/iso_encoder.c
@@ -103,33 +103,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_1,    D_1,    E_1}
 };
 
-#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, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 42, 28 },
-        { 29, 30, 31, 32, 33, 34, __, 35, 36, 37, 38, 39, 40, 41, 43 },
-        { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 },
-        { 59, 60, 61, 62, __, __, 63, 64, 65, 66, __, __, 67, 68, 69 },
-    },
-    {
-        // LED Index to Physical Position
-        {7,1},  {20,1},  {33,0},  {48,3},  {61,6},  {74,8},  {87,11},  {106,11}, {119,8},  {132,6},  {145,3},  {160,0},  {173,1},  {193,1},            {220,0},
-        {7,14}, {24,14}, {39,14}, {52,17}, {65,19}, {78,22}, {103,25}, {116,22}, {129,20}, {142,17}, {155,14}, {172,14}, {186,14},                     {222,16},
-        {6,27}, {24,27}, {39,27}, {52,30}, {65,33}, {78,35}, {109,37}, {122,34}, {135,31}, {148,29}, {162,27}, {176,27}, {189,27}, {207,22},           {224,29},
-        {0,40}, {15,40}, {28,40}, {43,41}, {56,44}, {69,47}, {82,49},  {102,51}, {115,49}, {128,46}, {141,43}, {154,41}, {169,40}, {187,40}, {209,43},
-        {0,52}, {17,52}, {42,54},          {65,59},          {86,63},  {104,64},           {129,59},           {153,54},           {196,56}, {209,56}, {222,59},
-    },
-    {
-        // RGB LED Index to Flag
-        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,
-        8, 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,
-        1, 1, 1,    1,    1,    1, 1,    1,    1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk
index 5d77f09971..6e7633bfe0 100644
--- a/keyboards/keychron/q8/iso_encoder/rules.mk
+++ b/keyboards/keychron/q8/iso_encoder/rules.mk
@@ -1,15 +1 @@
-# 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
+# This file intentionally left blank
diff --git a/keyboards/keychron/q8/readme.md b/keyboards/keychron/q8/readme.md
index da200e2c18..eaa286899a 100644
--- a/keyboards/keychron/q8/readme.md
+++ b/keyboards/keychron/q8/readme.md
@@ -1,19 +1,27 @@
 # Keychron Q8
 
+![Keychron Q8](https://i.imgur.com/FQnOwRrh.jpg)
+
 A customizable 65% Alice layout keyboard.
 
 * Keyboard Maintainer: [Keychron](https://github.com/keychron)
 * Hardware Supported: Keychron Q8
-* Hardware Availability: [Keychron](https://www.keychron.com)
+* Hardware Availability: [Keychron Q8 (Alice Layout) QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q8-alice-layout-qmk-custom-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
     make keychron/q8/ansi:default
+    make keychron/q8/ansi_encoder:default
+    make keychron/q8/iso:default
+    make keychron/q8/iso_encoder:default
 
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+Flashing example for this keyboard:
 
     make keychron/q8/ansi:default:flash
+    make keychron/q8/ansi_encoder:default:flash
+    make keychron/q8/iso:default:flash
+    make keychron/q8/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