8 files changed, 6 insertions, 30 deletions
diff --git a/keyboards/rmi_kb/mona/v1_1/config.h b/keyboards/rmi_kb/mona/v1_1/config.h
index 2d7b5e33e4..cc1173b3e4 100644
--- a/keyboards/rmi_kb/mona/v1_1/config.h
+++ b/keyboards/rmi_kb/mona/v1_1/config.h
@@ -37,6 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-
-/* indicator LEDs */
-#define LED_CAPS_LOCK_PIN B3
diff --git a/keyboards/rmi_kb/mona/v1_1/info.json b/keyboards/rmi_kb/mona/v1_1/info.json
index 77488da230..f59541cd83 100644
--- a/keyboards/rmi_kb/mona/v1_1/info.json
+++ b/keyboards/rmi_kb/mona/v1_1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x404B",
         "device_version": "0.1.1"
     },
+    "indicators": {
+        "caps_lock": "B3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/rmi_kb/mona/v32a/config.h b/keyboards/rmi_kb/mona/v32a/config.h
index 1363c8635a..e1b162e93b 100644
--- a/keyboards/rmi_kb/mona/v32a/config.h
+++ b/keyboards/rmi_kb/mona/v32a/config.h
@@ -37,6 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-
-/* indicator LEDs */
-#define LED_CAPS_LOCK_PIN C1
diff --git a/keyboards/rmi_kb/mona/v32a/info.json b/keyboards/rmi_kb/mona/v32a/info.json
index 3e802d1a4e..03d2dfa9f6 100644
--- a/keyboards/rmi_kb/mona/v32a/info.json
+++ b/keyboards/rmi_kb/mona/v32a/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4032",
         "device_version": "0.1.1"
     },
+    "indicators": {
+        "caps_lock": "C1"
+    },
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h
index 4997395a45..130c531c56 100644
--- a/keyboards/rmi_kb/squishyfrl/config.h
+++ b/keyboards/rmi_kb/squishyfrl/config.h
@@ -39,12 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
-
 #define RGB_DI_PIN C15
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 8fa3a43667..c57f9f8591 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -39,12 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
-
 #define RGB_DI_PIN C15
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
diff --git a/keyboards/rmi_kb/tkl_ff/config.h b/keyboards/rmi_kb/tkl_ff/config.h
index 2aeec8d58c..b8ed645cb2 100644
--- a/keyboards/rmi_kb/tkl_ff/config.h
+++ b/keyboards/rmi_kb/tkl_ff/config.h
@@ -38,12 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index 7edcb3f1ea..d5c58f8f05 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
@@ -42,12 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { D2 }
 #define ENCODERS_PAD_B { D1 }
 
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
-
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF