diff --git a/keyboards/keychron/k10_pro/ansi/rgb/config.h b/keyboards/keychron/k10_pro/ansi/rgb/config.h
index 7416c60cd2..703644657a 100644
--- a/keyboards/keychron/k10_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k10_pro/ansi/rgb/config.h
@@ -48,54 +48,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30 }
diff --git a/keyboards/keychron/k10_pro/ansi/rgb/info.json b/keyboards/keychron/k10_pro/ansi/rgb/info.json
index 40448576ff..ad52f9670c 100644
--- a/keyboards/keychron/k10_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k10_pro/ansi/rgb/info.json
@@ -1,130 +1,35 @@
 {
-    "keyboard_name": "Keychron K10 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x02A0",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_108": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[0,17], "x":18.5, "y":0},
-                {"matrix":[0,18], "x":19.5, "y":0},
-                {"matrix":[0,19], "x":20.5, "y":0},
-                {"matrix":[0,20], "x":21.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},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[1,17], "x":18.5, "y":1.25},
-                {"matrix":[1,18], "x":19.5, "y":1.25},
-                {"matrix":[1,19], "x":20.5, "y":1.25},
-                {"matrix":[1,20], "x":21.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},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-		        {"matrix":[2,17], "x":18.5, "y":2.25},
-                {"matrix":[2,18], "x":19.5, "y":2.25},
-                {"matrix":[2,19], "x":20.5, "y":2.25},
-                {"matrix":[2,20], "x":21.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},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,17], "x":18.5, "y":3.25},
-                {"matrix":[3,18], "x":19.5, "y":3.25},
-                {"matrix":[3,19], "x":20.5, "y":3.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25},
-                {"matrix":[4,18], "x":19.5, "y":4.25},
-                {"matrix":[4,19], "x":20.5, "y":4.25},
-                {"matrix":[4,20], "x":21.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},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25},
-                {"matrix":[5,17], "x":18.5, "y":5.25},
-                {"matrix":[5,19], "x":20.5, "y":5.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k10_pro/ansi/rgb/rules.mk b/keyboards/keychron/k10_pro/ansi/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k10_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k10_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k10_pro/ansi/white/config.h b/keyboards/keychron/k10_pro/ansi/white/config.h
index 97e7457086..22ed7ea697 100644
--- a/keyboards/keychron/k10_pro/ansi/white/config.h
+++ b/keyboards/keychron/k10_pro/ansi/white/config.h
@@ -39,32 +39,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-//#    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-//#    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-//#    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 8 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_8CHANNEL
 
@@ -72,4 +46,4 @@
 #    define CKLED2001_CURRENT_TUNE \
         { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/keyboards/keychron/k10_pro/ansi/white/info.json b/keyboards/keychron/k10_pro/ansi/white/info.json
index 20190bf7ce..13928a7773 100644
--- a/keyboards/keychron/k10_pro/ansi/white/info.json
+++ b/keyboards/keychron/k10_pro/ansi/white/info.json
@@ -1,130 +1,30 @@
 {
-    "keyboard_name": "Keychron K10 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x02A3",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_108": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[0,17], "x":18.5, "y":0},
-                {"matrix":[0,18], "x":19.5, "y":0},
-                {"matrix":[0,19], "x":20.5, "y":0},
-                {"matrix":[0,20], "x":21.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},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[1,17], "x":18.5, "y":1.25},
-                {"matrix":[1,18], "x":19.5, "y":1.25},
-                {"matrix":[1,19], "x":20.5, "y":1.25},
-                {"matrix":[1,20], "x":21.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},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-		        {"matrix":[2,17], "x":18.5, "y":2.25},
-                {"matrix":[2,18], "x":19.5, "y":2.25},
-                {"matrix":[2,19], "x":20.5, "y":2.25},
-                {"matrix":[2,20], "x":21.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},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,17], "x":18.5, "y":3.25},
-                {"matrix":[3,18], "x":19.5, "y":3.25},
-                {"matrix":[3,19], "x":20.5, "y":3.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25},
-                {"matrix":[4,18], "x":19.5, "y":4.25},
-                {"matrix":[4,19], "x":20.5, "y":4.25},
-                {"matrix":[4,20], "x":21.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},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25},
-                {"matrix":[5,17], "x":18.5, "y":5.25},
-                {"matrix":[5,19], "x":20.5, "y":5.25}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k10_pro/ansi/white/rules.mk b/keyboards/keychron/k10_pro/ansi/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k10_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k10_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k10_pro/config.h b/keyboards/keychron/k10_pro/config.h
index 88efdab338..9fe5a4aa58 100644
--- a/keyboards/keychron/k10_pro/config.h
+++ b/keyboards/keychron/k10_pro/config.h
@@ -16,26 +16,10 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 21
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { B0, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN,  NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k10_pro/info.json b/keyboards/keychron/k10_pro/info.json
new file mode 100644
index 0000000000..f17910af4c
--- /dev/null
+++ b/keyboards/keychron/k10_pro/info.json
@@ -0,0 +1,266 @@
+{
+    "keyboard_name": "Keychron K10 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 21
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,  null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_108": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,17], "x":18.5, "y":0},
+                {"matrix":[0,18], "x":19.5, "y":0},
+                {"matrix":[0,19], "x":20.5, "y":0},
+                {"matrix":[0,20], "x":21.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},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[1,19], "x":20.5, "y":1.25},
+                {"matrix":[1,20], "x":21.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},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[2,19], "x":20.5, "y":2.25},
+                {"matrix":[2,20], "x":21.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},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,19], "x":20.5, "y":3.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25},
+                {"matrix":[4,18], "x":19.5, "y":4.25},
+                {"matrix":[4,19], "x":20.5, "y":4.25},
+                {"matrix":[4,20], "x":21.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},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25},
+                {"matrix":[5,17], "x":18.5, "y":5.25},
+                {"matrix":[5,19], "x":20.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_iso_109": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":2, "y":0},
+                {"matrix":[0,2], "x":3, "y":0},
+                {"matrix":[0,3], "x":4, "y":0},
+                {"matrix":[0,4], "x":5, "y":0},
+                {"matrix":[0,5], "x":6.5, "y":0},
+                {"matrix":[0,6], "x":7.5, "y":0},
+                {"matrix":[0,7], "x":8.5, "y":0},
+                {"matrix":[0,8], "x":9.5, "y":0},
+                {"matrix":[0,9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,17], "x":18.5, "y":0},
+                {"matrix":[0,18], "x":19.5, "y":0},
+                {"matrix":[0,19], "x":20.5, "y":0},
+                {"matrix":[0,20], "x":21.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},
+                {"matrix":[1,3], "x":3, "y":1.25},
+                {"matrix":[1,4], "x":4, "y":1.25},
+                {"matrix":[1,5], "x":5, "y":1.25},
+                {"matrix":[1,6], "x":6, "y":1.25},
+                {"matrix":[1,7], "x":7, "y":1.25},
+                {"matrix":[1,8], "x":8, "y":1.25},
+                {"matrix":[1,9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[1,19], "x":20.5, "y":1.25},
+                {"matrix":[1,20], "x":21.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},
+                {"matrix":[2,3], "x":3.5, "y":2.25},
+                {"matrix":[2,4], "x":4.5, "y":2.25},
+                {"matrix":[2,5], "x":5.5, "y":2.25},
+                {"matrix":[2,6], "x":6.5, "y":2.25},
+                {"matrix":[2,7], "x":7.5, "y":2.25},
+                {"matrix":[2,8], "x":8.5, "y":2.25},
+                {"matrix":[2,9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[2,19], "x":20.5, "y":2.25},
+                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":1.75, "y":3.25},
+                {"matrix":[3,2], "x":2.75, "y":3.25},
+                {"matrix":[3,3], "x":3.75, "y":3.25},
+                {"matrix":[3,4], "x":4.75, "y":3.25},
+                {"matrix":[3,5], "x":5.75, "y":3.25},
+                {"matrix":[3,6], "x":6.75, "y":3.25},
+                {"matrix":[3,7], "x":7.75, "y":3.25},
+                {"matrix":[3,8], "x":8.75, "y":3.25},
+                {"matrix":[3,9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,19], "x":20.5, "y":3.25},
+
+                {"matrix":[4,0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4,1], "x":1.25, "y":4.25},
+                {"matrix":[4,2], "x":2.25, "y":4.25},
+                {"matrix":[4,3], "x":3.25, "y":4.25},
+                {"matrix":[4,4], "x":4.25, "y":4.25},
+                {"matrix":[4,5], "x":5.25, "y":4.25},
+                {"matrix":[4,6], "x":6.25, "y":4.25},
+                {"matrix":[4,7], "x":7.25, "y":4.25},
+                {"matrix":[4,8], "x":8.25, "y":4.25},
+                {"matrix":[4,9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25},
+                {"matrix":[4,18], "x":19.5, "y":4.25},
+                {"matrix":[4,19], "x":20.5, "y":4.25},
+                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
+
+                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25},
+                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
+                {"matrix":[5,19], "x":20.5, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k10_pro/iso/rgb/config.h b/keyboards/keychron/k10_pro/iso/rgb/config.h
index 00e4cef1c1..da2aa831f6 100644
--- a/keyboards/keychron/k10_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k10_pro/iso/rgb/config.h
@@ -46,54 +46,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D }
diff --git a/keyboards/keychron/k10_pro/iso/rgb/info.json b/keyboards/keychron/k10_pro/iso/rgb/info.json
index e567783100..ecaa60d9c9 100644
--- a/keyboards/keychron/k10_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k10_pro/iso/rgb/info.json
@@ -1,133 +1,36 @@
 {
-    "keyboard_name": "Keychron K10 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-        "vid": "0x3434",
         "pid": "0x02A1",
         "device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_109": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[0,17], "x":18.5, "y":0},
-                {"matrix":[0,18], "x":19.5, "y":0},
-                {"matrix":[0,19], "x":20.5, "y":0},
-                {"matrix":[0,20], "x":21.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},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[1,17], "x":18.5, "y":1.25},
-                {"matrix":[1,18], "x":19.5, "y":1.25},
-                {"matrix":[1,19], "x":20.5, "y":1.25},
-                {"matrix":[1,20], "x":21.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},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25},
-                {"matrix":[2,18], "x":19.5, "y":2.25},
-                {"matrix":[2,19], "x":20.5, "y":2.25},
-                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25},
-                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3,17], "x":18.5, "y":3.25},
-                {"matrix":[3,18], "x":19.5, "y":3.25},
-                {"matrix":[3,19], "x":20.5, "y":3.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4,1], "x":1.25, "y":4.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25},
-                {"matrix":[4,18], "x":19.5, "y":4.25},
-                {"matrix":[4,19], "x":20.5, "y":4.25},
-                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
-
-                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25},
-                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5,19], "x":20.5, "y":5.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
+        
\ No newline at end of file
diff --git a/keyboards/keychron/k10_pro/iso/rgb/rules.mk b/keyboards/keychron/k10_pro/iso/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k10_pro/iso/rgb/rules.mk
+++ b/keyboards/keychron/k10_pro/iso/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k10_pro/iso/white/config.h b/keyboards/keychron/k10_pro/iso/white/config.h
index cbf7a9c800..1ef38951b6 100644
--- a/keyboards/keychron/k10_pro/iso/white/config.h
+++ b/keyboards/keychron/k10_pro/iso/white/config.h
@@ -40,32 +40,6 @@
 
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-// #define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-// #define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-// #define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 8 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_8CHANNEL
 
diff --git a/keyboards/keychron/k10_pro/iso/white/info.json b/keyboards/keychron/k10_pro/iso/white/info.json
index 88e94fb3f0..0201dd96b6 100644
--- a/keyboards/keychron/k10_pro/iso/white/info.json
+++ b/keyboards/keychron/k10_pro/iso/white/info.json
@@ -1,133 +1,30 @@
 {
-    "keyboard_name": "Keychron K10 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-        "vid": "0x3434",
         "pid": "0x02A4",
         "device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_109": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[0,17], "x":18.5, "y":0},
-                {"matrix":[0,18], "x":19.5, "y":0},
-                {"matrix":[0,19], "x":20.5, "y":0},
-                {"matrix":[0,20], "x":21.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},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[1,17], "x":18.5, "y":1.25},
-                {"matrix":[1,18], "x":19.5, "y":1.25},
-                {"matrix":[1,19], "x":20.5, "y":1.25},
-                {"matrix":[1,20], "x":21.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},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25},
-                {"matrix":[2,18], "x":19.5, "y":2.25},
-                {"matrix":[2,19], "x":20.5, "y":2.25},
-                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25},
-                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3,17], "x":18.5, "y":3.25},
-                {"matrix":[3,18], "x":19.5, "y":3.25},
-                {"matrix":[3,19], "x":20.5, "y":3.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4,1], "x":1.25, "y":4.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25},
-                {"matrix":[4,18], "x":19.5, "y":4.25},
-                {"matrix":[4,19], "x":20.5, "y":4.25},
-                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
-
-                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25},
-                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5,19], "x":20.5, "y":5.25}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k10_pro/iso/white/rules.mk b/keyboards/keychron/k10_pro/iso/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k10_pro/iso/white/rules.mk
+++ b/keyboards/keychron/k10_pro/iso/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k10_pro/rules.mk b/keyboards/keychron/k10_pro/rules.mk
index 84e2c11192..15ebea7eb8 100644
--- a/keyboards/keychron/k10_pro/rules.mk
+++ b/keyboards/keychron/k10_pro/rules.mk
@@ -1,30 +1,8 @@
-# MCU name
-MCU = STM32L432
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-DIP_SWITCH_ENABLE = yes
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k13_pro/ansi/rgb/config.h b/keyboards/keychron/k13_pro/ansi/rgb/config.h
index eca9f2550a..31bceece61 100644
--- a/keyboards/keychron/k13_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k13_pro/ansi/rgb/config.h
@@ -43,54 +43,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Use first 9 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_9CHANNEL
 
diff --git a/keyboards/keychron/k13_pro/ansi/rgb/info.json b/keyboards/keychron/k13_pro/ansi/rgb/info.json
index 549fc3b464..cc2056b816 100644
--- a/keyboards/keychron/k13_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k13_pro/ansi/rgb/info.json
@@ -1,109 +1,35 @@
 {
-    "keyboard_name": "Keychron K13 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-        "vid": "0x3434",
         "pid": "0x02D0",
         "device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_90": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[1,0], "x":0, "y":1.25},
-                {"matrix":[1,1], "x":1, "y":1.25},
-                {"matrix":[1,2], "x":2, "y":1.25},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2,1], "x":1.5, "y":2.25},
-                {"matrix":[2,2], "x":2.5, "y":2.25},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,14], "x":15.25, "y":3.25},
-                {"matrix":[3,15], "x":16.25, "y":3.25},
-                {"matrix":[3,16], "x":17.25, "y":3.25},
-                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "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},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k13_pro/ansi/rgb/rules.mk b/keyboards/keychron/k13_pro/ansi/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k13_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k13_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k13_pro/ansi/white/config.h b/keyboards/keychron/k13_pro/ansi/white/config.h
index e746986802..fd91c19d42 100644
--- a/keyboards/keychron/k13_pro/ansi/white/config.h
+++ b/keyboards/keychron/k13_pro/ansi/white/config.h
@@ -40,32 +40,6 @@
 
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-// #define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-// #define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-// #define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k13_pro/ansi/white/info.json b/keyboards/keychron/k13_pro/ansi/white/info.json
index f40fa245cd..d8ecbc278b 100644
--- a/keyboards/keychron/k13_pro/ansi/white/info.json
+++ b/keyboards/keychron/k13_pro/ansi/white/info.json
@@ -1,109 +1,30 @@
 {
-    "keyboard_name": "Keychron K13 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-        "vid": "0x3434",
         "pid": "0x02D3",
         "device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_90": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[1,0], "x":0, "y":1.25},
-                {"matrix":[1,1], "x":1, "y":1.25},
-                {"matrix":[1,2], "x":2, "y":1.25},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2,1], "x":1.5, "y":2.25},
-                {"matrix":[2,2], "x":2.5, "y":2.25},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,14], "x":15.25, "y":3.25},
-                {"matrix":[3,15], "x":16.25, "y":3.25},
-                {"matrix":[3,16], "x":17.25, "y":3.25},
-                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "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},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k13_pro/ansi/white/rules.mk b/keyboards/keychron/k13_pro/ansi/white/rules.mk
index 290c1bb47a..f886ea2e8e 100644
--- a/keyboards/keychron/k13_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k13_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k13_pro/config.h b/keyboards/keychron/k13_pro/config.h
index 1b8ea0404c..eb2a32ad6d 100644
--- a/keyboards/keychron/k13_pro/config.h
+++ b/keyboards/keychron/k13_pro/config.h
@@ -16,22 +16,10 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C15, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k13_pro/info.json b/keyboards/keychron/k13_pro/info.json
new file mode 100644
index 0000000000..c76af8ed35
--- /dev/null
+++ b/keyboards/keychron/k13_pro/info.json
@@ -0,0 +1,125 @@
+{
+    "keyboard_name": "Keychron K13 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 17
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_90": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":2, "y":0},
+                {"matrix":[0,2], "x":3, "y":0},
+                {"matrix":[0,3], "x":4, "y":0},
+                {"matrix":[0,4], "x":5, "y":0},
+                {"matrix":[0,5], "x":6.5, "y":0},
+                {"matrix":[0,6], "x":7.5, "y":0},
+                {"matrix":[0,7], "x":8.5, "y":0},
+                {"matrix":[0,8], "x":9.5, "y":0},
+                {"matrix":[0,9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[1,0], "x":0, "y":1.25},
+                {"matrix":[1,1], "x":1, "y":1.25},
+                {"matrix":[1,2], "x":2, "y":1.25},
+                {"matrix":[1,3], "x":3, "y":1.25},
+                {"matrix":[1,4], "x":4, "y":1.25},
+                {"matrix":[1,5], "x":5, "y":1.25},
+                {"matrix":[1,6], "x":6, "y":1.25},
+                {"matrix":[1,7], "x":7, "y":1.25},
+                {"matrix":[1,8], "x":8, "y":1.25},
+                {"matrix":[1,9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2,1], "x":1.5, "y":2.25},
+                {"matrix":[2,2], "x":2.5, "y":2.25},
+                {"matrix":[2,3], "x":3.5, "y":2.25},
+                {"matrix":[2,4], "x":4.5, "y":2.25},
+                {"matrix":[2,5], "x":5.5, "y":2.25},
+                {"matrix":[2,6], "x":6.5, "y":2.25},
+                {"matrix":[2,7], "x":7.5, "y":2.25},
+                {"matrix":[2,8], "x":8.5, "y":2.25},
+                {"matrix":[2,9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":1.75, "y":3.25},
+                {"matrix":[3,2], "x":2.75, "y":3.25},
+                {"matrix":[3,3], "x":3.75, "y":3.25},
+                {"matrix":[3,4], "x":4.75, "y":3.25},
+                {"matrix":[3,5], "x":5.75, "y":3.25},
+                {"matrix":[3,6], "x":6.75, "y":3.25},
+                {"matrix":[3,7], "x":7.75, "y":3.25},
+                {"matrix":[3,8], "x":8.75, "y":3.25},
+                {"matrix":[3,9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3,14], "x":15.25, "y":3.25},
+                {"matrix":[3,15], "x":16.25, "y":3.25},
+                {"matrix":[3,16], "x":17.25, "y":3.25},
+                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4,2], "x":2.25, "y":4.25},
+                {"matrix":[4,3], "x":3.25, "y":4.25},
+                {"matrix":[4,4], "x":4.25, "y":4.25},
+                {"matrix":[4,5], "x":5.25, "y":4.25},
+                {"matrix":[4,6], "x":6.25, "y":4.25},
+                {"matrix":[4,7], "x":7.25, "y":4.25},
+                {"matrix":[4,8], "x":8.25, "y":4.25},
+                {"matrix":[4,9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "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},
+                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k13_pro/rules.mk b/keyboards/keychron/k13_pro/rules.mk
index ee301839c3..98cf5c564b 100644
--- a/keyboards/keychron/k13_pro/rules.mk
+++ b/keyboards/keychron/k13_pro/rules.mk
@@ -1,24 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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           # USB Nkey Rollover
-ENCODER_ENABLE = no         # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-BLUETOOTH_ENABLE = no
-BLUETOOTH_DRIVER = custom
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k1_pro/ansi/rgb/config.h b/keyboards/keychron/k1_pro/ansi/rgb/config.h
index e6227054cc..5a97419722 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k1_pro/ansi/rgb/config.h
@@ -41,55 +41,7 @@
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
 
 #    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_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_EFFECT
 
 /* Use first 9 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_9CHANNEL
diff --git a/keyboards/keychron/k1_pro/ansi/rgb/info.json b/keyboards/keychron/k1_pro/ansi/rgb/info.json
index ca4b4d079d..9b11965651 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k1_pro/ansi/rgb/info.json
@@ -1,111 +1,35 @@
 {
-    "keyboard_name": "Keychron K1 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-        "vid": "0x3434",
         "pid": "0x0210",
         "device_version": "1.0.1"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-
-                {"matrix":[1,0], "x":0, "y":1.25},
-                {"matrix":[1,1], "x":1, "y":1.25},
-                {"matrix":[1,2], "x":2, "y":1.25},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-
-                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2,1], "x":1.5, "y":2.25},
-                {"matrix":[2,2], "x":2.5, "y":2.25},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "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},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k1_pro/ansi/rgb/rules.mk b/keyboards/keychron/k1_pro/ansi/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k1_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k1_pro/ansi/white/config.h b/keyboards/keychron/k1_pro/ansi/white/config.h
index ac29af2439..bfd714a2c1 100644
--- a/keyboards/keychron/k1_pro/ansi/white/config.h
+++ b/keyboards/keychron/k1_pro/ansi/white/config.h
@@ -40,32 +40,6 @@
 
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-// #define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-// #define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-// #define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k1_pro/ansi/white/info.json b/keyboards/keychron/k1_pro/ansi/white/info.json
index 8b7ad7c4b8..1509ceb749 100644
--- a/keyboards/keychron/k1_pro/ansi/white/info.json
+++ b/keyboards/keychron/k1_pro/ansi/white/info.json
@@ -1,111 +1,30 @@
 {
-    "keyboard_name": "Keychron K1 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-        "vid": "0x3434",
         "pid": "0x0213",
         "device_version": "1.0.1"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-
-                {"matrix":[1,0], "x":0, "y":1.25},
-                {"matrix":[1,1], "x":1, "y":1.25},
-                {"matrix":[1,2], "x":2, "y":1.25},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-
-                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2,1], "x":1.5, "y":2.25},
-                {"matrix":[2,2], "x":2.5, "y":2.25},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "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},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k1_pro/ansi/white/rules.mk b/keyboards/keychron/k1_pro/ansi/white/rules.mk
index 290c1bb47a..f886ea2e8e 100644
--- a/keyboards/keychron/k1_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k1_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k1_pro/config.h b/keyboards/keychron/k1_pro/config.h
index ace11ded59..6e3550b93d 100644
--- a/keyboards/keychron/k1_pro/config.h
+++ b/keyboards/keychron/k1_pro/config.h
@@ -16,22 +16,10 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C15, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k1_pro/info.json b/keyboards/keychron/k1_pro/info.json
new file mode 100644
index 0000000000..e62f0e35d9
--- /dev/null
+++ b/keyboards/keychron/k1_pro/info.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Keychron K1 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 17
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":2, "y":0},
+                {"matrix":[0,2], "x":3, "y":0},
+                {"matrix":[0,3], "x":4, "y":0},
+                {"matrix":[0,4], "x":5, "y":0},
+                {"matrix":[0,5], "x":6.5, "y":0},
+                {"matrix":[0,6], "x":7.5, "y":0},
+                {"matrix":[0,7], "x":8.5, "y":0},
+                {"matrix":[0,8], "x":9.5, "y":0},
+                {"matrix":[0,9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+
+                {"matrix":[1,0], "x":0, "y":1.25},
+                {"matrix":[1,1], "x":1, "y":1.25},
+                {"matrix":[1,2], "x":2, "y":1.25},
+                {"matrix":[1,3], "x":3, "y":1.25},
+                {"matrix":[1,4], "x":4, "y":1.25},
+                {"matrix":[1,5], "x":5, "y":1.25},
+                {"matrix":[1,6], "x":6, "y":1.25},
+                {"matrix":[1,7], "x":7, "y":1.25},
+                {"matrix":[1,8], "x":8, "y":1.25},
+                {"matrix":[1,9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+
+                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2,1], "x":1.5, "y":2.25},
+                {"matrix":[2,2], "x":2.5, "y":2.25},
+                {"matrix":[2,3], "x":3.5, "y":2.25},
+                {"matrix":[2,4], "x":4.5, "y":2.25},
+                {"matrix":[2,5], "x":5.5, "y":2.25},
+                {"matrix":[2,6], "x":6.5, "y":2.25},
+                {"matrix":[2,7], "x":7.5, "y":2.25},
+                {"matrix":[2,8], "x":8.5, "y":2.25},
+                {"matrix":[2,9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":1.75, "y":3.25},
+                {"matrix":[3,2], "x":2.75, "y":3.25},
+                {"matrix":[3,3], "x":3.75, "y":3.25},
+                {"matrix":[3,4], "x":4.75, "y":3.25},
+                {"matrix":[3,5], "x":5.75, "y":3.25},
+                {"matrix":[3,6], "x":6.75, "y":3.25},
+                {"matrix":[3,7], "x":7.75, "y":3.25},
+                {"matrix":[3,8], "x":8.75, "y":3.25},
+                {"matrix":[3,9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+
+                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4,2], "x":2.25, "y":4.25},
+                {"matrix":[4,3], "x":3.25, "y":4.25},
+                {"matrix":[4,4], "x":4.25, "y":4.25},
+                {"matrix":[4,5], "x":5.25, "y":4.25},
+                {"matrix":[4,6], "x":6.25, "y":4.25},
+                {"matrix":[4,7], "x":7.25, "y":4.25},
+                {"matrix":[4,8], "x":8.25, "y":4.25},
+                {"matrix":[4,9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "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},
+                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k1_pro/rules.mk b/keyboards/keychron/k1_pro/rules.mk
index ee301839c3..98cf5c564b 100644
--- a/keyboards/keychron/k1_pro/rules.mk
+++ b/keyboards/keychron/k1_pro/rules.mk
@@ -1,24 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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           # USB Nkey Rollover
-ENCODER_ENABLE = no         # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-BLUETOOTH_ENABLE = no
-BLUETOOTH_DRIVER = custom
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k2_pro/ansi/rgb/config.h b/keyboards/keychron/k2_pro/ansi/rgb/config.h
index d3e50c41fc..608cee85cf 100644
--- a/keyboards/keychron/k2_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k2_pro/ansi/rgb/config.h
@@ -46,54 +46,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
diff --git a/keyboards/keychron/k2_pro/ansi/rgb/info.json b/keyboards/keychron/k2_pro/ansi/rgb/info.json
index 67e151209a..8da37faa4a 100644
--- a/keyboards/keychron/k2_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k2_pro/ansi/rgb/info.json
@@ -1,106 +1,35 @@
 {
-    "keyboard_name": "Keychron K2 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0220",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_84": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1, "w":2},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,12], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4,13], "x":14, "y":4},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5, 9], "x":10, "y":5},
-                {"matrix":[5,10], "x":11, "y":5},
-                {"matrix":[5,11], "x":12, "y":5},
-                {"matrix":[5,12], "x":13, "y":5},
-                {"matrix":[5,13], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k2_pro/ansi/rgb/rules.mk b/keyboards/keychron/k2_pro/ansi/rgb/rules.mk
index f5f4192470..f886ea2e8e 100644
--- a/keyboards/keychron/k2_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k2_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k2_pro/ansi/white/config.h b/keyboards/keychron/k2_pro/ansi/white/config.h
index c2b6af74e2..f45e789f43 100644
--- a/keyboards/keychron/k2_pro/ansi/white/config.h
+++ b/keyboards/keychron/k2_pro/ansi/white/config.h
@@ -39,32 +39,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-// #    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-// #    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-// #    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k2_pro/ansi/white/info.json b/keyboards/keychron/k2_pro/ansi/white/info.json
index 6f7091ebfe..fecf6887d7 100644
--- a/keyboards/keychron/k2_pro/ansi/white/info.json
+++ b/keyboards/keychron/k2_pro/ansi/white/info.json
@@ -1,106 +1,30 @@
 {
-    "keyboard_name": "Keychron K2 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0223",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_84": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1, "w":2},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,12], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4,13], "x":14, "y":4},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5, 9], "x":10, "y":5},
-                {"matrix":[5,10], "x":11, "y":5},
-                {"matrix":[5,11], "x":12, "y":5},
-                {"matrix":[5,12], "x":13, "y":5},
-                {"matrix":[5,13], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k2_pro/ansi/white/rules.mk b/keyboards/keychron/k2_pro/ansi/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k2_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k2_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k2_pro/config.h b/keyboards/keychron/k2_pro/config.h
index 8f5e313c3a..0c652cf85f 100644
--- a/keyboards/keychron/k2_pro/config.h
+++ b/keyboards/keychron/k2_pro/config.h
@@ -16,26 +16,10 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { B0, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k2_pro/info.json b/keyboards/keychron/k2_pro/info.json
new file mode 100644
index 0000000000..719ba5a259
--- /dev/null
+++ b/keyboards/keychron/k2_pro/info.json
@@ -0,0 +1,314 @@
+{
+    "keyboard_name": "Keychron K2 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 16
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_84": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0},
+                {"matrix":[0,14], "x":14, "y":0},
+                {"matrix":[0,15], "x":15, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1},
+                {"matrix":[1, 1], "x":1, "y":1},
+                {"matrix":[1, 2], "x":2, "y":1},
+                {"matrix":[1, 3], "x":3, "y":1},
+                {"matrix":[1, 4], "x":4, "y":1},
+                {"matrix":[1, 5], "x":5, "y":1},
+                {"matrix":[1, 6], "x":6, "y":1},
+                {"matrix":[1, 7], "x":7, "y":1},
+                {"matrix":[1, 8], "x":8, "y":1},
+                {"matrix":[1, 9], "x":9, "y":1},
+                {"matrix":[1,10], "x":10, "y":1},
+                {"matrix":[1,11], "x":11, "y":1},
+                {"matrix":[1,12], "x":12, "y":1},
+                {"matrix":[1,13], "x":13, "y":1, "w":2},
+                {"matrix":[1,15], "x":15, "y":1},
+
+                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2},
+                {"matrix":[2, 2], "x":2.5, "y":2},
+                {"matrix":[2, 3], "x":3.5, "y":2},
+                {"matrix":[2, 4], "x":4.5, "y":2},
+                {"matrix":[2, 5], "x":5.5, "y":2},
+                {"matrix":[2, 6], "x":6.5, "y":2},
+                {"matrix":[2, 7], "x":7.5, "y":2},
+                {"matrix":[2, 8], "x":8.5, "y":2},
+                {"matrix":[2, 9], "x":9.5, "y":2},
+                {"matrix":[2,10], "x":10.5, "y":2},
+                {"matrix":[2,11], "x":11.5, "y":2},
+                {"matrix":[2,12], "x":12.5, "y":2},
+                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
+                {"matrix":[2,15], "x":15, "y":2},
+
+                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3},
+                {"matrix":[3, 2], "x":2.75, "y":3},
+                {"matrix":[3, 3], "x":3.75, "y":3},
+                {"matrix":[3, 4], "x":4.75, "y":3},
+                {"matrix":[3, 5], "x":5.75, "y":3},
+                {"matrix":[3, 6], "x":6.75, "y":3},
+                {"matrix":[3, 7], "x":7.75, "y":3},
+                {"matrix":[3, 8], "x":8.75, "y":3},
+                {"matrix":[3, 9], "x":9.75, "y":3},
+                {"matrix":[3,10], "x":10.75, "y":3},
+                {"matrix":[3,11], "x":11.75, "y":3},
+                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
+                {"matrix":[3,15], "x":15, "y":3},
+
+                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4},
+                {"matrix":[4, 3], "x":3.25, "y":4},
+                {"matrix":[4, 4], "x":4.25, "y":4},
+                {"matrix":[4, 5], "x":5.25, "y":4},
+                {"matrix":[4, 6], "x":6.25, "y":4},
+                {"matrix":[4, 7], "x":7.25, "y":4},
+                {"matrix":[4, 8], "x":8.25, "y":4},
+                {"matrix":[4, 9], "x":9.25, "y":4},
+                {"matrix":[4,10], "x":10.25, "y":4},
+                {"matrix":[4,11], "x":11.25, "y":4},
+                {"matrix":[4,12], "x":12.25, "y":4, "w":1.75},
+                {"matrix":[4,13], "x":14, "y":4},
+                {"matrix":[4,15], "x":15, "y":4},
+
+                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
+                {"matrix":[5, 9], "x":10, "y":5},
+                {"matrix":[5,10], "x":11, "y":5},
+                {"matrix":[5,11], "x":12, "y":5},
+                {"matrix":[5,12], "x":13, "y":5},
+                {"matrix":[5,13], "x":14, "y":5},
+                {"matrix":[5,15], "x":15, "y":5}
+            ]
+        },
+        "LAYOUT_iso_85": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0},
+                {"matrix":[0,14], "x":14, "y":0},
+                {"matrix":[0,15], "x":15, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1},
+                {"matrix":[1, 1], "x":1, "y":1},
+                {"matrix":[1, 2], "x":2, "y":1},
+                {"matrix":[1, 3], "x":3, "y":1},
+                {"matrix":[1, 4], "x":4, "y":1},
+                {"matrix":[1, 5], "x":5, "y":1},
+                {"matrix":[1, 6], "x":6, "y":1},
+                {"matrix":[1, 7], "x":7, "y":1},
+                {"matrix":[1, 8], "x":8, "y":1},
+                {"matrix":[1, 9], "x":9, "y":1},
+                {"matrix":[1,10], "x":10, "y":1},
+                {"matrix":[1,11], "x":11, "y":1},
+                {"matrix":[1,12], "x":12, "y":1},
+                {"matrix":[1,13], "x":13, "y":1, "w":2},
+                {"matrix":[1,15], "x":15, "y":1},
+
+                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2},
+                {"matrix":[2, 2], "x":2.5, "y":2},
+                {"matrix":[2, 3], "x":3.5, "y":2},
+                {"matrix":[2, 4], "x":4.5, "y":2},
+                {"matrix":[2, 5], "x":5.5, "y":2},
+                {"matrix":[2, 6], "x":6.5, "y":2},
+                {"matrix":[2, 7], "x":7.5, "y":2},
+                {"matrix":[2, 8], "x":8.5, "y":2},
+                {"matrix":[2, 9], "x":9.5, "y":2},
+                {"matrix":[2,10], "x":10.5, "y":2},
+                {"matrix":[2,11], "x":11.5, "y":2},
+                {"matrix":[2,12], "x":12.5, "y":2},
+                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
+                {"matrix":[2,15], "x":15, "y":2},
+
+                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3},
+                {"matrix":[3, 2], "x":2.75, "y":3},
+                {"matrix":[3, 3], "x":3.75, "y":3},
+                {"matrix":[3, 4], "x":4.75, "y":3},
+                {"matrix":[3, 5], "x":5.75, "y":3},
+                {"matrix":[3, 6], "x":6.75, "y":3},
+                {"matrix":[3, 7], "x":7.75, "y":3},
+                {"matrix":[3, 8], "x":8.75, "y":3},
+                {"matrix":[3, 9], "x":9.75, "y":3},
+                {"matrix":[3,10], "x":10.75, "y":3},
+                {"matrix":[3,11], "x":11.75, "y":3},
+                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
+                {"matrix":[3,15], "x":15, "y":3},
+
+                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4},
+                {"matrix":[4, 2], "x":2.25, "y":4},
+                {"matrix":[4, 3], "x":3.25, "y":4},
+                {"matrix":[4, 4], "x":4.25, "y":4},
+                {"matrix":[4, 5], "x":5.25, "y":4},
+                {"matrix":[4, 6], "x":6.25, "y":4},
+                {"matrix":[4, 7], "x":7.25, "y":4},
+                {"matrix":[4, 8], "x":8.25, "y":4},
+                {"matrix":[4, 9], "x":9.25, "y":4},
+                {"matrix":[4,10], "x":10.25, "y":4},
+                {"matrix":[4,11], "x":11.25, "y":4},
+                {"matrix":[4,12], "x":12.25, "y":4, "w":1.75},
+                {"matrix":[4,13], "x":14, "y":4},
+                {"matrix":[4,15], "x":15, "y":4},
+
+                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
+                {"matrix":[5, 9], "x":10, "y":5},
+                {"matrix":[5,10], "x":11, "y":5},
+                {"matrix":[5,11], "x":12, "y":5},
+                {"matrix":[5,12], "x":13, "y":5},
+                {"matrix":[5,13], "x":14, "y":5},
+                {"matrix":[5,15], "x":15, "y":5}
+            ]
+        },
+        "LAYOUT": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1, "y":0},
+                {"matrix":[0,2], "x":2, "y":0},
+                {"matrix":[0,3], "x":3, "y":0},
+                {"matrix":[0,4], "x":4, "y":0},
+                {"matrix":[0,5], "x":5, "y":0},
+                {"matrix":[0,6], "x":6, "y":0},
+                {"matrix":[0,7], "x":7, "y":0},
+                {"matrix":[0,8], "x":8, "y":0},
+                {"matrix":[0,9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0},
+                {"matrix":[0,14], "x":14, "y":0},
+                {"matrix":[0,15], "x":15, "y":0},
+
+                {"matrix":[1,0], "x":0, "y":1},
+                {"matrix":[1,1], "x":1, "y":1},
+                {"matrix":[1,2], "x":2, "y":1},
+                {"matrix":[1,3], "x":3, "y":1},
+                {"matrix":[1,4], "x":4, "y":1},
+                {"matrix":[1,5], "x":5, "y":1},
+                {"matrix":[1,6], "x":6, "y":1},
+                {"matrix":[1,7], "x":7, "y":1},
+                {"matrix":[1,8], "x":8, "y":1},
+                {"matrix":[1,9], "x":9, "y":1},
+                {"matrix":[1,10], "x":10, "y":1},
+                {"matrix":[1,11], "x":11, "y":1},
+                {"matrix":[1,12], "x":12, "y":1},
+                {"matrix":[1,13], "x":13, "y":1},
+                {"matrix":[1,14], "x":14, "y":1},
+                {"matrix":[1,15], "x":15, "y":1},
+
+                {"matrix":[2,0], "x":0, "y":2, "w":1.5},
+                {"matrix":[2,1], "x":1.5, "y":2},
+                {"matrix":[2,2], "x":2.5, "y":2},
+                {"matrix":[2,3], "x":3.5, "y":2},
+                {"matrix":[2,4], "x":4.5, "y":2},
+                {"matrix":[2,5], "x":5.5, "y":2},
+                {"matrix":[2,6], "x":6.5, "y":2},
+                {"matrix":[2,7], "x":7.5, "y":2},
+                {"matrix":[2,8], "x":8.5, "y":2},
+                {"matrix":[2,9], "x":9.5, "y":2},
+                {"matrix":[2,10], "x":10.5, "y":2},
+                {"matrix":[2,11], "x":11.5, "y":2},
+                {"matrix":[2,12], "x":12.5, "y":2},
+                {"matrix":[2,15], "x":15, "y":2},
+
+                {"matrix":[3,0], "x":0, "y":3, "w":1.75},
+                {"matrix":[3,1], "x":1.75, "y":3},
+                {"matrix":[3,2], "x":2.75, "y":3},
+                {"matrix":[3,3], "x":3.75, "y":3},
+                {"matrix":[3,4], "x":4.75, "y":3},
+                {"matrix":[3,5], "x":5.75, "y":3},
+                {"matrix":[3,6], "x":6.75, "y":3},
+                {"matrix":[3,7], "x":7.75, "y":3},
+                {"matrix":[3,8], "x":8.75, "y":3},
+                {"matrix":[3,9], "x":9.75, "y":3},
+                {"matrix":[3,10], "x":10.75, "y":3},
+                {"matrix":[3,11], "x":11.75, "y":3},
+                {"matrix":[3,13], "x":12.75, "y":3},
+                {"matrix":[2,13], "x":13.75, "y":2, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15, "y":3},
+
+                {"matrix":[4,0], "x":0, "y":4, "w":2.25},
+                {"matrix":[4,2], "x":2.25, "y":4},
+                {"matrix":[4,3], "x":3.25, "y":4},
+                {"matrix":[4,4], "x":4.25, "y":4},
+                {"matrix":[4,5], "x":5.25, "y":4},
+                {"matrix":[4,6], "x":6.25, "y":4},
+                {"matrix":[4,7], "x":7.25, "y":4},
+                {"matrix":[4,8], "x":8.25, "y":4},
+                {"matrix":[4,9], "x":9.25, "y":4},
+                {"matrix":[4,10], "x":10.25, "y":4},
+                {"matrix":[4,11], "x":11.25, "y":4},
+                {"matrix":[4,12], "x":12.25, "y":4},
+                {"matrix":[4,13], "x":13.25, "y":4, "w":1.75},
+                {"matrix":[4,15], "x":15, "y":4},
+
+                {"matrix":[5,0], "x":0, "y":5, "w":1.25},
+                {"matrix":[5,1], "x":1.25, "y":5},
+                {"matrix":[5,2], "x":2.25, "y":5, "w":1.25},
+                {"matrix":[5,3], "x":3.5, "y":5},
+                {"matrix":[5,6], "x":4.5, "y":5, "w":4.5},
+                {"matrix":[5,8], "x":9, "y":5},
+                {"matrix":[5,9], "x":10, "y":5},
+                {"matrix":[5,10], "x":11, "y":5},
+                {"matrix":[5,11], "x":12, "y":5},
+                {"matrix":[5,12], "x":13, "y":5},
+                {"matrix":[5,13], "x":14, "y":5},
+                {"matrix":[5,15], "x":15, "y":5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k2_pro/iso/rgb/config.h b/keyboards/keychron/k2_pro/iso/rgb/config.h
index cfbb3a5079..3d6e962a72 100644
--- a/keyboards/keychron/k2_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k2_pro/iso/rgb/config.h
@@ -46,54 +46,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
diff --git a/keyboards/keychron/k2_pro/iso/rgb/info.json b/keyboards/keychron/k2_pro/iso/rgb/info.json
index bd531d7621..93e9586443 100644
--- a/keyboards/keychron/k2_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k2_pro/iso/rgb/info.json
@@ -1,107 +1,35 @@
 {
-    "keyboard_name": "Keychron K2 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0221",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_iso_85": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1, "w":2},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,12], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4,13], "x":14, "y":4},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5, 9], "x":10, "y":5},
-                {"matrix":[5,10], "x":11, "y":5},
-                {"matrix":[5,11], "x":12, "y":5},
-                {"matrix":[5,12], "x":13, "y":5},
-                {"matrix":[5,13], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k2_pro/iso/rgb/rules.mk b/keyboards/keychron/k2_pro/iso/rgb/rules.mk
index f5f4192470..f886ea2e8e 100644
--- a/keyboards/keychron/k2_pro/iso/rgb/rules.mk
+++ b/keyboards/keychron/k2_pro/iso/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k2_pro/iso/white/config.h b/keyboards/keychron/k2_pro/iso/white/config.h
index 3cee94dfa4..42b9068f89 100644
--- a/keyboards/keychron/k2_pro/iso/white/config.h
+++ b/keyboards/keychron/k2_pro/iso/white/config.h
@@ -39,32 +39,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-// #    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-// #    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-// #    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k2_pro/iso/white/info.json b/keyboards/keychron/k2_pro/iso/white/info.json
index 18937e3fce..214b8f5018 100644
--- a/keyboards/keychron/k2_pro/iso/white/info.json
+++ b/keyboards/keychron/k2_pro/iso/white/info.json
@@ -1,107 +1,30 @@
 {
-    "keyboard_name": "Keychron K2 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0224",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_iso_85": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1, "w":2},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,12], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4,13], "x":14, "y":4},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5, 9], "x":10, "y":5},
-                {"matrix":[5,10], "x":11, "y":5},
-                {"matrix":[5,11], "x":12, "y":5},
-                {"matrix":[5,12], "x":13, "y":5},
-                {"matrix":[5,13], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k2_pro/iso/white/rules.mk b/keyboards/keychron/k2_pro/iso/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k2_pro/iso/white/rules.mk
+++ b/keyboards/keychron/k2_pro/iso/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k2_pro/jis/rgb/config.h b/keyboards/keychron/k2_pro/jis/rgb/config.h
index e43dd9d52a..6a557c0f0c 100644
--- a/keyboards/keychron/k2_pro/jis/rgb/config.h
+++ b/keyboards/keychron/k2_pro/jis/rgb/config.h
@@ -46,54 +46,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
diff --git a/keyboards/keychron/k2_pro/jis/rgb/info.json b/keyboards/keychron/k2_pro/jis/rgb/info.json
index a7fb5bcdbf..1854b550ba 100644
--- a/keyboards/keychron/k2_pro/jis/rgb/info.json
+++ b/keyboards/keychron/k2_pro/jis/rgb/info.json
@@ -1,111 +1,35 @@
 {
-    "keyboard_name": "Keychron K2 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0222",
     	"device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":1, "y":0},
-                {"matrix":[0,2], "x":2, "y":0},
-                {"matrix":[0,3], "x":3, "y":0},
-                {"matrix":[0,4], "x":4, "y":0},
-                {"matrix":[0,5], "x":5, "y":0},
-                {"matrix":[0,6], "x":6, "y":0},
-                {"matrix":[0,7], "x":7, "y":0},
-                {"matrix":[0,8], "x":8, "y":0},
-                {"matrix":[0,9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1,0], "x":0, "y":1},
-                {"matrix":[1,1], "x":1, "y":1},
-                {"matrix":[1,2], "x":2, "y":1},
-                {"matrix":[1,3], "x":3, "y":1},
-                {"matrix":[1,4], "x":4, "y":1},
-                {"matrix":[1,5], "x":5, "y":1},
-                {"matrix":[1,6], "x":6, "y":1},
-                {"matrix":[1,7], "x":7, "y":1},
-                {"matrix":[1,8], "x":8, "y":1},
-                {"matrix":[1,9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1},
-                {"matrix":[1,14], "x":14, "y":1},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2,0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2,1], "x":1.5, "y":2},
-                {"matrix":[2,2], "x":2.5, "y":2},
-                {"matrix":[2,3], "x":3.5, "y":2},
-                {"matrix":[2,4], "x":4.5, "y":2},
-                {"matrix":[2,5], "x":5.5, "y":2},
-                {"matrix":[2,6], "x":6.5, "y":2},
-                {"matrix":[2,7], "x":7.5, "y":2},
-                {"matrix":[2,8], "x":8.5, "y":2},
-                {"matrix":[2,9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3,0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3},
-                {"matrix":[3,2], "x":2.75, "y":3},
-                {"matrix":[3,3], "x":3.75, "y":3},
-                {"matrix":[3,4], "x":4.75, "y":3},
-                {"matrix":[3,5], "x":5.75, "y":3},
-                {"matrix":[3,6], "x":6.75, "y":3},
-                {"matrix":[3,7], "x":7.75, "y":3},
-                {"matrix":[3,8], "x":8.75, "y":3},
-                {"matrix":[3,9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3},
-                {"matrix":[2,13], "x":13.75, "y":2, "w":1.25, "h":2},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4,0], "x":0, "y":4, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4},
-                {"matrix":[4,3], "x":3.25, "y":4},
-                {"matrix":[4,4], "x":4.25, "y":4},
-                {"matrix":[4,5], "x":5.25, "y":4},
-                {"matrix":[4,6], "x":6.25, "y":4},
-                {"matrix":[4,7], "x":7.25, "y":4},
-                {"matrix":[4,8], "x":8.25, "y":4},
-                {"matrix":[4,9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,12], "x":12.25, "y":4},
-                {"matrix":[4,13], "x":13.25, "y":4, "w":1.75},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5,0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5},
-                {"matrix":[5,2], "x":2.25, "y":5, "w":1.25},
-                {"matrix":[5,3], "x":3.5, "y":5},
-                {"matrix":[5,6], "x":4.5, "y":5, "w":4.5},
-                {"matrix":[5,8], "x":9, "y":5},
-                {"matrix":[5,9], "x":10, "y":5},
-                {"matrix":[5,10], "x":11, "y":5},
-                {"matrix":[5,11], "x":12, "y":5},
-                {"matrix":[5,12], "x":13, "y":5},
-                {"matrix":[5,13], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k2_pro/jis/rgb/rules.mk b/keyboards/keychron/k2_pro/jis/rgb/rules.mk
index f5f4192470..f886ea2e8e 100644
--- a/keyboards/keychron/k2_pro/jis/rgb/rules.mk
+++ b/keyboards/keychron/k2_pro/jis/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k2_pro/jis/white/config.h b/keyboards/keychron/k2_pro/jis/white/config.h
index 0dfb6ab8eb..a0b7c03e87 100644
--- a/keyboards/keychron/k2_pro/jis/white/config.h
+++ b/keyboards/keychron/k2_pro/jis/white/config.h
@@ -40,32 +40,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-// #    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-// #    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-// #    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k2_pro/jis/white/info.json b/keyboards/keychron/k2_pro/jis/white/info.json
index a1356e3eab..c23cc74422 100644
--- a/keyboards/keychron/k2_pro/jis/white/info.json
+++ b/keyboards/keychron/k2_pro/jis/white/info.json
@@ -1,111 +1,30 @@
 {
-    "keyboard_name": "Keychron K2 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0225",
     	"device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":1, "y":0},
-                {"matrix":[0,2], "x":2, "y":0},
-                {"matrix":[0,3], "x":3, "y":0},
-                {"matrix":[0,4], "x":4, "y":0},
-                {"matrix":[0,5], "x":5, "y":0},
-                {"matrix":[0,6], "x":6, "y":0},
-                {"matrix":[0,7], "x":7, "y":0},
-                {"matrix":[0,8], "x":8, "y":0},
-                {"matrix":[0,9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1,0], "x":0, "y":1},
-                {"matrix":[1,1], "x":1, "y":1},
-                {"matrix":[1,2], "x":2, "y":1},
-                {"matrix":[1,3], "x":3, "y":1},
-                {"matrix":[1,4], "x":4, "y":1},
-                {"matrix":[1,5], "x":5, "y":1},
-                {"matrix":[1,6], "x":6, "y":1},
-                {"matrix":[1,7], "x":7, "y":1},
-                {"matrix":[1,8], "x":8, "y":1},
-                {"matrix":[1,9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1},
-                {"matrix":[1,14], "x":14, "y":1},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2,0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2,1], "x":1.5, "y":2},
-                {"matrix":[2,2], "x":2.5, "y":2},
-                {"matrix":[2,3], "x":3.5, "y":2},
-                {"matrix":[2,4], "x":4.5, "y":2},
-                {"matrix":[2,5], "x":5.5, "y":2},
-                {"matrix":[2,6], "x":6.5, "y":2},
-                {"matrix":[2,7], "x":7.5, "y":2},
-                {"matrix":[2,8], "x":8.5, "y":2},
-                {"matrix":[2,9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3,0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3},
-                {"matrix":[3,2], "x":2.75, "y":3},
-                {"matrix":[3,3], "x":3.75, "y":3},
-                {"matrix":[3,4], "x":4.75, "y":3},
-                {"matrix":[3,5], "x":5.75, "y":3},
-                {"matrix":[3,6], "x":6.75, "y":3},
-                {"matrix":[3,7], "x":7.75, "y":3},
-                {"matrix":[3,8], "x":8.75, "y":3},
-                {"matrix":[3,9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3},
-                {"matrix":[2,13], "x":13.75, "y":2, "w":1.25, "h":2},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4,0], "x":0, "y":4, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4},
-                {"matrix":[4,3], "x":3.25, "y":4},
-                {"matrix":[4,4], "x":4.25, "y":4},
-                {"matrix":[4,5], "x":5.25, "y":4},
-                {"matrix":[4,6], "x":6.25, "y":4},
-                {"matrix":[4,7], "x":7.25, "y":4},
-                {"matrix":[4,8], "x":8.25, "y":4},
-                {"matrix":[4,9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,12], "x":12.25, "y":4},
-                {"matrix":[4,13], "x":13.25, "y":4, "w":1.75},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5,0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5},
-                {"matrix":[5,2], "x":2.25, "y":5, "w":1.25},
-                {"matrix":[5,3], "x":3.5, "y":5},
-                {"matrix":[5,6], "x":4.5, "y":5, "w":4.5},
-                {"matrix":[5,8], "x":9, "y":5},
-                {"matrix":[5,9], "x":10, "y":5},
-                {"matrix":[5,10], "x":11, "y":5},
-                {"matrix":[5,11], "x":12, "y":5},
-                {"matrix":[5,12], "x":13, "y":5},
-                {"matrix":[5,13], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k2_pro/jis/white/rules.mk b/keyboards/keychron/k2_pro/jis/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k2_pro/jis/white/rules.mk
+++ b/keyboards/keychron/k2_pro/jis/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k2_pro/rules.mk b/keyboards/keychron/k2_pro/rules.mk
index a747da42ca..15ebea7eb8 100644
--- a/keyboards/keychron/k2_pro/rules.mk
+++ b/keyboards/keychron/k2_pro/rules.mk
@@ -1,35 +1,8 @@
-# MCU name
-MCU = STM32L432
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with
-BLUETOOTH_DRIVER = custom
-AUDIO_ENABLE = no           # Audio output on port C6
-DIP_SWITCH_ENABLE = yes
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k3_pro/ansi/rgb/config.h b/keyboards/keychron/k3_pro/ansi/rgb/config.h
index 78ddccf5b9..20e008d78f 100644
--- a/keyboards/keychron/k3_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k3_pro/ansi/rgb/config.h
@@ -51,54 +51,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 }
diff --git a/keyboards/keychron/k3_pro/ansi/rgb/info.json b/keyboards/keychron/k3_pro/ansi/rgb/info.json
index 2e7b853b7f..0948bd91bc 100644
--- a/keyboards/keychron/k3_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k3_pro/ansi/rgb/info.json
@@ -1,106 +1,35 @@
 {
-    "keyboard_name": "Keychron K3 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0230",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_84": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1, "w":2},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,13], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4,14], "x":14, "y":4},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5},
-                {"matrix":[5,11], "x":11, "y":5},
-                {"matrix":[5,12], "x":12, "y":5},
-                {"matrix":[5,13], "x":13, "y":5},
-                {"matrix":[5,14], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k3_pro/ansi/rgb/rules.mk b/keyboards/keychron/k3_pro/ansi/rgb/rules.mk
index f5f4192470..f886ea2e8e 100644
--- a/keyboards/keychron/k3_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k3_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k3_pro/ansi/white/config.h b/keyboards/keychron/k3_pro/ansi/white/config.h
index 41e7a814a2..36b9f7caa2 100644
--- a/keyboards/keychron/k3_pro/ansi/white/config.h
+++ b/keyboards/keychron/k3_pro/ansi/white/config.h
@@ -40,32 +40,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-//#    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-//#    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-//#    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k3_pro/ansi/white/info.json b/keyboards/keychron/k3_pro/ansi/white/info.json
index a81f2de379..27a77571ec 100644
--- a/keyboards/keychron/k3_pro/ansi/white/info.json
+++ b/keyboards/keychron/k3_pro/ansi/white/info.json
@@ -1,107 +1,30 @@
 {
-    "keyboard_name": "Keychron K3 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0233",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_84": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1, "w":2},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
-
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,13], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4,14], "x":14, "y":4},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5},
-                {"matrix":[5,11], "x":11, "y":5},
-                {"matrix":[5,12], "x":12, "y":5},
-                {"matrix":[5,13], "x":13, "y":5},
-                {"matrix":[5,14], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k3_pro/ansi/white/rules.mk b/keyboards/keychron/k3_pro/ansi/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k3_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k3_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k3_pro/config.h b/keyboards/keychron/k3_pro/config.h
index 4e802fadff..53aa047573 100644
--- a/keyboards/keychron/k3_pro/config.h
+++ b/keyboards/keychron/k3_pro/config.h
@@ -16,19 +16,6 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C15, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Use SPI to drive 74HC595 shift register */
 #define DRIVE_SHRIFT_REGISTER_WITH_SPI
 
@@ -36,9 +23,6 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k3_pro/info.json b/keyboards/keychron/k3_pro/info.json
new file mode 100644
index 0000000000..c8eaeb4f88
--- /dev/null
+++ b/keyboards/keychron/k3_pro/info.json
@@ -0,0 +1,314 @@
+{
+    "keyboard_name": "Keychron K3 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 16
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_84": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0},
+                {"matrix":[0,14], "x":14, "y":0},
+                {"matrix":[0,15], "x":15, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1},
+                {"matrix":[1, 1], "x":1, "y":1},
+                {"matrix":[1, 2], "x":2, "y":1},
+                {"matrix":[1, 3], "x":3, "y":1},
+                {"matrix":[1, 4], "x":4, "y":1},
+                {"matrix":[1, 5], "x":5, "y":1},
+                {"matrix":[1, 6], "x":6, "y":1},
+                {"matrix":[1, 7], "x":7, "y":1},
+                {"matrix":[1, 8], "x":8, "y":1},
+                {"matrix":[1, 9], "x":9, "y":1},
+                {"matrix":[1,10], "x":10, "y":1},
+                {"matrix":[1,11], "x":11, "y":1},
+                {"matrix":[1,12], "x":12, "y":1},
+                {"matrix":[1,13], "x":13, "y":1, "w":2},
+                {"matrix":[1,15], "x":15, "y":1},
+
+                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2},
+                {"matrix":[2, 2], "x":2.5, "y":2},
+                {"matrix":[2, 3], "x":3.5, "y":2},
+                {"matrix":[2, 4], "x":4.5, "y":2},
+                {"matrix":[2, 5], "x":5.5, "y":2},
+                {"matrix":[2, 6], "x":6.5, "y":2},
+                {"matrix":[2, 7], "x":7.5, "y":2},
+                {"matrix":[2, 8], "x":8.5, "y":2},
+                {"matrix":[2, 9], "x":9.5, "y":2},
+                {"matrix":[2,10], "x":10.5, "y":2},
+                {"matrix":[2,11], "x":11.5, "y":2},
+                {"matrix":[2,12], "x":12.5, "y":2},
+                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
+                {"matrix":[2,15], "x":15, "y":2},
+
+                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3},
+                {"matrix":[3, 2], "x":2.75, "y":3},
+                {"matrix":[3, 3], "x":3.75, "y":3},
+                {"matrix":[3, 4], "x":4.75, "y":3},
+                {"matrix":[3, 5], "x":5.75, "y":3},
+                {"matrix":[3, 6], "x":6.75, "y":3},
+                {"matrix":[3, 7], "x":7.75, "y":3},
+                {"matrix":[3, 8], "x":8.75, "y":3},
+                {"matrix":[3, 9], "x":9.75, "y":3},
+                {"matrix":[3,10], "x":10.75, "y":3},
+                {"matrix":[3,11], "x":11.75, "y":3},
+                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
+                {"matrix":[3,15], "x":15, "y":3},
+
+                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4},
+                {"matrix":[4, 3], "x":3.25, "y":4},
+                {"matrix":[4, 4], "x":4.25, "y":4},
+                {"matrix":[4, 5], "x":5.25, "y":4},
+                {"matrix":[4, 6], "x":6.25, "y":4},
+                {"matrix":[4, 7], "x":7.25, "y":4},
+                {"matrix":[4, 8], "x":8.25, "y":4},
+                {"matrix":[4, 9], "x":9.25, "y":4},
+                {"matrix":[4,10], "x":10.25, "y":4},
+                {"matrix":[4,11], "x":11.25, "y":4},
+                {"matrix":[4,13], "x":12.25, "y":4, "w":1.75},
+                {"matrix":[4,14], "x":14, "y":4},
+                {"matrix":[4,15], "x":15, "y":4},
+
+                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5},
+                {"matrix":[5,11], "x":11, "y":5},
+                {"matrix":[5,12], "x":12, "y":5},
+                {"matrix":[5,13], "x":13, "y":5},
+                {"matrix":[5,14], "x":14, "y":5},
+                {"matrix":[5,15], "x":15, "y":5}
+            ]
+        },
+        "LAYOUT_iso_85": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0},
+                {"matrix":[0,14], "x":14, "y":0},
+                {"matrix":[0,15], "x":15, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1},
+                {"matrix":[1, 1], "x":1, "y":1},
+                {"matrix":[1, 2], "x":2, "y":1},
+                {"matrix":[1, 3], "x":3, "y":1},
+                {"matrix":[1, 4], "x":4, "y":1},
+                {"matrix":[1, 5], "x":5, "y":1},
+                {"matrix":[1, 6], "x":6, "y":1},
+                {"matrix":[1, 7], "x":7, "y":1},
+                {"matrix":[1, 8], "x":8, "y":1},
+                {"matrix":[1, 9], "x":9, "y":1},
+                {"matrix":[1,10], "x":10, "y":1},
+                {"matrix":[1,11], "x":11, "y":1},
+                {"matrix":[1,12], "x":12, "y":1},
+                {"matrix":[1,13], "x":13, "y":1, "w":2},
+                {"matrix":[1,15], "x":15, "y":1},
+
+                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2},
+                {"matrix":[2, 2], "x":2.5, "y":2},
+                {"matrix":[2, 3], "x":3.5, "y":2},
+                {"matrix":[2, 4], "x":4.5, "y":2},
+                {"matrix":[2, 5], "x":5.5, "y":2},
+                {"matrix":[2, 6], "x":6.5, "y":2},
+                {"matrix":[2, 7], "x":7.5, "y":2},
+                {"matrix":[2, 8], "x":8.5, "y":2},
+                {"matrix":[2, 9], "x":9.5, "y":2},
+                {"matrix":[2,10], "x":10.5, "y":2},
+                {"matrix":[2,11], "x":11.5, "y":2},
+                {"matrix":[2,12], "x":12.5, "y":2},
+                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
+                {"matrix":[2,15], "x":15, "y":2},
+
+                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3},
+                {"matrix":[3, 2], "x":2.75, "y":3},
+                {"matrix":[3, 3], "x":3.75, "y":3},
+                {"matrix":[3, 4], "x":4.75, "y":3},
+                {"matrix":[3, 5], "x":5.75, "y":3},
+                {"matrix":[3, 6], "x":6.75, "y":3},
+                {"matrix":[3, 7], "x":7.75, "y":3},
+                {"matrix":[3, 8], "x":8.75, "y":3},
+                {"matrix":[3, 9], "x":9.75, "y":3},
+                {"matrix":[3,10], "x":10.75, "y":3},
+                {"matrix":[3,11], "x":11.75, "y":3},
+                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
+                {"matrix":[3,15], "x":15, "y":3},
+
+                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4},
+                {"matrix":[4, 2], "x":2.25, "y":4},
+                {"matrix":[4, 3], "x":3.25, "y":4},
+                {"matrix":[4, 4], "x":4.25, "y":4},
+                {"matrix":[4, 5], "x":5.25, "y":4},
+                {"matrix":[4, 6], "x":6.25, "y":4},
+                {"matrix":[4, 7], "x":7.25, "y":4},
+                {"matrix":[4, 8], "x":8.25, "y":4},
+                {"matrix":[4, 9], "x":9.25, "y":4},
+                {"matrix":[4,10], "x":10.25, "y":4},
+                {"matrix":[4,11], "x":11.25, "y":4},
+                {"matrix":[4,13], "x":12.25, "y":4, "w":1.75},
+                {"matrix":[4,14], "x":14, "y":4},
+                {"matrix":[4,15], "x":15, "y":4},
+
+                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5},
+                {"matrix":[5,11], "x":11, "y":5},
+                {"matrix":[5,12], "x":12, "y":5},
+                {"matrix":[5,13], "x":13, "y":5},
+                {"matrix":[5,14], "x":14, "y":5},
+                {"matrix":[5,15], "x":15, "y":5}
+            ]
+        },
+        "LAYOUT": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0},
+                {"matrix":[0,14], "x":14, "y":0},
+                {"matrix":[0,15], "x":15, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1},
+                {"matrix":[1, 1], "x":1, "y":1},
+                {"matrix":[1, 2], "x":2, "y":1},
+                {"matrix":[1, 3], "x":3, "y":1},
+                {"matrix":[1, 4], "x":4, "y":1},
+                {"matrix":[1, 5], "x":5, "y":1},
+                {"matrix":[1, 6], "x":6, "y":1},
+                {"matrix":[1, 7], "x":7, "y":1},
+                {"matrix":[1, 8], "x":8, "y":1},
+                {"matrix":[1, 9], "x":9, "y":1},
+                {"matrix":[1,10], "x":10, "y":1},
+                {"matrix":[1,11], "x":11, "y":1},
+                {"matrix":[1,12], "x":12, "y":1},
+                {"matrix":[1,13], "x":13, "y":1},
+                {"matrix":[1,14], "x":14, "y":1},
+                {"matrix":[1,15], "x":15, "y":1},
+
+                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2},
+                {"matrix":[2, 2], "x":2.5, "y":2},
+                {"matrix":[2, 3], "x":3.5, "y":2},
+                {"matrix":[2, 4], "x":4.5, "y":2},
+                {"matrix":[2, 5], "x":5.5, "y":2},
+                {"matrix":[2, 6], "x":6.5, "y":2},
+                {"matrix":[2, 7], "x":7.5, "y":2},
+                {"matrix":[2, 8], "x":8.5, "y":2},
+                {"matrix":[2, 9], "x":9.5, "y":2},
+                {"matrix":[2,10], "x":10.5, "y":2},
+                {"matrix":[2,11], "x":11.5, "y":2},
+                {"matrix":[2,12], "x":12.5, "y":2},
+                {"matrix":[2,15], "x":15, "y":2},
+
+                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3},
+                {"matrix":[3, 2], "x":2.75, "y":3},
+                {"matrix":[3, 3], "x":3.75, "y":3},
+                {"matrix":[3, 4], "x":4.75, "y":3},
+                {"matrix":[3, 5], "x":5.75, "y":3},
+                {"matrix":[3, 6], "x":6.75, "y":3},
+                {"matrix":[3, 7], "x":7.75, "y":3},
+                {"matrix":[3, 8], "x":8.75, "y":3},
+                {"matrix":[3, 9], "x":9.75, "y":3},
+                {"matrix":[3,10], "x":10.75, "y":3},
+                {"matrix":[3,11], "x":11.75, "y":3},
+                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15, "y":3},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4},
+                {"matrix":[4, 3], "x":3.25, "y":4},
+                {"matrix":[4, 4], "x":4.25, "y":4},
+                {"matrix":[4, 5], "x":5.25, "y":4},
+                {"matrix":[4, 6], "x":6.25, "y":4},
+                {"matrix":[4, 7], "x":7.25, "y":4},
+                {"matrix":[4, 8], "x":8.25, "y":4},
+                {"matrix":[4, 9], "x":9.25, "y":4},
+                {"matrix":[4,10], "x":10.25, "y":4},
+                {"matrix":[4,11], "x":11.25, "y":4},
+                {"matrix":[4,13], "x":12.25, "y":4},
+                {"matrix":[4,14], "x":13.25, "y":4.25, "w":1.75},
+                {"matrix":[4,15], "x":15, "y":4},
+
+                {"matrix":[5, 0], "x":0, "y":5},
+                {"matrix":[5, 1], "x":1, "y":5},
+                {"matrix":[5, 2], "x":2, "y":5},
+                {"matrix":[5, 3], "x":3, "y":5.25},
+                {"matrix":[5, 6], "x":4, "y":5, "w":5},
+                {"matrix":[5, 9], "x":9, "y":5.25},
+                {"matrix":[5,10], "x":10, "y":5},
+                {"matrix":[5,11], "x":11, "y":5},
+                {"matrix":[5,12], "x":12, "y":5},
+                {"matrix":[5,13], "x":13, "y":5},
+                {"matrix":[5,14], "x":14, "y":5},
+                {"matrix":[5,15], "x":15, "y":5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k3_pro/iso/rgb/config.h b/keyboards/keychron/k3_pro/iso/rgb/config.h
index 3a0d680e5e..2911d64868 100644
--- a/keyboards/keychron/k3_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k3_pro/iso/rgb/config.h
@@ -51,54 +51,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 }
diff --git a/keyboards/keychron/k3_pro/iso/rgb/info.json b/keyboards/keychron/k3_pro/iso/rgb/info.json
index 4897e9b027..8252592929 100644
--- a/keyboards/keychron/k3_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k3_pro/iso/rgb/info.json
@@ -1,107 +1,35 @@
 {
-    "keyboard_name": "Keychron K3 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0231",
     	"device_version": "1.0.1"
     },
-    "layouts": {
-        "LAYOUT_iso_85": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1, "w":2},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-		        {"matrix":[4, 1], "x":1.25, "y":4},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,13], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4,14], "x":14, "y":4},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5},
-                {"matrix":[5,11], "x":11, "y":5},
-                {"matrix":[5,12], "x":12, "y":5},
-                {"matrix":[5,13], "x":13, "y":5},
-                {"matrix":[5,14], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k3_pro/iso/rgb/rules.mk b/keyboards/keychron/k3_pro/iso/rgb/rules.mk
index f5f4192470..f886ea2e8e 100644
--- a/keyboards/keychron/k3_pro/iso/rgb/rules.mk
+++ b/keyboards/keychron/k3_pro/iso/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k3_pro/iso/white/config.h b/keyboards/keychron/k3_pro/iso/white/config.h
index ced8692684..d6042ade20 100644
--- a/keyboards/keychron/k3_pro/iso/white/config.h
+++ b/keyboards/keychron/k3_pro/iso/white/config.h
@@ -40,32 +40,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-//#    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-//#    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-//#    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k3_pro/iso/white/info.json b/keyboards/keychron/k3_pro/iso/white/info.json
index 38ab8c36b3..9e1fc9dda0 100644
--- a/keyboards/keychron/k3_pro/iso/white/info.json
+++ b/keyboards/keychron/k3_pro/iso/white/info.json
@@ -1,107 +1,30 @@
 {
-    "keyboard_name": "Keychron K3 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0234",
     	"device_version": "1.0.1"
     },
-    "layouts": {
-        "LAYOUT_iso_85": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1, "w":2},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-		        {"matrix":[4, 1], "x":1.25, "y":4},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,13], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4,14], "x":14, "y":4},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5},
-                {"matrix":[5,11], "x":11, "y":5},
-                {"matrix":[5,12], "x":12, "y":5},
-                {"matrix":[5,13], "x":13, "y":5},
-                {"matrix":[5,14], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k3_pro/iso/white/rules.mk b/keyboards/keychron/k3_pro/iso/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k3_pro/iso/white/rules.mk
+++ b/keyboards/keychron/k3_pro/iso/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k3_pro/jis/rgb/config.h b/keyboards/keychron/k3_pro/jis/rgb/config.h
index ccb766077c..f403f07168 100644
--- a/keyboards/keychron/k3_pro/jis/rgb/config.h
+++ b/keyboards/keychron/k3_pro/jis/rgb/config.h
@@ -47,54 +47,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 }
diff --git a/keyboards/keychron/k3_pro/jis/rgb/info.json b/keyboards/keychron/k3_pro/jis/rgb/info.json
index 380e7c4f3d..187aae7dff 100644
--- a/keyboards/keychron/k3_pro/jis/rgb/info.json
+++ b/keyboards/keychron/k3_pro/jis/rgb/info.json
@@ -1,111 +1,35 @@
 {
-    "keyboard_name": "Keychron K3 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0232",
     	"device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1},
-                {"matrix":[1,14], "x":14, "y":1},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,13], "x":12.25, "y":4},
-                {"matrix":[4,14], "x":13.25, "y":4.25, "w":1.75},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5},
-                {"matrix":[5, 1], "x":1, "y":5},
-                {"matrix":[5, 2], "x":2, "y":5},
-                {"matrix":[5, 3], "x":3, "y":5.25},
-                {"matrix":[5, 6], "x":4, "y":5, "w":5},
-                {"matrix":[5, 9], "x":9, "y":5.25},
-                {"matrix":[5,10], "x":10, "y":5},
-                {"matrix":[5,11], "x":11, "y":5},
-                {"matrix":[5,12], "x":12, "y":5},
-                {"matrix":[5,13], "x":13, "y":5},
-                {"matrix":[5,14], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k3_pro/jis/rgb/rules.mk b/keyboards/keychron/k3_pro/jis/rgb/rules.mk
index f5f4192470..f886ea2e8e 100644
--- a/keyboards/keychron/k3_pro/jis/rgb/rules.mk
+++ b/keyboards/keychron/k3_pro/jis/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k3_pro/jis/white/config.h b/keyboards/keychron/k3_pro/jis/white/config.h
index 7e1b851372..240dc9a02d 100644
--- a/keyboards/keychron/k3_pro/jis/white/config.h
+++ b/keyboards/keychron/k3_pro/jis/white/config.h
@@ -40,32 +40,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-// #    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-// #    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-// #    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k3_pro/jis/white/info.json b/keyboards/keychron/k3_pro/jis/white/info.json
index ec8f9c09d9..08c7bf2855 100644
--- a/keyboards/keychron/k3_pro/jis/white/info.json
+++ b/keyboards/keychron/k3_pro/jis/white/info.json
@@ -1,111 +1,30 @@
 {
-    "keyboard_name": "Keychron K3 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0235",
     	"device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1,10], "x":10, "y":1},
-                {"matrix":[1,11], "x":11, "y":1},
-                {"matrix":[1,12], "x":12, "y":1},
-                {"matrix":[1,13], "x":13, "y":1},
-                {"matrix":[1,14], "x":14, "y":1},
-                {"matrix":[1,15], "x":15, "y":1},
-
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2,10], "x":10.5, "y":2},
-                {"matrix":[2,11], "x":11.5, "y":2},
-                {"matrix":[2,12], "x":12.5, "y":2},
-                {"matrix":[2,15], "x":15, "y":2},
-
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "y":3},
-                {"matrix":[3, 3], "x":3.75, "y":3},
-                {"matrix":[3, 4], "x":4.75, "y":3},
-                {"matrix":[3, 5], "x":5.75, "y":3},
-                {"matrix":[3, 6], "x":6.75, "y":3},
-                {"matrix":[3, 7], "x":7.75, "y":3},
-                {"matrix":[3, 8], "x":8.75, "y":3},
-                {"matrix":[3, 9], "x":9.75, "y":3},
-                {"matrix":[3,10], "x":10.75, "y":3},
-                {"matrix":[3,11], "x":11.75, "y":3},
-                {"matrix":[3,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3,15], "x":15, "y":3},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4,10], "x":10.25, "y":4},
-                {"matrix":[4,11], "x":11.25, "y":4},
-                {"matrix":[4,13], "x":12.25, "y":4},
-                {"matrix":[4,14], "x":13.25, "y":4.25, "w":1.75},
-                {"matrix":[4,15], "x":15, "y":4},
-
-                {"matrix":[5, 0], "x":0, "y":5},
-                {"matrix":[5, 1], "x":1, "y":5},
-                {"matrix":[5, 2], "x":2, "y":5},
-                {"matrix":[5,3], "x":3, "y":5.25},
-                {"matrix":[5, 6], "x":4, "y":5, "w":5},
-                {"matrix":[5,9], "x":9, "y":5.25},
-                {"matrix":[5,10], "x":10, "y":5},
-                {"matrix":[5,11], "x":11, "y":5},
-                {"matrix":[5,12], "x":12, "y":5},
-                {"matrix":[5,13], "x":13, "y":5},
-                {"matrix":[5,14], "x":14, "y":5},
-                {"matrix":[5,15], "x":15, "y":5}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k3_pro/jis/white/rules.mk b/keyboards/keychron/k3_pro/jis/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k3_pro/jis/white/rules.mk
+++ b/keyboards/keychron/k3_pro/jis/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k3_pro/rules.mk b/keyboards/keychron/k3_pro/rules.mk
index 84e2c11192..15ebea7eb8 100644
--- a/keyboards/keychron/k3_pro/rules.mk
+++ b/keyboards/keychron/k3_pro/rules.mk
@@ -1,30 +1,8 @@
-# MCU name
-MCU = STM32L432
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-DIP_SWITCH_ENABLE = yes
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k4_pro/ansi/rgb/config.h b/keyboards/keychron/k4_pro/ansi/rgb/config.h
index 4fad884ea6..765c3a98a5 100644
--- a/keyboards/keychron/k4_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k4_pro/ansi/rgb/config.h
@@ -51,54 +51,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30 }
diff --git a/keyboards/keychron/k4_pro/ansi/rgb/info.json b/keyboards/keychron/k4_pro/ansi/rgb/info.json
index 22ccdfd072..78cafae157 100644
--- a/keyboards/keychron/k4_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k4_pro/ansi/rgb/info.json
@@ -1,122 +1,35 @@
 {
-    "keyboard_name": "Keychron K4 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0240",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_100": {
-            "layout": [
-                {"matrix":[0,  0], "x":0, "y":0},
-                {"matrix":[0,  1], "x":1, "y":0},
-                {"matrix":[0,  2], "x":2, "y":0},
-                {"matrix":[0,  3], "x":3, "y":0},
-                {"matrix":[0,  4], "x":4, "y":0},
-                {"matrix":[0,  5], "x":5, "y":0},
-                {"matrix":[0,  6], "x":6, "y":0},
-                {"matrix":[0,  7], "x":7, "y":0},
-                {"matrix":[0,  8], "x":8, "y":0},
-                {"matrix":[0,  9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.5, "y":0},
-                {"matrix":[0, 16], "x":16.5, "y":0},
-                {"matrix":[0, 17], "x":17.5, "y":0},
-                {"matrix":[3, 17], "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},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.5, "y":1.25},
-                {"matrix":[1,15], "x":16.5, "y":1.25},
-                {"matrix":[1,16], "x":17.5, "y":1.25},
-                {"matrix":[1,17], "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},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.5, "y":2.25},
-                {"matrix":[2,15], "x":16.5, "y":2.25},
-                {"matrix":[2,16], "x":17.5, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25, "h":2},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,14], "x":15.5, "y":3.25},
-                {"matrix":[3,15], "x":16.5, "y":3.25},
-                {"matrix":[3,16], "x":17.5, "y":3.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,13], "x":14.25, "y":4.5},
-                {"matrix":[4,14], "x":15.5, "y":4.25},
-                {"matrix":[4,15], "x":16.5, "y":4.25},
-                {"matrix":[4,16], "x":17.5, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25, "h":2},
-
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5},
-                {"matrix":[5,16], "x":16.5, "y":5.25},
-                {"matrix":[5,17], "x":17.5, "y":5.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k4_pro/ansi/rgb/rules.mk b/keyboards/keychron/k4_pro/ansi/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k4_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k4_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k4_pro/ansi/white/config.h b/keyboards/keychron/k4_pro/ansi/white/config.h
index fb0f2d5f5b..6560f1c80e 100644
--- a/keyboards/keychron/k4_pro/ansi/white/config.h
+++ b/keyboards/keychron/k4_pro/ansi/white/config.h
@@ -40,32 +40,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-//#    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-//#    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-//#    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_7CHANNEL
 
diff --git a/keyboards/keychron/k4_pro/ansi/white/info.json b/keyboards/keychron/k4_pro/ansi/white/info.json
index 115894ea22..8991a26c26 100644
--- a/keyboards/keychron/k4_pro/ansi/white/info.json
+++ b/keyboards/keychron/k4_pro/ansi/white/info.json
@@ -1,122 +1,30 @@
 {
-    "keyboard_name": "Keychron K4 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0243",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_100": {
-            "layout": [
-                {"matrix":[0,  0], "x":0, "y":0},
-                {"matrix":[0,  1], "x":1, "y":0},
-                {"matrix":[0,  2], "x":2, "y":0},
-                {"matrix":[0,  3], "x":3, "y":0},
-                {"matrix":[0,  4], "x":4, "y":0},
-                {"matrix":[0,  5], "x":5, "y":0},
-                {"matrix":[0,  6], "x":6, "y":0},
-                {"matrix":[0,  7], "x":7, "y":0},
-                {"matrix":[0,  8], "x":8, "y":0},
-                {"matrix":[0,  9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.5, "y":0},
-                {"matrix":[0, 16], "x":16.5, "y":0},
-                {"matrix":[0, 17], "x":17.5, "y":0},
-                {"matrix":[3, 17], "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},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.5, "y":1.25},
-                {"matrix":[1,15], "x":16.5, "y":1.25},
-                {"matrix":[1,16], "x":17.5, "y":1.25},
-                {"matrix":[1,17], "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},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.5, "y":2.25},
-                {"matrix":[2,15], "x":16.5, "y":2.25},
-                {"matrix":[2,16], "x":17.5, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25, "h":2},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,14], "x":15.5, "y":3.25},
-                {"matrix":[3,15], "x":16.5, "y":3.25},
-                {"matrix":[3,16], "x":17.5, "y":3.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,13], "x":14.25, "y":4.5},
-                {"matrix":[4,14], "x":15.5, "y":4.25},
-                {"matrix":[4,15], "x":16.5, "y":4.25},
-                {"matrix":[4,16], "x":17.5, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25, "h":2},
-
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5},
-                {"matrix":[5,16], "x":16.5, "y":5.25},
-                {"matrix":[5,17], "x":17.5, "y":5.25}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k4_pro/ansi/white/rules.mk b/keyboards/keychron/k4_pro/ansi/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k4_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k4_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k4_pro/config.h b/keyboards/keychron/k4_pro/config.h
index 4af87a8f18..2a28579146 100644
--- a/keyboards/keychron/k4_pro/config.h
+++ b/keyboards/keychron/k4_pro/config.h
@@ -16,26 +16,10 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { B0, A7, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k4_pro/info.json b/keyboards/keychron/k4_pro/info.json
new file mode 100644
index 0000000000..f62064cbae
--- /dev/null
+++ b/keyboards/keychron/k4_pro/info.json
@@ -0,0 +1,250 @@
+{
+    "keyboard_name": "Keychron K4 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 18
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": ["B0", "A7", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_100": {
+            "layout": [
+                {"matrix":[0,  0], "x":0, "y":0},
+                {"matrix":[0,  1], "x":1, "y":0},
+                {"matrix":[0,  2], "x":2, "y":0},
+                {"matrix":[0,  3], "x":3, "y":0},
+                {"matrix":[0,  4], "x":4, "y":0},
+                {"matrix":[0,  5], "x":5, "y":0},
+                {"matrix":[0,  6], "x":6, "y":0},
+                {"matrix":[0,  7], "x":7, "y":0},
+                {"matrix":[0,  8], "x":8, "y":0},
+                {"matrix":[0,  9], "x":9, "y":0},
+                {"matrix":[0, 10], "x":10, "y":0},
+                {"matrix":[0, 11], "x":11, "y":0},
+                {"matrix":[0, 12], "x":12, "y":0},
+                {"matrix":[0, 13], "x":13, "y":0},
+                {"matrix":[0, 14], "x":14, "y":0},
+                {"matrix":[0, 15], "x":15.5, "y":0},
+                {"matrix":[0, 16], "x":16.5, "y":0},
+                {"matrix":[0, 17], "x":17.5, "y":0},
+                {"matrix":[3, 17], "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},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.5, "y":1.25},
+                {"matrix":[1,15], "x":16.5, "y":1.25},
+                {"matrix":[1,16], "x":17.5, "y":1.25},
+                {"matrix":[1,17], "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},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.5, "y":2.25},
+                {"matrix":[2,15], "x":16.5, "y":2.25},
+                {"matrix":[2,16], "x":17.5, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25, "h":2},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3,14], "x":15.5, "y":3.25},
+                {"matrix":[3,15], "x":16.5, "y":3.25},
+                {"matrix":[3,16], "x":17.5, "y":3.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,13], "x":14.25, "y":4.5},
+                {"matrix":[4,14], "x":15.5, "y":4.25},
+                {"matrix":[4,15], "x":16.5, "y":4.25},
+                {"matrix":[4,16], "x":17.5, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25, "h":2},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5},
+                {"matrix":[5,16], "x":16.5, "y":5.25},
+                {"matrix":[5,17], "x":17.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_iso_101": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1, "y":0},
+                {"matrix":[0,2], "x":2, "y":0},
+                {"matrix":[0,3], "x":3, "y":0},
+                {"matrix":[0,4], "x":4, "y":0},
+                {"matrix":[0,5], "x":5, "y":0},
+                {"matrix":[0,6], "x":6, "y":0},
+                {"matrix":[0,7], "x":7, "y":0},
+                {"matrix":[0,8], "x":8, "y":0},
+                {"matrix":[0,9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0},
+                {"matrix":[0,14], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.5, "y":0},
+                {"matrix":[0,16], "x":16.5, "y":0},
+                {"matrix":[0,17], "x":17.5, "y":0},
+                {"matrix":[3,17], "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},
+                {"matrix":[1,3], "x":3, "y":1.25},
+                {"matrix":[1,4], "x":4, "y":1.25},
+                {"matrix":[1,5], "x":5, "y":1.25},
+                {"matrix":[1,6], "x":6, "y":1.25},
+                {"matrix":[1,7], "x":7, "y":1.25},
+                {"matrix":[1,8], "x":8, "y":1.25},
+                {"matrix":[1,9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.5, "y":1.25},
+                {"matrix":[1,15], "x":16.5, "y":1.25},
+                {"matrix":[1,16], "x":17.5, "y":1.25},
+                {"matrix":[1,17], "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},
+                {"matrix":[2,3], "x":3.5, "y":2.25},
+                {"matrix":[2,4], "x":4.5, "y":2.25},
+                {"matrix":[2,5], "x":5.5, "y":2.25},
+                {"matrix":[2,6], "x":6.5, "y":2.25},
+                {"matrix":[2,7], "x":7.5, "y":2.25},
+                {"matrix":[2,8], "x":8.5, "y":2.25},
+                {"matrix":[2,9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.5, "y":2.25},
+                {"matrix":[2,15], "x":16.5, "y":2.25},
+                {"matrix":[2,16], "x":17.5, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25, "h":2},
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":1.75, "y":3.25},
+                {"matrix":[3,2], "x":2.75, "y":3.25},
+                {"matrix":[3,3], "x":3.75, "y":3.25},
+                {"matrix":[3,4], "x":4.75, "y":3.25},
+                {"matrix":[3,5], "x":5.75, "y":3.25},
+                {"matrix":[3,6], "x":6.75, "y":3.25},
+                {"matrix":[3,7], "x":7.75, "y":3.25},
+                {"matrix":[3,8], "x":8.75, "y":3.25},
+                {"matrix":[3,9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,14], "x":15.5, "y":3.25},
+                {"matrix":[3,15], "x":16.5, "y":3.25},
+                {"matrix":[3,16], "x":17.5, "y":3.25},
+
+                {"matrix":[4,0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4,1], "x":1.25, "y":4.25},
+                {"matrix":[4,2], "x":2.25, "y":4.25},
+                {"matrix":[4,3], "x":3.25, "y":4.25},
+                {"matrix":[4,4], "x":4.25, "y":4.25},
+                {"matrix":[4,5], "x":5.25, "y":4.25},
+                {"matrix":[4,6], "x":6.25, "y":4.25},
+                {"matrix":[4,7], "x":7.25, "y":4.25},
+                {"matrix":[4,8], "x":8.25, "y":4.25},
+                {"matrix":[4,9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,13], "x":14.25, "y":4.5},
+                {"matrix":[4,14], "x":15.5, "y":4.25},
+                {"matrix":[4,15], "x":16.5, "y":4.25},
+                {"matrix":[4,16], "x":17.5, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25, "h":2},
+
+                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5},
+                {"matrix":[5,16], "x":16.5, "y":5.25},
+                {"matrix":[5,17], "x":17.5, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k4_pro/iso/rgb/config.h b/keyboards/keychron/k4_pro/iso/rgb/config.h
index 4ead364553..dd73a3b754 100644
--- a/keyboards/keychron/k4_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k4_pro/iso/rgb/config.h
@@ -47,54 +47,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30 }
diff --git a/keyboards/keychron/k4_pro/iso/rgb/info.json b/keyboards/keychron/k4_pro/iso/rgb/info.json
index 9d6adf0fc4..df0b05b894 100644
--- a/keyboards/keychron/k4_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k4_pro/iso/rgb/info.json
@@ -1,125 +1,35 @@
 {
-    "keyboard_name": "Keychron K4 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0241",
     	"device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_101": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":1, "y":0},
-                {"matrix":[0,2], "x":2, "y":0},
-                {"matrix":[0,3], "x":3, "y":0},
-                {"matrix":[0,4], "x":4, "y":0},
-                {"matrix":[0,5], "x":5, "y":0},
-                {"matrix":[0,6], "x":6, "y":0},
-                {"matrix":[0,7], "x":7, "y":0},
-                {"matrix":[0,8], "x":8, "y":0},
-                {"matrix":[0,9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15.5, "y":0},
-                {"matrix":[0,16], "x":16.5, "y":0},
-                {"matrix":[0,17], "x":17.5, "y":0},
-                {"matrix":[3,17], "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},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.5, "y":1.25},
-                {"matrix":[1,15], "x":16.5, "y":1.25},
-                {"matrix":[1,16], "x":17.5, "y":1.25},
-                {"matrix":[1,17], "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},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,14], "x":15.5, "y":2.25},
-                {"matrix":[2,15], "x":16.5, "y":2.25},
-                {"matrix":[2,16], "x":17.5, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25, "h":2},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25},
-                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3,14], "x":15.5, "y":3.25},
-                {"matrix":[3,15], "x":16.5, "y":3.25},
-                {"matrix":[3,16], "x":17.5, "y":3.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4,1], "x":1.25, "y":4.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,13], "x":14.25, "y":4.5},
-                {"matrix":[4,14], "x":15.5, "y":4.25},
-                {"matrix":[4,15], "x":16.5, "y":4.25},
-                {"matrix":[4,16], "x":17.5, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25, "h":2},
-
-                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5},
-                {"matrix":[5,16], "x":16.5, "y":5.25},
-                {"matrix":[5,17], "x":17.5, "y":5.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k4_pro/iso/rgb/rules.mk b/keyboards/keychron/k4_pro/iso/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k4_pro/iso/rgb/rules.mk
+++ b/keyboards/keychron/k4_pro/iso/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k4_pro/iso/white/config.h b/keyboards/keychron/k4_pro/iso/white/config.h
index 96530c7a1f..45a0586d07 100644
--- a/keyboards/keychron/k4_pro/iso/white/config.h
+++ b/keyboards/keychron/k4_pro/iso/white/config.h
@@ -39,35 +39,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-// #    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-// #    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-// #    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
-/* Use first 6 channels of LED driver */
-#    define PHASE_CHANNEL MSKPHASE_7CHANNEL
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
diff --git a/keyboards/keychron/k4_pro/iso/white/info.json b/keyboards/keychron/k4_pro/iso/white/info.json
index 2ca310c935..91ecb912fc 100644
--- a/keyboards/keychron/k4_pro/iso/white/info.json
+++ b/keyboards/keychron/k4_pro/iso/white/info.json
@@ -1,125 +1,30 @@
 {
-    "keyboard_name": "Keychron K4 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0244",
     	"device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_iso_101": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":1, "y":0},
-                {"matrix":[0,2], "x":2, "y":0},
-                {"matrix":[0,3], "x":3, "y":0},
-                {"matrix":[0,4], "x":4, "y":0},
-                {"matrix":[0,5], "x":5, "y":0},
-                {"matrix":[0,6], "x":6, "y":0},
-                {"matrix":[0,7], "x":7, "y":0},
-                {"matrix":[0,8], "x":8, "y":0},
-                {"matrix":[0,9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[0,15], "x":15.5, "y":0},
-                {"matrix":[0,16], "x":16.5, "y":0},
-                {"matrix":[0,17], "x":17.5, "y":0},
-                {"matrix":[3,17], "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},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.5, "y":1.25},
-                {"matrix":[1,15], "x":16.5, "y":1.25},
-                {"matrix":[1,16], "x":17.5, "y":1.25},
-                {"matrix":[1,17], "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},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,14], "x":15.5, "y":2.25},
-                {"matrix":[2,15], "x":16.5, "y":2.25},
-                {"matrix":[2,16], "x":17.5, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25, "h":2},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25},
-                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3,14], "x":15.5, "y":3.25},
-                {"matrix":[3,15], "x":16.5, "y":3.25},
-                {"matrix":[3,16], "x":17.5, "y":3.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4,1], "x":1.25, "y":4.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4,13], "x":14.25, "y":4.5},
-                {"matrix":[4,14], "x":15.5, "y":4.25},
-                {"matrix":[4,15], "x":16.5, "y":4.25},
-                {"matrix":[4,16], "x":17.5, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25, "h":2},
-
-                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25},
-                {"matrix":[5,11], "x":11, "y":5.25},
-                {"matrix":[5,12], "x":12, "y":5.25},
-                {"matrix":[5,13], "x":13.25, "y":5.5},
-                {"matrix":[5,14], "x":14.25, "y":5.5},
-                {"matrix":[5,15], "x":15.25, "y":5.5},
-                {"matrix":[5,16], "x":16.5, "y":5.25},
-                {"matrix":[5,17], "x":17.5, "y":5.25}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k4_pro/iso/white/rules.mk b/keyboards/keychron/k4_pro/iso/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k4_pro/iso/white/rules.mk
+++ b/keyboards/keychron/k4_pro/iso/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k4_pro/rules.mk b/keyboards/keychron/k4_pro/rules.mk
index 84e2c11192..15ebea7eb8 100644
--- a/keyboards/keychron/k4_pro/rules.mk
+++ b/keyboards/keychron/k4_pro/rules.mk
@@ -1,30 +1,8 @@
-# MCU name
-MCU = STM32L432
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-DIP_SWITCH_ENABLE = yes
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/config.h b/keyboards/keychron/k5_pro/ansi/rgb/config.h
index 83294b9d52..9f656ec129 100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k5_pro/ansi/rgb/config.h
@@ -45,54 +45,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 }
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/info.json b/keyboards/keychron/k5_pro/ansi/rgb/info.json
index 7cf7341733..2c7946e4de 100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k5_pro/ansi/rgb/info.json
@@ -1,132 +1,35 @@
 {
-    "keyboard_name": "Keychron K5 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-        "vid": "0x3434",
         "pid": "0x0250",
         "device_version": "1.0.1"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_108": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[0,17], "x":18.5, "y":0},
-                {"matrix":[0,18], "x":19.5, "y":0},
-                {"matrix":[0,19], "x":20.5, "y":0},
-                {"matrix":[0,20], "x":21.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},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[1,17], "x":18.5, "y":1.25},
-                {"matrix":[1,18], "x":19.5, "y":1.25},
-                {"matrix":[1,19], "x":20.5, "y":1.25},
-                {"matrix":[1,20], "x":21.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},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25},
-                {"matrix":[2,18], "x":19.5, "y":2.25},
-                {"matrix":[2,19], "x":20.5, "y":2.25},
-                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,17], "x":18.5, "y":3.25},
-                {"matrix":[3,18], "x":19.5, "y":3.25},
-                {"matrix":[3,19], "x":20.5, "y":3.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25},
-                {"matrix":[4,18], "x":19.5, "y":4.25},
-                {"matrix":[4,19], "x":20.5, "y":4.25},
-                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
-
-                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25},
-                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5,19], "x":20.5, "y":5.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/rules.mk b/keyboards/keychron/k5_pro/ansi/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k5_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k5_pro/ansi/white/config.h b/keyboards/keychron/k5_pro/ansi/white/config.h
index 3c2d99a4cf..a8a9ea29cd 100644
--- a/keyboards/keychron/k5_pro/ansi/white/config.h
+++ b/keyboards/keychron/k5_pro/ansi/white/config.h
@@ -40,32 +40,6 @@
 
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-// #define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-// #define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-// #define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 9 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_9CHANNEL
 
diff --git a/keyboards/keychron/k5_pro/ansi/white/info.json b/keyboards/keychron/k5_pro/ansi/white/info.json
index a9df1baa6a..0ef63baed4 100644
--- a/keyboards/keychron/k5_pro/ansi/white/info.json
+++ b/keyboards/keychron/k5_pro/ansi/white/info.json
@@ -1,132 +1,30 @@
 {
-    "keyboard_name": "Keychron K5 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-        "vid": "0x3434",
         "pid": "0x0253",
         "device_version": "1.0.1"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_108": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[0,17], "x":18.5, "y":0},
-                {"matrix":[0,18], "x":19.5, "y":0},
-                {"matrix":[0,19], "x":20.5, "y":0},
-                {"matrix":[0,20], "x":21.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},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[1,17], "x":18.5, "y":1.25},
-                {"matrix":[1,18], "x":19.5, "y":1.25},
-                {"matrix":[1,19], "x":20.5, "y":1.25},
-                {"matrix":[1,20], "x":21.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},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25},
-                {"matrix":[2,18], "x":19.5, "y":2.25},
-                {"matrix":[2,19], "x":20.5, "y":2.25},
-                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,17], "x":18.5, "y":3.25},
-                {"matrix":[3,18], "x":19.5, "y":3.25},
-                {"matrix":[3,19], "x":20.5, "y":3.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25},
-                {"matrix":[4,18], "x":19.5, "y":4.25},
-                {"matrix":[4,19], "x":20.5, "y":4.25},
-                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
-
-                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25},
-                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5,19], "x":20.5, "y":5.25}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k5_pro/ansi/white/rules.mk b/keyboards/keychron/k5_pro/ansi/white/rules.mk
index 290c1bb47a..f886ea2e8e 100644
--- a/keyboards/keychron/k5_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k5_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k5_pro/config.h b/keyboards/keychron/k5_pro/config.h
index 02bb3f3aa2..3cfc523829 100644
--- a/keyboards/keychron/k5_pro/config.h
+++ b/keyboards/keychron/k5_pro/config.h
@@ -16,22 +16,10 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k5_pro/info.json b/keyboards/keychron/k5_pro/info.json
new file mode 100644
index 0000000000..68a187263d
--- /dev/null
+++ b/keyboards/keychron/k5_pro/info.json
@@ -0,0 +1,148 @@
+{
+    "keyboard_name": "Keychron K5 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 21
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_108": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":2, "y":0},
+                {"matrix":[0,2], "x":3, "y":0},
+                {"matrix":[0,3], "x":4, "y":0},
+                {"matrix":[0,4], "x":5, "y":0},
+                {"matrix":[0,5], "x":6.5, "y":0},
+                {"matrix":[0,6], "x":7.5, "y":0},
+                {"matrix":[0,7], "x":8.5, "y":0},
+                {"matrix":[0,8], "x":9.5, "y":0},
+                {"matrix":[0,9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,17], "x":18.5, "y":0},
+                {"matrix":[0,18], "x":19.5, "y":0},
+                {"matrix":[0,19], "x":20.5, "y":0},
+                {"matrix":[0,20], "x":21.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},
+                {"matrix":[1,3], "x":3, "y":1.25},
+                {"matrix":[1,4], "x":4, "y":1.25},
+                {"matrix":[1,5], "x":5, "y":1.25},
+                {"matrix":[1,6], "x":6, "y":1.25},
+                {"matrix":[1,7], "x":7, "y":1.25},
+                {"matrix":[1,8], "x":8, "y":1.25},
+                {"matrix":[1,9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[1,19], "x":20.5, "y":1.25},
+                {"matrix":[1,20], "x":21.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},
+                {"matrix":[2,3], "x":3.5, "y":2.25},
+                {"matrix":[2,4], "x":4.5, "y":2.25},
+                {"matrix":[2,5], "x":5.5, "y":2.25},
+                {"matrix":[2,6], "x":6.5, "y":2.25},
+                {"matrix":[2,7], "x":7.5, "y":2.25},
+                {"matrix":[2,8], "x":8.5, "y":2.25},
+                {"matrix":[2,9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[2,19], "x":20.5, "y":2.25},
+                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":1.75, "y":3.25},
+                {"matrix":[3,2], "x":2.75, "y":3.25},
+                {"matrix":[3,3], "x":3.75, "y":3.25},
+                {"matrix":[3,4], "x":4.75, "y":3.25},
+                {"matrix":[3,5], "x":5.75, "y":3.25},
+                {"matrix":[3,6], "x":6.75, "y":3.25},
+                {"matrix":[3,7], "x":7.75, "y":3.25},
+                {"matrix":[3,8], "x":8.75, "y":3.25},
+                {"matrix":[3,9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,19], "x":20.5, "y":3.25},
+
+                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4,2], "x":2.25, "y":4.25},
+                {"matrix":[4,3], "x":3.25, "y":4.25},
+                {"matrix":[4,4], "x":4.25, "y":4.25},
+                {"matrix":[4,5], "x":5.25, "y":4.25},
+                {"matrix":[4,6], "x":6.25, "y":4.25},
+                {"matrix":[4,7], "x":7.25, "y":4.25},
+                {"matrix":[4,8], "x":8.25, "y":4.25},
+                {"matrix":[4,9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25},
+                {"matrix":[4,18], "x":19.5, "y":4.25},
+                {"matrix":[4,19], "x":20.5, "y":4.25},
+                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
+
+                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25},
+                {"matrix":[5,17], "x":18.5, "y":5.25, "w":2},
+                {"matrix":[5,19], "x":20.5, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/k5_pro/rules.mk b/keyboards/keychron/k5_pro/rules.mk
index 1de119ff73..98cf5c564b 100644
--- a/keyboards/keychron/k5_pro/rules.mk
+++ b/keyboards/keychron/k5_pro/rules.mk
@@ -1,27 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no         # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-BLUETOOTH_ENABLE = no
-BLUETOOTH_DRIVER = custom
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k6_pro/ansi/rgb/config.h b/keyboards/keychron/k6_pro/ansi/rgb/config.h
index d3254ec33b..e76da758c9 100644
--- a/keyboards/keychron/k6_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k6_pro/ansi/rgb/config.h
@@ -46,54 +46,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
diff --git a/keyboards/keychron/k6_pro/ansi/rgb/info.json b/keyboards/keychron/k6_pro/ansi/rgb/info.json
index 9e8a9fa87d..002e792a42 100644
--- a/keyboards/keychron/k6_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k6_pro/ansi/rgb/info.json
@@ -1,89 +1,35 @@
 {
-    "keyboard_name": "Keychron K6 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0260",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_68": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0, "w":2},
-                {"matrix":[0,14], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":2},
-                {"matrix":[1, 2], "x":2.5, "y":2},
-                {"matrix":[1, 3], "x":3.5, "y":2},
-                {"matrix":[1, 4], "x":4.5, "y":2},
-                {"matrix":[1, 5], "x":5.5, "y":2},
-                {"matrix":[1, 6], "x":6.5, "y":2},
-                {"matrix":[1, 7], "x":7.5, "y":2},
-                {"matrix":[1, 8], "x":8.5, "y":2},
-                {"matrix":[1, 9], "x":9.5, "y":2},
-                {"matrix":[1,10], "x":10.5, "y":2},
-                {"matrix":[1,11], "x":11.5, "y":2},
-                {"matrix":[1,12], "x":12.5, "y":2},
-                {"matrix":[1,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[1,14], "x":15, "y":2},
-
-                {"matrix":[2, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":3},
-                {"matrix":[2, 2], "x":2.75, "y":3},
-                {"matrix":[2, 3], "x":3.75, "y":3},
-                {"matrix":[2, 4], "x":4.75, "y":3},
-                {"matrix":[2, 5], "x":5.75, "y":3},
-                {"matrix":[2, 6], "x":6.75, "y":3},
-                {"matrix":[2, 7], "x":7.75, "y":3},
-                {"matrix":[2, 8], "x":8.75, "y":3},
-                {"matrix":[2, 9], "x":9.75, "y":3},
-                {"matrix":[2,10], "x":10.75, "y":3},
-                {"matrix":[2,11], "x":11.75, "y":3},
-                {"matrix":[2,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[2,14], "x":15, "y":3, "w":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":4},
-                {"matrix":[3, 3], "x":3.25, "y":4},
-                {"matrix":[3, 4], "x":4.25, "y":4},
-                {"matrix":[3, 5], "x":5.25, "y":4},
-                {"matrix":[3, 6], "x":6.25, "y":4},
-                {"matrix":[3, 7], "x":7.25, "y":4},
-                {"matrix":[3, 8], "x":8.25, "y":4},
-                {"matrix":[3, 9], "x":9.25, "y":4},
-                {"matrix":[3,10], "x":10.25, "y":4},
-                {"matrix":[3,11], "x":11.25, "y":4},
-                {"matrix":[3,12], "x":11.25, "y":4, "w":1.75},
-                {"matrix":[3,13], "x":14, "y":4},
-                {"matrix":[3,14], "x":15, "y":4},
-
-                {"matrix":[4, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[4, 9], "x":10, "y":5},
-                {"matrix":[4,10], "x":11, "y":5},
-                {"matrix":[4,11], "x":12, "y":5},
-                {"matrix":[4,12], "x":13, "y":5},
-                {"matrix":[4,13], "x":14, "y":5},
-                {"matrix":[4,14], "x":15, "y":5}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k6_pro/ansi/rgb/rules.mk b/keyboards/keychron/k6_pro/ansi/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k6_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k6_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k6_pro/ansi/white/config.h b/keyboards/keychron/k6_pro/ansi/white/config.h
index 8631928d19..ce82be861a 100644
--- a/keyboards/keychron/k6_pro/ansi/white/config.h
+++ b/keyboards/keychron/k6_pro/ansi/white/config.h
@@ -40,32 +40,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-//#    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-//#    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-//#    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k6_pro/ansi/white/info.json b/keyboards/keychron/k6_pro/ansi/white/info.json
index 456efcdaf1..889b38509a 100644
--- a/keyboards/keychron/k6_pro/ansi/white/info.json
+++ b/keyboards/keychron/k6_pro/ansi/white/info.json
@@ -1,89 +1,30 @@
 {
-    "keyboard_name": "Keychron K6 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0263",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_68": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0, "w":2},
-                {"matrix":[0,14], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":2},
-                {"matrix":[1, 2], "x":2.5, "y":2},
-                {"matrix":[1, 3], "x":3.5, "y":2},
-                {"matrix":[1, 4], "x":4.5, "y":2},
-                {"matrix":[1, 5], "x":5.5, "y":2},
-                {"matrix":[1, 6], "x":6.5, "y":2},
-                {"matrix":[1, 7], "x":7.5, "y":2},
-                {"matrix":[1, 8], "x":8.5, "y":2},
-                {"matrix":[1, 9], "x":9.5, "y":2},
-                {"matrix":[1,10], "x":10.5, "y":2},
-                {"matrix":[1,11], "x":11.5, "y":2},
-                {"matrix":[1,12], "x":12.5, "y":2},
-                {"matrix":[1,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[1,14], "x":15, "y":2},
-
-                {"matrix":[2, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":3},
-                {"matrix":[2, 2], "x":2.75, "y":3},
-                {"matrix":[2, 3], "x":3.75, "y":3},
-                {"matrix":[2, 4], "x":4.75, "y":3},
-                {"matrix":[2, 5], "x":5.75, "y":3},
-                {"matrix":[2, 6], "x":6.75, "y":3},
-                {"matrix":[2, 7], "x":7.75, "y":3},
-                {"matrix":[2, 8], "x":8.75, "y":3},
-                {"matrix":[2, 9], "x":9.75, "y":3},
-                {"matrix":[2,10], "x":10.75, "y":3},
-                {"matrix":[2,11], "x":11.75, "y":3},
-                {"matrix":[2,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[2,14], "x":15, "y":3, "w":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":4},
-                {"matrix":[3, 3], "x":3.25, "y":4},
-                {"matrix":[3, 4], "x":4.25, "y":4},
-                {"matrix":[3, 5], "x":5.25, "y":4},
-                {"matrix":[3, 6], "x":6.25, "y":4},
-                {"matrix":[3, 7], "x":7.25, "y":4},
-                {"matrix":[3, 8], "x":8.25, "y":4},
-                {"matrix":[3, 9], "x":9.25, "y":4},
-                {"matrix":[3,10], "x":10.25, "y":4},
-                {"matrix":[3,11], "x":11.25, "y":4},
-                {"matrix":[3,12], "x":11.25, "y":4, "w":1.75},
-                {"matrix":[3,13], "x":14, "y":4},
-                {"matrix":[3,14], "x":15, "y":4},
-
-                {"matrix":[4, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[4, 9], "x":10, "y":5},
-                {"matrix":[4,10], "x":11, "y":5},
-                {"matrix":[4,11], "x":12, "y":5},
-                {"matrix":[4,12], "x":13, "y":5},
-                {"matrix":[4,13], "x":14, "y":5},
-                {"matrix":[4,14], "x":15, "y":5}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k6_pro/ansi/white/rules.mk b/keyboards/keychron/k6_pro/ansi/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k6_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k6_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k6_pro/config.h b/keyboards/keychron/k6_pro/config.h
index 04f320780d..30d5e3176c 100644
--- a/keyboards/keychron/k6_pro/config.h
+++ b/keyboards/keychron/k6_pro/config.h
@@ -16,26 +16,10 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k6_pro/info.json b/keyboards/keychron/k6_pro/info.json
new file mode 100644
index 0000000000..e545466376
--- /dev/null
+++ b/keyboards/keychron/k6_pro/info.json
@@ -0,0 +1,263 @@
+{
+    "keyboard_name": "Keychron K6 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 5,
+        "cols": 15
+    },
+    "matrix_pins": {
+        "rows": ["B4", "B3", "A15", "A14", "A13"],
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_68": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0, "w":2},
+                {"matrix":[0,14], "x":15, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":2, "w":1.5},
+                {"matrix":[1, 1], "x":1.5, "y":2},
+                {"matrix":[1, 2], "x":2.5, "y":2},
+                {"matrix":[1, 3], "x":3.5, "y":2},
+                {"matrix":[1, 4], "x":4.5, "y":2},
+                {"matrix":[1, 5], "x":5.5, "y":2},
+                {"matrix":[1, 6], "x":6.5, "y":2},
+                {"matrix":[1, 7], "x":7.5, "y":2},
+                {"matrix":[1, 8], "x":8.5, "y":2},
+                {"matrix":[1, 9], "x":9.5, "y":2},
+                {"matrix":[1,10], "x":10.5, "y":2},
+                {"matrix":[1,11], "x":11.5, "y":2},
+                {"matrix":[1,12], "x":12.5, "y":2},
+                {"matrix":[1,13], "x":13.5, "y":2, "w":1.5},
+                {"matrix":[1,14], "x":15, "y":2},
+
+                {"matrix":[2, 0], "x":0, "y":3, "w":1.75},
+                {"matrix":[2, 1], "x":1.75, "y":3},
+                {"matrix":[2, 2], "x":2.75, "y":3},
+                {"matrix":[2, 3], "x":3.75, "y":3},
+                {"matrix":[2, 4], "x":4.75, "y":3},
+                {"matrix":[2, 5], "x":5.75, "y":3},
+                {"matrix":[2, 6], "x":6.75, "y":3},
+                {"matrix":[2, 7], "x":7.75, "y":3},
+                {"matrix":[2, 8], "x":8.75, "y":3},
+                {"matrix":[2, 9], "x":9.75, "y":3},
+                {"matrix":[2,10], "x":10.75, "y":3},
+                {"matrix":[2,11], "x":11.75, "y":3},
+                {"matrix":[2,13], "x":12.75, "y":3, "w":2.25},
+                {"matrix":[2,14], "x":15, "y":3, "w":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":4, "w":2.25},
+                {"matrix":[3, 2], "x":2.25, "y":4},
+                {"matrix":[3, 3], "x":3.25, "y":4},
+                {"matrix":[3, 4], "x":4.25, "y":4},
+                {"matrix":[3, 5], "x":5.25, "y":4},
+                {"matrix":[3, 6], "x":6.25, "y":4},
+                {"matrix":[3, 7], "x":7.25, "y":4},
+                {"matrix":[3, 8], "x":8.25, "y":4},
+                {"matrix":[3, 9], "x":9.25, "y":4},
+                {"matrix":[3,10], "x":10.25, "y":4},
+                {"matrix":[3,11], "x":11.25, "y":4},
+                {"matrix":[3,12], "x":11.25, "y":4, "w":1.75},
+                {"matrix":[3,13], "x":14, "y":4},
+                {"matrix":[3,14], "x":15, "y":4},
+
+                {"matrix":[4, 0], "x":0, "y":5, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25},
+                {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25},
+                {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25},
+                {"matrix":[4, 9], "x":10, "y":5},
+                {"matrix":[4,10], "x":11, "y":5},
+                {"matrix":[4,11], "x":12, "y":5},
+                {"matrix":[4,12], "x":13, "y":5},
+                {"matrix":[4,13], "x":14, "y":5},
+                {"matrix":[4,14], "x":15, "y":5}
+            ]
+        },
+        "LAYOUT_iso_69": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0, "w":2},
+                {"matrix":[0,14], "x":15, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":2, "w":1.5},
+                {"matrix":[1, 1], "x":1.5, "y":2},
+                {"matrix":[1, 2], "x":2.5, "y":2},
+                {"matrix":[1, 3], "x":3.5, "y":2},
+                {"matrix":[1, 4], "x":4.5, "y":2},
+                {"matrix":[1, 5], "x":5.5, "y":2},
+                {"matrix":[1, 6], "x":6.5, "y":2},
+                {"matrix":[1, 7], "x":7.5, "y":2},
+                {"matrix":[1, 8], "x":8.5, "y":2},
+                {"matrix":[1, 9], "x":9.5, "y":2},
+                {"matrix":[1,10], "x":10.5, "y":2},
+                {"matrix":[1,11], "x":11.5, "y":2},
+                {"matrix":[1,12], "x":12.5, "y":2},
+                {"matrix":[1,13], "x":13.5, "y":2, "w":1.5},
+                {"matrix":[1,14], "x":15, "y":2},
+
+                {"matrix":[2, 0], "x":0, "y":3, "w":1.75},
+                {"matrix":[2, 1], "x":1.75, "y":3},
+                {"matrix":[2, 2], "x":2.75, "y":3},
+                {"matrix":[2, 3], "x":3.75, "y":3},
+                {"matrix":[2, 4], "x":4.75, "y":3},
+                {"matrix":[2, 5], "x":5.75, "y":3},
+                {"matrix":[2, 6], "x":6.75, "y":3},
+                {"matrix":[2, 7], "x":7.75, "y":3},
+                {"matrix":[2, 8], "x":8.75, "y":3},
+                {"matrix":[2, 9], "x":9.75, "y":3},
+                {"matrix":[2,10], "x":10.75, "y":3},
+                {"matrix":[2,11], "x":11.75, "y":3},
+                {"matrix":[2,13], "x":12.75, "y":3, "w":2.25},
+                {"matrix":[2,14], "x":15, "y":3, "w":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":4, "w":1.25},
+	    	{"matrix":[3, 1], "x":1.25, "y":4},
+                {"matrix":[3, 2], "x":2.25, "y":4},
+                {"matrix":[3, 3], "x":3.25, "y":4},
+                {"matrix":[3, 4], "x":4.25, "y":4},
+                {"matrix":[3, 5], "x":5.25, "y":4},
+                {"matrix":[3, 6], "x":6.25, "y":4},
+                {"matrix":[3, 7], "x":7.25, "y":4},
+                {"matrix":[3, 8], "x":8.25, "y":4},
+                {"matrix":[3, 9], "x":9.25, "y":4},
+                {"matrix":[3,10], "x":10.25, "y":4},
+                {"matrix":[3,11], "x":11.25, "y":4},
+                {"matrix":[3,12], "x":11.25, "y":4, "w":1.75},
+                {"matrix":[3,13], "x":14, "y":4},
+                {"matrix":[3,14], "x":15, "y":4},
+
+                {"matrix":[4, 0], "x":0, "y":5, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25},
+                {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25},
+                {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25},
+                {"matrix":[4, 9], "x":10, "y":5},
+                {"matrix":[4,10], "x":11, "y":5},
+                {"matrix":[4,11], "x":12, "y":5},
+                {"matrix":[4,12], "x":13, "y":5},
+                {"matrix":[4,13], "x":14, "y":5},
+                {"matrix":[4,14], "x":15, "y":5}
+            ]
+        },
+        "LAYOUT": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1, "y":0},
+                {"matrix":[0,2], "x":2, "y":0},
+                {"matrix":[0,3], "x":3, "y":0},
+                {"matrix":[0,4], "x":4, "y":0},
+                {"matrix":[0,5], "x":5, "y":0},
+                {"matrix":[0,6], "x":6, "y":0},
+                {"matrix":[0,7], "x":7, "y":0},
+                {"matrix":[0,8], "x":8, "y":0},
+                {"matrix":[0,9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[2,12], "x":13, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,14], "x":15, "y":0},
+
+                {"matrix":[1,0], "x":0, "y":1, "w":1.5},
+                {"matrix":[1,1], "x":1.5, "y":1},
+                {"matrix":[1,2], "x":2.5, "y":1},
+                {"matrix":[1,3], "x":3.5, "y":1},
+                {"matrix":[1,4], "x":4.5, "y":1},
+                {"matrix":[1,5], "x":5.5, "y":1},
+                {"matrix":[1,6], "x":6.5, "y":1},
+                {"matrix":[1,7], "x":7.5, "y":1},
+                {"matrix":[1,8], "x":8.5, "y":1},
+                {"matrix":[1,9], "x":9.5, "y":1},
+                {"matrix":[1,10], "x":10.5, "y":1},
+                {"matrix":[1,11], "x":11.5, "y":1},
+                {"matrix":[1,12], "x":12.5, "y":1},
+                {"matrix":[1,14], "x":15, "y":1},
+
+                {"matrix":[2,0], "x":0, "y":2, "w":1.75},
+                {"matrix":[2,1], "x":1.75, "y":2},
+                {"matrix":[2,2], "x":2.75, "y":2},
+                {"matrix":[2,3], "x":3.75, "y":2},
+                {"matrix":[2,4], "x":4.75, "y":2},
+                {"matrix":[2,5], "x":5.75, "y":2},
+                {"matrix":[2,6], "x":6.75, "y":2},
+                {"matrix":[2,7], "x":7.75, "y":2},
+                {"matrix":[2,8], "x":8.75, "y":2},
+                {"matrix":[2,9], "x":9.75, "y":2},
+                {"matrix":[2,10], "x":10.75, "y":2},
+                {"matrix":[2,11], "x":11.75, "y":2},
+                {"matrix":[2,13], "x":12.75, "y":2},
+                {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2},
+                {"matrix":[2,14], "x":15, "y":2},
+
+                {"matrix":[3,0], "x":0, "y":3, "w":2.25},
+                {"matrix":[3,2], "x":2.25, "y":3},
+                {"matrix":[3,3], "x":3.25, "y":3},
+                {"matrix":[3,4], "x":4.25, "y":3},
+                {"matrix":[3,5], "x":5.25, "y":3},
+                {"matrix":[3,6], "x":6.25, "y":3},
+                {"matrix":[3,7], "x":7.25, "y":3},
+                {"matrix":[3,8], "x":8.25, "y":3},
+                {"matrix":[3,9], "x":9.25, "y":3},
+                {"matrix":[3,10], "x":10.25, "y":3},
+                {"matrix":[3,11], "x":11.25, "y":3},
+                {"matrix":[3,12], "x":12.25, "y":3},
+                {"matrix":[3,13], "x":13.25, "y":3, "w":1.75},
+                {"matrix":[3,14], "x":15, "y":3},
+
+                {"matrix":[4,0], "x":0, "y":4, "w":1.25},
+                {"matrix":[4,1], "x":1.25, "y":4},
+                {"matrix":[4,2], "x":2.25, "y":4, "w":1.25},
+                {"matrix":[4,3], "x":3.5, "y":4},
+                {"matrix":[4,6], "x":4.5, "y":4, "w":4.5},
+                {"matrix":[4,8], "x":9, "y":4},
+                {"matrix":[4,9], "x":10, "y":4},
+                {"matrix":[4,10], "x":11, "y":4},
+                {"matrix":[4,11], "x":12, "y":4},
+                {"matrix":[4,12], "x":13, "y":4},
+                {"matrix":[4,13], "x":14, "y":4},
+                {"matrix":[4,14], "x":15, "y":4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k6_pro/iso/rgb/config.h b/keyboards/keychron/k6_pro/iso/rgb/config.h
index af3eda73dd..2494f3c612 100644
--- a/keyboards/keychron/k6_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k6_pro/iso/rgb/config.h
@@ -43,54 +43,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
diff --git a/keyboards/keychron/k6_pro/iso/rgb/info.json b/keyboards/keychron/k6_pro/iso/rgb/info.json
index 579a0c271c..e133e5cf86 100644
--- a/keyboards/keychron/k6_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k6_pro/iso/rgb/info.json
@@ -1,90 +1,35 @@
 {
-    "keyboard_name": "Keychron K6 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0261",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_iso_69": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0, "w":2},
-                {"matrix":[0,14], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":2},
-                {"matrix":[1, 2], "x":2.5, "y":2},
-                {"matrix":[1, 3], "x":3.5, "y":2},
-                {"matrix":[1, 4], "x":4.5, "y":2},
-                {"matrix":[1, 5], "x":5.5, "y":2},
-                {"matrix":[1, 6], "x":6.5, "y":2},
-                {"matrix":[1, 7], "x":7.5, "y":2},
-                {"matrix":[1, 8], "x":8.5, "y":2},
-                {"matrix":[1, 9], "x":9.5, "y":2},
-                {"matrix":[1,10], "x":10.5, "y":2},
-                {"matrix":[1,11], "x":11.5, "y":2},
-                {"matrix":[1,12], "x":12.5, "y":2},
-                {"matrix":[1,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[1,14], "x":15, "y":2},
-
-                {"matrix":[2, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":3},
-                {"matrix":[2, 2], "x":2.75, "y":3},
-                {"matrix":[2, 3], "x":3.75, "y":3},
-                {"matrix":[2, 4], "x":4.75, "y":3},
-                {"matrix":[2, 5], "x":5.75, "y":3},
-                {"matrix":[2, 6], "x":6.75, "y":3},
-                {"matrix":[2, 7], "x":7.75, "y":3},
-                {"matrix":[2, 8], "x":8.75, "y":3},
-                {"matrix":[2, 9], "x":9.75, "y":3},
-                {"matrix":[2,10], "x":10.75, "y":3},
-                {"matrix":[2,11], "x":11.75, "y":3},
-                {"matrix":[2,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[2,14], "x":15, "y":3, "w":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":4, "w":1.25},
-		{"matrix":[3, 1], "x":1.25, "y":4},
-                {"matrix":[3, 2], "x":2.25, "y":4},
-                {"matrix":[3, 3], "x":3.25, "y":4},
-                {"matrix":[3, 4], "x":4.25, "y":4},
-                {"matrix":[3, 5], "x":5.25, "y":4},
-                {"matrix":[3, 6], "x":6.25, "y":4},
-                {"matrix":[3, 7], "x":7.25, "y":4},
-                {"matrix":[3, 8], "x":8.25, "y":4},
-                {"matrix":[3, 9], "x":9.25, "y":4},
-                {"matrix":[3,10], "x":10.25, "y":4},
-                {"matrix":[3,11], "x":11.25, "y":4},
-                {"matrix":[3,12], "x":11.25, "y":4, "w":1.75},
-                {"matrix":[3,13], "x":14, "y":4},
-                {"matrix":[3,14], "x":15, "y":4},
-
-                {"matrix":[4, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[4, 9], "x":10, "y":5},
-                {"matrix":[4,10], "x":11, "y":5},
-                {"matrix":[4,11], "x":12, "y":5},
-                {"matrix":[4,12], "x":13, "y":5},
-                {"matrix":[4,13], "x":14, "y":5},
-                {"matrix":[4,14], "x":15, "y":5}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k6_pro/iso/rgb/rules.mk b/keyboards/keychron/k6_pro/iso/rgb/rules.mk
index f5f4192470..f886ea2e8e 100644
--- a/keyboards/keychron/k6_pro/iso/rgb/rules.mk
+++ b/keyboards/keychron/k6_pro/iso/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k6_pro/iso/white/config.h b/keyboards/keychron/k6_pro/iso/white/config.h
index 2898bce8d5..7fb303a468 100644
--- a/keyboards/keychron/k6_pro/iso/white/config.h
+++ b/keyboards/keychron/k6_pro/iso/white/config.h
@@ -37,32 +37,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-//#    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-//#    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-//#    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k6_pro/iso/white/info.json b/keyboards/keychron/k6_pro/iso/white/info.json
index b961951a79..a41ddd9455 100644
--- a/keyboards/keychron/k6_pro/iso/white/info.json
+++ b/keyboards/keychron/k6_pro/iso/white/info.json
@@ -1,90 +1,30 @@
 {
-    "keyboard_name": "Keychron K6 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0264",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_iso_69": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0, "w":2},
-                {"matrix":[0,14], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":2},
-                {"matrix":[1, 2], "x":2.5, "y":2},
-                {"matrix":[1, 3], "x":3.5, "y":2},
-                {"matrix":[1, 4], "x":4.5, "y":2},
-                {"matrix":[1, 5], "x":5.5, "y":2},
-                {"matrix":[1, 6], "x":6.5, "y":2},
-                {"matrix":[1, 7], "x":7.5, "y":2},
-                {"matrix":[1, 8], "x":8.5, "y":2},
-                {"matrix":[1, 9], "x":9.5, "y":2},
-                {"matrix":[1,10], "x":10.5, "y":2},
-                {"matrix":[1,11], "x":11.5, "y":2},
-                {"matrix":[1,12], "x":12.5, "y":2},
-                {"matrix":[1,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[1,14], "x":15, "y":2},
-
-                {"matrix":[2, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":3},
-                {"matrix":[2, 2], "x":2.75, "y":3},
-                {"matrix":[2, 3], "x":3.75, "y":3},
-                {"matrix":[2, 4], "x":4.75, "y":3},
-                {"matrix":[2, 5], "x":5.75, "y":3},
-                {"matrix":[2, 6], "x":6.75, "y":3},
-                {"matrix":[2, 7], "x":7.75, "y":3},
-                {"matrix":[2, 8], "x":8.75, "y":3},
-                {"matrix":[2, 9], "x":9.75, "y":3},
-                {"matrix":[2,10], "x":10.75, "y":3},
-                {"matrix":[2,11], "x":11.75, "y":3},
-                {"matrix":[2,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[2,14], "x":15, "y":3, "w":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":4},
-		{"matrix":[3, 2], "x":2.25, "y":4},
-                {"matrix":[3, 3], "x":3.25, "y":4},
-                {"matrix":[3, 4], "x":4.25, "y":4},
-                {"matrix":[3, 5], "x":5.25, "y":4},
-                {"matrix":[3, 6], "x":6.25, "y":4},
-                {"matrix":[3, 7], "x":7.25, "y":4},
-                {"matrix":[3, 8], "x":8.25, "y":4},
-                {"matrix":[3, 9], "x":9.25, "y":4},
-                {"matrix":[3,10], "x":10.25, "y":4},
-                {"matrix":[3,11], "x":11.25, "y":4},
-                {"matrix":[3,12], "x":11.25, "y":4, "w":1.75},
-                {"matrix":[3,13], "x":14, "y":4},
-                {"matrix":[3,14], "x":15, "y":4},
-
-                {"matrix":[4, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[4, 9], "x":10, "y":5},
-                {"matrix":[4,10], "x":11, "y":5},
-                {"matrix":[4,11], "x":12, "y":5},
-                {"matrix":[4,12], "x":13, "y":5},
-                {"matrix":[4,13], "x":14, "y":5},
-                {"matrix":[4,14], "x":15, "y":5}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k6_pro/iso/white/rules.mk b/keyboards/keychron/k6_pro/iso/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k6_pro/iso/white/rules.mk
+++ b/keyboards/keychron/k6_pro/iso/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k6_pro/jis/rgb/config.h b/keyboards/keychron/k6_pro/jis/rgb/config.h
index cae428a714..2212c6843e 100644
--- a/keyboards/keychron/k6_pro/jis/rgb/config.h
+++ b/keyboards/keychron/k6_pro/jis/rgb/config.h
@@ -42,54 +42,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
diff --git a/keyboards/keychron/k6_pro/jis/rgb/info.json b/keyboards/keychron/k6_pro/jis/rgb/info.json
index fde6618319..5e6bd85fa1 100644
--- a/keyboards/keychron/k6_pro/jis/rgb/info.json
+++ b/keyboards/keychron/k6_pro/jis/rgb/info.json
@@ -1,94 +1,35 @@
 {
-    "keyboard_name": "Keychron K6 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0262",
     	"device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":1, "y":0},
-                {"matrix":[0,2], "x":2, "y":0},
-                {"matrix":[0,3], "x":3, "y":0},
-                {"matrix":[0,4], "x":4, "y":0},
-                {"matrix":[0,5], "x":5, "y":0},
-                {"matrix":[0,6], "x":6, "y":0},
-                {"matrix":[0,7], "x":7, "y":0},
-                {"matrix":[0,8], "x":8, "y":0},
-                {"matrix":[0,9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[2,12], "x":13, "y":0},
-                {"matrix":[0,13], "x":14, "y":0},
-                {"matrix":[0,14], "x":15, "y":0},
-
-                {"matrix":[1,0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1,1], "x":1.5, "y":1},
-                {"matrix":[1,2], "x":2.5, "y":1},
-                {"matrix":[1,3], "x":3.5, "y":1},
-                {"matrix":[1,4], "x":4.5, "y":1},
-                {"matrix":[1,5], "x":5.5, "y":1},
-                {"matrix":[1,6], "x":6.5, "y":1},
-                {"matrix":[1,7], "x":7.5, "y":1},
-                {"matrix":[1,8], "x":8.5, "y":1},
-                {"matrix":[1,9], "x":9.5, "y":1},
-                {"matrix":[1,10], "x":10.5, "y":1},
-                {"matrix":[1,11], "x":11.5, "y":1},
-                {"matrix":[1,12], "x":12.5, "y":1},
-                {"matrix":[1,14], "x":15, "y":1},
-
-                {"matrix":[2,0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2,1], "x":1.75, "y":2},
-                {"matrix":[2,2], "x":2.75, "y":2},
-                {"matrix":[2,3], "x":3.75, "y":2},
-                {"matrix":[2,4], "x":4.75, "y":2},
-                {"matrix":[2,5], "x":5.75, "y":2},
-                {"matrix":[2,6], "x":6.75, "y":2},
-                {"matrix":[2,7], "x":7.75, "y":2},
-                {"matrix":[2,8], "x":8.75, "y":2},
-                {"matrix":[2,9], "x":9.75, "y":2},
-                {"matrix":[2,10], "x":10.75, "y":2},
-                {"matrix":[2,11], "x":11.75, "y":2},
-                {"matrix":[2,13], "x":12.75, "y":2},
-                {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2},
-                {"matrix":[2,14], "x":15, "y":2},
-
-                {"matrix":[3,0], "x":0, "y":3, "w":2.25},
-                {"matrix":[3,2], "x":2.25, "y":3},
-                {"matrix":[3,3], "x":3.25, "y":3},
-                {"matrix":[3,4], "x":4.25, "y":3},
-                {"matrix":[3,5], "x":5.25, "y":3},
-                {"matrix":[3,6], "x":6.25, "y":3},
-                {"matrix":[3,7], "x":7.25, "y":3},
-                {"matrix":[3,8], "x":8.25, "y":3},
-                {"matrix":[3,9], "x":9.25, "y":3},
-                {"matrix":[3,10], "x":10.25, "y":3},
-                {"matrix":[3,11], "x":11.25, "y":3},
-                {"matrix":[3,12], "x":12.25, "y":3},
-                {"matrix":[3,13], "x":13.25, "y":3, "w":1.75},
-                {"matrix":[3,14], "x":15, "y":3},
-
-                {"matrix":[4,0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4,1], "x":1.25, "y":4},
-                {"matrix":[4,2], "x":2.25, "y":4, "w":1.25},
-                {"matrix":[4,3], "x":3.5, "y":4},
-                {"matrix":[4,6], "x":4.5, "y":4, "w":4.5},
-                {"matrix":[4,8], "x":9, "y":4},
-                {"matrix":[4,9], "x":10, "y":4},
-                {"matrix":[4,10], "x":11, "y":4},
-                {"matrix":[4,11], "x":12, "y":4},
-                {"matrix":[4,12], "x":13, "y":4},
-                {"matrix":[4,13], "x":14, "y":4},
-                {"matrix":[4,14], "x":15, "y":4}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k6_pro/jis/rgb/rules.mk b/keyboards/keychron/k6_pro/jis/rgb/rules.mk
index f5f4192470..f886ea2e8e 100644
--- a/keyboards/keychron/k6_pro/jis/rgb/rules.mk
+++ b/keyboards/keychron/k6_pro/jis/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k6_pro/rules.mk b/keyboards/keychron/k6_pro/rules.mk
index 7244d12fd2..15ebea7eb8 100644
--- a/keyboards/keychron/k6_pro/rules.mk
+++ b/keyboards/keychron/k6_pro/rules.mk
@@ -1,35 +1,8 @@
-# MCU name
-MCU = STM32L432
- 
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with
-BLUETOOTH_DRIVER = custom
-AUDIO_ENABLE = no           # Audio output on port C6
-DIP_SWITCH_ENABLE = yes
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k7_pro/ansi/rgb/config.h b/keyboards/keychron/k7_pro/ansi/rgb/config.h
index cafbc88f38..0b6b08e292 100644
--- a/keyboards/keychron/k7_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k7_pro/ansi/rgb/config.h
@@ -46,54 +46,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
diff --git a/keyboards/keychron/k7_pro/ansi/rgb/info.json b/keyboards/keychron/k7_pro/ansi/rgb/info.json
index d2c3cb1097..2d11455840 100644
--- a/keyboards/keychron/k7_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k7_pro/ansi/rgb/info.json
@@ -1,89 +1,35 @@
 {
-    "keyboard_name": "Keychron K7 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0270",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_68": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0, "w":2},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":2},
-                {"matrix":[1, 2], "x":2.5, "y":2},
-                {"matrix":[1, 3], "x":3.5, "y":2},
-                {"matrix":[1, 4], "x":4.5, "y":2},
-                {"matrix":[1, 5], "x":5.5, "y":2},
-                {"matrix":[1, 6], "x":6.5, "y":2},
-                {"matrix":[1, 7], "x":7.5, "y":2},
-                {"matrix":[1, 8], "x":8.5, "y":2},
-                {"matrix":[1, 9], "x":9.5, "y":2},
-                {"matrix":[1,10], "x":10.5, "y":2},
-                {"matrix":[1,11], "x":11.5, "y":2},
-                {"matrix":[1,12], "x":12.5, "y":2},
-                {"matrix":[1,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[1,15], "x":15, "y":2},
-
-                {"matrix":[2, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":3},
-                {"matrix":[2, 2], "x":2.75, "y":3},
-                {"matrix":[2, 3], "x":3.75, "y":3},
-                {"matrix":[2, 4], "x":4.75, "y":3},
-                {"matrix":[2, 5], "x":5.75, "y":3},
-                {"matrix":[2, 6], "x":6.75, "y":3},
-                {"matrix":[2, 7], "x":7.75, "y":3},
-                {"matrix":[2, 8], "x":8.75, "y":3},
-                {"matrix":[2, 9], "x":9.75, "y":3},
-                {"matrix":[2,10], "x":10.75, "y":3},
-                {"matrix":[2,11], "x":11.75, "y":3},
-                {"matrix":[2,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[2,15], "x":15, "y":3, "w":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":4},
-                {"matrix":[3, 3], "x":3.25, "y":4},
-                {"matrix":[3, 4], "x":4.25, "y":4},
-                {"matrix":[3, 5], "x":5.25, "y":4},
-                {"matrix":[3, 6], "x":6.25, "y":4},
-                {"matrix":[3, 7], "x":7.25, "y":4},
-                {"matrix":[3, 8], "x":8.25, "y":4},
-                {"matrix":[3, 9], "x":9.25, "y":4},
-                {"matrix":[3,10], "x":10.25, "y":4},
-                {"matrix":[3,11], "x":11.25, "y":4},
-                {"matrix":[3,13], "x":11.25, "y":4, "w":1.75},
-                {"matrix":[3,14], "x":14, "y":4},
-                {"matrix":[3,15], "x":15, "y":4},
-
-                {"matrix":[4, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[4,10], "x":10, "y":5},
-                {"matrix":[4,11], "x":11, "y":5},
-                {"matrix":[4,12], "x":12, "y":5},
-                {"matrix":[4,13], "x":13, "y":5},
-                {"matrix":[4,14], "x":14, "y":5},
-                {"matrix":[4,15], "x":15, "y":5}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k7_pro/ansi/rgb/rules.mk b/keyboards/keychron/k7_pro/ansi/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k7_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k7_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k7_pro/ansi/white/config.h b/keyboards/keychron/k7_pro/ansi/white/config.h
index 8369026ac3..28d6234898 100644
--- a/keyboards/keychron/k7_pro/ansi/white/config.h
+++ b/keyboards/keychron/k7_pro/ansi/white/config.h
@@ -40,32 +40,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-//#    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-//#    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-//#    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k7_pro/ansi/white/info.json b/keyboards/keychron/k7_pro/ansi/white/info.json
index 6778168efe..27700c4aa4 100644
--- a/keyboards/keychron/k7_pro/ansi/white/info.json
+++ b/keyboards/keychron/k7_pro/ansi/white/info.json
@@ -1,89 +1,30 @@
 {
-    "keyboard_name": "Keychron K7 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0273",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_68": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0, "w":2},
-                {"matrix":[0,15], "x":15, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":2},
-                {"matrix":[1, 2], "x":2.5, "y":2},
-                {"matrix":[1, 3], "x":3.5, "y":2},
-                {"matrix":[1, 4], "x":4.5, "y":2},
-                {"matrix":[1, 5], "x":5.5, "y":2},
-                {"matrix":[1, 6], "x":6.5, "y":2},
-                {"matrix":[1, 7], "x":7.5, "y":2},
-                {"matrix":[1, 8], "x":8.5, "y":2},
-                {"matrix":[1, 9], "x":9.5, "y":2},
-                {"matrix":[1,10], "x":10.5, "y":2},
-                {"matrix":[1,11], "x":11.5, "y":2},
-                {"matrix":[1,12], "x":12.5, "y":2},
-                {"matrix":[1,13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[1,15], "x":15, "y":2},
-
-                {"matrix":[2, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":3},
-                {"matrix":[2, 2], "x":2.75, "y":3},
-                {"matrix":[2, 3], "x":3.75, "y":3},
-                {"matrix":[2, 4], "x":4.75, "y":3},
-                {"matrix":[2, 5], "x":5.75, "y":3},
-                {"matrix":[2, 6], "x":6.75, "y":3},
-                {"matrix":[2, 7], "x":7.75, "y":3},
-                {"matrix":[2, 8], "x":8.75, "y":3},
-                {"matrix":[2, 9], "x":9.75, "y":3},
-                {"matrix":[2,10], "x":10.75, "y":3},
-                {"matrix":[2,11], "x":11.75, "y":3},
-                {"matrix":[2,13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[2,15], "x":15, "y":3, "w":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":4},
-                {"matrix":[3, 3], "x":3.25, "y":4},
-                {"matrix":[3, 4], "x":4.25, "y":4},
-                {"matrix":[3, 5], "x":5.25, "y":4},
-                {"matrix":[3, 6], "x":6.25, "y":4},
-                {"matrix":[3, 7], "x":7.25, "y":4},
-                {"matrix":[3, 8], "x":8.25, "y":4},
-                {"matrix":[3, 9], "x":9.25, "y":4},
-                {"matrix":[3,10], "x":10.25, "y":4},
-                {"matrix":[3,11], "x":11.25, "y":4},
-                {"matrix":[3,13], "x":11.25, "y":4, "w":1.75},
-                {"matrix":[3,14], "x":14, "y":4},
-                {"matrix":[3,15], "x":15, "y":4},
-
-                {"matrix":[4, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[4,10], "x":10, "y":5},
-                {"matrix":[4,11], "x":11, "y":5},
-                {"matrix":[4,12], "x":12, "y":5},
-                {"matrix":[4,13], "x":13, "y":5},
-                {"matrix":[4,14], "x":14, "y":5},
-                {"matrix":[4,15], "x":15, "y":5}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k7_pro/ansi/white/rules.mk b/keyboards/keychron/k7_pro/ansi/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k7_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k7_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k7_pro/config.h b/keyboards/keychron/k7_pro/config.h
index eae06b1a2f..81430eadb9 100644
--- a/keyboards/keychron/k7_pro/config.h
+++ b/keyboards/keychron/k7_pro/config.h
@@ -16,19 +16,6 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C15, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Use SPI to drive 74HC595 shift register */
 #define DRIVE_SHRIFT_REGISTER_WITH_SPI
 
@@ -36,9 +23,6 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k7_pro/info.json b/keyboards/keychron/k7_pro/info.json
new file mode 100644
index 0000000000..f4ed9fc733
--- /dev/null
+++ b/keyboards/keychron/k7_pro/info.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Keychron K7 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 5,
+        "cols": 16
+    },
+    "matrix_pins": {
+        "rows": ["B4", "B3", "A15", "A14", "A13"],
+        "cols": ["C15", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_68": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1, "y":0},
+                {"matrix":[0, 2], "x":2, "y":0},
+                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix":[0, 4], "x":4, "y":0},
+                {"matrix":[0, 5], "x":5, "y":0},
+                {"matrix":[0, 6], "x":6, "y":0},
+                {"matrix":[0, 7], "x":7, "y":0},
+                {"matrix":[0, 8], "x":8, "y":0},
+                {"matrix":[0, 9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0, "w":2},
+                {"matrix":[0,15], "x":15, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":2, "w":1.5},
+                {"matrix":[1, 1], "x":1.5, "y":2},
+                {"matrix":[1, 2], "x":2.5, "y":2},
+                {"matrix":[1, 3], "x":3.5, "y":2},
+                {"matrix":[1, 4], "x":4.5, "y":2},
+                {"matrix":[1, 5], "x":5.5, "y":2},
+                {"matrix":[1, 6], "x":6.5, "y":2},
+                {"matrix":[1, 7], "x":7.5, "y":2},
+                {"matrix":[1, 8], "x":8.5, "y":2},
+                {"matrix":[1, 9], "x":9.5, "y":2},
+                {"matrix":[1,10], "x":10.5, "y":2},
+                {"matrix":[1,11], "x":11.5, "y":2},
+                {"matrix":[1,12], "x":12.5, "y":2},
+                {"matrix":[1,13], "x":13.5, "y":2, "w":1.5},
+                {"matrix":[1,15], "x":15, "y":2},
+
+                {"matrix":[2, 0], "x":0, "y":3, "w":1.75},
+                {"matrix":[2, 1], "x":1.75, "y":3},
+                {"matrix":[2, 2], "x":2.75, "y":3},
+                {"matrix":[2, 3], "x":3.75, "y":3},
+                {"matrix":[2, 4], "x":4.75, "y":3},
+                {"matrix":[2, 5], "x":5.75, "y":3},
+                {"matrix":[2, 6], "x":6.75, "y":3},
+                {"matrix":[2, 7], "x":7.75, "y":3},
+                {"matrix":[2, 8], "x":8.75, "y":3},
+                {"matrix":[2, 9], "x":9.75, "y":3},
+                {"matrix":[2,10], "x":10.75, "y":3},
+                {"matrix":[2,11], "x":11.75, "y":3},
+                {"matrix":[2,13], "x":12.75, "y":3, "w":2.25},
+                {"matrix":[2,15], "x":15, "y":3, "w":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":4, "w":2.25},
+                {"matrix":[3, 2], "x":2.25, "y":4},
+                {"matrix":[3, 3], "x":3.25, "y":4},
+                {"matrix":[3, 4], "x":4.25, "y":4},
+                {"matrix":[3, 5], "x":5.25, "y":4},
+                {"matrix":[3, 6], "x":6.25, "y":4},
+                {"matrix":[3, 7], "x":7.25, "y":4},
+                {"matrix":[3, 8], "x":8.25, "y":4},
+                {"matrix":[3, 9], "x":9.25, "y":4},
+                {"matrix":[3,10], "x":10.25, "y":4},
+                {"matrix":[3,11], "x":11.25, "y":4},
+                {"matrix":[3,13], "x":11.25, "y":4, "w":1.75},
+                {"matrix":[3,14], "x":14, "y":4},
+                {"matrix":[3,15], "x":15, "y":4},
+
+                {"matrix":[4, 0], "x":0, "y":5, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25},
+                {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25},
+                {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25},
+                {"matrix":[4,10], "x":10, "y":5},
+                {"matrix":[4,11], "x":11, "y":5},
+                {"matrix":[4,12], "x":12, "y":5},
+                {"matrix":[4,13], "x":13, "y":5},
+                {"matrix":[4,14], "x":14, "y":5},
+                {"matrix":[4,15], "x":15, "y":5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k7_pro/rules.mk b/keyboards/keychron/k7_pro/rules.mk
index 84e2c11192..15ebea7eb8 100644
--- a/keyboards/keychron/k7_pro/rules.mk
+++ b/keyboards/keychron/k7_pro/rules.mk
@@ -1,30 +1,8 @@
-# MCU name
-MCU = STM32L432
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-DIP_SWITCH_ENABLE = yes
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k8_pro/ansi/info.json b/keyboards/keychron/k8_pro/ansi/info.json
new file mode 100644
index 0000000000..f4045d38f3
--- /dev/null
+++ b/keyboards/keychron/k8_pro/ansi/info.json
@@ -0,0 +1,100 @@
+{
+    "layouts": {
+        "LAYOUT_ansi_87": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "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},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/config.h b/keyboards/keychron/k8_pro/ansi/rgb/config.h
index 76cf4fea45..70bb00e209 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k8_pro/ansi/rgb/config.h
@@ -42,54 +42,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/info.json b/keyboards/keychron/k8_pro/ansi/rgb/info.json
index 303ec1bf57..7091c46e9a 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k8_pro/ansi/rgb/info.json
@@ -1,109 +1,35 @@
 {
-    "keyboard_name": "Keychron K8 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0280",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_87": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "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},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/rules.mk b/keyboards/keychron/k8_pro/ansi/rgb/rules.mk
index 5975e7843e..f886ea2e8e 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k8_pro/ansi/rgb/rules.mk
@@ -1,3 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
-
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k8_pro/ansi/white/config.h b/keyboards/keychron/k8_pro/ansi/white/config.h
index 57483be6b3..d1e0274606 100644
--- a/keyboards/keychron/k8_pro/ansi/white/config.h
+++ b/keyboards/keychron/k8_pro/ansi/white/config.h
@@ -35,32 +35,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-//#    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-//#    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-//#    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k8_pro/ansi/white/info.json b/keyboards/keychron/k8_pro/ansi/white/info.json
index 7545631b91..27be4d351f 100644
--- a/keyboards/keychron/k8_pro/ansi/white/info.json
+++ b/keyboards/keychron/k8_pro/ansi/white/info.json
@@ -1,109 +1,30 @@
 {
-    "keyboard_name": "Keychron K8 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0283",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_87": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "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},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k8_pro/ansi/white/rules.mk b/keyboards/keychron/k8_pro/ansi/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k8_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k8_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k8_pro/config.h b/keyboards/keychron/k8_pro/config.h
index dc315d1894..b0fb7abc17 100644
--- a/keyboards/keychron/k8_pro/config.h
+++ b/keyboards/keychron/k8_pro/config.h
@@ -16,26 +16,10 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { B0, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k8_pro/info.json b/keyboards/keychron/k8_pro/info.json
new file mode 100644
index 0000000000..ae4c537f07
--- /dev/null
+++ b/keyboards/keychron/k8_pro/info.json
@@ -0,0 +1,224 @@
+{
+    "keyboard_name": "Keychron K8 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 17
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_87": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "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},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_iso_88": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 3], "x":4, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6.5, "y":0},
+                {"matrix":[0, 6], "x":7.5, "y":0},
+                {"matrix":[0, 7], "x":8.5, "y":0},
+                {"matrix":[0, 8], "x":9.5, "y":0},
+                {"matrix":[0, 9], "x":11, "y":0},
+                {"matrix":[0,10], "x":12, "y":0},
+                {"matrix":[0,11], "x":13, "y":0},
+                {"matrix":[0,12], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4, 1], "x":1.25, "y":4.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "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},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/k8_pro/iso/rgb/config.h b/keyboards/keychron/k8_pro/iso/rgb/config.h
index e304d6a7bb..f2d5086b84 100644
--- a/keyboards/keychron/k8_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k8_pro/iso/rgb/config.h
@@ -38,53 +38,6 @@
 
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
 
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
diff --git a/keyboards/keychron/k8_pro/iso/rgb/info.json b/keyboards/keychron/k8_pro/iso/rgb/info.json
index d894287090..c0638f4381 100644
--- a/keyboards/keychron/k8_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k8_pro/iso/rgb/info.json
@@ -1,110 +1,35 @@
 {
-    "keyboard_name": "Keychron K8 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0281",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_iso_88": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-		{"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "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},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k8_pro/iso/rgb/rules.mk b/keyboards/keychron/k8_pro/iso/rgb/rules.mk
index 5975e7843e..f886ea2e8e 100644
--- a/keyboards/keychron/k8_pro/iso/rgb/rules.mk
+++ b/keyboards/keychron/k8_pro/iso/rgb/rules.mk
@@ -1,3 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
-
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k8_pro/iso/white/config.h b/keyboards/keychron/k8_pro/iso/white/config.h
index 57483be6b3..d1e0274606 100644
--- a/keyboards/keychron/k8_pro/iso/white/config.h
+++ b/keyboards/keychron/k8_pro/iso/white/config.h
@@ -35,32 +35,6 @@
  */
 #    define LED_MATRIX_KEYPRESSES
 
-#    define ENABLE_LED_MATRIX_NONE
-#    define ENABLE_LED_MATRIX_SOLID
-//#    define ENABLE_LED_MATRIX_ALPHAS_MODS
-#    define ENABLE_LED_MATRIX_BREATHING
-//#    define ENABLE_LED_MATRIX_BAND
-#    define ENABLE_LED_MATRIX_BAND_PINWHEEL
-#    define ENABLE_LED_MATRIX_BAND_SPIRAL
-#    define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_CYCLE_UP_DOWN
-#    define ENABLE_LED_MATRIX_CYCLE_OUT_IN
-#    define ENABLE_LED_MATRIX_DUAL_BEACON
-
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-#    define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#    define ENABLE_LED_MATRIX_SOLID_SPLASH
-//#    define ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-
-#    define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
-#    define ENABLE_LED_MATRIX_WAVE_UP_DOWN
-#    define ENABLE_LED_MATRIX_EFFECT_MAX
-
 /* Use first 6 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_6CHANNEL
 
diff --git a/keyboards/keychron/k8_pro/iso/white/info.json b/keyboards/keychron/k8_pro/iso/white/info.json
index 1e2762f6a9..466950eccf 100644
--- a/keyboards/keychron/k8_pro/iso/white/info.json
+++ b/keyboards/keychron/k8_pro/iso/white/info.json
@@ -1,110 +1,30 @@
 {
-    "keyboard_name": "Keychron K8 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0284",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_iso_88": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-		{"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "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},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
         }
     }
 }
diff --git a/keyboards/keychron/k8_pro/iso/white/rules.mk b/keyboards/keychron/k8_pro/iso/white/rules.mk
index 6b0c2a0769..f886ea2e8e 100644
--- a/keyboards/keychron/k8_pro/iso/white/rules.mk
+++ b/keyboards/keychron/k8_pro/iso/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k8_pro/rules.mk b/keyboards/keychron/k8_pro/rules.mk
index 7244d12fd2..15ebea7eb8 100644
--- a/keyboards/keychron/k8_pro/rules.mk
+++ b/keyboards/keychron/k8_pro/rules.mk
@@ -1,35 +1,8 @@
-# MCU name
-MCU = STM32L432
- 
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with
-BLUETOOTH_DRIVER = custom
-AUDIO_ENABLE = no           # Audio output on port C6
-DIP_SWITCH_ENABLE = yes
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/k9_pro/ansi/rgb/config.h b/keyboards/keychron/k9_pro/ansi/rgb/config.h
index 9fa8482dfe..507ef17232 100644
--- a/keyboards/keychron/k9_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k9_pro/ansi/rgb/config.h
@@ -44,54 +44,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
diff --git a/keyboards/keychron/k9_pro/ansi/rgb/info.json b/keyboards/keychron/k9_pro/ansi/rgb/info.json
index c5cec23256..f8bfaf0590 100644
--- a/keyboards/keychron/k9_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k9_pro/ansi/rgb/info.json
@@ -1,84 +1,35 @@
 {
-    "keyboard_name": "Keychron K9 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0290",
     	"device_version": "1.0.0"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_ansi_61": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":1, "y":0},
-                {"matrix":[0,2], "x":2, "y":0},
-                {"matrix":[0,3], "x":3, "y":0},
-                {"matrix":[0,4], "x":4, "y":0},
-                {"matrix":[0,5], "x":5, "y":0},
-                {"matrix":[0,6], "x":6, "y":0},
-                {"matrix":[0,7], "x":7, "y":0},
-                {"matrix":[0,8], "x":8, "y":0},
-                {"matrix":[0,9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0, "w":2},
-                {"matrix":[1,0], "x":0, "y":1, "w":1.5},
-
-                {"matrix":[1,1], "x":1.5, "y":1},
-                {"matrix":[1,2], "x":2.5, "y":1},
-                {"matrix":[1,3], "x":3.5, "y":1},
-                {"matrix":[1,4], "x":4.5, "y":1},
-                {"matrix":[1,5], "x":5.5, "y":1},
-                {"matrix":[1,6], "x":6.5, "y":1},
-                {"matrix":[1,7], "x":7.5, "y":1},
-                {"matrix":[1,8], "x":8.5, "y":1},
-                {"matrix":[1,9], "x":9.5, "y":1},
-                {"matrix":[1,10], "x":10.5, "y":1},
-                {"matrix":[1,11], "x":11.5, "y":1},
-                {"matrix":[1,12], "x":12.5, "y":1},
-                {"matrix":[1,13], "x":13.5, "y":1, "w":1.5},
-
-                {"matrix":[2,0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2,1], "x":1.75, "y":2},
-                {"matrix":[2,2], "x":2.75, "y":2},
-                {"matrix":[2,3], "x":3.75, "y":2},
-                {"matrix":[2,4], "x":4.75, "y":2},
-                {"matrix":[2,5], "x":5.75, "y":2},
-                {"matrix":[2,6], "x":6.75, "y":2},
-                {"matrix":[2,7], "x":7.75, "y":2},
-                {"matrix":[2,8], "x":8.75, "y":2},
-                {"matrix":[2,9], "x":9.75, "y":2},
-                {"matrix":[2,10], "x":10.75, "y":2},
-                {"matrix":[2,11], "x":11.75, "y":2},
-                {"matrix":[2,13], "x":12.75, "y":2, "w":2.25},
-
-                {"matrix":[3,0], "x":0, "y":3, "w":2.25},
-                {"matrix":[3,2], "x":2.25, "y":3},
-                {"matrix":[3,3], "x":3.25, "y":3},
-                {"matrix":[3,4], "x":4.25, "y":3},
-                {"matrix":[3,5], "x":5.25, "y":3},
-                {"matrix":[3,6], "x":6.25, "y":3},
-                {"matrix":[3,7], "x":7.25, "y":3},
-                {"matrix":[3,8], "x":8.25, "y":3},
-                {"matrix":[3,9], "x":9.25, "y":3},
-                {"matrix":[3,10], "x":10.25, "y":3},
-                {"matrix":[3,11], "x":11.25, "y":3},
-                {"matrix":[3,13], "x":12.25, "y":3, "w":2.75},
-
-                {"matrix":[4,0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4,6], "x":3.75, "y":4, "w":6.25},
-                {"matrix":[4,10], "x":10, "y":4, "w":1.25},
-                {"matrix":[4,11], "x":11.25, "y":4, "w":1.25},
-                {"matrix":[4,12], "x":12.5, "y":4, "w":1.25},
-                {"matrix":[4,13], "x":13.75, "y":4, "w":1.25}
-            ]
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k9_pro/ansi/rgb/rules.mk b/keyboards/keychron/k9_pro/ansi/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k9_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k9_pro/ansi/rgb/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/k9_pro/config.h b/keyboards/keychron/k9_pro/config.h
index 1962946eb7..8d3b769dd1 100644
--- a/keyboards/keychron/k9_pro/config.h
+++ b/keyboards/keychron/k9_pro/config.h
@@ -16,22 +16,10 @@
 
 #pragma once
 
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/k9_pro/info.json b/keyboards/keychron/k9_pro/info.json
new file mode 100644
index 0000000000..fdc495f607
--- /dev/null
+++ b/keyboards/keychron/k9_pro/info.json
@@ -0,0 +1,100 @@
+{
+    "keyboard_name": "Keychron K9 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 5,
+        "cols": 16
+    },
+    "matrix_pins": {
+        "rows": ["B4", "B3", "A15", "A14", "A13"],
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "layouts": {
+        "LAYOUT_ansi_61": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1, "y":0},
+                {"matrix":[0,2], "x":2, "y":0},
+                {"matrix":[0,3], "x":3, "y":0},
+                {"matrix":[0,4], "x":4, "y":0},
+                {"matrix":[0,5], "x":5, "y":0},
+                {"matrix":[0,6], "x":6, "y":0},
+                {"matrix":[0,7], "x":7, "y":0},
+                {"matrix":[0,8], "x":8, "y":0},
+                {"matrix":[0,9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0, "w":2},
+                {"matrix":[1,0], "x":0, "y":1, "w":1.5},
+
+                {"matrix":[1,1], "x":1.5, "y":1},
+                {"matrix":[1,2], "x":2.5, "y":1},
+                {"matrix":[1,3], "x":3.5, "y":1},
+                {"matrix":[1,4], "x":4.5, "y":1},
+                {"matrix":[1,5], "x":5.5, "y":1},
+                {"matrix":[1,6], "x":6.5, "y":1},
+                {"matrix":[1,7], "x":7.5, "y":1},
+                {"matrix":[1,8], "x":8.5, "y":1},
+                {"matrix":[1,9], "x":9.5, "y":1},
+                {"matrix":[1,10], "x":10.5, "y":1},
+                {"matrix":[1,11], "x":11.5, "y":1},
+                {"matrix":[1,12], "x":12.5, "y":1},
+                {"matrix":[1,13], "x":13.5, "y":1, "w":1.5},
+
+                {"matrix":[2,0], "x":0, "y":2, "w":1.75},
+                {"matrix":[2,1], "x":1.75, "y":2},
+                {"matrix":[2,2], "x":2.75, "y":2},
+                {"matrix":[2,3], "x":3.75, "y":2},
+                {"matrix":[2,4], "x":4.75, "y":2},
+                {"matrix":[2,5], "x":5.75, "y":2},
+                {"matrix":[2,6], "x":6.75, "y":2},
+                {"matrix":[2,7], "x":7.75, "y":2},
+                {"matrix":[2,8], "x":8.75, "y":2},
+                {"matrix":[2,9], "x":9.75, "y":2},
+                {"matrix":[2,10], "x":10.75, "y":2},
+                {"matrix":[2,11], "x":11.75, "y":2},
+                {"matrix":[2,13], "x":12.75, "y":2, "w":2.25},
+
+                {"matrix":[3,0], "x":0, "y":3, "w":2.25},
+                {"matrix":[3,2], "x":2.25, "y":3},
+                {"matrix":[3,3], "x":3.25, "y":3},
+                {"matrix":[3,4], "x":4.25, "y":3},
+                {"matrix":[3,5], "x":5.25, "y":3},
+                {"matrix":[3,6], "x":6.25, "y":3},
+                {"matrix":[3,7], "x":7.25, "y":3},
+                {"matrix":[3,8], "x":8.25, "y":3},
+                {"matrix":[3,9], "x":9.25, "y":3},
+                {"matrix":[3,10], "x":10.25, "y":3},
+                {"matrix":[3,11], "x":11.25, "y":3},
+                {"matrix":[3,13], "x":12.25, "y":3, "w":2.75},
+
+                {"matrix":[4,0], "x":0, "y":4, "w":1.25},
+                {"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
+                {"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
+                {"matrix":[4,6], "x":3.75, "y":4, "w":6.25},
+                {"matrix":[4,10], "x":10, "y":4, "w":1.25},
+                {"matrix":[4,11], "x":11.25, "y":4, "w":1.25},
+                {"matrix":[4,12], "x":12.5, "y":4, "w":1.25},
+                {"matrix":[4,13], "x":13.75, "y":4, "w":1.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/k9_pro/rules.mk b/keyboards/keychron/k9_pro/rules.mk
index ee301839c3..98cf5c564b 100644
--- a/keyboards/keychron/k9_pro/rules.mk
+++ b/keyboards/keychron/k9_pro/rules.mk
@@ -1,24 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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           # USB Nkey Rollover
-ENCODER_ENABLE = no         # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-BLUETOOTH_ENABLE = no
-BLUETOOTH_DRIVER = custom
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/q1_pro/ansi_knob/config.h b/keyboards/keychron/q1_pro/ansi_knob/config.h
index d6b3e80c6c..e7ebcf4214 100644
--- a/keyboards/keychron/q1_pro/ansi_knob/config.h
+++ b/keyboards/keychron/q1_pro/ansi_knob/config.h
@@ -18,7 +18,6 @@
 
 /* Encoder Configuration */
 #ifdef ENCODER_ENABLE
-#    define ENCODER_RESOLUTION 4
 #    define ENCODER_DEFAULT_POS 0x3
 #endif
 
@@ -47,60 +46,11 @@
  * For full list of effects, see:
  * https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
  */
-
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1_pro/ansi_knob/info.json b/keyboards/keychron/q1_pro/ansi_knob/info.json
index 304f2d3090..7bfd333649 100644
--- a/keyboards/keychron/q1_pro/ansi_knob/info.json
+++ b/keyboards/keychron/q1_pro/ansi_knob/info.json
@@ -1,20 +1,8 @@
 {
-    "keyboard_name": "Keychron Q1 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0610",
     	"device_version": "1.0.0"
     },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A0"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_82": {
             "layout": [
diff --git a/keyboards/keychron/q1_pro/ansi_knob/rules.mk b/keyboards/keychron/q1_pro/ansi_knob/rules.mk
index 535d5ebc18..f886ea2e8e 100644
--- a/keyboards/keychron/q1_pro/ansi_knob/rules.mk
+++ b/keyboards/keychron/q1_pro/ansi_knob/rules.mk
@@ -1,4 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
-ENCODER_ENABLE = yes        # Enable Encoder
-ENCODER_MAP_ENABLE = yes
\ No newline at end of file
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/q1_pro/config.h b/keyboards/keychron/q1_pro/config.h
index 867aa91a0d..9a6da1ecf4 100644
--- a/keyboards/keychron/q1_pro/config.h
+++ b/keyboards/keychron/q1_pro/config.h
@@ -16,25 +16,9 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/q1_pro/info.json b/keyboards/keychron/q1_pro/info.json
new file mode 100644
index 0000000000..bb1a34b25a
--- /dev/null
+++ b/keyboards/keychron/q1_pro/info.json
@@ -0,0 +1,63 @@
+{
+    "keyboard_name": "Keychron Q1 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A0", "resolution": 4}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true,
+        "encoder": true,
+        "encoder_map": true,
+        "rgb_matrix": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 16
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q1_pro/iso_knob/config.h b/keyboards/keychron/q1_pro/iso_knob/config.h
index 539f7d2f93..a87fb4d674 100644
--- a/keyboards/keychron/q1_pro/iso_knob/config.h
+++ b/keyboards/keychron/q1_pro/iso_knob/config.h
@@ -18,11 +18,6 @@
 
 /* Encoder Configuration */
 #ifdef ENCODER_ENABLE
-#    define ENCODERS_PAD_A \
-        { A10 }
-#    define ENCODERS_PAD_B \
-        { A0 }
-#    define ENCODER_RESOLUTION 4
 #    define ENCODER_DEFAULT_POS 0x3
 #endif
 
@@ -55,54 +50,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
diff --git a/keyboards/keychron/q1_pro/iso_knob/info.json b/keyboards/keychron/q1_pro/iso_knob/info.json
index 1811b6e03a..8d96101f1b 100644
--- a/keyboards/keychron/q1_pro/iso_knob/info.json
+++ b/keyboards/keychron/q1_pro/iso_knob/info.json
@@ -1,20 +1,8 @@
 {
-    "keyboard_name": "Keychron Q1 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lokher",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0611",
     	"device_version": "1.0.0"
     },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A0"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_iso_83": {
             "layout": [
diff --git a/keyboards/keychron/q1_pro/iso_knob/rules.mk b/keyboards/keychron/q1_pro/iso_knob/rules.mk
index a2a7f281a5..f886ea2e8e 100644
--- a/keyboards/keychron/q1_pro/iso_knob/rules.mk
+++ b/keyboards/keychron/q1_pro/iso_knob/rules.mk
@@ -1,4 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
-ENCODER_ENABLE = yes        # Enable Encoder
-ENCODER_MAP_ENABLE = yes
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/q1_pro/rules.mk b/keyboards/keychron/q1_pro/rules.mk
index 84e2c11192..15ebea7eb8 100644
--- a/keyboards/keychron/q1_pro/rules.mk
+++ b/keyboards/keychron/q1_pro/rules.mk
@@ -1,30 +1,8 @@
-# MCU name
-MCU = STM32L432
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-DIP_SWITCH_ENABLE = yes
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/config.h b/keyboards/keychron/q2_pro/ansi_encoder/config.h
index 9349e263bc..3fb1c48a04 100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/config.h
+++ b/keyboards/keychron/q2_pro/ansi_encoder/config.h
@@ -48,54 +48,6 @@
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
-
 /* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
 #    define PHASE_CHANNEL MSKPHASE_9CHANNEL
 
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/info.json b/keyboards/keychron/q2_pro/ansi_encoder/info.json
index ef13b35f73..98b0c077fb 100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/info.json
+++ b/keyboards/keychron/q2_pro/ansi_encoder/info.json
@@ -1,20 +1,8 @@
 {
-    "keyboard_name": "Keychron Q2 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-     "usb": {
-    	"vid": "0x3434",
+    "usb": {
     	"pid": "0x0620",
     	"device_version": "1.0.0"
     },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A0"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_knob_67": {
             "layout": [
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/rules.mk b/keyboards/keychron/q2_pro/ansi_encoder/rules.mk
index 4f20668f49..f886ea2e8e 100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q2_pro/ansi_encoder/rules.mk
@@ -1,3 +1 @@
-ENCODER_ENABLE = yes        # Enable Encoder
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/q2_pro/config.h b/keyboards/keychron/q2_pro/config.h
index 207ea5417b..d2f32e4617 100644
--- a/keyboards/keychron/q2_pro/config.h
+++ b/keyboards/keychron/q2_pro/config.h
@@ -16,22 +16,10 @@
 
 #pragma once
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/q2_pro/info.json b/keyboards/keychron/q2_pro/info.json
new file mode 100644
index 0000000000..65e3eab0fc
--- /dev/null
+++ b/keyboards/keychron/q2_pro/info.json
@@ -0,0 +1,62 @@
+{
+    "keyboard_name": "Keychron Q2 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A0", "resolution": 4}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true,
+        "encoder": true,
+        "rgb_matrix": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 5,
+        "cols": 16
+    },
+    "matrix_pins": {
+        "rows": ["B4", "B3", "A15", "A14", "A13"],
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q2_pro/rules.mk b/keyboards/keychron/q2_pro/rules.mk
index 0824dfed8b..98cf5c564b 100644
--- a/keyboards/keychron/q2_pro/rules.mk
+++ b/keyboards/keychron/q2_pro/rules.mk
@@ -1,23 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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           # USB Nkey Rollover
-DIP_SWITCH_ENABLE = yes
-BLUETOOTH_ENABLE = no
-BLUETOOTH_DRIVER = custom
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/config.h b/keyboards/keychron/q3_pro/ansi_encoder/config.h
index 8c0fbb754c..c111b5c6c0 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/config.h
+++ b/keyboards/keychron/q3_pro/ansi_encoder/config.h
@@ -50,52 +50,4 @@
 
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_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
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/info.json b/keyboards/keychron/q3_pro/ansi_encoder/info.json
index 6184fc2b1a..50b57d199e 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/info.json
+++ b/keyboards/keychron/q3_pro/ansi_encoder/info.json
@@ -1,20 +1,8 @@
 {
-    "keyboard_name": "Keychron Q3 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
-    	"vid": "0x3434",
     	"pid": "0x0630",
     	"device_version": "1.0.0"
     },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A10", "pin_b": "A0"}
-        ]
-    },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_ansi_92": {
             "layout": [
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/q3_pro/config.h b/keyboards/keychron/q3_pro/config.h
index 4be8751f2d..dde2580aec 100644
--- a/keyboards/keychron/q3_pro/config.h
+++ b/keyboards/keychron/q3_pro/config.h
@@ -16,22 +16,10 @@
 
 #pragma once
 
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define LED_DISABLE_WHEN_USB_SUSPENDED
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* DIP switch for Mac/win OS switch */
 #define DIP_SWITCH_PINS \
     { A8 }
diff --git a/keyboards/keychron/q3_pro/info.json b/keyboards/keychron/q3_pro/info.json
new file mode 100644
index 0000000000..93b771951b
--- /dev/null
+++ b/keyboards/keychron/q3_pro/info.json
@@ -0,0 +1,63 @@
+{
+    "keyboard_name": "Keychron Q3 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A0", "resolution": 4}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true,
+        "raw": true,
+        "encoder": true,
+        "encoder_map": true,
+        "rgb_matrix": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_size": {
+        "rows": 6,
+        "cols": 18
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom_lite": true 
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q3_pro/rules.mk b/keyboards/keychron/q3_pro/rules.mk
index 5f5fafa281..98cf5c564b 100644
--- a/keyboards/keychron/q3_pro/rules.mk
+++ b/keyboards/keychron/q3_pro/rules.mk
@@ -1,24 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable boot magic
-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           # USB Nkey Rollover
-ENCODER_ENABLE = yes        # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-BLUETOOTH_ENABLE = no
-BLUETOOTH_DRIVER = custom
-RAW_ENABLE = yes
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk