10 files changed, 15 insertions, 16 deletions
diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h
index ece3e61136..d50067ed98 100644
--- a/keyboards/quarkeys/z40/config.h
+++ b/keyboards/quarkeys/z40/config.h
@@ -47,7 +47,6 @@
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 47
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -64,5 +63,4 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_SLEEP
 #endif
 \ No newline at end of file
diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json
index cf4729fdd2..973ea332ed 100644
--- a/keyboards/quarkeys/z40/info.json
+++ b/keyboards/quarkeys/z40/info.json
@@ -12,7 +12,9 @@
       "driver": "WS2812"
     },
     "rgblight": {
-        "max_brightness": 130
+        "led_count": 47,
+        "max_brightness": 130,
+        "sleep": true
     },
     "matrix_pins": {
       "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"],
diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h
index f02635a639..88cc0d4255 100644
--- a/keyboards/quarkeys/z60/hotswap/config.h
+++ b/keyboards/quarkeys/z60/hotswap/config.h
@@ -14,7 +14,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 80
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -32,4 +31,3 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json
index 1db45e4f7b..d0287ab275 100644
--- a/keyboards/quarkeys/z60/hotswap/info.json
+++ b/keyboards/quarkeys/z60/hotswap/info.json
@@ -16,7 +16,9 @@
         "pin": "D6"
     },
     "rgblight": {
-        "max_brightness": 140
+        "led_count": 80,
+        "max_brightness": 140,
+        "sleep": true
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h
index 588044ec30..16531d3979 100644
--- a/keyboards/quarkeys/z60/solder/config.h
+++ b/keyboards/quarkeys/z60/solder/config.h
@@ -14,7 +14,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 77
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -32,5 +31,3 @@
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
-
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json
index 75316622d1..0d1aeb2328 100644
--- a/keyboards/quarkeys/z60/solder/info.json
+++ b/keyboards/quarkeys/z60/solder/info.json
@@ -16,7 +16,9 @@
         "pin": "D6"
     },
     "rgblight": {
-        "max_brightness": 180
+        "led_count": 77,
+        "max_brightness": 180,
+        "sleep": true
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h
index f662eb9480..88cc0d4255 100644
--- a/keyboards/quarkeys/z67/hotswap/config.h
+++ b/keyboards/quarkeys/z67/hotswap/config.h
@@ -14,7 +14,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 77
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -32,4 +31,3 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json
index 43a9f465f7..ab4b9562cf 100644
--- a/keyboards/quarkeys/z67/hotswap/info.json
+++ b/keyboards/quarkeys/z67/hotswap/info.json
@@ -16,7 +16,9 @@
         "pin": "F0"
     },
     "rgblight": {
-        "max_brightness": 180
+        "led_count": 77,
+        "max_brightness": 180,
+        "sleep": true
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
diff --git a/keyboards/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h
index e65139c5ff..75f48fd8b2 100644
--- a/keyboards/quarkeys/z67/solder/config.h
+++ b/keyboards/quarkeys/z67/solder/config.h
@@ -14,7 +14,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
@@ -31,4 +30,3 @@
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define RGBLIGHT_LAYERS
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json
index 2a19958302..f711400f76 100644
--- a/keyboards/quarkeys/z67/solder/info.json
+++ b/keyboards/quarkeys/z67/solder/info.json
@@ -16,7 +16,9 @@
         "pin": "F0"
     },
     "rgblight": {
-        "max_brightness": 180
+        "led_count": 18,
+        "max_brightness": 180,
+        "sleep": true
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",