6 files changed, 19 insertions, 25 deletions
diff --git a/keyboards/charue/charon/config.h b/keyboards/charue/charon/config.h
index 4ee679f707..89c9ebde7c 100644
--- a/keyboards/charue/charon/config.h
+++ b/keyboards/charue/charon/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    0x4344 // CD for CharueDesign
-#define PRODUCT_ID   0x4348 // CH for Charon
-#define DEVICE_VER   0x0001 // Revision prototype
-#define MANUFACTURER Charue Design
-#define PRODUCT      Charon
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/charue/charon/info.json b/keyboards/charue/charon/info.json
index 9702af08cf..cd8b7d1ba5 100644
--- a/keyboards/charue/charon/info.json
+++ b/keyboards/charue/charon/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Charon",
+    "manufacturer": "Charue Design",
     "url": "https://charue-design.com/products/charon",
     "maintainer": "ILWrites",
+    "usb": {
+        "vid": "0x4344",
+        "pid": "0x4348",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/charue/sunsetter/config.h b/keyboards/charue/sunsetter/config.h
index ac7746fa72..15ec852c4e 100644
--- a/keyboards/charue/sunsetter/config.h
+++ b/keyboards/charue/sunsetter/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       0x4344 // CD for CharueDesign
-#define PRODUCT_ID      0x5353 // SS for Sunsetter
-#define DEVICE_VER      0x0001 // Revision prototype
-#define MANUFACTURER    CharueDesign
-#define PRODUCT         Sunsetter
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18
diff --git a/keyboards/charue/sunsetter/info.json b/keyboards/charue/sunsetter/info.json
index 2471c60fd2..a761fd792f 100644
--- a/keyboards/charue/sunsetter/info.json
+++ b/keyboards/charue/sunsetter/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Sunsetter",
+    "manufacturer": "CharueDesign",
     "url": "https://charue-design.com/products/sunsetter",
     "maintainer": "coarse",
+    "usb": {
+        "vid": "0x4344",
+        "pid": "0x5353",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index f95013cd72..5a0f2e3f8e 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -5,16 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-// 0x4344 = CD for Charue Design
-#define VENDOR_ID    0x4344
-// 0x5335 = S2 for Sunsetter R2
-#define PRODUCT_ID   0x5335
-// 0x0001 = 1 for Base version
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Charue Design
-#define PRODUCT      Sunsetter R2
-
 /* Key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 17
diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json
index dc019f8c03..836d9ca6a1 100644
--- a/keyboards/charue/sunsetter_r2/info.json
+++ b/keyboards/charue/sunsetter_r2/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "sunsetter_r2",
+    "keyboard_name": "Sunsetter R2",
+    "manufacturer": "Charue Design",
     "url": "https://charue-design.com/collections/sunsetter",
     "maintainer": "ILWrites",
+    "usb": {
+        "vid": "0x4344",
+        "pid": "0x5335",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [