12 files changed, 36 insertions, 35 deletions
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index 013bb4e7d4..f0fc0f712a 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -17,12 +17,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID    0x5842
-#define PRODUCT_ID   0x4B6E
-#define DEVICE_VER   0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT      KNIGHT
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json
index dca3ea1ed1..d4ce054f0b 100644
--- a/keyboards/xbows/knight/info.json
+++ b/keyboards/xbows/knight/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "KNIGHT",
+    "manufacturer": "X-BOWS",
     "url": "",
     "maintainer": "xbows-qmk",
+    "usb": {
+        "vid": "0x5842",
+        "pid": "0x4B6E",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index 414b5a86b7..91c6dcebd4 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -17,12 +17,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID    0x5842
-#define PRODUCT_ID   0x4B50
-#define DEVICE_VER   0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT      KNIGHT_PLUS
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/info.json
index 7b6521510f..8311f0026e 100644
--- a/keyboards/xbows/knight_plus/info.json
+++ b/keyboards/xbows/knight_plus/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "KNIGHT_PLUS",
+    "manufacturer": "X-BOWS",
     "url": "",
     "maintainer": "xbows-qmk",
+    "usb": {
+        "vid": "0x5842",
+        "pid": "0x4B50",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index d9d6a2753e..a248fa37bb 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -17,12 +17,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID    0x5842
-#define PRODUCT_ID   0x4E61
-#define DEVICE_VER   0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT      NATURE
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/info.json
index 62e2c1f6d9..69da3dec9c 100644
--- a/keyboards/xbows/nature/info.json
+++ b/keyboards/xbows/nature/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "NATURE",
+    "manufacturer": "X-BOWS",
     "url": "",
     "maintainer": "xbows-qmk",
+    "usb": {
+        "vid": "0x5842",
+        "pid": "0x4E61",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index c36ee1a52c..7eb56caea7 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -17,12 +17,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID    0x5842
-#define PRODUCT_ID   0x4E75
-#define DEVICE_VER   0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT      NUMPAD
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4
 #define MATRIX_ROW_PINS { B5, B4, C6, B6, D7, B3 }
diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json
index f4be5f56d1..543a4f876f 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "NUMPAD",
+    "manufacturer": "X-BOWS",
     "url": "",
     "maintainer": "xbows-qmk",
+    "usb": {
+        "vid": "0x5842",
+        "pid": "0x4E75",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index 73a1bc3a74..6c557bf341 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -17,12 +17,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID    0x5842
-#define PRODUCT_ID   0x5261
-#define DEVICE_VER   0x0001
-#define MANUFACTURER X-BOWS
-#define PRODUCT      Ranger
-
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
 #define MATRIX_ROW_PINS { C7, B6, B4, C6, B5, D6 }
diff --git a/keyboards/xbows/ranger/info.json b/keyboards/xbows/ranger/info.json
index 8f0e3d1135..29919193c3 100644
--- a/keyboards/xbows/ranger/info.json
+++ b/keyboards/xbows/ranger/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Ranger",
+    "manufacturer": "X-BOWS",
     "url": "",
     "maintainer": "xbows-qmk",
+    "usb": {
+        "vid": "0x5842",
+        "pid": "0x5261",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_tkl_ansi"
     },
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index 9d04eb84c4..d6b7f32c68 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -1,10 +1,5 @@
 #pragma once
 #include "config_common.h"
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x1224
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    X-BOWS
-#define PRODUCT         WOO-DY
 
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
index 4e4e77a4ba..5b984811df 100644
--- a/keyboards/xbows/woody/info.json
+++ b/keyboards/xbows/woody/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "WOO-DY", 
+    "manufacturer": "X-BOWS",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1224",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":6.25}, {"x":10.25, "y":4, "w":1.5}, {"x":11.75, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]