8 files changed, 15 insertions, 7 deletions
diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h
index e48a1c82a1..5c86bf9604 100644
--- a/keyboards/mechlovin/olly/bb/config.h
+++ b/keyboards/mechlovin/olly/bb/config.h
@@ -35,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS {D6, A5, A4, A3, A6}
 
 #ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 24
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 /*== all animations enable ==*/
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index c3b55f95d8..51ba7cdf5c 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -12,6 +12,10 @@
         "pin": "D4",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 24,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "B3"
     },
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
index c028a04554..271830740b 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -37,8 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
-#define RGBLED_NUM 27
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 /*== all animations enable ==*/
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index 0d49cb611a..5152ece20d 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -17,6 +17,10 @@
         "num_lock": "B1",
         "scroll_lock": "B2"
     },
+    "rgblight": {
+        "led_count": 27,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "B3"
     },
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index a1127f6aad..4630f81cac 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #ifdef  RGBLIGHT_ENABLE
-#define RGBLED_NUM      26
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 81893874e0..f1ceec7ed8 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -8,6 +8,9 @@
         "pid": "0xD750",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 26
+    },
     "ws2812": {
         "pin": "A7"
     },
diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h
index 9b3e98be71..350695d34c 100644
--- a/keyboards/mechlovin/olly/orion/config.h
+++ b/keyboards/mechlovin/olly/orion/config.h
@@ -18,11 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 24
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json
index ad792e81af..de3ac401eb 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/info.json
@@ -18,6 +18,10 @@
         "num_lock": "A13",
         "scroll_lock": "A14"
     },
+    "rgblight": {
+        "led_count": 24,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "B15"
     },