14 files changed, 21 insertions, 8 deletions
diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h
index b591893634..8641113690 100644
--- a/keyboards/xiudi/xd60/rev2/config.h
+++ b/keyboards/xiudi/xd60/rev2/config.h
@@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Backlight Setup */
 #define BACKLIGHT_PIN F5
 #define BACKLIGHT_LEVELS 6
-#define BACKLIGHT_ON_STATE 0
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json
index 29e6891948..6d6d288d0c 100644
--- a/keyboards/xiudi/xd60/rev2/info.json
+++ b/keyboards/xiudi/xd60/rev2/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "pid": "0x6060"
     },
+    "backlight": {
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
index 30004147eb..05acd6cba2 100644
--- a/keyboards/xiudi/xd60/rev3/config.h
+++ b/keyboards/xiudi/xd60/rev3/config.h
@@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Backlight Setup */
 #define BACKLIGHT_PIN F5
 #define BACKLIGHT_LEVELS 6
-#define BACKLIGHT_ON_STATE 0
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json
index 76273bbc3b..85e6a5d3f4 100644
--- a/keyboards/xiudi/xd60/rev3/info.json
+++ b/keyboards/xiudi/xd60/rev3/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "pid": "0x6363"
     },
+    "backlight": {
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index 920ceb356f..d1e69102e1 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -37,8 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN F5
 #define BACKLIGHT_LEVELS 6
 #define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 6
-#define BACKLIGHT_ON_STATE 0
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json
index 4f1977ae12..5163e03127 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6868",
         "device_version": "0.0.1"
     },
+    "backlight": {
+        "on_state": 0
+    },
     "indicators": {
         "caps_lock": "B2",
         "on_state": 0
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index 79f020082a..b44c70e2c1 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN F5
 #define BACKLIGHT_LEVELS 6
-#define BACKLIGHT_ON_STATE 0
 
 #define RGB_DI_PIN F6
 #ifdef RGB_DI_PIN
diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json
index c3b751f474..0c45316080 100644
--- a/keyboards/xiudi/xd75/info.json
+++ b/keyboards/xiudi/xd75/info.json
@@ -8,6 +8,9 @@
         "pid": "0x7575",
         "device_version": "0.0.1"
     },
+    "backlight": {
+        "on_state": 0
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_5x15"],
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 2c9eaf1b37..6d1024d748 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -39,7 +39,6 @@
 
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 10
-#define BACKLIGHT_ON_STATE 0
 
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 7
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
index c2fc8fc5d6..a4d40e4fcd 100644
--- a/keyboards/xiudi/xd84/info.json
+++ b/keyboards/xiudi/xd84/info.json
@@ -8,6 +8,9 @@
         "pid": "0x8484",
         "device_version": "0.0.1"
     },
+    "backlight": {
+        "on_state": 0
+    },
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index 3349dd7be2..f9b059ef56 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -44,7 +44,6 @@
 
 #define BACKLIGHT_PIN F5
 #define BACKLIGHT_LEVELS 10
-#define BACKLIGHT_ON_STATE 0
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
index 315515dbde..87f1549c57 100644
--- a/keyboards/xiudi/xd84pro/info.json
+++ b/keyboards/xiudi/xd84pro/info.json
@@ -8,6 +8,9 @@
         "pid": "0x8450",
         "device_version": "0.0.1"
     },
+    "backlight": {
+        "on_state": 0
+    },
     "indicators": {
         "caps_lock": "B2",
         "on_state": 0
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index fd927ba6d8..082512fcdf 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PIN D0
 #define BACKLIGHT_LEVELS 3
-#define BACKLIGHT_ON_STATE 0
 
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json
index bf6a9d206e..6503d55bba 100644
--- a/keyboards/xiudi/xd87/info.json
+++ b/keyboards/xiudi/xd87/info.json
@@ -8,6 +8,9 @@
     "pid": "0x8787",
     "device_version": "0.0.1"
   },
+  "backlight": {
+    "on_state": 0
+  },
   "indicators": {
     "caps_lock": "E2",
     "on_state": 0