diff --git a/keyboards/enviousdesign/60f/config.h b/keyboards/enviousdesign/60f/config.h
index 2c6fc020573..685aece2f48 100644
--- a/keyboards/enviousdesign/60f/config.h
+++ b/keyboards/enviousdesign/60f/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0x2E8A
-#define PRODUCT_ID 0xE739
+#define VENDOR_ID 0xE739
+#define PRODUCT_ID 0xA400
 #define DEVICE_VER 0x0001
 #define MANUFACTURER EnviousDesign
 #define PRODUCT 60F 1.0
diff --git a/keyboards/enviousdesign/65m/config.h b/keyboards/enviousdesign/65m/config.h
index 67d51ea9ee7..784b0b964f9 100644
--- a/keyboards/enviousdesign/65m/config.h
+++ b/keyboards/enviousdesign/65m/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0x2E8A
-#define PRODUCT_ID 0xE739
+#define VENDOR_ID 0xE739
+#define PRODUCT_ID 0xA200
 #define DEVICE_VER 0x0001
 #define MANUFACTURER EnviousDesign
 #define PRODUCT EnvKB 65M
diff --git a/keyboards/enviousdesign/mcro/rev1/config.h b/keyboards/enviousdesign/mcro/rev1/config.h
index f127d54287a..22db3cfd7e8 100644
--- a/keyboards/enviousdesign/mcro/rev1/config.h
+++ b/keyboards/enviousdesign/mcro/rev1/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0x2E8A
-#define PRODUCT_ID 0xE739
+#define VENDOR_ID 0xE739
+#define PRODUCT_ID 0xA300
 #define DEVICE_VER 0x0011
 #define MANUFACTURER EnviousDesign
 #define PRODUCT MCRO 1.0
diff --git a/keyboards/enviousdesign/tkl/rev0/config.h b/keyboards/enviousdesign/tkl/rev0/config.h
index 13e99c16f6d..6bbd058b4a4 100644
--- a/keyboards/enviousdesign/tkl/rev0/config.h
+++ b/keyboards/enviousdesign/tkl/rev0/config.h
@@ -20,11 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0x2E8A
-#define PRODUCT_ID 0xE739
+#define VENDOR_ID 0xE739
+#define PRODUCT_ID 0xA100
 #define DEVICE_VER 0x0000
 #define MANUFACTURER EnviousDesign
-#define PRODUCT EnvKB TKL Prototype
+#define PRODUCT TKL Prototype
 
 /* key matrix size */
 #define MATRIX_ROWS 6
diff --git a/keyboards/enviousdesign/tkl/rev1/config.h b/keyboards/enviousdesign/tkl/rev1/config.h
index 3f417643021..7578c6f8fa7 100644
--- a/keyboards/enviousdesign/tkl/rev1/config.h
+++ b/keyboards/enviousdesign/tkl/rev1/config.h
@@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* USB Device descriptor parameter */
 #define PRODUCT Delirium TKL Rev 1.0 +
-#define VENDOR_ID 0x2E8A
-#define PRODUCT_ID 0xE739
+#define VENDOR_ID 0xE739
+#define PRODUCT_ID 0xA500
 #define DEVICE_VER 0x0001
 #define MANUFACTURER EnviousDesign
 
diff --git a/keyboards/enviousdesign/tkl/rgb/config.h b/keyboards/enviousdesign/tkl/rgb/config.h
index 8cf02244ef5..504bed21ee9 100644
--- a/keyboards/enviousdesign/tkl/rgb/config.h
+++ b/keyboards/enviousdesign/tkl/rgb/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0x2E8A
-#define PRODUCT_ID 0x000A
+#define VENDOR_ID 0xE739
+#define PRODUCT_ID 0xA400
 #define DEVICE_VER 0x0001
 #define MANUFACTURER EnviousDesign
 #define PRODUCT ALT Delirium RGB
@@ -44,9 +44,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define MATRIX_ROW_PINS { GP20, GP21, GP22, GP26, GP27, GP28 }
-#define MATRIX_COL_PINS { GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15, GP19, GP18, GP17, GP16 }
-#define UNUSED_PINS { GP1, GP23, GP24, GP29 }
+#define MATRIX_ROW_PINS \
+    { GP20, GP21, GP22, GP26, GP27, GP28 }
+#define MATRIX_COL_PINS \
+    { GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15, GP19, GP18, GP17, GP16 }
+#define UNUSED_PINS \
+    { GP1, GP23, GP24, GP29 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW