diff --git a/releases/M30/1.10/m30.metainfo.xml b/releases/M30/1.10/m30.metainfo.xml
index edb32f7..a832508 100644
--- a/releases/M30/1.10/m30.metainfo.xml
+++ b/releases/M30/1.10/m30.metainfo.xml
@@ -12,7 +12,7 @@
   </description>
   <provides>
     <!-- USB\VID_2DC8&PID_5006 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
+    <firmware type="flashed">49c74d94-86d7-5587-b48f-aa36decb1568</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/m30/</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/releases/M30/1.13/m30.metainfo.xml b/releases/M30/1.13/m30.metainfo.xml
index 3abaeed..f56dad4 100644
--- a/releases/M30/1.13/m30.metainfo.xml
+++ b/releases/M30/1.13/m30.metainfo.xml
@@ -12,7 +12,7 @@
   </description>
   <provides>
     <!-- USB\VID_2DC8&PID_5006 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
+    <firmware type="flashed">49c74d94-86d7-5587-b48f-aa36decb1568</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/m30/</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/releases/N30_Pro_2/6.10/n30pro2.metainfo.xml b/releases/N30_Pro_2/6.10/n30pro2.metainfo.xml
index ecf9447..c49306f 100644
--- a/releases/N30_Pro_2/6.10/n30pro2.metainfo.xml
+++ b/releases/N30_Pro_2/6.10/n30pro2.metainfo.xml
@@ -22,8 +22,6 @@
     <firmware type="flashed">e5f6e0cf-c156-58e6-94e5-10ef2dff807c</firmware>
     <!-- USB\VID_054C&PID_05C4 -->
     <firmware type="flashed">50afc861-c345-56d2-b4be-8a54e6a1ed12</firmware>
-    <!-- USB\VID_2dC8&PID_5750 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/n30pro-2/</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/releases/SF30_Pro-SN30_Pro/1.25/sf30sn30pro.metainfo.xml b/releases/SF30_Pro-SN30_Pro/1.25/sf30sn30pro.metainfo.xml
index 69c8a99..d10a573 100644
--- a/releases/SF30_Pro-SN30_Pro/1.25/sf30sn30pro.metainfo.xml
+++ b/releases/SF30_Pro-SN30_Pro/1.25/sf30sn30pro.metainfo.xml
@@ -22,8 +22,6 @@
     <firmware type="flashed">e5f6e0cf-c156-58e6-94e5-10ef2dff807c</firmware>
     <!-- USB\VID_054C&PID_05C4 -->
     <firmware type="flashed">50afc861-c345-56d2-b4be-8a54e6a1ed12</firmware>
-    <!-- USB\VID_2dC8&PID_5750 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/sn30pro-sf30pro/</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/releases/SF30_Pro-SN30_Pro/1.26/sf30sn30pro.metainfo.xml b/releases/SF30_Pro-SN30_Pro/1.26/sf30sn30pro.metainfo.xml
index 83b8656..6d77287 100644
--- a/releases/SF30_Pro-SN30_Pro/1.26/sf30sn30pro.metainfo.xml
+++ b/releases/SF30_Pro-SN30_Pro/1.26/sf30sn30pro.metainfo.xml
@@ -22,8 +22,6 @@
     <firmware type="flashed">e5f6e0cf-c156-58e6-94e5-10ef2dff807c</firmware>
     <!-- USB\VID_054C&PID_05C4 -->
     <firmware type="flashed">50afc861-c345-56d2-b4be-8a54e6a1ed12</firmware>
-    <!-- USB\VID_2dC8&PID_5750 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/sn30pro-sf30pro/</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/releases/SF30_Pro-SN30_Pro/1.29/sf30sn30pro.metainfo.xml b/releases/SF30_Pro-SN30_Pro/1.29/sf30sn30pro.metainfo.xml
index c11382e..b794c08 100644
--- a/releases/SF30_Pro-SN30_Pro/1.29/sf30sn30pro.metainfo.xml
+++ b/releases/SF30_Pro-SN30_Pro/1.29/sf30sn30pro.metainfo.xml
@@ -22,8 +22,6 @@
     <firmware type="flashed">e5f6e0cf-c156-58e6-94e5-10ef2dff807c</firmware>
     <!-- USB\VID_054C&PID_05C4 -->
     <firmware type="flashed">50afc861-c345-56d2-b4be-8a54e6a1ed12</firmware>
-    <!-- USB\VID_2dC8&PID_5750 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/sn30pro-sf30pro/</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/releases/SF30_Pro-SN30_Pro/1.30/sf30sn30pro.metainfo.xml b/releases/SF30_Pro-SN30_Pro/1.30/sf30sn30pro.metainfo.xml
index ade391a..3f9bfea 100644
--- a/releases/SF30_Pro-SN30_Pro/1.30/sf30sn30pro.metainfo.xml
+++ b/releases/SF30_Pro-SN30_Pro/1.30/sf30sn30pro.metainfo.xml
@@ -22,8 +22,6 @@
     <firmware type="flashed">e5f6e0cf-c156-58e6-94e5-10ef2dff807c</firmware>
     <!-- USB\VID_054C&PID_05C4 -->
     <firmware type="flashed">50afc861-c345-56d2-b4be-8a54e6a1ed12</firmware>
-    <!-- USB\VID_2dC8&PID_5750 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/sn30pro-sf30pro/</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/releases/SF30_Pro-SN30_Pro/1.32/sf30sn30pro.metainfo.xml b/releases/SF30_Pro-SN30_Pro/1.32/sf30sn30pro.metainfo.xml
index 40be2b3..aeffb37 100644
--- a/releases/SF30_Pro-SN30_Pro/1.32/sf30sn30pro.metainfo.xml
+++ b/releases/SF30_Pro-SN30_Pro/1.32/sf30sn30pro.metainfo.xml
@@ -22,8 +22,6 @@
     <firmware type="flashed">e5f6e0cf-c156-58e6-94e5-10ef2dff807c</firmware>
     <!-- USB\VID_054C&PID_05C4 -->
     <firmware type="flashed">50afc861-c345-56d2-b4be-8a54e6a1ed12</firmware>
-    <!-- USB\VID_2dC8&PID_5750 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/sn30pro-sf30pro/</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/releases/SF30_Pro-SN30_Pro/1.33/sf30sn30pro.metainfo.xml b/releases/SF30_Pro-SN30_Pro/1.33/sf30sn30pro.metainfo.xml
index 9a653db..74ad403 100644
--- a/releases/SF30_Pro-SN30_Pro/1.33/sf30sn30pro.metainfo.xml
+++ b/releases/SF30_Pro-SN30_Pro/1.33/sf30sn30pro.metainfo.xml
@@ -22,8 +22,6 @@
     <firmware type="flashed">e5f6e0cf-c156-58e6-94e5-10ef2dff807c</firmware>
     <!-- USB\VID_054C&PID_05C4 -->
     <firmware type="flashed">50afc861-c345-56d2-b4be-8a54e6a1ed12</firmware>
-    <!-- USB\VID_2dC8&PID_5750 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/sn30pro-sf30pro/</url>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/releases/SN30_Pro+/3.01/sn30pro_plus.metainfo.xml b/releases/SN30_Pro+/3.01/sn30pro_plus.metainfo.xml
index bd58e03..d45a851 100644
--- a/releases/SN30_Pro+/3.01/sn30pro_plus.metainfo.xml
+++ b/releases/SN30_Pro+/3.01/sn30pro_plus.metainfo.xml
@@ -7,15 +7,15 @@
   <summary>Firmware for the 8Bitdo SN30 Pro+ Game Controller</summary>
   <description>
     <p>
-      Updating the firmware on your SN30 Pro+ device improves performance and adds
-      new features.
+      Updating the firmware on your SN30 Pro+ device improves performance and
+      adds new features.
     </p>
   </description>
   <provides>
-    <!-- USB\VID_2DC8&PID_5750&REV_020 -->
-    <firmware type="flashed">78acf201-a624-5c0b-a521-e204be14e3d5</firmware>
-    <!-- USB\VID_2DC8&PID_5750 -->
-    <firmware type="flashed">b02f1319-c1c4-54f4-b7f2-5bb3552f6a9e</firmware>
+    <!-- USB\VID_2DC8&PID_6002&REV_0001 -->
+    <firmware type="flashed">64eb3e9c-e79c-50d0-984b-21a1641f37c5</firmware>
+    <!-- USB\VID_2DC8&PID_6002 -->
+    <firmware type="flashed">a9a82ee0-7fdc-5d80-bd73-6b39f7a4f061</firmware>
   </provides>
   <url type="homepage">http://www.8bitdo.com/sn30pro-plus/</url>
   <metadata_license>CC0-1.0</metadata_license>
@@ -25,19 +25,17 @@
     <release urgency="medium" version="3.01" date="2019-08-09" timestamp="1565309220">
       <checksum filename="Firmware_SN30_Pro+_V3.01.dat" target="content"/>
       <description>
-        <p>
-          This stable release fixes the following issues:
-        </p>
+        <p>This stable release fixes the following issues:</p>
         <ul>
-            <li>Fixed the latency issue when using the Switch with Joy-cons attached</li>
-            <li>Compatible with 8BitDo Ultimate Software</li> 
+          <li>Fixed the latency issue when using the Switch with Joy-cons attached</li>
+          <li>Compatible with 8BitDo Ultimate Software</li>
         </ul>
       </description>
     </release>
   </releases>
   <screenshots>
     <screenshot type="default">
-      <image type="source">https://raw.githubusercontent.com/hughsie/8bitdo-firmware/master/screenshots/sn30-pro.svg</image>
+      <image type="source">https://raw.githubusercontent.com/fwupd/8bitdo-firmware/master/screenshots/sn30-pro.png</image>
       <caption>Unplug the controller, hold down L1 + R1 + START until the red LED on top of the controller is flashing and then reconnect the controller.</caption>
     </screenshot>
   </screenshots>