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

author: QMK Bot <hello@qmk.fm> 2022-08-03 22:06:14 +0000
committer: QMK Bot <hello@qmk.fm> 2022-08-03 22:06:14 +0000
commit: 237039cdcd896e7a99e58db92d193c5ff7a2dc33 (patch)
tree: 35144bfd16a200e2697a6f2ae3db3513834f2ac5 /keyboards
parent: c6a6f987c93c424fc31e090737e4c7b8af728856 (diff)
parent: b40c03140e5da1edac2faa2b672a84ea28d0a7c1 (diff)
136 files changed, 419 insertions, 486 deletions
diff --git a/keyboards/rabbit/rabbit68/config.h b/keyboards/rabbit/rabbit68/config.h
index 9ebd5e55ae..548ab2bb44 100644
--- a/keyboards/rabbit/rabbit68/config.h
+++ b/keyboards/rabbit/rabbit68/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 0x68F1
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Kai Eckert
-#define PRODUCT Rabbit68
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/rabbit/rabbit68/info.json b/keyboards/rabbit/rabbit68/info.json
index 2f6fcf7e63..a850c3ae05 100644
--- a/keyboards/rabbit/rabbit68/info.json
+++ b/keyboards/rabbit/rabbit68/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Rabbit68",
+    "manufacturer": "Kai Eckert",
     "url": "",
     "maintainer": "kaiec",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x68F1",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
index d07366a51d..b0ca5cb44d 100644
--- a/keyboards/rainkeebs/delilah/config.h
+++ b/keyboards/rainkeebs/delilah/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x726B
-#define PRODUCT_ID      0x645C
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    rainkeebs
-#define PRODUCT         Delilah
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json
index d6a378eeba..5600bae870 100644
--- a/keyboards/rainkeebs/delilah/info.json
+++ b/keyboards/rainkeebs/delilah/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Delilah",
+    "manufacturer": "rainkeebs",
     "url": "https://www.rainkeebs.mx/product/delilah-keyboard-group-buy",
     "maintainer": "rainkeebs",
+    "usb": {
+        "vid": "0x726B",
+        "pid": "0x645C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back<br>Space", "x":11, "y":0, "w":1.25}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.5}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3}, {"label":"Alt", "x":2.25, "y":3}, {"label":"225", "x":3.25, "y":3, "w":2.25}, {"label":"275", "x":5.5, "y":3, "w":2.75}, {"label":"Alt", "x":9.0, "y":3}, {"label":"Win", "x":10.0, "y":3}, {"label":"Ctrl", "x":11.0, "y":3, "w":1.25}]
diff --git a/keyboards/rainkeebs/rainkeeb/config.h b/keyboards/rainkeebs/rainkeeb/config.h
index 36c3a5d5bf..f1f6ea5c14 100644
--- a/keyboards/rainkeebs/rainkeeb/config.h
+++ b/keyboards/rainkeebs/rainkeeb/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x726B // rk - "rainkeebs"
-#define PRODUCT_ID      0x726B // rk - "rainkeeb"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    rainkeebs
-#define PRODUCT         rainkeeb
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6
diff --git a/keyboards/rainkeebs/rainkeeb/info.json b/keyboards/rainkeebs/rainkeeb/info.json
index b704d2d43b..b0ced909a6 100644
--- a/keyboards/rainkeebs/rainkeeb/info.json
+++ b/keyboards/rainkeebs/rainkeeb/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "rainkeeb",
+    "manufacturer": "rainkeebs",
     "url": "",
     "maintainer": "rain",
+    "usb": {
+        "vid": "0x726B",
+        "pid": "0x726B",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
index 7d41a9e7f9..438a925096 100644
--- a/keyboards/rainkeebs/yasui/config.h
+++ b/keyboards/rainkeebs/yasui/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x726B // rk - "rainkeebs"
-#define PRODUCT_ID      0x7973 // ys - "yasui"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    rainkeebs
-#define PRODUCT         yasui
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10
diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/info.json
index 019d4f94fc..b1f44226f0 100644
--- a/keyboards/rainkeebs/yasui/info.json
+++ b/keyboards/rainkeebs/yasui/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Yasui",
+    "manufacturer": "rainkeebs",
     "url": "https://www.rainkeebs.mx/product/yasui-keyboard-kit",
     "maintainer": "rainkeebs",
+    "usb": {
+        "vid": "0x726B",
+        "pid": "0x7973",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "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":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}]
diff --git a/keyboards/ramonimbao/aelith/config.h b/keyboards/ramonimbao/aelith/config.h
index a2911dac4f..907acb8ff3 100644
--- a/keyboards/ramonimbao/aelith/config.h
+++ b/keyboards/ramonimbao/aelith/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 0xB16B
-#define PRODUCT_ID 0xE460
-#define DEVICE_VER 0x0012
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT AELITH
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/ramonimbao/aelith/info.json b/keyboards/ramonimbao/aelith/info.json
index 8dd9ddff0a..2df7a46399 100644
--- a/keyboards/ramonimbao/aelith/info.json
+++ b/keyboards/ramonimbao/aelith/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "AELITH",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0xE460",
+        "device_version": "0.1.2"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
diff --git a/keyboards/ramonimbao/chevron/config.h b/keyboards/ramonimbao/chevron/config.h
index 9deeff3856..454feec40f 100644
--- a/keyboards/ramonimbao/chevron/config.h
+++ b/keyboards/ramonimbao/chevron/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 0xB16B
-#define PRODUCT_ID 0xC4EE
-#define DEVICE_VER 0x0012
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT Chevron
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/ramonimbao/chevron/info.json b/keyboards/ramonimbao/chevron/info.json
index b464fd9915..d9add91eba 100644
--- a/keyboards/ramonimbao/chevron/info.json
+++ b/keyboards/ramonimbao/chevron/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Chevron",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0xC4EE",
+        "device_version": "0.1.2"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/ramonimbao/herringbone/pro/config.h b/keyboards/ramonimbao/herringbone/pro/config.h
index f78665a880..885940b17f 100644
--- a/keyboards/ramonimbao/herringbone/pro/config.h
+++ b/keyboards/ramonimbao/herringbone/pro/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 0xB16B
-#define PRODUCT_ID 0x440B
-#define DEVICE_VER 0x0012
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT Herringbone Pro
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 15
diff --git a/keyboards/ramonimbao/herringbone/pro/info.json b/keyboards/ramonimbao/herringbone/pro/info.json
index c7846f00f2..3ca8db0858 100644
--- a/keyboards/ramonimbao/herringbone/pro/info.json
+++ b/keyboards/ramonimbao/herringbone/pro/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Herringbone Pro",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x440B",
+        "device_version": "0.1.2"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/ramonimbao/herringbone/v1/config.h b/keyboards/ramonimbao/herringbone/v1/config.h
index 7f37bcc8b2..04b017f470 100644
--- a/keyboards/ramonimbao/herringbone/v1/config.h
+++ b/keyboards/ramonimbao/herringbone/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 0xB16B
-#define PRODUCT_ID 0x04E5
-#define DEVICE_VER 0x0012
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT Herringbone
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
diff --git a/keyboards/ramonimbao/herringbone/v1/info.json b/keyboards/ramonimbao/herringbone/v1/info.json
index b5b1ea3187..2bacde4015 100644
--- a/keyboards/ramonimbao/herringbone/v1/info.json
+++ b/keyboards/ramonimbao/herringbone/v1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Herringbone",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x04E5",
+        "device_version": "0.1.2"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/ramonimbao/mona/v1/config.h b/keyboards/ramonimbao/mona/v1/config.h
index 5ee7ca3e33..d2bacf04cd 100644
--- a/keyboards/ramonimbao/mona/v1/config.h
+++ b/keyboards/ramonimbao/mona/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    0xB16B
-#define PRODUCT_ID   0x404A
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT      Mona
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/ramonimbao/mona/v1/info.json b/keyboards/ramonimbao/mona/v1/info.json
index 11b0719145..cd80a8ee66 100644
--- a/keyboards/ramonimbao/mona/v1/info.json
+++ b/keyboards/ramonimbao/mona/v1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Mona",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x404A",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
diff --git a/keyboards/ramonimbao/mona/v1_1/config.h b/keyboards/ramonimbao/mona/v1_1/config.h
index ce9c01139e..326c661a81 100644
--- a/keyboards/ramonimbao/mona/v1_1/config.h
+++ b/keyboards/ramonimbao/mona/v1_1/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    0xB16B
-#define PRODUCT_ID   0x404B
-#define DEVICE_VER   0x0011
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT      Mona
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/ramonimbao/mona/v1_1/info.json b/keyboards/ramonimbao/mona/v1_1/info.json
index 8a2e11f13c..a7ad5385c0 100644
--- a/keyboards/ramonimbao/mona/v1_1/info.json
+++ b/keyboards/ramonimbao/mona/v1_1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Mona",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x404B",
+        "device_version": "0.1.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
diff --git a/keyboards/ramonimbao/mona/v32a/config.h b/keyboards/ramonimbao/mona/v32a/config.h
index fdd80e59aa..e71c5d80e4 100644
--- a/keyboards/ramonimbao/mona/v32a/config.h
+++ b/keyboards/ramonimbao/mona/v32a/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    0xB16B
-#define PRODUCT_ID   0x4032
-#define DEVICE_VER   0x0011
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT      Mona
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/ramonimbao/mona/v32a/info.json b/keyboards/ramonimbao/mona/v32a/info.json
index 8a2e11f13c..58fdd28653 100644
--- a/keyboards/ramonimbao/mona/v32a/info.json
+++ b/keyboards/ramonimbao/mona/v32a/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Mona",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x4032",
+        "device_version": "0.1.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
diff --git a/keyboards/ramonimbao/squishy65/config.h b/keyboards/ramonimbao/squishy65/config.h
index 1f2bfd7e66..1f858ffee2 100644
--- a/keyboards/ramonimbao/squishy65/config.h
+++ b/keyboards/ramonimbao/squishy65/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       0xB16B
-#define PRODUCT_ID      0x10B5
-#define DEVICE_VER      0x0065
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT Squishy65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/ramonimbao/squishy65/info.json b/keyboards/ramonimbao/squishy65/info.json
index d85efa831f..5e41ed2685 100644
--- a/keyboards/ramonimbao/squishy65/info.json
+++ b/keyboards/ramonimbao/squishy65/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Squishy65",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x10B5",
+        "device_version": "0.6.5"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "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":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Home", "x":15, "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":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15, "y":1}, {"label":"Caps Lock", "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":"PgDn", "x":15, "y":2}, {"label":"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":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"", "x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
diff --git a/keyboards/ramonimbao/squishyfrl/config.h b/keyboards/ramonimbao/squishyfrl/config.h
index 9a50948771..cc7f422723 100644
--- a/keyboards/ramonimbao/squishyfrl/config.h
+++ b/keyboards/ramonimbao/squishyfrl/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    0xB16B
-#define PRODUCT_ID   0x4BE5
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT      SquishyFRL
-
 /* key matrix size */
 #define MATRIX_ROWS 9
 #define MATRIX_COLS 21
diff --git a/keyboards/ramonimbao/squishyfrl/info.json b/keyboards/ramonimbao/squishyfrl/info.json
index 15a1cd1f86..d2623d0fc9 100644
--- a/keyboards/ramonimbao/squishyfrl/info.json
+++ b/keyboards/ramonimbao/squishyfrl/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "SquishyTKL",
+    "keyboard_name": "SquishyFRL",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x4BE5",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/ramonimbao/squishytkl/config.h b/keyboards/ramonimbao/squishytkl/config.h
index 0ee0bc9509..b9a3ce8016 100644
--- a/keyboards/ramonimbao/squishytkl/config.h
+++ b/keyboards/ramonimbao/squishytkl/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    0xB16B
-#define PRODUCT_ID   0x00B1
-#define DEVICE_VER   0x0100
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT      SquishyTKL
-
 /* key matrix size */
 #define MATRIX_ROWS 14
 #define MATRIX_COLS 26
diff --git a/keyboards/ramonimbao/squishytkl/info.json b/keyboards/ramonimbao/squishytkl/info.json
index aa19c73fa8..1f60e2bcaf 100644
--- a/keyboards/ramonimbao/squishytkl/info.json
+++ b/keyboards/ramonimbao/squishytkl/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "SquishyTKL",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x00B1",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/ramonimbao/wete/v1/config.h b/keyboards/ramonimbao/wete/v1/config.h
index ae9ffc6d97..894980edf3 100644
--- a/keyboards/ramonimbao/wete/v1/config.h
+++ b/keyboards/ramonimbao/wete/v1/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       0xB16B
-#define PRODUCT_ID      0x00B5
-#define DEVICE_VER      0x0012
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT Wete
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 20
diff --git a/keyboards/ramonimbao/wete/v1/info.json b/keyboards/ramonimbao/wete/v1/info.json
index 7886b864ab..c57354bfcb 100644
--- a/keyboards/ramonimbao/wete/v1/info.json
+++ b/keyboards/ramonimbao/wete/v1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Wete",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x00B5",
+        "device_version": "0.1.2"
+    },
     "layouts": {
         "LAYOUT_ansi_rhnp": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":17.75, "y":0}, {"x":19.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":6.25, "y":1.25}, {"x":7.25, "y":1.25}, {"x":8.25, "y":1.25}, {"x":9.25, "y":1.25}, {"x":10.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25, "w":2}, {"x":19.25, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25, "h":2}, {"x":4.25, "y":2.25, "w":1.5}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25}, {"x":17.75, "y":2.25, "w":1.5}, {"x":19.25, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":4.25, "y":3.25, "w":1.75}, {"x":6, "y":3.25}, {"x":7, "y":3.25}, {"x":8, "y":3.25}, {"x":9, "y":3.25}, {"x":10, "y":3.25}, {"x":11, "y":3.25}, {"x":12, "y":3.25}, {"x":13, "y":3.25}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":16, "y":3.25}, {"x":17, "y":3.25, "w":2.25}, {"x":19.25, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25, "h":2}, {"x":4.25, "y":4.25, "w":2.25}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25}, {"x":8.5, "y":4.25}, {"x":9.5, "y":4.25}, {"x":10.5, "y":4.25}, {"x":11.5, "y":4.25}, {"x":12.5, "y":4.25}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25, "w":1.75}, {"x":18.25, "y":4.25}, {"x":19.25, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":4.25, "y":5.25, "w":1.25}, {"x":5.5, "y":5.25, "w":1.25}, {"x":6.75, "y":5.25, "w":1.25}, {"x":8, "y":5.25, "w":6.25}, {"x":14.25, "y":5.25, "w":1.25}, {"x":15.5, "y":5.25, "w":1.25}, {"x":17.25, "y":5.25}, {"x":18.25, "y":5.25}, {"x":19.25, "y":5.25}]
diff --git a/keyboards/ramonimbao/wete/v2/config.h b/keyboards/ramonimbao/wete/v2/config.h
index d66fe09ad3..3d6ceb080b 100644
--- a/keyboards/ramonimbao/wete/v2/config.h
+++ b/keyboards/ramonimbao/wete/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    0xB16B
-#define PRODUCT_ID   0x00B3
-#define DEVICE_VER   0x3500
-#define MANUFACTURER Ramon Imbao
-#define PRODUCT      Wete R2
-
 /* key matrix size */
 #define MATRIX_ROWS 13
 #define MATRIX_COLS 10
diff --git a/keyboards/ramonimbao/wete/v2/info.json b/keyboards/ramonimbao/wete/v2/info.json
index 8231871a1f..64f4d1afdf 100644
--- a/keyboards/ramonimbao/wete/v2/info.json
+++ b/keyboards/ramonimbao/wete/v2/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Wete R2",
+    "manufacturer": "Ramon Imbao",
     "url": "",
     "maintainer": "Ramon Imbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x00B3",
+        "device_version": "35.0.0"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/rart/rart45/config.h b/keyboards/rart/rart45/config.h
index 90d584649d..20339c1fe9 100644
--- a/keyboards/rart/rart45/config.h
+++ b/keyboards/rart/rart45/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x414C
-#define PRODUCT_ID      0x0045
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         Rart45
-
 /* key matrix size */
 #define MATRIX_ROWS 9
 #define MATRIX_COLS 6
diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/info.json
index e7b1f241b8..e0f9986eee 100644
--- a/keyboards/rart/rart45/info.json
+++ b/keyboards/rart/rart45/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Rart45",
+  "manufacturer": "Alabahuy",
   "url": "",
   "maintainer": "Alabahuy",
+  "usb": {
+    "vid": "0x414C",
+    "pid": "0x0045",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_all": {
       "layout": [
diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index e203cdaaab..29fe515367 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/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       0x414C 
-#define PRODUCT_ID      0x0004
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         RART4X4
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4
diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json
index 468962aaa6..79be3f9722 100644
--- a/keyboards/rart/rart4x4/info.json
+++ b/keyboards/rart/rart4x4/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "RART4X4",
+    "manufacturer": "Alabahuy",
     "url": "",
     "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h
index fe96325ac4..43ece277d9 100644
--- a/keyboards/rart/rart67/config.h
+++ b/keyboards/rart/rart67/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       0x414C  // "AL"
-#define PRODUCT_ID      0x0067  // "67"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         RART67
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json
index 1bd24c14f8..8e6a1620f8 100644
--- a/keyboards/rart/rart67/info.json
+++ b/keyboards/rart/rart67/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "RART67",
+    "manufacturer": "Alabahuy",
     "url": "",
     "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x0067",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/rart/rart67m/config.h b/keyboards/rart/rart67m/config.h
index 02ee4817d9..d0153e5a25 100644
--- a/keyboards/rart/rart67m/config.h
+++ b/keyboards/rart/rart67m/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x414C
-#define PRODUCT_ID      0x6067
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         RART67M
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
diff --git a/keyboards/rart/rart67m/info.json b/keyboards/rart/rart67m/info.json
index a8398b041d..6cfd7dcbd6 100644
--- a/keyboards/rart/rart67m/info.json
+++ b/keyboards/rart/rart67m/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "RART67M",
+    "manufacturer": "Alabahuy",
     "url": "",
     "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x6067",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/rart/rart75/config.h b/keyboards/rart/rart75/config.h
index 1f9a473907..91f263fc40 100644
--- a/keyboards/rart/rart75/config.h
+++ b/keyboards/rart/rart75/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       0x414C  // "AL"
-#define PRODUCT_ID      0x0075  // "75"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         RART75
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
diff --git a/keyboards/rart/rart75/info.json b/keyboards/rart/rart75/info.json
index d045da2ac1..ebb8c4044d 100644
--- a/keyboards/rart/rart75/info.json
+++ b/keyboards/rart/rart75/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "RART75",
+    "manufacturer": "Alabahuy",
     "url": "",
     "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x0075",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index d08e0612a2..e1581ac2a1 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/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       0x414C  // "AL"
-#define PRODUCT_ID      0x5575  // "75"
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         RART75 Hotswap
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
index 2a8cae96f8..43822f71f1 100644
--- a/keyboards/rart/rart75hs/info.json
+++ b/keyboards/rart/rart75hs/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "RART75 Hotswap",
+    "manufacturer": "Alabahuy",
     "url": "",
     "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x5575",
+        "device_version": "0.0.3"
+    },
     "layouts": {
             "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/rart/rart75m/config.h b/keyboards/rart/rart75m/config.h
index 528082cee0..2eb109e1ed 100644
--- a/keyboards/rart/rart75m/config.h
+++ b/keyboards/rart/rart75m/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x414C
-#define PRODUCT_ID      0x6075
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         75
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14
diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/info.json
index 29a948fb8c..5ff8da619f 100644
--- a/keyboards/rart/rart75m/info.json
+++ b/keyboards/rart/rart75m/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "RART75M",
+    "manufacturer": "Alabahuy",
     "url": "",
     "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x6075",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/rart/rartand/config.h b/keyboards/rart/rartand/config.h
index 841b63b639..bb3a6aefb6 100644
--- a/keyboards/rart/rartand/config.h
+++ b/keyboards/rart/rartand/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x414C
-#define PRODUCT_ID      0x5050
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         Rartand
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 7
diff --git a/keyboards/rart/rartand/info.json b/keyboards/rart/rartand/info.json
index e1f885ed46..8faf60cf01 100644
--- a/keyboards/rart/rartand/info.json
+++ b/keyboards/rart/rartand/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Rartand",
+  "manufacturer": "Alabahuy",
   "url": "",
   "maintainer": "Alabahuy",
+  "usb": {
+    "vid": "0x414C",
+    "pid": "0x5050",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_all": {
       "layout": [
diff --git a/keyboards/rart/rartland/config.h b/keyboards/rart/rartland/config.h
index 46f08f11a4..446e0aa65c 100644
--- a/keyboards/rart/rartland/config.h
+++ b/keyboards/rart/rartland/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x414C
-#define PRODUCT_ID      0x6065
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         RARTLAND
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json
index 2743457e7a..2e46454f85 100644
--- a/keyboards/rart/rartland/info.json
+++ b/keyboards/rart/rartland/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "RARTLAND", 
+    "manufacturer": "Alabahuy",
     "url": " ", 
     "maintainer": "Alabahuy", 
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x6065",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
           "layout": [
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h
index cf02cfedb6..2db1919529 100644
--- a/keyboards/rart/rartlice/config.h
+++ b/keyboards/rart/rartlice/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       0x414C
-#define PRODUCT_ID      0x0065
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         Rartlice
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json
index cd49dbf03c..d5e8802ee6 100644
--- a/keyboards/rart/rartlice/info.json
+++ b/keyboards/rart/rartlice/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Rartlice",
+    "manufacturer": "Alabahuy",
     "url": "",
     "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x0065",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/rart/rartlite/config.h b/keyboards/rart/rartlite/config.h
index a11592d392..8c8897be54 100644
--- a/keyboards/rart/rartlite/config.h
+++ b/keyboards/rart/rartlite/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       0x414C 
-#define PRODUCT_ID      0x4040
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         RARTLITE
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 7
diff --git a/keyboards/rart/rartlite/info.json b/keyboards/rart/rartlite/info.json
index 96b3d26d70..6403eca743 100644
--- a/keyboards/rart/rartlite/info.json
+++ b/keyboards/rart/rartlite/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "RART4X4",
+    "keyboard_name": "RARTLITE",
+    "manufacturer": "Alabahuy",
     "url": "",
     "maintainer": "Alabahuy",
+    "usb": {
+        "vid": "0x414C",
+        "pid": "0x4040",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_right_numpad": {
             "layout": [
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index efb6c7ec29..d35681aaa0 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/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       0x414C  // "AL" 
-#define PRODUCT_ID      0x0050	// "P"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Alabahuy
-#define PRODUCT         RARTPAD
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4
diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json
index 48edae5122..2c883cc215 100644
--- a/keyboards/rart/rartpad/info.json
+++ b/keyboards/rart/rartpad/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "RARTPAD",
+  "manufacturer": "Alabahuy",
   "url": "",
   "maintainer": "Alabahuy",
+  "usb": {
+      "vid": "0x414C",
+      "pid": "0x0050",
+      "device_version": "0.0.1"
+  },
   "layouts": {
       "LAYOUT_ortho_5x4": {
             "layout": [
diff --git a/keyboards/rate/pistachio/config.h b/keyboards/rate/pistachio/config.h
index 5ff7b3d799..8396147b11 100644
--- a/keyboards/rate/pistachio/config.h
+++ b/keyboards/rate/pistachio/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    0x5255
-#define PRODUCT_ID   0xD0C2
-#define DEVICE_VER   0x0001
-#define MANUFACTURER rate
-#define PRODUCT      pistachio
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9
diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json
index 8cdeb51ca3..7f9e92e484 100644
--- a/keyboards/rate/pistachio/info.json
+++ b/keyboards/rate/pistachio/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Pistachio", 
+    "keyboard_name": "pistachio", 
+    "manufacturer": "rate",
     "url": "", 
     "maintainer": "rate", 
+    "usb": {
+        "vid": "0x5255",
+        "pid": "0xD0C2",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"ESC", "x":1.25, "y":0.25},
diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h
index 09b067c8ee..06db2459d2 100644
--- a/keyboards/rate/pistachio_mp/config.h
+++ b/keyboards/rate/pistachio_mp/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    0x5255
-#define PRODUCT_ID   0xE212
-#define DEVICE_VER   0x0001
-#define MANUFACTURER rate
-#define PRODUCT      pistachio_mp
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4
diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
index d4e130300c..52c754186f 100644
--- a/keyboards/rate/pistachio_mp/info.json
+++ b/keyboards/rate/pistachio_mp/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "pistachio_mp", 
+    "manufacturer": "rate",
     "url": "", 
     "maintainer": "rate", 
+    "usb": {
+        "vid": "0x5255",
+        "pid": "0xE212",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/rate/pistachio_pro/config.h b/keyboards/rate/pistachio_pro/config.h
index d140aa5407..40325c35eb 100644
--- a/keyboards/rate/pistachio_pro/config.h
+++ b/keyboards/rate/pistachio_pro/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    0x5255
-#define PRODUCT_ID   0xF40C
-#define DEVICE_VER   0x0001
-#define MANUFACTURER rate
-#define PRODUCT      PistachioPro
-
 #define ENCODERS_PAD_A {D2}
 #define ENCODERS_PAD_B {D3}
 
diff --git a/keyboards/rate/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json
index c519a69e11..e762f30b69 100644
--- a/keyboards/rate/pistachio_pro/info.json
+++ b/keyboards/rate/pistachio_pro/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "PistachioPro",
+    "manufacturer": "rate",
     "url": "https://rates.booth.pm/items/2925303",
     "maintainer": "rate",
+    "usb": {
+        "vid": "0x5255",
+        "pid": "0xF40C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/recompile_keys/choco60/config.h b/keyboards/recompile_keys/choco60/config.h
index 72264f51e2..5a017cbc4b 100644
--- a/keyboards/recompile_keys/choco60/config.h
+++ b/keyboards/recompile_keys/choco60/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       0x524B // recompile keys
-#define PRODUCT_ID      0x4362 // Choco60
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    recompile keys
-#define PRODUCT         Choco60
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 9
diff --git a/keyboards/recompile_keys/choco60/info.json b/keyboards/recompile_keys/choco60/info.json
index 193e8f37b6..17ab7eadb2 100644
--- a/keyboards/recompile_keys/choco60/info.json
+++ b/keyboards/recompile_keys/choco60/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Choco60",
+    "manufacturer": "recompile keys",
     "url": "https://keys.recompile.net/projects/choco60/",
     "maintainer": "Naoto Takai",
+    "usb": {
+        "vid": "0x524B",
+        "pid": "0x4362",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "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":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":"+", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"~", "x":15, "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":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"{", "x":12.5, "y":1}, {"label":"}", "x":13.5, "y":1}, {"label":"Delete", "x":14.5, "y":1, "w":1.5}, {"label":"Control", "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":7.75, "y":2}, {"label":"J", "x":8.75, "y":2}, {"label":"K", "x":9.75, "y":2}, {"label":"L", "x":10.75, "y":2}, {"label":":", "x":11.75, "y":2}, {"label":"\"", "x":12.75, "y":2}, {"label":"Return", "x":13.75, "y":2, "w":2.25}, {"label":"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":8.25, "y":3}, {"label":"M", "x":9.25, "y":3}, {"label":"<", "x":10.25, "y":3}, {"label":">", "x":11.25, "y":3}, {"label":"?", "x":12.25, "y":3}, {"label":"Shift", "x":13.25, "y":3, "w":1.75}, {"label":"Fn", "x":15, "y":3}, {"label":"Opt", "x":1.5, "y":4}, {"label":"\u2318", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":2.75}, {"label":"Opt", "x":7.75, "y":4}, {"x":8.75, "y":4, "w":2.25}, {"label":"\u2318", "x":11, "y":4, "w":1.5}, {"label":"Ctrl", "x":12.5, "y":4}]
diff --git a/keyboards/recompile_keys/cocoa40/config.h b/keyboards/recompile_keys/cocoa40/config.h
index 50da34ffbd..e85bed8b14 100644
--- a/keyboards/recompile_keys/cocoa40/config.h
+++ b/keyboards/recompile_keys/cocoa40/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       0xC0C0
-#define PRODUCT_ID      0x4000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    recompile keys
-#define PRODUCT         cocoa40
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json
index d2b75a6fca..dca5750161 100644
--- a/keyboards/recompile_keys/cocoa40/info.json
+++ b/keyboards/recompile_keys/cocoa40/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Cocoa40",
+    "manufacturer": "recompile keys",
     "url": "https://keys.recompile.net/projects/cocoa40/",
     "maintainer": "Naoto Takai",
+    "usb": {
+        "vid": "0xC0C0",
+        "pid": "0x4000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7.25, "y":0}, {"label":"U", "x":8.25, "y":0}, {"label":"I", "x":9.25, "y":0}, {"label":"O", "x":10.25, "y":0}, {"label":"P", "x":11.25, "y":0}, {"label":"{", "x":12.25, "y":0}, {"label":"}", "x":13.25, "y":0}, {"label":"Back<br>Space", "x":14.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":7.5, "y":1}, {"label":"J", "x":8.5, "y":1}, {"label":"K", "x":9.5, "y":1}, {"label":"L", "x":10.5, "y":1}, {"label":":", "x":11.5, "y":1}, {"label":"\"", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":8, "y":2}, {"label":"M", "x":9, "y":2}, {"label":"<", "x":10, "y":2}, {"label":">", "x":11, "y":2}, {"label":"?", "x":12, "y":2}, {"label":"Shift", "x":13, "y":2, "w":1.25}, {"label":"Fn", "x":14.25, "y":2}, {"label":"Opt", "x":1.5, "y":3}, {"label":"Command", "x":2.5, "y":3, "w":1.5}, {"label":"", "x":4, "y":3, "w":2.25}, {"label":"", "x":7.5, "y":3, "w":2.75}, {"label":"Command", "x":10.25, "y":3, "w":1.5}, {"label":"Opt", "x":11.75, "y":3}]
diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h
index 0c4438e53e..2a7668d3f5 100644
--- a/keyboards/recompile_keys/mio/config.h
+++ b/keyboards/recompile_keys/mio/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    0x524B // recompile keys
-#define PRODUCT_ID   0x4D41 // MIO
-#define DEVICE_VER   0x0001
-#define MANUFACTURER recompile keys
-#define PRODUCT      MIO
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 8
diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json
index fb66fba7f5..6c82236727 100644
--- a/keyboards/recompile_keys/mio/info.json
+++ b/keyboards/recompile_keys/mio/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "MIO",
+  "manufacturer": "recompile keys",
   "url": "https://keys.recompile.net/projects/mio/",
   "maintainer": "recompile keys",
+  "usb": {
+    "vid": "0x524B",
+    "pid": "0x4D41",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/recompile_keys/nomu30/config.h b/keyboards/recompile_keys/nomu30/config.h
index 62aec20525..23b19c4e0c 100644
--- a/keyboards/recompile_keys/nomu30/config.h
+++ b/keyboards/recompile_keys/nomu30/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       0x524B // recompile keys
-#define PRODUCT_ID      0x4E31 // Nomu30
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    recompile keys
-#define PRODUCT         Nomu30
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 12
diff --git a/keyboards/recompile_keys/nomu30/info.json b/keyboards/recompile_keys/nomu30/info.json
index 8f53f003b5..7521023d1b 100644
--- a/keyboards/recompile_keys/nomu30/info.json
+++ b/keyboards/recompile_keys/nomu30/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Nomu30",
+    "manufacturer": "recompile keys",
     "url": "https://keys.recompile.net/projects/nomu30/",
     "maintainer": "takai",
+    "usb": {
+        "vid": "0x524B",
+        "pid": "0x4E31",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/rect44/config.h b/keyboards/rect44/config.h
index d76f5f068f..19343d16a8 100644
--- a/keyboards/rect44/config.h
+++ b/keyboards/rect44/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x4DD7
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    koshinoya
-#define PRODUCT         Rect44
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13
diff --git a/keyboards/rect44/info.json b/keyboards/rect44/info.json
index aae5fe41de..857df635d9 100644
--- a/keyboards/rect44/info.json
+++ b/keyboards/rect44/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "rect44",
+    "keyboard_name": "Rect44",
+    "manufacturer": "koshinoya",
     "url": "",
     "maintainer": "koshinoya",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x4DD7",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/redox_media/config.h b/keyboards/redox_media/config.h
index 0d4ac16b5f..6f2225adb0 100644
--- a/keyboards/redox_media/config.h
+++ b/keyboards/redox_media/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      0x0100
-#define MANUFACTURER    shiftux
-#define PRODUCT         Redox Media
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12
diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/info.json
index e13487e791..ac2480c997 100644
--- a/keyboards/redox_media/info.json
+++ b/keyboards/redox_media/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Redox Media",
+    "manufacturer": "shiftux",
     "url": "",
     "maintainer": "shiftux",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/redox_w/config.h b/keyboards/redox_w/config.h
index 4fe2447b06..3c4b49fa10 100644
--- a/keyboards/redox_w/config.h
+++ b/keyboards/redox_w/config.h
@@ -18,14 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-
-#define VENDOR_ID       0x4D44 //MD
-#define PRODUCT_ID      0x5257 //RW
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mattia Dal Ben
-#define PRODUCT         Redox_wireless
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/redox_w/info.json b/keyboards/redox_w/info.json
index aae795c677..b91fec5a50 100644
--- a/keyboards/redox_w/info.json
+++ b/keyboards/redox_w/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Redox Wireless",
+  "manufacturer": "Mattia Dal Ben",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4D44",
+    "pid": "0x5257",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/redscarf_i/config.h b/keyboards/redscarf_i/config.h
index ec86905db1..218874010d 100644
--- a/keyboards/redscarf_i/config.h
+++ b/keyboards/redscarf_i/config.h
@@ -19,14 +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      0x5959
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Red Scarf
-#define PRODUCT         Red Scarf I
-
 /* Matrix */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4
diff --git a/keyboards/redscarf_i/info.json b/keyboards/redscarf_i/info.json
index ac997c3a5f..fb4341f78f 100644
--- a/keyboards/redscarf_i/info.json
+++ b/keyboards/redscarf_i/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Red Scarf I",
+    "manufacturer": "Red Scarf",
     "url": "",
     "maintainer": "qmk, defying",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x5959",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_5x4": {
             "layout": [
diff --git a/keyboards/redscarf_iiplus/verb/config.h b/keyboards/redscarf_iiplus/verb/config.h
index daf1bc8823..34a7dba6ac 100755
--- a/keyboards/redscarf_iiplus/verb/config.h
+++ b/keyboards/redscarf_iiplus/verb/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    RedScarf
-#define PRODUCT         RedScarfII+
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
diff --git a/keyboards/redscarf_iiplus/verb/info.json b/keyboards/redscarf_iiplus/verb/info.json
index 2b675a5ca8..2e4ad61866 100644
--- a/keyboards/redscarf_iiplus/verb/info.json
+++ b/keyboards/redscarf_iiplus/verb/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Red Scarf II+ Ver.B (RS78)", 
+    "keyboard_name": "RedScarfII+ Ver.B (RS78)", 
+    "manufacturer": "RedScarf",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_78_ansi": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.25, "y":1, "w":1.5}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1, "w":1.5}, {"x":17.25, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.25, "y":2, "w":1.75}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "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":15, "y":2, "w":2.25}, {"x":17.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.25, "y":3, "w":2.25}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3, "w":1.75}, {"x":16.25, "y":3}, {"x":17.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":1.25}, {"x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"x":12.25, "y":4}, {"x":13.25, "y":4}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}]
diff --git a/keyboards/redscarf_iiplus/verc/config.h b/keyboards/redscarf_iiplus/verc/config.h
index daf1bc8823..34a7dba6ac 100755
--- a/keyboards/redscarf_iiplus/verc/config.h
+++ b/keyboards/redscarf_iiplus/verc/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    RedScarf
-#define PRODUCT         RedScarfII+
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
diff --git a/keyboards/redscarf_iiplus/verc/info.json b/keyboards/redscarf_iiplus/verc/info.json
index c3988d225b..1093d3a363 100644
--- a/keyboards/redscarf_iiplus/verc/info.json
+++ b/keyboards/redscarf_iiplus/verc/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Red Scarf II+ Ver.C (RS68)", 
+    "keyboard_name": "RedScarfII+ Ver.C (RS68)", 
+    "manufacturer": "RedScarf",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
diff --git a/keyboards/redscarf_iiplus/verd/config.h b/keyboards/redscarf_iiplus/verd/config.h
index d0ab1abe33..281a6efb6c 100644
--- a/keyboards/redscarf_iiplus/verd/config.h
+++ b/keyboards/redscarf_iiplus/verd/config.h
@@ -18,13 +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       0xFEED
-#define PRODUCT_ID      0x7778
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    RedScarf
-#define PRODUCT         RedScarfII+
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18
diff --git a/keyboards/redscarf_iiplus/verd/info.json b/keyboards/redscarf_iiplus/verd/info.json
index 8b2d3c2d97..0d36542278 100644
--- a/keyboards/redscarf_iiplus/verd/info.json
+++ b/keyboards/redscarf_iiplus/verd/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Red Scarf II+ Ver D",
+  "keyboard_name": "RedScarfII+ Ver.D",
+  "manufacturer": "RedScarf",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x7778",
+    "device_version": "0.0.1"
+  },
   "layouts": {  
     "LAYOUT_60_ansi_numpad_split0": {
       "layout": [
diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h
index 5d8c26450d..fb695474f5 100644
--- a/keyboards/retro_75/config.h
+++ b/keyboards/retro_75/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      0x5275
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    PheonixStarr
-#define PRODUCT         Retro75
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
diff --git a/keyboards/retro_75/info.json b/keyboards/retro_75/info.json
index 585506ae43..69dd3a89d7 100644
--- a/keyboards/retro_75/info.json
+++ b/keyboards/retro_75/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Retro75", 
+    "manufacturer": "PheonixStarr",
     "url": "", 
     "maintainer": "zvecr", 
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x5275",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10.5, "y":0}, {"label":"F10", "x":11.5, "y":0}, {"label":"F11", "x":12.5, "y":0}, {"label":"F12", "x":13.5, "y":0}, {"label":"Prt Sc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"label":"Delete", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"Fn", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Alt", "x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25, "w":7}, {"label":"Alt", "x":10.75, "y":5.25, "w":1.5}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}]
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index f4bbdfda11..9d498b0542 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -19,14 +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       0x5253
-#define PRODUCT_ID      0x4450
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    ReverseStudio
-#define PRODUCT         DecadePad
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4
diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/info.json
index 0789acae2c..fc835f9182 100644
--- a/keyboards/reversestudio/decadepad/info.json
+++ b/keyboards/reversestudio/decadepad/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "DecadePad",
+    "manufacturer": "ReverseStudio",
     "url": "",
     "maintainer": "huajijam",
+    "usb": {
+        "vid": "0x5253",
+        "pid": "0x4450",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h
index f113de6d11..baf56d8035 100644
--- a/keyboards/reviung/reviung33/config.h
+++ b/keyboards/reviung/reviung33/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   0x516D
-#define DEVICE_VER   0x0001
-#define MANUFACTURER gtips
-#define PRODUCT      reviung33
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10
diff --git a/keyboards/reviung/reviung33/info.json b/keyboards/reviung/reviung33/info.json
index 450a41930b..f5d83a1363 100644
--- a/keyboards/reviung/reviung33/info.json
+++ b/keyboards/reviung/reviung33/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "reviung33",
+    "manufacturer": "gtips",
     "url": "",
     "maintainer": "gtips",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x516D",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_reviung33": {
             "layout": [
diff --git a/keyboards/reviung/reviung34/config.h b/keyboards/reviung/reviung34/config.h
index 254ea550af..a59e82be54 100755
--- a/keyboards/reviung/reviung34/config.h
+++ b/keyboards/reviung/reviung34/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      0x4E03
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    gtips
-#define PRODUCT         reviung34
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 9
diff --git a/keyboards/reviung/reviung34/info.json b/keyboards/reviung/reviung34/info.json
index 6e727a4ff3..2738014d21 100755
--- a/keyboards/reviung/reviung34/info.json
+++ b/keyboards/reviung/reviung34/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "reviung34",
+    "manufacturer": "gtips",
     "url": "",
     "maintainer": "gtips",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x4E03",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_reviung34": {
             "layout": [
diff --git a/keyboards/reviung/reviung39/config.h b/keyboards/reviung/reviung39/config.h
index 1377cecd3f..88b229e684 100644
--- a/keyboards/reviung/reviung39/config.h
+++ b/keyboards/reviung/reviung39/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      0x5F10
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    gtips
-#define PRODUCT         reviung39
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 6
diff --git a/keyboards/reviung/reviung39/info.json b/keyboards/reviung/reviung39/info.json
index 725e2ff8e1..3602d0c2c3 100644
--- a/keyboards/reviung/reviung39/info.json
+++ b/keyboards/reviung/reviung39/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "reviung39",
+    "manufacturer": "gtips",
     "url": "",
     "maintainer": "gtips",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x5F10",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_reviung39": {
             "layout": [
diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h
index afa83220c7..45e29b7baa 100644
--- a/keyboards/reviung/reviung41/config.h
+++ b/keyboards/reviung/reviung41/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 0x7807
-#define PRODUCT_ID 0xDCCB
-#define DEVICE_VER 0x0001
-#define MANUFACTURER gtips
-#define PRODUCT reviung41
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 6
diff --git a/keyboards/reviung/reviung41/info.json b/keyboards/reviung/reviung41/info.json
index d640c86611..62c430b738 100644
--- a/keyboards/reviung/reviung41/info.json
+++ b/keyboards/reviung/reviung41/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "reviung41",
+    "manufacturer": "gtips",
     "url": "",
     "maintainer": "gtips",
+    "usb": {
+        "vid": "0x7807",
+        "pid": "0xDCCB",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_reviung41": {
             "layout": [
diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h
index 38b88c07a8..a3413cfe45 100644
--- a/keyboards/reviung/reviung5/config.h
+++ b/keyboards/reviung/reviung5/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    0x5C06
-#define PRODUCT_ID   0x4F0D
-#define DEVICE_VER   0x0001
-#define MANUFACTURER gtips
-#define PRODUCT      reviung5
-
 /* key matrix size */
 #define MATRIX_ROWS  1
 #define MATRIX_COLS  5
diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json
index 78d27d64e2..12320d7774 100644
--- a/keyboards/reviung/reviung5/info.json
+++ b/keyboards/reviung/reviung5/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "reviung5",
+    "manufacturer": "gtips",
     "url": "",
     "maintainer": "gtips",
+    "usb": {
+        "vid": "0x5C06",
+        "pid": "0x4F0D",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_reviung5": {
             "layout": [
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index f874297d77..7baa0f910f 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/config.h
@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x4E94
-#define PRODUCT_ID   0x4E09
-#define DEVICE_VER   0x0001
-#define MANUFACTURER gtips
-#define PRODUCT      reviung53
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 8
diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json
index ff63de5bc8..9001719324 100644
--- a/keyboards/reviung/reviung53/info.json
+++ b/keyboards/reviung/reviung53/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "reviung53",
+    "manufacturer": "gtips",
     "url": "",
     "maintainer": "gtips",
+    "usb": {
+        "vid": "0x4E94",
+        "pid": "0x4E09",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_reviung53": {
             "layout": [
diff --git a/keyboards/reviung/reviung61/config.h b/keyboards/reviung/reviung61/config.h
index 0d10c983c9..82293a2e86 100644
--- a/keyboards/reviung/reviung61/config.h
+++ b/keyboards/reviung/reviung61/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 0x7C1A
-#define DEVICE_VER 0x0001
-#define MANUFACTURER gtips
-#define PRODUCT reviung61
-
 /* key matrix size */
 #define MATRIX_ROWS 5 
 #define MATRIX_COLS 14
diff --git a/keyboards/reviung/reviung61/info.json b/keyboards/reviung/reviung61/info.json
index 5a23617d55..25ba896b2f 100644
--- a/keyboards/reviung/reviung61/info.json
+++ b/keyboards/reviung/reviung61/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "reviung61",
+    "manufacturer": "gtips",
     "url": "",
     "maintainer": "gtips",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x7C1A",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
diff --git a/keyboards/ristretto/config.h b/keyboards/ristretto/config.h
index 3d5a66fbc3..0aad014e02 100644
--- a/keyboards/ristretto/config.h
+++ b/keyboards/ristretto/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x666B // fk
-#define PRODUCT_ID      0x7273 // rs
-#define DEVICE_VER      0x0001 // rev 1
-#define MANUFACTURER    fruitykeeb
-#define PRODUCT         ristretto
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13
diff --git a/keyboards/ristretto/info.json b/keyboards/ristretto/info.json
index de01aaea4d..a409f9339b 100644
--- a/keyboards/ristretto/info.json
+++ b/keyboards/ristretto/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "ristretto",
+    "manufacturer": "fruitykeeb",
     "url": "https://www.fruitykeeb.xyz/product/ristretto",
     "maintainer": "Fruit",
+    "usb": {
+        "vid": "0x666B",
+        "pid": "0x7273",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/rmkeebs/rm_numpad/config.h b/keyboards/rmkeebs/rm_numpad/config.h
index e0c9ef89a6..3d7a6a7efa 100644
--- a/keyboards/rmkeebs/rm_numpad/config.h
+++ b/keyboards/rmkeebs/rm_numpad/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   0x524E  /* RN (RMKeebs Numpad) */
-#define DEVICE_VER   0x0001
-#define MANUFACTURER RMKeebs
-#define PRODUCT      rm_numpad
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 5
diff --git a/keyboards/rmkeebs/rm_numpad/info.json b/keyboards/rmkeebs/rm_numpad/info.json
index 9ad0ebd286..9bba777661 100644
--- a/keyboards/rmkeebs/rm_numpad/info.json
+++ b/keyboards/rmkeebs/rm_numpad/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "rm_numpad",
+    "manufacturer": "RMKeebs",
     "url": "https://www.rmkeebs.com/product/rm-numpad/",
     "maintainer": "RuckerMachine",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x524E",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h
index d06895f709..ab5cd2399f 100644
--- a/keyboards/rocketboard_16/config.h
+++ b/keyboards/rocketboard_16/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       0xB034
-#define PRODUCT_ID      0xFF16
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Rocketboard
-#define PRODUCT         Rocketboard-16
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
index 1ff728bfb7..f9accb9629 100644
--- a/keyboards/rocketboard_16/info.json
+++ b/keyboards/rocketboard_16/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Rocketboard-16",
+    "manufacturer": "Rocketboard",
     "url": "",
     "maintainer": "fl3tching101",
+    "usb": {
+        "vid": "0xB034",
+        "pid": "0xFF16",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_default": "LAYOUT"
     },
diff --git a/keyboards/rominronin/katana60/rev1/config.h b/keyboards/rominronin/katana60/rev1/config.h
index fea2d7d643..e7f7d92016 100644
--- a/keyboards/rominronin/katana60/rev1/config.h
+++ b/keyboards/rominronin/katana60/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       0x7272  // "rr" - rominronin
-#define PRODUCT_ID      0x0C2C
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    RominRonin CandyKeys
-#define PRODUCT         Katana60 rev1
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/rominronin/katana60/rev1/info.json b/keyboards/rominronin/katana60/rev1/info.json
index 8ac62a68e3..1b4ec3c943 100644
--- a/keyboards/rominronin/katana60/rev1/info.json
+++ b/keyboards/rominronin/katana60/rev1/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Katana60 rev1",
+  "manufacturer": "RominRonin CandyKeys",
   "url": "",
   "maintainer": "rominronin",
+  "usb": {
+    "vid": "0x7272",
+    "pid": "0x0C2C",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/rominronin/katana60/rev2/config.h b/keyboards/rominronin/katana60/rev2/config.h
index 24984c8179..e1441acdfc 100644
--- a/keyboards/rominronin/katana60/rev2/config.h
+++ b/keyboards/rominronin/katana60/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 0x7272  // "rr" - rominronin
-#define PRODUCT_ID 0xF03B
-#define DEVICE_VER 0x0001
-#define MANUFACTURER RominRonin CandyKeys
-#define PRODUCT Katana60 rev2
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/rominronin/katana60/rev2/info.json b/keyboards/rominronin/katana60/rev2/info.json
index e2ac51024f..3b26ff635e 100644
--- a/keyboards/rominronin/katana60/rev2/info.json
+++ b/keyboards/rominronin/katana60/rev2/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Katana60 rev2",
+    "manufacturer": "RominRonin CandyKeys",
     "url": "https://candykeys.com/product/katana60-pcb-V2",
     "maintainer": "rominronin",
+    "usb": {
+        "vid": "0x7272",
+        "pid": "0xF03B",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_7u_a": {
             "layout": [
diff --git a/keyboards/roseslite/config.h b/keyboards/roseslite/config.h
index 44f415b379..c323bbbfed 100644
--- a/keyboards/roseslite/config.h
+++ b/keyboards/roseslite/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       0xDE17
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    DeltaDesigns
-#define PRODUCT         roseslite
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/roseslite/info.json b/keyboards/roseslite/info.json
index 70db000a64..0ecc988464 100644
--- a/keyboards/roseslite/info.json
+++ b/keyboards/roseslite/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "roses lite",
+    "manufacturer": "Delta Designs",
     "url": "delta-design.xyz",
     "maintainer": "Reason6/Vk2fgav",
+    "usb": {
+        "vid": "0xDE17",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/rotor/config.h b/keyboards/rotor/config.h
index 9f3d8aa7d3..98cdb24a6b 100644
--- a/keyboards/rotor/config.h
+++ b/keyboards/rotor/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x04D8
-#define PRODUCT_ID      0xE8BE
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Densus Design
-#define PRODUCT         Rotor
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18
diff --git a/keyboards/rotor/info.json b/keyboards/rotor/info.json
index a5c86ec4bd..455a7b3f60 100644
--- a/keyboards/rotor/info.json
+++ b/keyboards/rotor/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Rotor", 
+    "manufacturer": "Densus Design",
     "url": "https://klc-playground.com/", 
     "maintainer": "2Moons", 
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xE8BE",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"label":"Esc", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Home", "x":17.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"PgUp", "x":17.25, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgDn", "x":17.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"End", "x":17.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"label":"7u", "x":6.25, "y":4, "w":7}, {"label":"Ctrl", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
diff --git a/keyboards/rotr/config.h b/keyboards/rotr/config.h
index b9eac7d8bc..c16d420910 100644
--- a/keyboards/rotr/config.h
+++ b/keyboards/rotr/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x726F
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    ROTR
-#define PRODUCT         ROTR
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 3
diff --git a/keyboards/rotr/info.json b/keyboards/rotr/info.json
index cf3113b496..a621150f6b 100644
--- a/keyboards/rotr/info.json
+++ b/keyboards/rotr/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "rotr", 
+    "keyboard_name": "ROTR", 
+    "manufacturer": "ROTR",
     "url": "https://geekhack.org/index.php?topic=107104.0", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x726F",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}]
diff --git a/keyboards/rpiguy9907/southpaw66/config.h b/keyboards/rpiguy9907/southpaw66/config.h
index b5cef39a6f..fb5c072fff 100644
--- a/keyboards/rpiguy9907/southpaw66/config.h
+++ b/keyboards/rpiguy9907/southpaw66/config.h
@@ -17,12 +17,6 @@
 #pragma once
 
 #include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x9907 // "9907" - rpiguy9907
-#define PRODUCT_ID      0x5366 // "S" "66"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    rpiguy9907
-#define PRODUCT         Southpaw66
 
 #define TAPPING_TERM 400
 
diff --git a/keyboards/rpiguy9907/southpaw66/info.json b/keyboards/rpiguy9907/southpaw66/info.json
index ae9e1d4c67..fb8e6789da 100644
--- a/keyboards/rpiguy9907/southpaw66/info.json
+++ b/keyboards/rpiguy9907/southpaw66/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Southpaw66",
+    "manufacturer": "rpiguy9907",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x9907",
+        "pid": "0x5366",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
 
diff --git a/keyboards/rubi/config.h b/keyboards/rubi/config.h
index 25c7aa5be7..6e773bf055 100644
--- a/keyboards/rubi/config.h
+++ b/keyboards/rubi/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    0x4752
-#define PRODUCT_ID   0x5242
-#define DEVICE_VER   0x0001
-#define MANUFACTURER gregorio
-#define PRODUCT      Rubi
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4
diff --git a/keyboards/rubi/info.json b/keyboards/rubi/info.json
index 2ee76f3fdd..95d77d5204 100644
--- a/keyboards/rubi/info.json
+++ b/keyboards/rubi/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "Rubi",
+   "manufacturer": "gregorio",
    "url": "https://github.com/ohchiko/qmk_firmware/tree/master/keyboards/rubi",
    "maintainer": "gregorio",
+   "usb": {
+      "vid": "0x4752",
+      "pid": "0x5242",
+      "device_version": "0.0.1"
+   },
    "layouts": {
       "LAYOUT": {
          "layout": [
diff --git a/keyboards/runes/skjoldr/config.h b/keyboards/runes/skjoldr/config.h
index 5e605792c7..b74eed3904 100644
--- a/keyboards/runes/skjoldr/config.h
+++ b/keyboards/runes/skjoldr/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    0x726E
-#define PRODUCT_ID   0x736B
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Runes
-#define PRODUCT      Skjöldr
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/runes/skjoldr/info.json b/keyboards/runes/skjoldr/info.json
index 337f14c755..4ebb2a7309 100644
--- a/keyboards/runes/skjoldr/info.json
+++ b/keyboards/runes/skjoldr/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Runes Skjöldr",
+    "keyboard_name": "Skjöldr",
+    "manufacturer": "Runes",
     "url": "https://www.runes.id",
     "maintainer": "vicktorhu",
+    "usb": {
+        "vid": "0x726E",
+        "pid": "0x736B",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60_ansi_arrow"
     },
diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h
index 67ba4ca0fe..1a2f1a202e 100644
--- a/keyboards/runes/vaengr/config.h
+++ b/keyboards/runes/vaengr/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    0x726E
-#define PRODUCT_ID   0x7661
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Runes
-#define PRODUCT      VÆNGR
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12
diff --git a/keyboards/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json
index 53619a7868..3c5d4e2b86 100644
--- a/keyboards/runes/vaengr/info.json
+++ b/keyboards/runes/vaengr/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Runes Vængr",
+    "keyboard_name": "VÆNGR",
+    "manufacturer": "Runes",
     "url": "https://www.runes.id",
     "maintainer": "Vicktor",
+    "usb": {
+        "vid": "0x726E",
+        "pid": "0x7661",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h
index 6351db6acf..e7b1fd5b87 100644
--- a/keyboards/ryanbaekr/rb18/config.h
+++ b/keyboards/ryanbaekr/rb18/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 0x7262
-#define PRODUCT_ID 0x0018
-#define DEVICE_VER 0x0003
-#define MANUFACTURER ryanbaekr
-#define PRODUCT rb18
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4
diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json
index 5537f63a92..ba8f2955c1 100644
--- a/keyboards/ryanbaekr/rb18/info.json
+++ b/keyboards/ryanbaekr/rb18/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "rb18",
+    "manufacturer": "ryanbaekr",
     "url": "",
     "maintainer": "ryanbaekr",
+    "usb": {
+        "vid": "0x7262",
+        "pid": "0x0018",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
index 0464befc5f..7fe0e39988 100644
--- a/keyboards/ryanbaekr/rb69/config.h
+++ b/keyboards/ryanbaekr/rb69/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 0x7262
-#define PRODUCT_ID 0x0069
-#define DEVICE_VER 0x0003
-#define MANUFACTURER ryanbaekr
-#define PRODUCT rb69
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json
index 0377479cf6..805169a526 100644
--- a/keyboards/ryanbaekr/rb69/info.json
+++ b/keyboards/ryanbaekr/rb69/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "rb69", 
+    "manufacturer": "ryanbaekr",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x7262",
+        "pid": "0x0069",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.25, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.5}, {"x":15.25, "y":4.25}, {"x":14, "y":4.5}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25, "w":1.25}, {"x":2.75, "y":5.25, "w":1.25}, {"x":4, "y":5.25, "w":6.25}, {"x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"x":13, "y":5.5}, {"x":14, "y":5.5}, {"x":15, "y":5.5}]
diff --git a/keyboards/ryanbaekr/rb86/config.h b/keyboards/ryanbaekr/rb86/config.h
index fd076dd706..af10504520 100644
--- a/keyboards/ryanbaekr/rb86/config.h
+++ b/keyboards/ryanbaekr/rb86/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 0x7262
-#define PRODUCT_ID 0x0086
-#define DEVICE_VER 0x0002
-#define MANUFACTURER ryanbaekr
-#define PRODUCT rb86
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
diff --git a/keyboards/ryanbaekr/rb86/info.json b/keyboards/ryanbaekr/rb86/info.json
index 42cf9e2aa1..05e3da7686 100644
--- a/keyboards/ryanbaekr/rb86/info.json
+++ b/keyboards/ryanbaekr/rb86/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "rb86", 
+    "manufacturer": "ryanbaekr",
     "url": "", 
     "maintainer": "qmk", 
+    "usb": {
+        "vid": "0x7262",
+        "pid": "0x0086",
+        "device_version": "0.0.2"
+    },
     "layout_aliases": {
         "LAYOUT_numpad_6x17": "LAYOUT"
     },
diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h
index aa3dcb3622..187834f7e3 100644
--- a/keyboards/ryanskidmore/rskeys100/config.h
+++ b/keyboards/ryanskidmore/rskeys100/config.h
@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x7273 // rs
-#define PRODUCT_ID   0x0064 // 100
-#define DEVICE_VER   0x0001 // rev 1
-#define MANUFACTURER ryanskidmore
-#define PRODUCT      rsKeys100
-
 /* Key Matrix Sizes */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 24
diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json
index e87e7c50d3..ab2fbd9897 100644
--- a/keyboards/ryanskidmore/rskeys100/info.json
+++ b/keyboards/ryanskidmore/rskeys100/info.json
@@ -1,5 +1,11 @@
 {
-    "keyboard_name": "rskeys100",
+    "keyboard_name": "rsKeys100",
+    "manufacturer": "ryanskidmore",
+    "usb": {
+        "vid": "0x7273",
+        "pid": "0x0064",
+        "device_version": "0.0.1"
+    },
     "url": "",
     "maintainer": "ryanskidmore",
     "layouts": {
diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h
index 754c164b6a..4fea945a5c 100755
--- a/keyboards/ryloo_studio/m0110/config.h
+++ b/keyboards/ryloo_studio/m0110/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 0x614D
-#define PRODUCT_ID 0x1000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Ryloo studio
-#define PRODUCT M0110
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/info.json
index 10917cb3ec..694fd668d0 100644
--- a/keyboards/ryloo_studio/m0110/info.json
+++ b/keyboards/ryloo_studio/m0110/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "M0110",
+    "manufacturer": "Ryloo studio",
     "url": "https://drop.com/buy/ryloo-studio-hello-m0110-mechanical-keyboard-kit",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x614D",
+        "pid": "0x1000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
author	QMK Bot <hello@qmk.fm>	2022-08-03 22:06:14 +0000
committer	QMK Bot <hello@qmk.fm>	2022-08-03 22:06:14 +0000
commit	237039cdcd896e7a99e58db92d193c5ff7a2dc33 (patch)
tree	35144bfd16a200e2697a6f2ae3db3513834f2ac5 /keyboards
parent	c6a6f987c93c424fc31e090737e4c7b8af728856 (diff)
parent	b40c03140e5da1edac2faa2b672a84ea28d0a7c1 (diff)