9 files changed, 17 insertions, 6 deletions
diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h
index 0901b701e4..8bc75d0616 100644
--- a/keyboards/mode/m65ha_alpha/config.h
+++ b/keyboards/mode/m65ha_alpha/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define OPENDRAIN_INDICATORS
-#define LED_CAPS_LOCK_PIN A6
 
 /*
  * Feature disable options
diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json
index e856d0a7b6..4d27f46223 100644
--- a/keyboards/mode/m65ha_alpha/info.json
+++ b/keyboards/mode/m65ha_alpha/info.json
@@ -8,6 +8,9 @@
     "pid": "0x6566",
     "device_version": "0.6.5"
   },
+  "indicators": {
+    "caps_lock": "A6"
+  },
   "processor": "STM32F401",
     "bootloader": "stm32-dfu",
   "layout_aliases": {
diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h
index f7f3c78e41..aab8942456 100644
--- a/keyboards/mode/m65hi_alpha/config.h
+++ b/keyboards/mode/m65hi_alpha/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define OPENDRAIN_INDICATORS
-#define LED_CAPS_LOCK_PIN A6
 
 /*
  * Feature disable options
diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json
index 3adafce6f0..c6ea41bee0 100644
--- a/keyboards/mode/m65hi_alpha/info.json
+++ b/keyboards/mode/m65hi_alpha/info.json
@@ -8,6 +8,9 @@
     "pid": "0x6574",
     "device_version": "0.6.5"
   },
+  "indicators": {
+    "caps_lock": "A6"
+  },
   "processor": "STM32F401",
     "bootloader": "stm32-dfu",
   "layout_aliases": {
diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h
index caa263cf80..a00b5d7e82 100644
--- a/keyboards/mode/m65s/config.h
+++ b/keyboards/mode/m65s/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define OPENDRAIN_INDICATORS
-#define LED_CAPS_LOCK_PIN C8
 
 /*
  * Feature disable options
diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json
index 60ee66db88..53c7ccace4 100644
--- a/keyboards/mode/m65s/info.json
+++ b/keyboards/mode/m65s/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6583",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "C8"
+    },
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h
index e78b490b31..def4e84ab5 100644
--- a/keyboards/mode/m80v2/config.h
+++ b/keyboards/mode/m80v2/config.h
@@ -30,6 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define LED_CAPS_LOCK_PIN A0
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json
index fdbd5c88d1..51788340ca 100644
--- a/keyboards/mode/m80v2/m80v2h/info.json
+++ b/keyboards/mode/m80v2/m80v2h/info.json
@@ -8,6 +8,10 @@
     	"pid": "0x0083",
     	"device_version": "0.0.2"
     },
+    "indicators": {
+    	"caps_lock": "A0",
+    	"on_state": 0
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
 	"community_layouts": [ "tkl_ansi" ],
diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json
index 0304354325..d7f5dd663b 100644
--- a/keyboards/mode/m80v2/m80v2s/info.json
+++ b/keyboards/mode/m80v2/m80v2s/info.json
@@ -8,6 +8,10 @@
     	"pid": "0x0082",
     	"device_version": "0.0.2"
     },
+    "indicators": {
+    	"caps_lock": "A0",
+    	"on_state": 0
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {