10 files changed, 21 insertions, 16 deletions
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index 2677dbf30c..2ac58e35e8 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN F5
 #define BACKLIGHT_LEVELS 6
 #define BACKLIGHT_BREATHING
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json
index 1a14004290..4f1977ae12 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/info.json
@@ -8,6 +8,10 @@
         "pid": "0x6868",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_iso"],
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 6a82f970ff..2c9eaf1b37 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -37,9 +37,6 @@
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
 
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 10
 #define BACKLIGHT_ON_STATE 0
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
index 7ff0dd7bcd..c2fc8fc5d6 100644
--- a/keyboards/xiudi/xd84/info.json
+++ b/keyboards/xiudi/xd84/info.json
@@ -8,6 +8,10 @@
         "pid": "0x8484",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi", "75_iso"],
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index 636fe187b1..223e68a17d 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -26,9 +26,6 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_CAPS_LOCK_PIN B2
-#define LED_PIN_ON_STATE 0
-
 #define RGB_DI_PIN F6
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 12
diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
index a80a49598b..315515dbde 100644
--- a/keyboards/xiudi/xd84pro/info.json
+++ b/keyboards/xiudi/xd84pro/info.json
@@ -8,6 +8,10 @@
         "pid": "0x8450",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B2",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi", "75_iso"],
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index 009949d249..31ea924280 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -40,9 +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 E2
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN D0
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_ON_STATE 0
diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json
index d122894de0..bf6a9d206e 100644
--- a/keyboards/xiudi/xd87/info.json
+++ b/keyboards/xiudi/xd87/info.json
@@ -8,6 +8,10 @@
     "pid": "0x8787",
     "device_version": "0.0.1"
   },
+  "indicators": {
+    "caps_lock": "E2",
+    "on_state": 0
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["tkl_ansi", "tkl_iso"],
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index d0f6e89656..8e6c6601e7 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -37,10 +37,6 @@
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
 
-#define LED_NUM_LOCK_PIN C6
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
-
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 10
 
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
index a1d16818d5..c8a62379b2 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/info.json
@@ -8,6 +8,11 @@
     "pid": "0x9696",
     "device_version": "0.0.1"
   },
+  "indicators": {
+    "caps_lock": "B6",
+    "num_lock": "C6",
+    "on_state": 0
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {