Merge remote-tracking branch 'upstream/master' into develop

author: fauxpark <fauxpark@gmail.com> 2022-08-15 17:54:07 +1000
committer: fauxpark <fauxpark@gmail.com> 2022-08-15 17:54:07 +1000
commit: c202602938e1b065e6bac394771b310fea2a3edb (patch)
tree: 444978b63e48d68f004b1c0730929bfbcfb221e8
parent: 8e9ee29fe352b98ee1380213fc2e2b0e945cdf3f (diff)
parent: 51d5aad25b92a34bc051849616fcd93e3ae407fc (diff)
170 files changed, 508 insertions, 750 deletions
diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h
index d3833931a4..6204d1c82e 100644
--- a/keyboards/dailycraft/bat43/config.h
+++ b/keyboards/dailycraft/bat43/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 0x5946 // YF
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT bat43
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6
diff --git a/keyboards/dailycraft/bat43/rev2/info.json b/keyboards/dailycraft/bat43/info.json
index 352d9a6beb..ce05fe8a5a 100644
--- a/keyboards/dailycraft/bat43/rev2/info.json
+++ b/keyboards/dailycraft/bat43/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "bat43",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/bat43/rev1/info.json b/keyboards/dailycraft/bat43/rev1/info.json
deleted file mode 100644
index 0384bb5feb..0000000000
--- a/keyboards/dailycraft/bat43/rev1/info.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "keyboard_name": "bat43",
-    "url": "",
-    "maintainer": "yfuku",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"k00", "x":0, "y":1.43},
-                {"label":"k01", "x":1, "y":1.11},
-                {"label":"k02", "x":2, "y":0.38},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0.05},
-                {"label":"k05", "x":5, "y":0.16},
-
-                {"label":"k40", "x":9, "y":0.16},
-                {"label":"k41", "x":10, "y":0.05},
-                {"label":"k42", "x":11, "y":0},
-                {"label":"k43", "x":12, "y":0.38},
-                {"label":"k44", "x":13, "y":1.11},
-                {"label":"k45", "x":14, "y":1.43},
-
-                {"label":"k10", "x":0, "y":2.43},
-                {"label":"k11", "x":1, "y":2.11},
-                {"label":"k12", "x":2, "y":1.38},
-                {"label":"k13", "x":3, "y":1},
-                {"label":"k14", "x":4, "y":1.05},
-                {"label":"k15", "x":5, "y":1.16},
-
-                {"label":"k30", "x":7, "y":1.16},
-
-                {"label":"k50", "x":9, "y":1.16},
-                {"label":"k51", "x":10, "y":1.05},
-                {"label":"k52", "x":11, "y":1},
-                {"label":"k53", "x":12, "y":1.38},
-                {"label":"k54", "x":13, "y":2.11},
-                {"label":"k55", "x":14, "y":2.43},
-
-                {"label":"k20", "x":0, "y":3.43},
-                {"label":"k21", "x":1, "y":3.11},
-                {"label":"k22", "x":2, "y":2.38},
-                {"label":"k23", "x":3, "y":2},
-                {"label":"k24", "x":4, "y":2.05},
-                {"label":"k25", "x":5, "y":2.16},
-
-                {"label":"k60", "x":9, "y":2.16},
-                {"label":"k61", "x":10, "y":2.05},
-                {"label":"k62", "x":11, "y":2},
-                {"label":"k63", "x":12, "y":2.38},
-                {"label":"k64", "x":13, "y":3.11},
-                {"label":"k65", "x":14, "y":3.43},
-
-                {"label":"k33", "x":4, "y":3.3},
-                {"label":"k34", "x":5, "y":3.3},
-                {"label":"k35", "x":6, "y":3.3},
-
-                {"label":"k70", "x":8, "y":3.3},
-                {"label":"k71", "x":9, "y":3.3},
-                {"label":"k72", "x":10, "y":3.3},
-
-                {"label":"k74", "x":5.1, "y":4.3, "w":0.8, "h":0.8},
-                {"label":"k75", "x":6.1, "y":4.3, "w":0.8, "h":0.8},
-
-                {"label":"k73", "x":8.1, "y":4.3, "w":0.8, "h":0.8},
-                {"label":"k31", "x":9.1, "y":4.3, "w":0.8, "h":0.8},
-                {"label":"k32", "x":10.1, "y":4.3, "w":0.8, "h":0.8}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dailycraft/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h
index 6256f3db9c..98a7d40e5d 100644
--- a/keyboards/dailycraft/claw44/rev1/config.h
+++ b/keyboards/dailycraft/claw44/rev1/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5946 // YF
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT claw44
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6
diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json
index 3301e7d2ec..88a0237032 100644
--- a/keyboards/dailycraft/claw44/rev1/info.json
+++ b/keyboards/dailycraft/claw44/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Claw44 rev1",
+    "keyboard_name": "claw44",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h
index 332aa6cdc1..8d2007496f 100644
--- a/keyboards/dailycraft/sandbox/rev1/config.h
+++ b/keyboards/dailycraft/sandbox/rev1/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 0x5946 // YF
-#define PRODUCT_ID 0x0009
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      sandbox
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 5
diff --git a/keyboards/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/info.json
index 518225a813..c94f88bd30 100644
--- a/keyboards/dailycraft/sandbox/rev1/info.json
+++ b/keyboards/dailycraft/sandbox/rev1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "sandbox rev1",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0009",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h
index f24c8ef740..11b49e086c 100644
--- a/keyboards/dailycraft/sandbox/rev2/config.h
+++ b/keyboards/dailycraft/sandbox/rev2/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 0x5946 // YF
-#define PRODUCT_ID 0x0011
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      sandbox rev2
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json
index e561dfec5c..ce1574a0e1 100644
--- a/keyboards/dailycraft/sandbox/rev2/info.json
+++ b/keyboards/dailycraft/sandbox/rev2/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "sandbox rev2",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0011",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/stickey4/config.h b/keyboards/dailycraft/stickey4/config.h
index ad7bd295bb..ede6d87792 100644
--- a/keyboards/dailycraft/stickey4/config.h
+++ b/keyboards/dailycraft/stickey4/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 0x5946 // YF
-#define PRODUCT_ID 0x0010
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      stickey4
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 8
diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/info.json
new file mode 100644
index 0000000000..94f57674b4
--- /dev/null
+++ b/keyboards/dailycraft/stickey4/info.json
@@ -0,0 +1,11 @@
+{
+    "keyboard_name": "stickey4",
+    "manufacturer": "yfuku",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0010",
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
index 992729e3af..670531ddc5 100644
--- a/keyboards/dailycraft/wings42/rev1/config.h
+++ b/keyboards/dailycraft/wings42/rev1/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 0x5946 // YF
-#define PRODUCT_ID 0x0003
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      wings42
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6
diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json
index 863bb3d34e..72ece409da 100644
--- a/keyboards/dailycraft/wings42/rev1/info.json
+++ b/keyboards/dailycraft/wings42/rev1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "wings42 rev1",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
index 2f32c483fe..841d2e9f5a 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/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 0x5946 // YF
-#define PRODUCT_ID 0x0004
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      wings42 extkeys
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 8
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json
index b9a793f112..440df65dbf 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/info.json
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "wings42 rev1_extkeys",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
index 3314ac118b..010d8ab896 100644
--- a/keyboards/dailycraft/wings42/rev2/config.h
+++ b/keyboards/dailycraft/wings42/rev2/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 0x5946 // YF
-#define PRODUCT_ID 0x0005
-#define DEVICE_VER 0x0001
-#define MANUFACTURER yfuku
-#define PRODUCT      wings42 rev2
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 6
diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json
index 4e78697627..67a642b425 100644
--- a/keyboards/dailycraft/wings42/rev2/info.json
+++ b/keyboards/dailycraft/wings42/rev2/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "wings42 rev2",
+    "manufacturer": "yfuku",
     "url": "",
     "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0005",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_3x6_3_2": {
             "layout": [
diff --git a/keyboards/delikeeb/vanana/config.h b/keyboards/delikeeb/vanana/config.h
index 3a5a888945..7879dc1b1a 100644
--- a/keyboards/delikeeb/vanana/config.h
+++ b/keyboards/delikeeb/vanana/config.h
@@ -18,7 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-
-#define VENDOR_ID    0x9906
-#define PRODUCT_ID   0x0013
-#define MANUFACTURER dELIKEEb
diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json
index 78c11fbee2..b8a5f78cf8 100644
--- a/keyboards/delikeeb/vanana/info.json
+++ b/keyboards/delikeeb/vanana/info.json
@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "vanana",
+    "manufacturer": "dELIKEEb",
     "url": "",
     "maintainer": "noclew",
+    "usb": {
+        "vid": "0x9906",
+        "pid": "0x0013"
+    },
     "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index 8a054927b9..8ddb222440 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER   0x0001
-#define PRODUCT      Vanana rev1
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12
diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json
new file mode 100644
index 0000000000..992960c5a2
--- /dev/null
+++ b/keyboards/delikeeb/vanana/rev1/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Vanana rev1",
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index e6f95fa9d4..d6d04d47d1 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER   0x0002
-#define PRODUCT      Vanana rev2
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 10
diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json
new file mode 100644
index 0000000000..c7206e9d97
--- /dev/null
+++ b/keyboards/delikeeb/vanana/rev2/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Vanana rev2",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}
diff --git a/keyboards/delikeeb/waaffle/config.h b/keyboards/delikeeb/waaffle/config.h
index 1b02e32c6d..7879dc1b1a 100644
--- a/keyboards/delikeeb/waaffle/config.h
+++ b/keyboards/delikeeb/waaffle/config.h
@@ -18,7 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-
-#define VENDOR_ID       0x9906
-#define PRODUCT_ID      0x0012
-#define MANUFACTURER    dELIKEEb
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 6b8604e289..d9ffc232dd 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0003
-#define PRODUCT         Waaffle_rev3
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 10
diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index f855f89732..709ceb1844 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/keyboards/delikeeb/waaffle/rev3/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "waaffle",
+    "keyboard_name": "Waaffle rev3",
+    "manufacturer": "dELIKEEb",
     "url": "",
     "maintainer": "noclew",
+    "usb": {
+        "vid": "0x9906",
+        "pid": "0x0012",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT_ortho_5x16": {
             "layout":
diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h
index ffc2724e5e..64b86371fc 100644
--- a/keyboards/deltasplit75/v2/config.h
+++ b/keyboards/deltasplit75/v2/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       0xFEED
-#define PRODUCT_ID      0x3060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    xyxjj
-#define PRODUCT         DeltaSplit75
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 14
diff --git a/keyboards/deltasplit75/info.json b/keyboards/deltasplit75/v2/info.json
index da5e226cb2..f6326d96ca 100644
--- a/keyboards/deltasplit75/info.json
+++ b/keyboards/deltasplit75/v2/info.json
@@ -1,6 +1,12 @@
 {
     "keyboard_name": "DeltaSplit75",
+    "manufacturer": "xyxjj",
     "maintainer": "xyxjj & itsaferbie",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x3060",
+      "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_v2": {
           "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"Print", "x":14, "y":0}, {"label":"Scroll", "x":15, "y":0}, {"label":"Pause", "x":16, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":8, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Back", "x":14, "y":1}, {"label":"Trns", "x":15, "y":1}, {"label":"Home", "x":16, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"Back", "x":14.5, "y":2, "w":1.5}, {"label":"PgUp", "x":16, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Trns", "x":13.75, "y":3}, {"label":"Enter", "x":14.75, "y":3, "w":1.25}, {"label":"PgDn", "x":16, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"Trns", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"Up", "x":15, "y":4}, {"label":"End", "x":16, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":2}, {"label":"Fn", "x":5.75, "y":5}, {"label":"Space", "x":7.75, "y":5, "w":2.75}, {"label":"Alt", "x":10.5, "y":5, "w":1.25}, {"label":"Win", "x":11.75, "y":5}, {"label":"Ctrl", "x":12.75, "y":5, "w":1.25}, {"label":"Left", "x":14, "y":5}, {"label":"Down", "x":15, "y":5}, {"label":"Right", "x":16, "y":5}]
diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h
index 7bf69a7b63..834554c45a 100644
--- a/keyboards/duck/octagon/v1/config.h
+++ b/keyboards/duck/octagon/v1/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       0x444B // Duck ("DK")
-#define PRODUCT_ID      0x4F31 // Octagon V1 ("O1")
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Duck
-#define PRODUCT         Octagon V1
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json
index 1fae48975b..8912165c6d 100644
--- a/keyboards/duck/octagon/v1/info.json
+++ b/keyboards/duck/octagon/v1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Octagon V1", 
+    "manufacturer": "Duck",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4F31",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index 0de966c604..57df912112 100644
--- a/keyboards/duck/octagon/v2/config.h
+++ b/keyboards/duck/octagon/v2/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       0x444B // Duck ("DK")
-#define PRODUCT_ID      0x4F32 // Octagon V2 ("O2")
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Duck
-#define PRODUCT         Octagon V2
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json
index 23911f3403..3b9f84417e 100644
--- a/keyboards/duck/octagon/v2/info.json
+++ b/keyboards/duck/octagon/v2/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Octagon V2",
+    "manufacturer": "Duck",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4F32",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":1.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}]
diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h
index bcc5fb0046..477243e495 100644
--- a/keyboards/duck/orion/v3/config.h
+++ b/keyboards/duck/orion/v3/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       0x444B // Duck ("DK")
-#define PRODUCT_ID      0x4F52 // Orion ("OR")
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Duck
-#define PRODUCT         Orion V3
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18
diff --git a/keyboards/duck/orion/info.json b/keyboards/duck/orion/v3/info.json
index 3ba2d3017b..39f0e1e1bd 100644
--- a/keyboards/duck/orion/info.json
+++ b/keyboards/duck/orion/v3/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Duck Orion V3", 
+    "keyboard_name": "Orion V3", 
+    "manufacturer": "Duck",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4F52",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
diff --git a/keyboards/dumbpad/config.h b/keyboards/dumbpad/config.h
index 883eff97f4..b51663981d 100644
--- a/keyboards/dumbpad/config.h
+++ b/keyboards/dumbpad/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xDEAF
-#define PRODUCT_ID      0x0913
-#define MANUFACTURER    imchipwood
-#define PRODUCT         dumbpad
-
 /* Column/Row IO definitions */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/dumbpad/info.json b/keyboards/dumbpad/info.json
new file mode 100644
index 0000000000..341a1bcf8b
--- /dev/null
+++ b/keyboards/dumbpad/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "dumbpad",
+    "manufacturer": "imchipwood",
+    "url": "https://www.github.com/imchipwood/dumbpad",
+    "maintainer": "imchipwood",
+    "usb": {
+        "vid": "0xDEAF",
+        "pid": "0x0913"
+    }
+}
diff --git a/keyboards/dumbpad/v0x/config.h b/keyboards/dumbpad/v0x/config.h
index 973cb87b86..b59578aa14 100644
--- a/keyboards/dumbpad/v0x/config.h
+++ b/keyboards/dumbpad/v0x/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0007
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json
index 01fe1d5178..5e5feb42ba 100644
--- a/keyboards/dumbpad/v0x/info.json
+++ b/keyboards/dumbpad/v0x/info.json
@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v0x",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.0.7"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dumbpad/v0x_dualencoder/config.h b/keyboards/dumbpad/v0x_dualencoder/config.h
index 586e55056c..6879d73960 100644
--- a/keyboards/dumbpad/v0x_dualencoder/config.h
+++ b/keyboards/dumbpad/v0x_dualencoder/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0006
-
 /* Column/Row IO definitions - dualencoder version is true 4x4 */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4
diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json
index f4bf8be585..150a82f373 100644
--- a/keyboards/dumbpad/v0x_dualencoder/info.json
+++ b/keyboards/dumbpad/v0x_dualencoder/info.json
@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v0x_dualencoder",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.0.6"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dumbpad/v0x_right/config.h b/keyboards/dumbpad/v0x_right/config.h
index d02d5fe8a3..76f78eff64 100644
--- a/keyboards/dumbpad/v0x_right/config.h
+++ b/keyboards/dumbpad/v0x_right/config.h
@@ -16,9 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0007
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json
index 7269fe3d08..657a85542d 100644
--- a/keyboards/dumbpad/v0x_right/info.json
+++ b/keyboards/dumbpad/v0x_right/info.json
@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v0x_right",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.0.7"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json
index d8cd5b2304..6355245982 100644
--- a/keyboards/dumbpad/v1x/info.json
+++ b/keyboards/dumbpad/v1x/info.json
@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v1x",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.1.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dumbpad/v1x_dualencoder/config.h b/keyboards/dumbpad/v1x_dualencoder/config.h
index 29340597b3..ed33f9d193 100644
--- a/keyboards/dumbpad/v1x_dualencoder/config.h
+++ b/keyboards/dumbpad/v1x_dualencoder/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0010
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json
index 42eb5a3e77..6355245982 100644
--- a/keyboards/dumbpad/v1x_dualencoder/info.json
+++ b/keyboards/dumbpad/v1x_dualencoder/info.json
@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v1x_dualencoder",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.1.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h
index 2f7963b875..2dba0c3b14 100644
--- a/keyboards/dumbpad/v1x_oled/config.h
+++ b/keyboards/dumbpad/v1x_oled/config.h
@@ -15,11 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    imchipwood
-#define PRODUCT         dumbpad
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json
index dae417e88f..d124c76e14 100644
--- a/keyboards/dumbpad/v1x_oled/info.json
+++ b/keyboards/dumbpad/v1x_oled/info.json
@@ -1,8 +1,7 @@
 {
-    "keyboard_name": "dumbpad",
-    "keyboard_folder": "dumbpad",
-    "url": "https://www.github.com/keebd/dumbpad",
-    "maintainer": "keebd",
+    "usb": {
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dumbpad/v1x_right/config.h b/keyboards/dumbpad/v1x_right/config.h
index 79f0ec1503..8d57b6a837 100644
--- a/keyboards/dumbpad/v1x_right/config.h
+++ b/keyboards/dumbpad/v1x_right/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0010
-
 /* Column/Row IO definitions */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json
index 05734d16b0..44b7abacff 100644
--- a/keyboards/dumbpad/v1x_right/info.json
+++ b/keyboards/dumbpad/v1x_right/info.json
@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "dumbpad/v1x_right",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.1.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index 28a506cf8d..bfb3f2ba9d 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -18,10 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xD60D
-#define MANUFACTURER    Hoksi Technology
-
 #define WAIT_US_TIMER           GPTD3
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h
index e8108f7d11..7da032b967 100644
--- a/keyboards/durgod/dgk6x/galaxy/config.h
+++ b/keyboards/durgod/dgk6x/galaxy/config.h
@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x6A1A
-#define DEVICE_VER      0x0001
-#define PRODUCT         Galaxy 84 HK gaming x DURGOD (QMK)
-
 /* key matrix rows */
 #define MATRIX_ROWS 6
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 }
diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/info.json
index 6fc8959d0b..221d6613aa 100644
--- a/keyboards/durgod/dgk6x/galaxy/info.json
+++ b/keyboards/durgod/dgk6x/galaxy/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Galaxy",
+  "keyboard_name": "Galaxy 84 HK gaming x DURGOD (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.amazon.com/Galaxy-75-Modular-Mechanical-Keyboard/dp/B08PDRD8MP",
   "maintainer": "dkjer",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x6A1A",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h
index c148ae1b1f..a2bba0a5a5 100644
--- a/keyboards/durgod/dgk6x/hades/config.h
+++ b/keyboards/durgod/dgk6x/hades/config.h
@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x4AD3
-#define DEVICE_VER      0x0001
-#define PRODUCT         DURGOD Hades (QMK)
-
 /* key matrix rows */
 #define MATRIX_ROWS 5
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
diff --git a/keyboards/durgod/dgk6x/hades/info.json b/keyboards/durgod/dgk6x/hades/info.json
index b439ea4acb..345b26adcd 100644
--- a/keyboards/durgod/dgk6x/hades/info.json
+++ b/keyboards/durgod/dgk6x/hades/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Hades",
+  "keyboard_name": "DURGOD Hades (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.amazon.com/gp/product/B08562392T",
   "maintainer": "J-Sully",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x4AD3",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h
index 3bef1ea7ed..207508dead 100644
--- a/keyboards/durgod/dgk6x/venus/config.h
+++ b/keyboards/durgod/dgk6x/venus/config.h
@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x7EC5
-#define DEVICE_VER      0x0001
-#define PRODUCT         DURGOD Venus (QMK)
-
 /* key matrix rows */
 #define MATRIX_ROWS 5
 #define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/info.json
index 21e93d55c2..a2d297d661 100644
--- a/keyboards/durgod/dgk6x/venus/info.json
+++ b/keyboards/durgod/dgk6x/venus/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Venus",
+  "keyboard_name": "DURGOD Venus (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.amazon.com/dp/B07XFP5MMZ",
   "maintainer": "J-Sully",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x7EC5",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
diff --git a/keyboards/durgod/k3x0/config.h b/keyboards/durgod/k3x0/config.h
index 691076ecac..0f2e01cfc1 100644
--- a/keyboards/durgod/k3x0/config.h
+++ b/keyboards/durgod/k3x0/config.h
@@ -19,10 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xD60D
-#define MANUFACTURER    Hoksi Technology
-
 #define WAIT_US_TIMER           GPTD3
 
 /* key matrix size (rows in specific keyboard variant) */
diff --git a/keyboards/durgod/k3x0/k310/base/config.h b/keyboards/durgod/k3x0/k310/base/config.h
index 025369acd7..2ccb2f2f0c 100644
--- a/keyboards/durgod/k3x0/k310/base/config.h
+++ b/keyboards/durgod/k3x0/k310/base/config.h
@@ -17,7 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define PRODUCT         DURGOD Taurus K310 (QMK)
-#define DEVICE_VER      0x0001 // Base (no backlight)
diff --git a/keyboards/durgod/k3x0/k310/config.h b/keyboards/durgod/k3x0/k310/config.h
index 1eadb8e52d..cb936a201f 100644
--- a/keyboards/durgod/k3x0/k310/config.h
+++ b/keyboards/durgod/k3x0/k310/config.h
@@ -19,14 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x3100
-// Taurus K310 models:
-//#define DEVICE_VER      0x0001 // Base (no backlight)
-//#define DEVICE_VER      0x0002 // Corona (white led matrix)
-//#define DEVICE_VER      0x0003 // Aurora (red & blue led matrix)
-//#define DEVICE_VER      0x0004 // Nebula (rgb led matrix)
-
 /* key matrix size (cols in generic keyboard config) */
 #define MATRIX_ROWS 8
 
diff --git a/keyboards/durgod/k3x0/k310/info.json b/keyboards/durgod/k3x0/k310/info.json
index bf960ebd94..06e935484e 100644
--- a/keyboards/durgod/k3x0/k310/info.json
+++ b/keyboards/durgod/k3x0/k310/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Taurus K310",
+  "keyboard_name": "DURGOD Taurus K310 (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.durgod.com/page9?product_id=53&_l=en",
   "maintainer": "tylert",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x3100",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
diff --git a/keyboards/durgod/k3x0/k320/base/config.h b/keyboards/durgod/k3x0/k320/base/config.h
index d4eb732b90..2ccb2f2f0c 100644
--- a/keyboards/durgod/k3x0/k320/base/config.h
+++ b/keyboards/durgod/k3x0/k320/base/config.h
@@ -17,7 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define PRODUCT         DURGOD Taurus K320 (QMK)
-#define DEVICE_VER      0x0001 // Base (no backlight)
diff --git a/keyboards/durgod/k3x0/k320/config.h b/keyboards/durgod/k3x0/k320/config.h
index 25b4c63036..2ea9b37fdf 100644
--- a/keyboards/durgod/k3x0/k320/config.h
+++ b/keyboards/durgod/k3x0/k320/config.h
@@ -19,14 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x3200
-// Taurus K320 models:
-//#define DEVICE_VER      0x0001 // Base (no backlight)
-//#define DEVICE_VER      0x0002 // Corona (white led matrix)
-//#define DEVICE_VER      0x0003 // Aurora (red & blue led matrix)
-//#define DEVICE_VER      0x0004 // Nebula (rgb led matrix)
-
 /* key matrix size (cols in generic keyboard config) */
 #define MATRIX_ROWS 7
 
diff --git a/keyboards/durgod/k3x0/k320/info.json b/keyboards/durgod/k3x0/k320/info.json
index cc0da77a3f..0386ef7709 100644
--- a/keyboards/durgod/k3x0/k320/info.json
+++ b/keyboards/durgod/k3x0/k320/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "DURGOD Taurus K320",
+  "keyboard_name": "DURGOD Taurus K320 (QMK)",
+  "manufacturer": "Hoksi Technology",
   "url": "https://www.durgod.com/page9?product_id=47&_l=en",
   "maintainer": "dkjer",
+  "usb": {
+      "vid": "0xD60D",
+      "pid": "0x3200",
+      "device_version": "0.0.1"
+  },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
diff --git a/keyboards/dztech/dz60rgb/info.json b/keyboards/dztech/dz60rgb/info.json
index 5cbce57165..d5179aa09f 100644
--- a/keyboards/dztech/dz60rgb/info.json
+++ b/keyboards/dztech/dz60rgb/info.json
@@ -1,7 +1,11 @@
 {
     "keyboard_name": "DZ60RGB",
+    "manufacturer": "DZTECH",
     "url": "",
     "maintainer": "dztech",
+    "usb": {
+        "vid": "0x445A"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index 86d74bf73a..b150e4a162 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1120
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json
new file mode 100644
index 0000000000..914ae82cd9
--- /dev/null
+++ b/keyboards/dztech/dz60rgb/v1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1120",
+        "device_version": "1.0.0"
+    }
+}
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index 89dc7c2b7f..3c6d07121b 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1121
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json
new file mode 100644
index 0000000000..172ca21102
--- /dev/null
+++ b/keyboards/dztech/dz60rgb/v2/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1121",
+        "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index 9638fab985..2079390a3b 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1121
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json
new file mode 100644
index 0000000000..7b2073bd4a
--- /dev/null
+++ b/keyboards/dztech/dz60rgb/v2_1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1121",
+        "device_version": "2.1.0"
+    }
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/info.json b/keyboards/dztech/dz60rgb_ansi/info.json
index 8431f17708..31c04c9599 100644
--- a/keyboards/dztech/dz60rgb_ansi/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/info.json
@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "dz60rgb_ansi",
+    "keyboard_name": "DZ60RGB_ANSI",
+    "manufacturer": "DZTECH",
     "url": "",
     "maintainer": "dztech",
+    "usb": {
+        "vid": "0x445A"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index b1be1fb430..9b31f27f2f 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1220
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_ANSI
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json
new file mode 100644
index 0000000000..6fcbd0806f
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1220",
+        "device_version": "1.0.0"
+    }
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index 89b2315ee6..92fcd17c88 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1221
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_ANSI
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json
new file mode 100644
index 0000000000..6d2ac4fbab
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1221",
+        "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index f4ec86ae9d..7ec226c30b 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1221
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_ANSI
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
new file mode 100644
index 0000000000..f2afc157ed
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1221",
+        "device_version": "2.1.0"
+    }
+}
diff --git a/keyboards/dztech/dz60rgb_wkl/info.json b/keyboards/dztech/dz60rgb_wkl/info.json
index 304c571f22..e5d0b7b962 100644
--- a/keyboards/dztech/dz60rgb_wkl/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/info.json
@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "dz60rgb_wkl",
+    "keyboard_name": "DZ60RGB_WKL",
+    "manufacturer": "DZTECH",
     "url": "",
     "maintainer": "dztech",
