diff --git a/avr/boards.txt b/avr/boards.txt
index 02bc59b..978a88d 100644
--- a/avr/boards.txt
+++ b/avr/boards.txt
@@ -26,7 +26,7 @@ leonardoExtended.build.mcu=atmega32u4
 leonardoExtended.build.f_cpu=16000000L
 leonardoExtended.build.core=HID:hid
 leonardoExtended.build.vid=0x2341
-leonardoExtended.build.pid=0x8036
+#leonardoExtended.build.pid=0x8036
 leonardoExtended.build.usb_product="Arduino Leonardo"
 leonardoExtended.build.board=AVR_LEONARDO
 leonardoExtended.build.extra_flags={build.usb_flags}
@@ -35,14 +35,19 @@ leonardoExtended.build.extra_flags={build.usb_flags}
 #HID Project needs to be installed https://github.com/NicoHood/HID
 leonardoExtended.menu.usbcore.hid=Serial + Extended HID
 leonardoExtended.menu.usbcore.hid.build.variant=leonardo_hid
+leonardoExtended.menu.usbcore.hid.build.pid=0x8036
 leonardoExtended.menu.usbcore.gamepad=Serial + Gamepad HID
 leonardoExtended.menu.usbcore.gamepad.build.variant=leonardo_gamepad
+leonardoExtended.menu.usbcore.gamepad.build.pid=0x8036
 leonardoExtended.menu.usbcore.custom=Serial + Custom HID
 leonardoExtended.menu.usbcore.custom.build.variant=leonardo_custom
+leonardoExtended.menu.usbcore.custom.build.pid=0x8036
 leonardoExtended.menu.usbcore.USB_CORE=Default Core
 leonardoExtended.menu.usbcore.USB_CORE.build.variant=leonardo
+leonardoExtended.menu.usbcore.USB_CORE.build.pid=0x8036
 leonardoExtended.menu.usbcore.NO_USB=No USB functions
 leonardoExtended.menu.usbcore.NO_USB.build.variant=leonardo_no_usb
+leonardoExtended.menu.usbcore.NO_USB.build.pid=0x8036
 
 ##############################################################
 
@@ -68,7 +73,7 @@ microExtended.build.mcu=atmega32u4
 microExtended.build.f_cpu=16000000L
 microExtended.build.core=HID:hid
 microExtended.build.vid=0x2341
-microExtended.build.pid=0x8037
+#microExtended.build.pid=0x8037
 microExtended.build.usb_product="Arduino Micro"
 microExtended.build.board=AVR_MICRO
 microExtended.build.extra_flags={build.usb_flags}
@@ -77,12 +82,17 @@ microExtended.build.extra_flags={build.usb_flags}
 #HID Project needs to be installed https://github.com/NicoHood/HID
 microExtended.menu.usbcore.hid=Serial + Extended HID
 microExtended.menu.usbcore.hid.build.variant=micro_hid
+microExtended.menu.usbcore.hid.pid=0x8037
 microExtended.menu.usbcore.gamepad=Serial + Gamepad HID
 microExtended.menu.usbcore.gamepad.build.variant=micro_gamepad
+microExtended.menu.usbcore.gamepad.pid=0x8037
 microExtended.menu.usbcore.custom=Serial + Custom HID
 microExtended.menu.usbcore.custom.build.variant=micro_custom
+microExtended.menu.usbcore.custom.pid=0x8037
 microExtended.menu.usbcore.USB_CORE=Default Core
 microExtended.menu.usbcore.USB_CORE.build.variant=micro
+microExtended.menu.usbcore.USB_CORE.pid=0x8037
 microExtended.menu.usbcore.NO_USB=No USB functions
 microExtended.menu.usbcore.NO_USB.build.variant=micro_no_usb
+microExtended.menu.usbcore.NO_USB.pid=0x8037