diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/AntGadget.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/AntGadget.kt
index 86f887c01e..9ee43a959b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/AntGadget.kt
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/AntGadget.kt
@@ -22,6 +22,19 @@ import java.util.Locale
 data class AntGadget(val manufacturer: Int, val product: Int, val name: String) {
     companion object {
         val All: Collection<AntGadget> = listOf(
+            AntGadget(1, 1, "HRM"),
+            AntGadget(1, 5, "HRM2"),
+            AntGadget(1, 7, "HRM3"),
+            AntGadget(1, 8, "HRM Run"),
+            AntGadget(1, 9, "BSM"),
+            AntGadget(1, 10, "BCM"),
+            AntGadget(1, 12, "HRM-Tri"),
+            AntGadget(1, 13, "HRM4-Run"),
+            AntGadget(1, 15, "BSM v3"),
+            AntGadget(1, 16, "BCM v3"),
+            AntGadget(1, 18, "HRM-Dual"),
+            AntGadget(1, 21, "HRMPro+"),
+            AntGadget(1, 22, "HRM-Fit"),
             AntGadget(1, 255, "OHR"),
             AntGadget(1, 357, "Rally RS200"),
             AntGadget(1, 359, "Varia RTL515"),
@@ -77,6 +90,7 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(1, 2327, "HRM-Run"),
             AntGadget(1, 2337, "Vivoactive HR"),
             AntGadget(1, 2348, "Vivosmart HR"),
+            AntGadget(1, 2396, "Forerunner 235 Asia"),
             AntGadget(1, 2413, "Fenix 3 HR"),
             AntGadget(1, 2413, "Fenix 3"),
             AntGadget(1, 2431, "Forerunner 235"),
@@ -89,6 +103,7 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(1, 2544, "Fenix 5S"),
             AntGadget(1, 2567, "Varia UT800"),
             AntGadget(1, 2593, "RD Pod"),
+            AntGadget(1, 2599, "Edge 820 China"),
             AntGadget(1, 2604, "Fenix 5X"),
             AntGadget(1, 2622, "Vivosmart 3"),
             AntGadget(1, 2623, "Vivosport"),
@@ -295,11 +310,16 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(23, 56, "Suunto 5 Peak"),
             AntGadget(23, 58, "Suunto 9 Peak Pro"),
             AntGadget(23, 59, "Suunto Vertical"),
+            AntGadget(23, 60, "Suunto Race"),
+            AntGadget(23, 61, "Suunto Race S"),
             AntGadget(23, 62, "Suunto Ocean"),
+            AntGadget(23, 65, "Suunto Run"),
             AntGadget(23, 66, "Suunto Race 2"),
             AntGadget(23, 67, "Suunto Vertical 2"),
             AntGadget(28, 0, "TrainingPeaks Virtual"),
             AntGadget(32, 8, "TICKRX"),
+            AntGadget(32, 28, "ELEMNT"),
+            AntGadget(32, 31, "ELEMNT BOLT"),
             AntGadget(32, 33, "ELEMNT RIVAL"),
             AntGadget(32, 35, "TICKR FIT"),
             AntGadget(32, 37, "ELEMNT ROAM"),
@@ -309,6 +329,8 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(32, 338, "TRACKR RADAR"),
             AntGadget(69, 1, "Stages DashL50"),
             AntGadget(69, 3, "Stages M200"),
+            AntGadget(86, 28, "Elite SUITO"),
+            AntGadget(89, 2850, "Tacx NEO 2"),
             AntGadget(107, 344, "Magene C506SE"),
             AntGadget(123, 2, "Polar H10"),
             AntGadget(123, 3, "Polar H9"),
@@ -319,6 +341,7 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(132, 3, "Cycplus C3"),
             AntGadget(136, 345, "Geoid CC600"),
             AntGadget(258, 4, "Lezyne Super GPS"),
+            AntGadget(258, 9, "Lezyne Enhanced Micro C GPS"),
             AntGadget(263, 10, "Assioma Uno"),
             AntGadget(263, 12, "Assioma Duo"),
             AntGadget(267, 1902, "Rider 750"),
@@ -330,9 +353,11 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(289, 1, "Karoo"),
             AntGadget(289, 2, "Karoo 2"),
             AntGadget(289, 3, "Karoo 3"),
+            AntGadget(294, 801, "COROS PACE"),
             AntGadget(294, 802, "COROS PACE 2"),
             AntGadget(294, 804, "COROS PACE 3"),
             AntGadget(294, 805, "COROS PACE Pro"),
+            AntGadget(294, 806, "COROS PACE 4"),
             AntGadget(294, 811, "COROS APEX 42mm"),
             AntGadget(294, 812, "COROS APEX 2"),
             AntGadget(294, 821, "COROS APEX"),