diff --git a/keyboards/q4z/config.h b/keyboards/q4z/config.h
index 8a591a9a898..19d618a025e 100644
--- a/keyboards/q4z/config.h
+++ b/keyboards/q4z/config.h
@@ -17,13 +17,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x0001
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER drmmr
-#define PRODUCT q4z keyboard
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 10
diff --git a/keyboards/q4z/info.json b/keyboards/q4z/info.json
index 47fe4dd0ed1..6b1503f5514 100644
--- a/keyboards/q4z/info.json
+++ b/keyboards/q4z/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "q4z",
+ "manufacturer": "drmmr",
"url": "",
"maintainer": "rjboone",
+ "usb": {
+ "vid": "0x0001",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/qpockets/eggman/config.h
index e1515e6c3d8..50f05a0147b 100644
--- a/keyboards/qpockets/eggman/config.h
+++ b/keyboards/qpockets/eggman/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7170
-#define PRODUCT_ID 0x656D
-#define DEVICE_VER 0x1000
-#define MANUFACTURER qpockets
-#define PRODUCT eggman
-
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 7
diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json
index 17e1cb21668..f9cc6c77b9c 100644
--- a/keyboards/qpockets/eggman/info.json
+++ b/keyboards/qpockets/eggman/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "eggman",
+ "manufacturer": "qpockets",
"url": "",
"maintainer": "qpockets",
+ "usb": {
+ "vid": "0x7170",
+ "pid": "0x656D",
+ "device_version": "10.0.0"
+ },
"layouts": {
"LAYOUT_default": {
"layout": [
diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h
index d52aad4c2b9..50ef5b3a209 100644
--- a/keyboards/qpockets/space_space/rev1/config.h
+++ b/keyboards/qpockets/space_space/rev1/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7170
-#define PRODUCT_ID 0x7373
-#define DEVICE_VER 0x3000
-#define MANUFACTURER qpockets
-#define PRODUCT space_space
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 11
diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
index 5bac73c6421..f882474efe5 100644
--- a/keyboards/qpockets/space_space/rev1/info.json
+++ b/keyboards/qpockets/space_space/rev1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "space_space",
+ "manufacturer": "qpockets",
"url": "",
"maintainer": "qpockets",
+ "usb": {
+ "vid": "0x7170",
+ "pid": "0x7373",
+ "device_version": "30.0.0"
+ },
"layouts": {
"LAYOUT_default": {
"layout": [
diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index bb8f04da2bc..5be679fa509 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7170
-#define PRODUCT_ID 0x7373
-#define DEVICE_VER 0x3002
-#define MANUFACTURER qpockets
-#define PRODUCT space_space
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 11
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index 5bac73c6421..a6cad3665ea 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "space_space",
+ "manufacturer": "qpockets",
"url": "",
"maintainer": "qpockets",
+ "usb": {
+ "vid": "0x7170",
+ "pid": "0x7373",
+ "device_version": "30.0.2"
+ },
"layouts": {
"LAYOUT_default": {
"layout": [
diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h
index 18a91c1dfdc..f2723ef51ce 100644
--- a/keyboards/qpockets/wanten/config.h
+++ b/keyboards/qpockets/wanten/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7170 //qp
-#define PRODUCT_ID 0x7774 //wt
-#define DEVICE_VER 0x0001
-#define MANUFACTURER qpockets
-#define PRODUCT wanten
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12
diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json
index e6837615826..d78efd2758c 100644
--- a/keyboards/qpockets/wanten/info.json
+++ b/keyboards/qpockets/wanten/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "wanten",
+ "manufacturer": "qpockets",
"url": "",
"maintainer": "qpockets",
+ "usb": {
+ "vid": "0x7170",
+ "pid": "0x7774",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_default": {
"layout": [
diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h
index 36cb275a97b..e5e9af0d7aa 100644
--- a/keyboards/quad_h/lb75/config.h
+++ b/keyboards/quad_h/lb75/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xA103
-#define PRODUCT_ID 0x0007
-#define DEVICE_VER 0x0001
-#define MANUFACTURER QUADH
-#define PRODUCT LB75
-
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 8
diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json
index 84916f1b9bd..10e63cb2d02 100644
--- a/keyboards/quad_h/lb75/info.json
+++ b/keyboards/quad_h/lb75/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "LB75",
+ "manufacturer": "QUADH",
"url": "",
"maintainer": "ai03",
+ "usb": {
+ "vid": "0xA103",
+ "pid": "0x0007",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_continuous_fnrow": {
"layout": [
diff --git a/keyboards/quantrik/kyuu/config.h b/keyboards/quantrik/kyuu/config.h
index 772e404ad01..e0e30baa63e 100644
--- a/keyboards/quantrik/kyuu/config.h
+++ b/keyboards/quantrik/kyuu/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5154 // "QT"
-#define PRODUCT_ID 0x0009
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Quantrik
-#define PRODUCT Kyuu
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/quantrik/kyuu/info.json b/keyboards/quantrik/kyuu/info.json
index c245b8baee8..f30b74c1a77 100644
--- a/keyboards/quantrik/kyuu/info.json
+++ b/keyboards/quantrik/kyuu/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Kyuu",
+ "manufacturer": "Quantrik",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x5154",
+ "pid": "0x0009",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h
index d1a5c2eb0bf..e3c38406dbc 100644
--- a/keyboards/qvex/lynepad/config.h
+++ b/keyboards/qvex/lynepad/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5156
-#define PRODUCT_ID 0x4C50
-#define DEVICE_VER 0x0001
-#define MANUFACTURER QVEX
-#define PRODUCT Lynepad
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 4
diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json
index 46612141c17..3a21a1f9b58 100644
--- a/keyboards/qvex/lynepad/info.json
+++ b/keyboards/qvex/lynepad/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "QVEX Lynepad",
+ "keyboard_name": "Lynepad",
+ "manufacturer": "QVEX",
"url": "https://www.tindie.com/products/qvex_tech/qvex-lynepad-macro-keypad/",
"maintainer": "KemoNine",
+ "usb": {
+ "vid": "0x5156",
+ "pid": "0x4C50",
+ "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]
diff --git a/keyboards/qwertykeys/qk65/hotswap/config.h b/keyboards/qwertykeys/qk65/hotswap/config.h
index 8dfaf1648d3..51b4780c225 100644
--- a/keyboards/qwertykeys/qk65/hotswap/config.h
+++ b/keyboards/qwertykeys/qk65/hotswap/config.h
@@ -19,14 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4F53 //0x4F53 for qwertykeys
-#define PRODUCT_ID 0x514B //0x514B QK for QK65
-#define DEVICE_VER 0x0001
-#define MANUFACTURER qwertykeys
-#define PRODUCT QK65
-
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json
index 21d30bd4911..a4684a27db1 100644
--- a/keyboards/qwertykeys/qk65/hotswap/info.json
+++ b/keyboards/qwertykeys/qk65/hotswap/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "qk65",
+ "keyboard_name": "QK65 Hotswap",
+ "manufacturer": "qwertykeys",
"url": "",
"maintainer": "qwertykeys",
+ "usb": {
+ "vid": "0x4F53",
+ "pid": "0x514B",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT_hotswap": "LAYOUT_65_ansi_blocker"
},
diff --git a/keyboards/qwertykeys/qk65/solder/config.h b/keyboards/qwertykeys/qk65/solder/config.h
index be8c11bbdaa..b12d6d41214 100644
--- a/keyboards/qwertykeys/qk65/solder/config.h
+++ b/keyboards/qwertykeys/qk65/solder/config.h
@@ -19,14 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter s*/
-#define VENDOR_ID 0x4F53 // 0x4F53 for qwertykeys
-#define PRODUCT_ID 0x5153 //0x5153 QS for QK65 Solder
-#define DEVICE_VER 0x0001
-#define MANUFACTURER qwertykeys
-#define PRODUCT QK65
-
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json
index 53c5179f428..332f881cb3a 100644
--- a/keyboards/qwertykeys/qk65/solder/info.json
+++ b/keyboards/qwertykeys/qk65/solder/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "qk65",
+ "keyboard_name": "QK65 Solder",
+ "manufacturer": "qwertykeys",
"url": "",
"maintainer": "qwertykeys",
+ "usb": {
+ "vid": "0x4F53",
+ "pid": "0x5153",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT_solder": "LAYOUT_all",
"LAYOUT_iso": "LAYOUT_65_iso_blocker"
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 4ca8fed1927..748999ac64c 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xCEEB
-#define PRODUCT_ID 0x1256
-#define DEVICE_VER 0x0100
-#define MANUFACTURER AYDENandDAD Youtube
-#define PRODUCT QWERTYYdox
-
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8
diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index 53de10d3f63..ee19ee58c0a 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -1,8 +1,14 @@
{
"keyboard_name": "QWERTYYdox",
+ "manufacturer": "AYDENandDAD Youtube",
"identifier": "0x1256",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xCEEB",
+ "pid": "0x1256",
+ "device_version": "1.0.0"
+ },
"bootloader": "caterina",
"processor": "atmega32u4",
"layouts": {