10 files changed, 29 insertions, 24 deletions
diff --git a/keyboards/bpiphany/ghost_squid/config.h b/keyboards/bpiphany/ghost_squid/config.h
index e40a2ed932..f18ee18888 100644
--- a/keyboards/bpiphany/ghost_squid/config.h
+++ b/keyboards/bpiphany/ghost_squid/config.h
@@ -24,8 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-
-#define LED_PIN_ON_STATE 0
-#define LED_NUM_LOCK_PIN C5
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN B7
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
index 9dcba8091a..bed329ccaf 100644
--- a/keyboards/bpiphany/ghost_squid/info.json
+++ b/keyboards/bpiphany/ghost_squid/info.json
@@ -8,6 +8,12 @@
         "pid": "0x6050",
         "device_version": "1.0.4"
     },
+    "indicators": {
+        "caps_lock": "C6",
+        "num_lock": "C5",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "community_layouts": [
diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
index 7c8752847b..f567c3e12a 100755
--- a/keyboards/bpiphany/hid_liber/config.h
+++ b/keyboards/bpiphany/hid_liber/config.h
@@ -25,10 +25,6 @@
 // HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3.
 //#define DIODE_DIRECTION
 
-#define LED_CAPS_LOCK_PIN B5
-#define LED_SCROLL_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
-
 /* 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/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json
index d368b1b886..fb7ec97d19 100644
--- a/keyboards/bpiphany/hid_liber/info.json
+++ b/keyboards/bpiphany/hid_liber/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB919",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B5",
+        "scroll_lock": "B6",
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index 9c682076b0..21ed9d44c7 100644
--- a/keyboards/bpiphany/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_NUM_LOCK_PIN B7
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN C5
-#define LED_PIN_ON_STATE 0
-
 /* 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/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json
index 13de5a5fd6..03e5162481 100644
--- a/keyboards/bpiphany/kitten_paw/info.json
+++ b/keyboards/bpiphany/kitten_paw/info.json
@@ -8,6 +8,12 @@
     "pid": "0x6050",
     "device_version": "1.0.4"
   },
+  "indicators": {
+    "caps_lock": "C6",
+    "num_lock": "B7",
+    "scroll_lock": "C5",
+    "on_state": 0
+  },
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "community_layouts": ["fullsize_ansi"],
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h
index dd4240ef29..cb63e867fc 100644
--- a/keyboards/bpiphany/tiger_lily/config.h
+++ b/keyboards/bpiphany/tiger_lily/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { C2, B3, B4, B2, B1, C7, B6, B5 }
 #define MATRIX_COL_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-#define LED_NUM_LOCK_PIN C5
-#define LED_CAPS_LOCK_PIN C6
-#define LED_SCROLL_LOCK_PIN B7
-#define LED_PIN_ON_STATE 0
-
 /* 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/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json
index 8b2e19671e..75d126eb50 100644
--- a/keyboards/bpiphany/tiger_lily/info.json
+++ b/keyboards/bpiphany/tiger_lily/info.json
@@ -8,6 +8,12 @@
     "pid": "0x544C",
     "device_version": "0.0.1"
   },
+  "indicators": {
+    "caps_lock": "C6",
+    "num_lock": "C5",
+    "scroll_lock": "B7",
+    "on_state": 0
+  },
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "community_layouts": ["fullsize_ansi"],
diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h
index c27bbd5a96..af21267357 100644
--- a/keyboards/bpiphany/unloved_bastard/config.h
+++ b/keyboards/bpiphany/unloved_bastard/config.h
@@ -22,11 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
 
-#define LED_NUM_LOCK_PIN B7
-#define LED_CAPS_LOCK_PIN C5
-#define LED_SCROLL_LOCK_PIN C6
-#define LED_PIN_ON_STATE 0
-
 /* 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/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json
index c67802caf5..7f16025525 100644
--- a/keyboards/bpiphany/unloved_bastard/info.json
+++ b/keyboards/bpiphany/unloved_bastard/info.json
@@ -7,6 +7,12 @@
     "pid": "0x1337",
     "device_version": "0.0.1"
   },
+  "indicators": {
+    "caps_lock": "C5",
+    "num_lock": "B7",
+    "scroll_lock": "C6",
+    "on_state": 0
+  },
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "community_layouts": ["tkl_ansi", "tkl_iso"],