+    "usb": {
+        "vid": "0x445A"
+    },
     "layouts": {
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index ab2dca7a69..d7d8c3a0a1 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1320
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_WKL
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json
new file mode 100644
index 0000000000..767be04f31
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1320",
+        "device_version": "1.0.0"
+    }
+}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index 3e52252889..a4416e806c 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -1,12 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1321
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_WKL
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json
new file mode 100644
index 0000000000..ee69be3b5a
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1321",
+        "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index 0ddd807f88..3803b4834f 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -16,13 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1321
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ60RGB_WKL
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
new file mode 100644
index 0000000000..3b2b23e989
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1321",
+        "device_version": "2.1.0"
+    }
+}
diff --git a/keyboards/dztech/dz65rgb/info.json b/keyboards/dztech/dz65rgb/info.json
index 4a97f4fd82..32171cd74a 100644
--- a/keyboards/dztech/dz65rgb/info.json
+++ b/keyboards/dztech/dz65rgb/info.json
@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "dz65rgb",
+    "keyboard_name": "DZ65RGB",
+    "manufacturer": "DZTECH",
     "url": "",
     "maintainer": "dztech",
+    "usb": {
+        "vid": "0x445A"
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index d281eaa51e..0ae5173051 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -15,13 +15,6 @@
  */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1420
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ65RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json
new file mode 100644
index 0000000000..752d361728
--- /dev/null
+++ b/keyboards/dztech/dz65rgb/v1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1420",
+        "device_version": "1.0.0"
+    }
+}
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index 5267f42aa2..d2dec023ef 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -15,13 +15,6 @@
  */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1421
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ65RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json
new file mode 100644
index 0000000000..1cfb5abdbb
--- /dev/null
+++ b/keyboards/dztech/dz65rgb/v2/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1421",
+        "device_version": "2.0.0"
+    }
+}
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index 27c99f91f6..ed7775a74b 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x445A
-#define PRODUCT_ID      0x1424
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    DZTECH
-#define PRODUCT         DZ65RGBV3
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json
new file mode 100644
index 0000000000..f2c2236031
--- /dev/null
+++ b/keyboards/dztech/dz65rgb/v3/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x1424",
+        "device_version": "3.0.0"
+    }
+}
diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h
index 5c4466985c..5717389e7a 100644
--- a/keyboards/eco/config.h
+++ b/keyboards/eco/config.h
@@ -19,12 +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       0x1337
-#define PRODUCT_ID      0x6006
-#define MANUFACTURER    Bishop Keyboards
-#define PRODUCT         The ECO Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14
diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json
index 2553371de2..36710f9996 100644
--- a/keyboards/eco/info.json
+++ b/keyboards/eco/info.json
@@ -1,7 +1,12 @@
 {
-  "keyboard_name": "ECO",
+  "keyboard_name": "The ECO Keyboard",
+  "manufacturer": "Bishop Keyboards",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x1337",
+    "pid": "0x6006"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"k01", "x":0, "y":0}, {"label":"k02", "x":1, "y":0}, {"label":"k03", "x":2, "y":0}, {"label":"k04", "x":3, "y":0}, {"label":"k05", "x":4, "y":0}, {"label":"k06", "x":5, "y":0}, {"label":"k07", "x":6, "y":0}, {"label":"k08", "x":7, "y":0}, {"label":"k09", "x":8, "y":0}, {"label":"k010", "x":9, "y":0}, {"label":"k011", "x":10, "y":0}, {"label":"k012", "x":11, "y":0}, {"label":"k013", "x":12, "y":0}, {"label":"k014", "x":13, "y":0}, {"label":"k11", "x":0, "y":1}, {"label":"k12", "x":1, "y":1}, {"label":"k13", "x":2, "y":1}, {"label":"k14", "x":3, "y":1}, {"label":"k15", "x":4, "y":1}, {"label":"k16", "x":5, "y":1}, {"label":"k17", "x":6, "y":1}, {"label":"k18", "x":7, "y":1}, {"label":"k19", "x":8, "y":1}, {"label":"k110", "x":9, "y":1}, {"label":"k111", "x":10, "y":1}, {"label":"k112", "x":11, "y":1}, {"label":"k113", "x":12, "y":1}, {"label":"k114", "x":13, "y":1}, {"label":"k21", "x":0, "y":2}, {"label":"k22", "x":1, "y":2}, {"label":"k23", "x":2, "y":2}, {"label":"k24", "x":3, "y":2}, {"label":"k25", "x":4, "y":2}, {"label":"k26", "x":5, "y":2}, {"label":"k27", "x":6, "y":2}, {"label":"k28", "x":7, "y":2}, {"label":"k29", "x":8, "y":2}, {"label":"k210", "x":9, "y":2}, {"label":"k211", "x":10, "y":2}, {"label":"k212", "x":11, "y":2}, {"label":"k213", "x":12, "y":2}, {"label":"k214", "x":13, "y":2}, {"label":"k31", "x":0, "y":3}, {"label":"k32", "x":1, "y":3}, {"label":"k33", "x":2, "y":3}, {"label":"k34", "x":3, "y":3}, {"label":"k35", "x":4, "y":3}, {"label":"k36", "x":5, "y":3}, {"label":"k37", "x":6, "y":3}, {"label":"k38", "x":7, "y":3}, {"label":"k39", "x":8, "y":3}, {"label":"k310", "x":9, "y":3}, {"label":"k311", "x":10, "y":3}, {"label":"k312", "x":11, "y":3}, {"label":"k313", "x":12, "y":3}, {"label":"k314", "x":13, "y":3}]
diff --git a/keyboards/eco/rev1/config.h b/keyboards/eco/rev1/config.h
index f674c50f23..1dc94e79b5 100644
--- a/keyboards/eco/rev1/config.h
+++ b/keyboards/eco/rev1/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../config.h"
 
-#define DEVICE_VER      0x0001
-
 /* ECO V1 pin-out */
 #define MATRIX_ROW_PINS { B1, B6, B2, B3 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/info.json
new file mode 100644
index 0000000000..90ac25f360
--- /dev/null
+++ b/keyboards/eco/rev1/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/eco/rev2/config.h b/keyboards/eco/rev2/config.h
index 091b4ffcce..35a2334fc9 100644
--- a/keyboards/eco/rev2/config.h
+++ b/keyboards/eco/rev2/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../config.h"
 
-#define DEVICE_VER      0x0002
-
 /* ECO V2.1 pin-out */
 #define MATRIX_ROW_PINS { D7, B5, B4, E6 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 }
diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/info.json
new file mode 100644
index 0000000000..e557e4d307
--- /dev/null
+++ b/keyboards/eco/rev2/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
index 321946b46c..fbcab5e8e5 100644
--- a/keyboards/edi/hardlight/mk1/config.h
+++ b/keyboards/edi/hardlight/mk1/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       0xF7E0
-#define PRODUCT_ID      0x2401
-#define DEVICE_VER      0x0000
-#define MANUFACTURER    Everywhere Defense Industries
-#define PRODUCT         Hard Light
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json
new file mode 100644
index 0000000000..f0ff1b915f
--- /dev/null
+++ b/keyboards/edi/hardlight/mk1/info.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Hard Light",
+    "manufacturer": "Everywhere Defense Industries",
+    "usb": {
+        "vid": "0xF7E0",
+        "pid": "0x2401",
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index 8580aabec5..2cf9ab9af9 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xF7E0
-#define PRODUCT_ID      0x2408
-#define DEVICE_VER      0x0007
-#define MANUFACTURER    Everywhere Defense Industries
-#define PRODUCT         Hard Light Mk 2
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
new file mode 100644
index 0000000000..25e9b06d49
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/info.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Hard Light Mk 2",
+    "manufacturer": "Everywhere Defense Industries",
+    "usb": {
+        "vid": "0xF7E0",
+        "pid": "0x2408",
+        "device_version": "0.0.7"
+    }
+}
diff --git a/keyboards/ergodox_ez/base/info.json b/keyboards/ergodox_ez/base/info.json
new file mode 100644
index 0000000000..be1433ccba
--- /dev/null
+++ b/keyboards/ergodox_ez/base/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "ErgoDox EZ",
+    "usb": {
+        "pid": "0x4974"
+    }
+}
diff --git a/keyboards/ergodox_ez/base/rules.mk b/keyboards/ergodox_ez/base/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/ergodox_ez/base/rules.mk
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index f25ff162cd..8a3f4eb7dc 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -22,13 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x3297
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    ZSA Technology Labs
-#define PRODUCT_ID      0x4974
-#define PRODUCT         ErgoDox EZ
-
 /* key matrix size */
 #define MATRIX_ROWS 14
 #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
diff --git a/keyboards/ergodox_ez/glow/config.h b/keyboards/ergodox_ez/glow/config.h
deleted file mode 100644
index 674b7bffb0..0000000000
--- a/keyboards/ergodox_ez/glow/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
-Copyright 2015 ZSA Technology Labs Inc (@zsa)
-Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef PRODUCT_ID
-#define PRODUCT_ID      0x4976
-#undef PRODUCT
-#define PRODUCT         ErgoDox EZ Glow
diff --git a/keyboards/ergodox_ez/glow/info.json b/keyboards/ergodox_ez/glow/info.json
new file mode 100644
index 0000000000..dcbb1999ca
--- /dev/null
+++ b/keyboards/ergodox_ez/glow/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "ErgoDox EZ Glow",
+    "usb": {
+        "pid": "0x4976"
+    }
+}
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index 1682f4bb45..46a0fbbacd 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "ErgoDox EZ",
+    "manufacturer": "ZSA Technology Labs",
     "url": "ergodox-ez.com",
     "maintainer": "ZSA via Drashna",
+    "usb": {
+        "vid": "0x3297",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ergodox": {
             "layout": [
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index 1b4ace5ee5..021ea0f130 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -38,3 +38,5 @@ AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
 
 MOUSE_SHARED_EP = no
+
+DEFAULT_FOLDER = ergodox_ez/base
diff --git a/keyboards/ergodox_ez/shine/config.h b/keyboards/ergodox_ez/shine/config.h
deleted file mode 100644
index cf4f59f3b8..0000000000
--- a/keyboards/ergodox_ez/shine/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
-Copyright 2015 ZSA Technology Labs Inc (@zsa)
-Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef PRODUCT_ID
-#define PRODUCT_ID      0x4975
-#undef PRODUCT
-#define PRODUCT         ErgoDox EZ Shine
diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/info.json
new file mode 100644
index 0000000000..11c3a8b209
--- /dev/null
+++ b/keyboards/ergodox_ez/shine/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "ErgoDox EZ Shine",
+    "usb": {
+        "pid": "0x4975"
+    }
+}
diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
index b754a7810c..7bb092834b 100644
--- a/keyboards/ergoslab/rev1/config.h
+++ b/keyboards/ergoslab/rev1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x5148
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    tomsaleeba
-#define PRODUCT         Ergoslab Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
diff --git a/keyboards/ergoslab/info.json b/keyboards/ergoslab/rev1/info.json
index e37a3b7cbf..38530960a5 100644
--- a/keyboards/ergoslab/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "ergoslab",
+  "keyboard_name": "Ergoslab Keyboard",
+  "manufacturer": "tomsaleeba",
   "url": "https://github.com/tomsaleeba/ergoslab",
   "maintainer": "tomsaleeba",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x5148",
+    "device_version": "1.0.0"
+  },
   "layouts": {
     "LAYOUT_ergoslab": {
       "layout": [
diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h
index 096a85d370..3703884c67 100644
--- a/keyboards/ergotravel/rev1/config.h
+++ b/keyboards/ergotravel/rev1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4A50 //JP
-#define PRODUCT_ID      0x4554 //ET
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    JPConstantineau.com
-#define PRODUCT         ErgoTravel Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
diff --git a/keyboards/ergotravel/info.json b/keyboards/ergotravel/rev1/info.json
index 71e9cf7f4f..5170788eba 100644
--- a/keyboards/ergotravel/info.json
+++ b/keyboards/ergotravel/rev1/info.json
@@ -1,8 +1,13 @@
 {
-  "keyboard_name": "ErgoTravel",
-  "identifier": "0x1256",
+  "keyboard_name": "ErgoTravel Keyboard",
+  "manufacturer": "JPConstantineau.com",
   "url": "https://github.com/jpconstantineau/ErgoTravel",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4A50",
+    "pid": "0x4554",
+    "device_version": "1.0.0"
+  },
   "bootloader": "caterina",
   "processor": "atmega32u4",
   "layouts": {
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
index 8aa4be245d..57c969ca79 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ b/keyboards/ericrlau/numdiscipline/rev1/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 0x454C   // EL
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER ELau
-#define PRODUCT NumDiscipline
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18
diff --git a/keyboards/ericrlau/numdiscipline/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json
index 202aceda76..cdaa9be039 100644
--- a/keyboards/ericrlau/numdiscipline/info.json
+++ b/keyboards/ericrlau/numdiscipline/rev1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "ELau NumDiscipline KB", 
+    "keyboard_name": "NumDiscipline", 
+    "manufacturer": "ELau",
     "url": "https://github.com/ericrlau/NumDiscipline", 
     "maintainer": "ericrlau", 
+    "usb": {
+        "vid": "0x454C",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"BackSpace", "x":13, "y":0, "w":2}, {"label":"Del", "x":15.5, "y":0}, {"label":"", "x":16.5, "y":0}, {"label":"", "x":17.5, "y":0}, {"label":"", "x":18.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"7", "x":15.5, "y":1}, {"label":"8", "x":16.5, "y":1}, {"label":"9", "x":17.5, "y":1}, {"label":"+", "x":18.5, "y":1, "h":2}, {"label":"CapsLock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":15.5, "y":2}, {"label":"5", "x":16.5, "y":2}, {"label":"6", "x":17.5, "y":2}, {"label":"Left Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Right Shift", "x":12.25, "y":3, "w":1.75}, {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14.25, "y":3.25}, {"label":"1", "x":15.5, "y":3}, {"label":"2", "x":16.5, "y":3}, {"label":"3", "x":17.5, "y":3}, {"label":"Enter", "x":18.5, "y":3, "h":2}, {"label":"Left Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Left Alt", "x":2.5, "y":4, "w":1.25}, {"label":"Space", "x":3.75, "y":4, "w":6.25}, {"label":"Right Alt", "x":10, "y":4}, {"label":"Right Ctrl", "x":11, "y":4}, {"label":"Func", "x":12, "y":4}, {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13.25, "y":4.25}, {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14.25, "y":4.25}, {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15.25, "y":4.25}, {"label":"0", "x":16.5, "y":4}, {"label":".", "x":17.5, "y":4}]        
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index 49d5efc7b0..f880b6d304 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -19,11 +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 0x4558 // EX
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Exclusive
-
 /* key matrix size */
 #define MATRIX_ROWS 11
 #define MATRIX_COLS 9
diff --git a/keyboards/exclusive/e85/hotswap/config.h b/keyboards/exclusive/e85/hotswap/config.h
deleted file mode 100644
index a0f957db87..0000000000
--- a/keyboards/exclusive/e85/hotswap/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define PRODUCT_ID 0xE851 // E8.5 Hotswap
-#define PRODUCT E8.5 Hotswap PCB
diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json
index e8c65f32d2..53ca1e3759 100644
--- a/keyboards/exclusive/e85/hotswap/info.json
+++ b/keyboards/exclusive/e85/hotswap/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Exclusive E8.5 TKL",
+    "keyboard_name": "E8.5 Hotswap",
+    "manufacturer": "Exclusive",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4558",
+        "pid": "0xE851",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ansi_standard": {
             "layout": [
diff --git a/keyboards/exclusive/e85/soldered/config.h b/keyboards/exclusive/e85/soldered/config.h
deleted file mode 100644
index c76fcf8074..0000000000
--- a/keyboards/exclusive/e85/soldered/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define PRODUCT_ID 0xE852 // E8.5 Soldered
-#define PRODUCT E8.5 Soldered PCB
diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json
index fa4be15647..937c2ad245 100644
--- a/keyboards/exclusive/e85/soldered/info.json
+++ b/keyboards/exclusive/e85/soldered/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Exclusive E8.5 TKL",
+    "keyboard_name": "E8.5 Soldered",
+    "manufacturer": "Exclusive",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4558",
+        "pid": "0xE852",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/ferris/0_1/config.h b/keyboards/ferris/0_1/config.h
index 6cd5c91621..79a74ae9bb 100644
--- a/keyboards/ferris/0_1/config.h
+++ b/keyboards/ferris/0_1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xC2AB
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Pierre
-#define PRODUCT Ferris the keeb
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 10
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json
new file mode 100644
index 0000000000..354545b3bd
--- /dev/null
+++ b/keyboards/ferris/0_1/info.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Ferris the keeb",
+    "manufacturer": "Pierre",
+    "usb": {
+        "vid": "0xC2AB",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/ferris/0_2/base/info.json b/keyboards/ferris/0_2/base/info.json
new file mode 100644
index 0000000000..d0d22b8047
--- /dev/null
+++ b/keyboards/ferris/0_2/base/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2",
+    "usb": {
+        "pid": "0x0001"
+    }
+}
diff --git a/keyboards/ferris/0_2/base/rules.mk b/keyboards/ferris/0_2/base/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/ferris/0_2/base/rules.mk
diff --git a/keyboards/ferris/0_2/bling/config.h b/keyboards/ferris/0_2/bling/config.h
index 4b2efd378d..ceb02e737b 100644
--- a/keyboards/ferris/0_2/bling/config.h
+++ b/keyboards/ferris/0_2/bling/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0002
-#undef PRODUCT
-#define PRODUCT Ferris 0.2 - Bling
-
-
-
 /* LED Drivers */
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110101
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json
new file mode 100644
index 0000000000..5473c33295
--- /dev/null
+++ b/keyboards/ferris/0_2/bling/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2 - Bling",
+    "usb": {
+        "pid": "0x0002"
+    }
+}
diff --git a/keyboards/ferris/0_2/compact/config.h b/keyboards/ferris/0_2/compact/config.h
deleted file mode 100644
index ee465b9acd..0000000000
--- a/keyboards/ferris/0_2/compact/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0003
-#undef PRODUCT
-#define PRODUCT Ferris 0.2 - Compact
diff --git a/keyboards/ferris/0_2/compact/info.json b/keyboards/ferris/0_2/compact/info.json
new file mode 100644
index 0000000000..4ca1555776
--- /dev/null
+++ b/keyboards/ferris/0_2/compact/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2 - Compact",
+    "usb": {
+        "pid": "0x0003"
+    }
+}
diff --git a/keyboards/ferris/0_2/config.h b/keyboards/ferris/0_2/config.h
index 4e454fd0a0..5de356f3cf 100644
--- a/keyboards/ferris/0_2/config.h
+++ b/keyboards/ferris/0_2/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xC2AB
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Cuddly Keyboards Ltd.
-#define PRODUCT Ferris 0.2
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 10
diff --git a/keyboards/ferris/0_2/high/config.h b/keyboards/ferris/0_2/high/config.h
deleted file mode 100644
index 67786241b4..0000000000
--- a/keyboards/ferris/0_2/high/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0005
-#undef PRODUCT
-#define PRODUCT Ferris 0.2 - High
diff --git a/keyboards/ferris/0_2/high/info.json b/keyboards/ferris/0_2/high/info.json
new file mode 100644
index 0000000000..adb9d07af3
--- /dev/null
+++ b/keyboards/ferris/0_2/high/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2 - High",
+    "usb": {
+        "pid": "0x0005"
+    }
+}
diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json
new file mode 100644
index 0000000000..9ab2ffbdfb
--- /dev/null
+++ b/keyboards/ferris/0_2/info.json
@@ -0,0 +1,7 @@
+{
+    "manufacturer": "Cuddly Keyboards Ltd.",
+    "usb": {
+        "vid": "0xC2AB",
+        "device_version": "0.0.2"
+    }
+}
diff --git a/keyboards/ferris/0_2/mini/config.h b/keyboards/ferris/0_2/mini/config.h
deleted file mode 100644
index e357cabe0b..0000000000
--- a/keyboards/ferris/0_2/mini/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0004
-#undef PRODUCT
-#define PRODUCT Ferris 0.2 - Mini
diff --git a/keyboards/ferris/0_2/mini/info.json b/keyboards/ferris/0_2/mini/info.json
new file mode 100644
index 0000000000..0ab5db559a
--- /dev/null
+++ b/keyboards/ferris/0_2/mini/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Ferris 0.2 - Mini",
+    "usb": {
+        "pid": "0x0004"
+    }
+}
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
index 2d406f5c1d..c5a44ca9ef 100644
--- a/keyboards/ferris/0_2/rules.mk
+++ b/keyboards/ferris/0_2/rules.mk
@@ -25,3 +25,5 @@ SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
 
 LAYOUTS = split_3x5_2
+
+DEFAULT_FOLDER = ferris/0_2/base
diff --git a/keyboards/ferris/info.json b/keyboards/ferris/info.json
index 93470c7253..52485bd9e9 100644
--- a/keyboards/ferris/info.json
+++ b/keyboards/ferris/info.json
@@ -1,5 +1,4 @@
 {
-    "keyboard_name": "Ferris",
     "url": "https://github.com/pierrechevalier83/ferris/",
     "maintainer": "@pierrec83",
     "layouts": {
diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h
index c74c1bf6c5..1708ec6e2b 100644
--- a/keyboards/ferris/sweep/config.h
+++ b/keyboards/ferris/sweep/config.h
@@ -21,13 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xC2AB
-#define PRODUCT_ID      0x3939
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DPB
-#define PRODUCT         Ferris sweep
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5
diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json
new file mode 100644
index 0000000000..fc53028c34
--- /dev/null
+++ b/keyboards/ferris/sweep/info.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Ferris sweep",
+    "manufacturer": "DPB",
+    "usb": {
+        "vid": "0xC2AB",
+        "pid": "0x3939",
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h
index dbb23e1ffb..44229ae65c 100644
--- a/keyboards/flehrad/bigswitch/config.h
+++ b/keyboards/flehrad/bigswitch/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       0x1209
-#define PRODUCT_ID      0xB195
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    flehrad
-#define PRODUCT         BigSwitch PCB
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json
index 8b1411775a..9e600672f8 100644
--- a/keyboards/flehrad/bigswitch/info.json
+++ b/keyboards/flehrad/bigswitch/info.json
@@ -1,6 +1,12 @@
 {
-    "keyboard_name": "Bigswitch PCB",
+    "keyboard_name": "BigSwitch PCB",
+    "manufacturer": "flehrad",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0xB195",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0, "w":4, "h":4}]
diff --git a/keyboards/flehrad/downbubble/config.h b/keyboards/flehrad/downbubble/config.h
index 2d22a98ae4..aa5691dc32 100644
--- a/keyboards/flehrad/downbubble/config.h
+++ b/keyboards/flehrad/downbubble/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       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Flehrad
-#define PRODUCT         downbubble
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 20
diff --git a/keyboards/flehrad/downbubble/info.json b/keyboards/flehrad/downbubble/info.json
index 6314e4f966..4e3ab26bb6 100644
--- a/keyboards/flehrad/downbubble/info.json
+++ b/keyboards/flehrad/downbubble/info.json
@@ -1,6 +1,12 @@
 {
   "keyboard_name": "downbubble",
+  "manufacturer": "Flehrad",
   "maintainer": "flehrad",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_standard": {
       "layout": [
diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h
index f39e99c8bb..68216287d1 100644
--- a/keyboards/flehrad/numbrero/config.h
+++ b/keyboards/flehrad/numbrero/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Flehrad
-#define PRODUCT         Numbrero
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 5
diff --git a/keyboards/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/info.json
index f0bce2bda2..30c93d035c 100644
--- a/keyboards/flehrad/numbrero/info.json
+++ b/keyboards/flehrad/numbrero/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Numbrero",
+  "manufacturer": "Flehrad",
   "url": "",
   "maintainer": "Flehrad",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_numbrero_numpad": {
       "layout": [
diff --git a/keyboards/flehrad/snagpad/config.h b/keyboards/flehrad/snagpad/config.h
index 728c624462..0360aa7446 100644
--- a/keyboards/flehrad/snagpad/config.h
+++ b/keyboards/flehrad/snagpad/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4443 // "DC" = Don Chiou
-#define PRODUCT_ID      0x5350 // "SP" = Snagpad
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Flehrad
-#define PRODUCT         Snagpad
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4
diff --git a/keyboards/flehrad/snagpad/info.json b/keyboards/flehrad/snagpad/info.json
index 785eaa6a93..c2c8bdadfc 100644
--- a/keyboards/flehrad/snagpad/info.json
+++ b/keyboards/flehrad/snagpad/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Snagpad",
+    "manufacturer": "Flehrad",
     "url": "",
     "maintainer": "Flehrad",
+    "usb": {
+        "vid": "0x4443",
+        "pid": "0x5350",
+        "device_version": "0.0.1"
+    },
     "layouts": {
 
         "LAYOUT_ortho_5x4": {
diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h
index aef6f60472..0b3a3c63f2 100644
--- a/keyboards/flehrad/tradestation/config.h
+++ b/keyboards/flehrad/tradestation/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Flehrad
-#define PRODUCT         Trade Station
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4
diff --git a/keyboards/flehrad/tradestation/info.json b/keyboards/flehrad/tradestation/info.json
index cf0344c01b..f61ccb7d2f 100644
--- a/keyboards/flehrad/tradestation/info.json
+++ b/keyboards/flehrad/tradestation/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Tradestation",
+    "keyboard_name": "Trade Station",
+    "manufacturer": "Flehrad",
     "url": "",
     "maintainer": "Flehrad",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_tradestation": {
             "layout": [
diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h
index e4366f959f..7d9cfab899 100644
--- a/keyboards/fortitude60/rev1/config.h
+++ b/keyboards/fortitude60/rev1/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       0xCB10
-#define PRODUCT_ID      0x1156
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    Pekaso
-#define PRODUCT         Fortitude60
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
diff --git a/keyboards/fortitude60/info.json b/keyboards/fortitude60/rev1/info.json
index db8959706f..f8c7f0a995 100644
--- a/keyboards/fortitude60/info.json
+++ b/keyboards/fortitude60/rev1/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Fortitude60",
+  "manufacturer": "Pekaso",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xCB10",
+    "pid": "0x1156",
+    "device_version": "1.0.0"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"R00", "x":9, "y":0}, {"label":"R01", "x":10, "y":0}, {"label":"R02", "x":11, "y":0}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0}, {"label":"R05", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"R10", "x":9, "y":1}, {"label":"R11", "x":10, "y":1}, {"label":"R12", "x":11, "y":1}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1}, {"label":"R15", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"R20", "x":9, "y":2}, {"label":"R21", "x":10, "y":2}, {"label":"R22", "x":11, "y":2}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2}, {"label":"R25", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"LT5", "x":6, "y":3}, {"label":"RT5", "x":8, "y":3}, {"label":"R30", "x":9, "y":3}, {"label":"R31", "x":10, "y":3}, {"label":"R32", "x":11, "y":3}, {"label":"R33", "x":12, "y":3}, {"label":"R34", "x":13, "y":3}, {"label":"R35", "x":14, "y":3}, {"label":"LT0", "x":2, "y":4}, {"label":"LT1", "x":3, "y":4}, {"label":"LT2", "x":4, "y":4}, {"label":"LT3", "x":5, "y":4}, {"label":"LT4", "x":6, "y":4}, {"label":"RT4", "x":8, "y":4}, {"label":"RT3", "x":9, "y":4}, {"label":"RT2", "x":10, "y":4}, {"label":"RT1", "x":11, "y":4}, {"label":"RT0", "x":12, "y":4}]
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index aea22c5434..9582de5265 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0001
-#define VENDOR_ID 0x320F
-#define PRODUCT_ID 0x5044
-#define MANUFACTURER Glorious
-#define PRODUCT GMMK Pro
-
 /* key matrix size */
 #define MATRIX_ROWS 11
 #define MATRIX_COLS 8
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index c3e76391d1..64f63e9593 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "GMMK Pro (ANSI)",
+    "keyboard_name": "GMMK Pro ANSI",
+    "manufacturer": "Glorious",
     "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
     "maintainer": "GloriousThrall",
+    "usb": {
+        "vid": "0x320F",
+        "pid": "0x5044",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 32fac89336..3638e9d684 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "GMMK Pro (ISO)",
+    "keyboard_name": "GMMK Pro ISO",
+    "manufacturer": "Glorious",
     "url": "https://www.pcgamingrace.com/products/glorious-gmmk-pro-75-barebone-black-reservation",
     "maintainer": "GloriousThrall",
+    "usb": {
+        "vid": "0x320F",
+        "pid": "0x5044",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/hadron/config.h b/keyboards/hadron/config.h
index 3281984d19..5fd8c70482 100644
--- a/keyboards/hadron/config.h
+++ b/keyboards/hadron/config.h
@@ -19,12 +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       0xFB30
-#define PRODUCT_ID      0x5F37
-#define MANUFACTURER    ishtob
-#define PRODUCT         Hadron Keyboard
-
 //#define AUDIO_VOICES
 
 //#define BACKLIGHT_PIN B7
diff --git a/keyboards/hadron/info.json b/keyboards/hadron/info.json
index 7fb7d41cf2..c5a19a2e14 100644
--- a/keyboards/hadron/info.json
+++ b/keyboards/hadron/info.json
@@ -1,7 +1,12 @@
 {
   "keyboard_name": "Hadron", 
+  "manufacturer": "ishtob",
   "url": "", 
   "maintainer": "qmk", 
+  "usb": {
+    "vid": "0xFB30",
+    "pid": "0x5F37"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K14", "x":4, "y":1}, {"label":"K15", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"K17", "x":7, "y":1}, {"label":"K18", "x":8, "y":1}, {"label":"K19", "x":9, "y":1}, {"label":"K1A", "x":10, "y":1}, {"label":"K1B", "x":11, "y":1}, {"label":"K1C", "x":12, "y":1}, {"label":"K1D", "x":13, "y":1}, {"label":"K1E", "x":14, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K24", "x":4, "y":2}, {"label":"K25", "x":5, "y":2}, {"label":"K26", "x":6, "y":2}, {"label":"K27", "x":7, "y":2}, {"label":"K28", "x":8, "y":2}, {"label":"K29", "x":9, "y":2}, {"label":"K2A", "x":10, "y":2}, {"label":"K2B", "x":11, "y":2}, {"label":"K2C", "x":12, "y":2}, {"label":"K2D", "x":13, "y":2}, {"label":"K2E", "x":14, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}, {"label":"K34", "x":4, "y":3}, {"label":"K35", "x":5, "y":3}, {"label":"K36", "x":6, "y":3}, {"label":"K37", "x":7, "y":3}, {"label":"K38", "x":8, "y":3}, {"label":"K39", "x":9, "y":3}, {"label":"K3A", "x":10, "y":3}, {"label":"K3B", "x":11, "y":3}, {"label":"K3C", "x":12, "y":3}, {"label":"K3D", "x":13, "y":3}, {"label":"K3E", "x":14, "y":3}, {"label":"K40", "x":0, "y":4}, {"label":"K41", "x":1, "y":4}, {"label":"K42", "x":2, "y":4}, {"label":"K43", "x":3, "y":4}, {"label":"K44", "x":4, "y":4}, {"label":"K45", "x":5, "y":4}, {"label":"K46", "x":6, "y":4}, {"label":"K47", "x":7, "y":4}, {"label":"K48", "x":8, "y":4}, {"label":"K49", "x":9, "y":4}, {"label":"K4A", "x":10, "y":4}, {"label":"K4B", "x":11, "y":4}, {"label":"K4C", "x":12, "y":4}, {"label":"K4D", "x":13, "y":4}, {"label":"K4E", "x":14, "y":4}]
diff --git a/keyboards/hadron/ver2/config.h b/keyboards/hadron/ver2/config.h
index c7e03e483b..a19ae41ffc 100644
--- a/keyboards/hadron/ver2/config.h
+++ b/keyboards/hadron/ver2/config.h
@@ -16,9 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER      0x0002
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json
new file mode 100644
index 0000000000..e557e4d307
--- /dev/null
+++ b/keyboards/hadron/ver2/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index 76353b6ee4..f130189b58 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -17,9 +17,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x0003
-
 #undef MATRIX_ROWS
 #undef MATRIX_COLS
 /* key matrix size */
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
new file mode 100644
index 0000000000..b377cdff00
--- /dev/null
+++ b/keyboards/hadron/ver3/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.3"
+    }
+}
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
index 4e027625fd..90ece5dd95 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
@@ -17,12 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x16C0
-#define PRODUCT_ID 0x27DB
-#define DEVICE_VER 0x0001
-#define MANUFACTURER IBM/Purdea Andrei
-#define PRODUCT IBM Model M (4th generation)
 #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
 
 /* key matrix size */
diff --git a/keyboards/ibm/model_m_4th_gen/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
index 932bfb8d73..b6cecf4309 100644
--- a/keyboards/ibm/model_m_4th_gen/info.json
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "ibm/model_m_4th_gen", 
+    "keyboard_name": "IBM Model M (4th generation)", 
+    "manufacturer": "IBM/Purdea Andrei",
     "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", 
     "maintainer": "purdeaandrei", 
+    "usb": {
+        "vid": "0x16C0",
+        "pid": "0x27DB",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":6}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}]
diff --git a/keyboards/ibnuda/squiggle/config.h b/keyboards/ibnuda/squiggle/config.h
index d9a144aca7..9e4c4f71bc 100644
--- a/keyboards/ibnuda/squiggle/config.h
+++ b/keyboards/ibnuda/squiggle/config.h
@@ -19,12 +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       0x1209
-#define PRODUCT_ID      0x6969
-#define MANUFACTURER    ibnuda
-#define PRODUCT         squiggle
-
 #define USE_SERIAL
 
 /*
diff --git a/keyboards/ibnuda/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h
index 9dec7e30f5..3d2752c8d4 100644
--- a/keyboards/ibnuda/squiggle/rev1/config.h
+++ b/keyboards/ibnuda/squiggle/rev1/config.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#define DEVICE_VER      0x0001
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5
diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
index 754164e5d7..0b32e42620 100644
--- a/keyboards/ibnuda/squiggle/rev1/info.json
+++ b/keyboards/ibnuda/squiggle/rev1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "squiggle",
+    "manufacturer": "ibnuda",
     "url": "https://github.com/ibnuda/squiggle",
     "maintainer": "Ibnu D. Aji",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x6969",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/idobao/id80/v2/ansi/config.h b/keyboards/idobao/id80/v2/ansi/config.h
deleted file mode 100644
index 253c0757b8..0000000000
--- a/keyboards/idobao/id80/v2/ansi/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964 /* "id" */
-#define PRODUCT_ID      0x0080
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID80
diff --git a/keyboards/idobao/id80/v2/ansi/info.json b/keyboards/idobao/id80/v2/ansi/info.json
new file mode 100644
index 0000000000..e44e5f8b00
--- /dev/null
+++ b/keyboards/idobao/id80/v2/ansi/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "ID80 ANSI",
+    "usb": {
+        "pid": "0x0080",
+    }
+}
diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json
index 03093e7b13..391460b3b2 100644
--- a/keyboards/idobao/id80/v2/info.json
+++ b/keyboards/idobao/id80/v2/info.json
@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "IDOBAO ID80",
+    "manufacturer": "IDOBAO",
     "url": "",
     "maintainer": "IDOBAOKB",
+    "usb": {
+        "vid": "0x6964",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/idobao/id80/v2/iso/config.h b/keyboards/idobao/id80/v2/iso/config.h
deleted file mode 100644
index cd9c497442..0000000000
--- a/keyboards/idobao/id80/v2/iso/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6964 /* "id" */
-#define PRODUCT_ID      0x0081
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    IDOBAO
-#define PRODUCT         ID80 ISO
diff --git a/keyboards/idobao/id80/v2/iso/info.json b/keyboards/idobao/id80/v2/iso/info.json
new file mode 100644
index 0000000000..7512d696e2
--- /dev/null
+++ b/keyboards/idobao/id80/v2/iso/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "ID80 ISO",
+    "usb": {
+        "pid": "0x0081",
+    }
+}
author	fauxpark <fauxpark@gmail.com>	2022-08-15 17:54:07 +1000
committer	fauxpark <fauxpark@gmail.com>	2022-08-15 17:54:07 +1000
commit	c202602938e1b065e6bac394771b310fea2a3edb (patch)
tree	444978b63e48d68f004b1c0730929bfbcfb221e8
parent	8e9ee29fe352b98ee1380213fc2e2b0e945cdf3f (diff)
parent	51d5aad25b92a34bc051849616fcd93e3ae407fc (diff)