8 files changed, 28 insertions, 32 deletions
diff --git a/keyboards/kudox/columner/config.h b/keyboards/kudox/columner/config.h
index 13a02bc803..a97d03596c 100644
--- a/keyboards/kudox/columner/config.h
+++ b/keyboards/kudox/columner/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xABBA
-#define PRODUCT_ID      0x9691
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Kumao Kobo
-#define PRODUCT         The Kudox Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
diff --git a/keyboards/kudox/columner/info.json b/keyboards/kudox/columner/info.json
index d11632d9da..2bc8ff50d3 100644
--- a/keyboards/kudox/columner/info.json
+++ b/keyboards/kudox/columner/info.json
@@ -1,7 +1,13 @@
 {
+    "keyboard_name": "The Kudox Keyboard Columner",
+    "manufacturer": "Kumao Kobo",
     "url": "http://kumaokobo.com/",
     "maintainer": "Kumao Kobo",
-    "keyboard_name": "Kudox Keyboard Columner",
+    "usb": {
+        "vid": "0xABBA",
+        "pid": "0x9691",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kudox/rev1/config.h b/keyboards/kudox/rev1/config.h
index de5dbbbe71..36a933dc2e 100644
--- a/keyboards/kudox/rev1/config.h
+++ b/keyboards/kudox/rev1/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xABBA
-#define PRODUCT_ID      0x9690
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Kumao Kobo
-#define PRODUCT         The Kudox Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kudox/rev1/info.json
index f92d525838..45f3a4e304 100644
--- a/keyboards/kudox/rev1/info.json
+++ b/keyboards/kudox/rev1/info.json
@@ -1,7 +1,13 @@
 {
+    "keyboard_name": "The Kudox Keyboard Rev1",
+    "manufacturer": "Kumao Kobo",
     "url": "http://kumaokobo.com/",
     "maintainer": "Kumao Kobo",
-    "keyboard_name": "Kudox Keyboard Rev1",
+    "usb": {
+        "vid": "0xABBA",
+        "pid": "0x9690",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kudox/rev2/config.h
index c510926919..36a933dc2e 100644
--- a/keyboards/kudox/rev2/config.h
+++ b/keyboards/kudox/rev2/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xABBA
-#define PRODUCT_ID      0x9690
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    Kumao Kobo
-#define PRODUCT         The Kudox Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kudox/rev2/info.json
index 73cb5a525a..2af08beaf2 100644
--- a/keyboards/kudox/rev2/info.json
+++ b/keyboards/kudox/rev2/info.json
@@ -1,7 +1,13 @@
 {
+    "keyboard_name": "The Kudox Keyboard Rev2",
+    "manufacturer": "Kumao Kobo",
     "url": "http://kumaokobo.com/",
     "maintainer": "Kumao Kobo",
-    "keyboard_name": "Kudox Keyboard Rev2",
+    "usb": {
+        "vid": "0xABBA",
+        "pid": "0x9690",
+        "device_version": "2.0.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kudox/rev3/config.h
index 969111d0c8..a97d03596c 100644
--- a/keyboards/kudox/rev3/config.h
+++ b/keyboards/kudox/rev3/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xABBA
-#define PRODUCT_ID      0x9690
-#define DEVICE_VER      0x0300
-#define MANUFACTURER    Kumao Kobo
-#define PRODUCT         The Kudox Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kudox/rev3/info.json
index 84b5ce0f30..31975f28d7 100644
--- a/keyboards/kudox/rev3/info.json
+++ b/keyboards/kudox/rev3/info.json
@@ -1,7 +1,13 @@
 {
+    "keyboard_name": "The Kudox Keyboard Rev3",
+    "manufacturer": "Kumao Kobo",
     "url": "http://kumaokobo.com/",
     "maintainer": "Kumao Kobo",
-    "keyboard_name": "Kudox Keyboard Rev3",
+    "usb": {
+        "vid": "0xABBA",
+        "pid": "0x9690",
+        "device_version": "3.0.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [