8 files changed, 22 insertions, 17 deletions
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index 0ba9a8ada7..b4baf11ff7 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -35,12 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* LED Indicators */
-#define LED_CAPS_LOCK_PIN F5
-#define LED_NUM_LOCK_PIN F6
-#define LED_SCROLL_LOCK_PIN F7
-#define LED_PIN_ON_STATE 0
-
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json
index c14c05558a..8d96a17bcc 100644
--- a/keyboards/cherrybstudio/cb1800/info.json
+++ b/keyboards/cherrybstudio/cb1800/info.json
@@ -8,6 +8,12 @@
         "pid": "0x1818",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "F5",
+        "num_lock": "F6",
+        "scroll_lock": "F7",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
index 9cfa0f8806..daf3cd4fc6 100644
--- a/keyboards/cherrybstudio/cb65/config.h
+++ b/keyboards/cherrybstudio/cb65/config.h
@@ -40,10 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_CAPS_LOCK_PIN F1
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
-
 /* RGB Lighting */
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json
index eee8faed6f..223d5560d4 100644
--- a/keyboards/cherrybstudio/cb65/info.json
+++ b/keyboards/cherrybstudio/cb65/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6565",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "F1",
+        "scroll_lock": "F4",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index 2f9a8a8754..bbbe5311cd 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -39,10 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 #endif
 
-#define LED_CAPS_LOCK_PIN F0
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
-
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json
index a0f229995b..3af7eff96d 100644
--- a/keyboards/cherrybstudio/cb87/info.json
+++ b/keyboards/cherrybstudio/cb87/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8787",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "F0",
+        "scroll_lock": "F4",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index 55bfbab687..c85ce35a37 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -34,9 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F0
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 1d4b373263..3cb29e13d0 100644
--- a/keyboards/cherrybstudio/cb87v2/info.json
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x8788",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "F0",
+        "scroll_lock": "F4",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {