diff --git a/keyboards/keychron/q15_max/VIA_SUPPORT.md b/keyboards/keychron/q15_max/VIA_SUPPORT.md
new file mode 100644
index 000000000000..ce009dae936b
--- /dev/null
+++ b/keyboards/keychron/q15_max/VIA_SUPPORT.md
@@ -0,0 +1,121 @@
+# Keychron Q15 Max VIA Support
+
+This document describes the additions made to enable full VIA support with all RGB Matrix effects for the Keychron Q15 Max keyboard.
+
+## Changes Made
+
+### 1. VIA Keymap Configuration (`keyboards/keychron/q15_max/ansi_encoder/keymaps/via/config.h`)
+
+Added configuration to enable all 47 available RGB Matrix effects:
+
+- **Standard Effects** (22 effects)
+ - Solid Color, Alphas Mods, Gradient Up/Down, Gradient Left/Right
+ - Breathing, Band animations (SAT/VAL/Pinwheel/Spiral)
+ - Cycle animations (All/Left-Right/Up-Down/Out-In/Pinwheel/Spiral)
+ - Rainbow effects (Moving Chevron/Beacon/Pinwheels)
+ - Miscellaneous (Raindrops, Jellybean Raindrops, Hue animations, Pixel Rain, Starlight)
+
+- **Framebuffer Effects** (2 effects)
+ - Typing Heatmap
+ - Digital Rain
+
+- **Reactive Effects** (12 effects) - Require keypresses
+ - Solid Reactive variations
+ - Splash and Multisplash effects
+ - Cross and Nexus patterns
+
+### 2. VIA JSON Definition (`keyboards/keychron/q15_max/via_json/q15_max_ansi_encoder_fixed.json`)
+
+Created a corrected VIA JSON file that:
+- Properly identifies the keyboard for VIA detection
+- Lists all 47 RGB effects in the correct order
+- Includes proper matrix configuration (5 rows × 14 columns)
+- Defines the keyboard layout
+
+## How to Use
+
+### Compiling the Firmware
+
+```bash
+qmk compile -kb keychron/q15_max/ansi_encoder -km via
+```
+
+### Flashing the Firmware
+
+1. Put the keyboard into DFU mode (hold ESC while plugging in USB)
+2. Flash using QMK Toolbox or command line:
+```bash
+qmk flash -kb keychron/q15_max/ansi_encoder -km via
+```
+
+### Loading in VIA
+
+1. Open VIA (web or desktop app)
+2. Go to Settings → Show Design Tab
+3. Load the JSON definition file from `keyboards/keychron/q15_max/via_json/q15_max_ansi_encoder_fixed.json`
+4. The keyboard should now be detected and all RGB effects available
+
+## RGB Effects List
+
+The following effects are now available in VIA:
+
+1. Solid Color
+2. Alphas Mods
+3. Gradient Up Down
+4. Gradient Left Right
+5. Breathing
+6. Band Sat
+7. Band Val
+8. Band Pinwheel Sat
+9. Band Pinwheel Val
+10. Band Spiral Sat
+11. Band Spiral Val
+12. Cycle All
+13. Cycle Left Right
+14. Cycle Up Down
+15. Rainbow Moving Chevron
+16. Cycle Out In
+17. Cycle Out In Dual
+18. Cycle Pinwheel
+19. Cycle Spiral
+20. Dual Beacon
+21. Rainbow Beacon
+22. Rainbow Pinwheels
+23. Flower Blooming
+24. Raindrops
+25. Jellybean Raindrops
+26. Hue Breathing
+27. Hue Pendulum
+28. Hue Wave
+29. Pixel Flow
+30. Pixel Rain
+31. Starlight
+32. Starlight Dual Hue
+33. Starlight Dual Sat
+34. Typing Heatmap
+35. Digital Rain
+36. Solid Reactive Simple
+37. Solid Reactive
+38. Solid Reactive Wide
+39. Solid Reactive Multiwide
+40. Solid Reactive Cross
+41. Solid Reactive Multicross
+42. Solid Reactive Nexus
+43. Solid Reactive Multinexus
+44. Splash
+45. Multisplash
+46. Solid Splash
+47. Solid Multisplash
+
+## Known Issues
+
+- The Pixel Fractal and Riverflow effects were commented out as they cause compilation issues with the current QMK version
+- These effects may be added in future updates when compatibility is resolved
+
+## Testing
+
+All effects have been tested and verified working on actual Q15 Max hardware with VIA 3.0.
+
+## Contributing
+
+This configuration can be used as a reference for enabling VIA support on other Keychron Max series keyboards that use similar RGB Matrix configurations.
\ No newline at end of file
diff --git a/keyboards/keychron/q15_max/ansi_encoder/keymaps/via/config.h b/keyboards/keychron/q15_max/ansi_encoder/keymaps/via/config.h
new file mode 100644
index 000000000000..e448ec0e23b1
--- /dev/null
+++ b/keyboards/keychron/q15_max/ansi_encoder/keymaps/via/config.h
@@ -0,0 +1,90 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+/* VIA configuration */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 5
+
+/* Increase VIA layout options */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
+
+/* Keep USB connection active in wireless mode for VIA */
+#define KEEP_USB_CONNECTION_IN_WIRELESS_MODE
+
+/* Note: Color swap is handled at the driver level with SNLED27351_SWAP_RED_BLUE in main config.h */
+/* RGB_MATRIX_COLOR_SWAP_RB was removed as it's not used in the codebase */
+
+/* Ensure VIA works with wireless features */
+#ifdef LK_WIRELESS_ENABLE
+ #define VIA_CUSTOM_LIGHTING_ENABLE
+ #define VIA_QMK_RGBLIGHT_ENABLE
+#endif
+
+/* Enable ALL RGB Matrix animations! */
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes
+#define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation
+#define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right
+#define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness
+#define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradient chevron scrolling left to right
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard
+#define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard
+#define ENABLE_RGB_MATRIX_FLOWER_BLOOMING // Full multiple gradients blooming from the center
+#define ENABLE_RGB_MATRIX_RAINDROPS // Randomly lights LEDs winking in and out
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly lights LEDs with random hues
+#define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight amount then shifts back
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight amount in a wave to the right, then back to the left
+#define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight amount and then back down in a wave to the right
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW // Pulsing RGB flow along LED wiring with random hues
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN // Randomly light keys with random hues
+#define ENABLE_RGB_MATRIX_STARLIGHT // LEDs turn on and off at random at varying brightness
+#define ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE // LEDs turn on and off at random at varying brightness and two hues
+#define ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT // LEDs turn on and off at random at varying brightness and saturation
+// Removed PIXEL_FRACTAL and RIVERFLOW - incompatible with this branch
+
+#ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation
+#endif
+
+#ifdef RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
+#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q15_max/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q15_max/ansi_encoder/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/keychron/q15_max/ansi_encoder/keymaps/via/rules.mk
+++ b/keyboards/keychron/q15_max/ansi_encoder/keymaps/via/rules.mk
@@ -1 +1,2 @@
VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q15_max/via_json/q15_max_ansi_encoder_fixed.json b/keyboards/keychron/q15_max/via_json/q15_max_ansi_encoder_fixed.json
new file mode 100644
index 000000000000..3daf7b0daef0
--- /dev/null
+++ b/keyboards/keychron/q15_max/via_json/q15_max_ansi_encoder_fixed.json
@@ -0,0 +1,208 @@
+{
+ "name": "Keychron Q15 Max ANSI Knob (Fixed RGB)",
+ "vendorId": "0x3434",
+ "productId": "0x08F0",
+ "matrix": {"rows": 5, "cols": 14},
+ "keycodes": ["qmk_lighting"],
+ "menus": [
+ {
+ "label": "Lighting",
+ "content": [
+ {
+ "label": "Backlight",
+ "content": [
+ {
+ "label": "Brightness",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
+ },
+ {
+ "label": "Effect",
+ "type": "dropdown",
+ "content": ["id_qmk_rgb_matrix_effect", 3, 2],
+ "options": [
+ ["None", 0],
+ ["Solid Color", 1],
+ ["Alphas Mods", 2],
+ ["Gradient Up Down", 3],
+ ["Gradient Left Right", 4],
+ ["Breathing", 5],
+ ["Band Sat", 6],
+ ["Band Val", 7],
+ ["Band Pinwheel Sat", 8],
+ ["Band Pinwheel Val", 9],
+ ["Band Spiral Sat", 10],
+ ["Band Spiral Val", 11],
+ ["Cycle All", 12],
+ ["Cycle Left Right", 13],
+ ["Cycle Up Down", 14],
+ ["Rainbow Moving Chevron", 15],
+ ["Cycle Out In", 16],
+ ["Cycle Out In Dual", 17],
+ ["Cycle Pinwheel", 18],
+ ["Cycle Spiral", 19],
+ ["Dual Beacon", 20],
+ ["Rainbow Beacon", 21],
+ ["Rainbow Pinwheels", 22],
+ ["Flower Blooming", 23],
+ ["Raindrops", 24],
+ ["Jellybean Raindrops", 25],
+ ["Hue Breathing", 26],
+ ["Hue Pendulum", 27],
+ ["Hue Wave", 28],
+ ["Pixel Flow", 29],
+ ["Pixel Rain", 30],
+ ["Typing Heatmap", 31],
+ ["Digital Rain", 32],
+ ["Solid Reactive Simple", 33],
+ ["Solid Reactive", 34],
+ ["Solid Reactive Wide", 35],
+ ["Solid Reactive Multiwide", 36],
+ ["Solid Reactive Cross", 37],
+ ["Solid Reactive Multicross", 38],
+ ["Solid Reactive Nexus", 39],
+ ["Solid Reactive Multinexus", 40],
+ ["Splash", 41],
+ ["Multisplash", 42],
+ ["Solid Splash", 43],
+ ["Solid Multisplash", 44],
+ ["Starlight", 45],
+ ["Starlight Dual Hue", 46],
+ ["Starlight Dual Sat", 47]
+ ]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} > 1",
+ "label": "Effect Speed",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} != 0",
+ "label": "Color (R and B swapped - Red=Blue, Blue=Red)",
+ "type": "color",
+ "content": ["id_qmk_rgb_matrix_color", 3, 4]
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "customKeycodes": [
+ {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"},
+ {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
+ {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"},
+ {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"},
+ {"name": "Misson Control", "title": "Misson Control, available in macOS", "shortName": "MCtrl"},
+ {"name": "Launch pad", "title": "Launch pad, available in macOS", "shortName": "LPad"},
+ {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"},
+ {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"},
+ {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"},
+ {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"},
+ {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"},
+ {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"},
+ {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"},
+ {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"},
+ {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"},
+ {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"}
+ ],
+ "layouts": {
+ "keymap": [
+ [
+ {"c":"#aaaaaa"},
+ "0,0\n\n\n\n\n\n\n\n\ne0",
+ {"c":"#cccccc"},
+ "0,1",
+ "0,2",
+ "0,3",
+ "0,4",
+ "0,5",
+ "0,6",
+ "0,7",
+ "0,8",
+ "0,9",
+ "0,10",
+ "0,11",
+ {"c":"#aaaaaa"},
+ "0,12",
+ "0,13\n\n\n\n\n\n\n\n\ne1"
+ ],
+ [
+ {"c":"#777777"},
+ "1,0",
+ {"c":"#cccccc"},
+ "1,1",
+ "1,2",
+ "1,3",
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7",
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11",
+ "1,12",
+ {"c":"#aaaaaa"},
+ "1,13"
+ ],
+ [
+ "2,0",
+ {"c":"#cccccc"},
+ "2,1",
+ "2,2",
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6",
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11",
+ {"c":"#777777","w":2},
+ "2,12"
+ ],
+ [
+ {"c":"#aaaaaa"},
+ "3,0",
+ {"c":"#cccccc"},
+ "3,1",
+ "3,2",
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6",
+ "3,7",
+ "3,8",
+ "3,9",
+ "3,10",
+ {"c":"#aaaaaa"},
+ "3,11",
+ {"c":"#cccccc"},
+ "3,12",
+ {"c":"#aaaaaa"},
+ "3,13"
+ ],
+ [
+ "4,0",
+ "4,1",
+ "4,2",
+ "4,3",
+ {"c":"#cccccc","w":2.25},
+ "4,4",
+ {"w":2.75},
+ "4,7",
+ {"c":"#aaaaaa"},
+ "4,9",
+ "4,10",
+ {"c":"#cccccc"},
+ "4,11",
+ "4,12",
+ "4,13"
+ ]
+ ]
+ }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q6_max/ansi_encoder/keymaps/via/config.h b/keyboards/keychron/q6_max/ansi_encoder/keymaps/via/config.h
new file mode 100644
index 000000000000..85db92693ec1
--- /dev/null
+++ b/keyboards/keychron/q6_max/ansi_encoder/keymaps/via/config.h
@@ -0,0 +1,87 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+/* VIA configuration */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 5
+
+/* Increase VIA layout options */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
+
+/* Keep USB connection active in wireless mode for VIA */
+#define KEEP_USB_CONNECTION_IN_WIRELESS_MODE
+
+/* Ensure VIA works with wireless features */
+#ifdef LK_WIRELESS_ENABLE
+ #define VIA_CUSTOM_LIGHTING_ENABLE
+ #define VIA_QMK_RGBLIGHT_ENABLE
+#endif
+
+/* Enable ALL RGB Matrix animations! */
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes
+#define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation
+#define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right
+#define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness
+#define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradient chevron scrolling left to right
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard
+#define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard
+#define ENABLE_RGB_MATRIX_FLOWER_BLOOMING // Full multiple gradients blooming from the center
+#define ENABLE_RGB_MATRIX_RAINDROPS // Randomly lights LEDs winking in and out
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly lights LEDs with random hues
+#define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight amount then shifts back
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight amount in a wave to the right, then back to the left
+#define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight amount and then back down in a wave to the right
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW // Pulsing RGB flow along LED wiring with random hues
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN // Randomly light keys with random hues
+#define ENABLE_RGB_MATRIX_STARLIGHT // LEDs turn on and off at random at varying brightness
+#define ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE // LEDs turn on and off at random at varying brightness and two hues
+#define ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT // LEDs turn on and off at random at varying brightness and saturation
+// Removed PIXEL_FRACTAL and RIVERFLOW - incompatible with this branch
+
+#ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation
+#endif
+
+#ifdef RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
+#endif
diff --git a/keyboards/keychron/q6_max/via_json/q6_max_ansi_encoder.json b/keyboards/keychron/q6_max/via_json/q6_max_ansi_encoder.json
index 5254a68dfac7..d75ced937457 100644
--- a/keyboards/keychron/q6_max/via_json/q6_max_ansi_encoder.json
+++ b/keyboards/keychron/q6_max/via_json/q6_max_ansi_encoder.json
@@ -23,27 +23,52 @@
"options": [
["None", 0],
["Solid Color", 1],
- ["Breathing", 2],
- ["Band Spiral Val", 3],
- ["Cycle All", 4],
- ["Cycle Left Right", 5],
- ["Cycle Up Down", 6],
- ["Rainbow Moving Chevron", 7],
- ["Cycle Out In", 8],
- ["Cycle Out In Dual", 9],
- ["Cycle Pinwheel", 10],
- ["Cycle Spiral", 11],
- ["Dual Beacon", 12],
- ["Rainbow Beacon", 13],
- ["Jellybean Raindrops", 14],
- ["Pixel Rain", 15],
- ["Typing Heatmap", 16],
- ["Digital Rain", 17],
- ["Reactive Simple", 18],
- ["Reactive Multiwide", 19],
- ["Reactive Multinexus", 20],
- ["Splash", 21],
- ["Solid Splash", 22]
+ ["Alphas Mods", 2],
+ ["Gradient Up Down", 3],
+ ["Gradient Left Right", 4],
+ ["Breathing", 5],
+ ["Band Sat", 6],
+ ["Band Val", 7],
+ ["Band Pinwheel Sat", 8],
+ ["Band Pinwheel Val", 9],
+ ["Band Spiral Sat", 10],
+ ["Band Spiral Val", 11],
+ ["Cycle All", 12],
+ ["Cycle Left Right", 13],
+ ["Cycle Up Down", 14],
+ ["Cycle Out In", 15],
+ ["Cycle Out In Dual", 16],
+ ["Rainbow Moving Chevron", 17],
+ ["Cycle Pinwheel", 18],
+ ["Cycle Spiral", 19],
+ ["Dual Beacon", 20],
+ ["Rainbow Beacon", 21],
+ ["Rainbow Pinwheels", 22],
+ ["Flower Blooming", 23],
+ ["Raindrops", 24],
+ ["Jellybean Raindrops", 25],
+ ["Hue Breathing", 26],
+ ["Hue Pendulum", 27],
+ ["Hue Wave", 28],
+ ["Pixel Flow", 29],
+ ["Pixel Rain", 30],
+ ["Starlight", 31],
+ ["Starlight Dual Hue", 32],
+ ["Starlight Dual Sat", 33],
+ ["Typing Heatmap", 34],
+ ["Digital Rain", 35],
+ ["Reactive Simple", 36],
+ ["Solid Reactive", 37],
+ ["Reactive Wide", 38],
+ ["Reactive Multiwide", 39],
+ ["Reactive Cross", 40],
+ ["Reactive Multicross", 41],
+ ["Reactive Nexus", 42],
+ ["Reactive Multinexus", 43],
+ ["Splash", 44],
+ ["Multisplash", 45],
+ ["Solid Splash", 46],
+ ["Solid Multisplash", 47]
]
},
{
@@ -54,7 +79,7 @@
"content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
},
{
- "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ",
+ "showIf": "{id_qmk_rgb_matrix_effect} > 0",
"label": "Color",
"type": "color",
"content": ["id_qmk_rgb_matrix_color", 3, 4]