8 files changed, 24 insertions, 28 deletions
diff --git a/keyboards/qpockets/eggman/config.h b/keyboards/qpockets/eggman/config.h
index e1515e6c3d..50f05a0147 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 17e1cb2166..f9cc6c77b9 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 d52aad4c2b..50ef5b3a20 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 5bac73c642..f882474efe 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 bb8f04da2b..5be679fa50 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 5bac73c642..a6cad3665e 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 18a91c1dfd..f2723ef51c 100644
--- a/keyboards/qpockets/wanten/config.h
+++ b/keyboards/qpockets/wanten/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #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 e683761582..d78efd2758 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": [