diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileType.java
index 3a0a9150bf..b2d2085d7b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileType.java
@@ -52,24 +52,41 @@ public class FileType {
         WEIGHT(128, 9),
         TOTALS(128, 10),
         GOALS(128, 11),
+        MAP(128, 12),
+        DEBUG(128, 13),
         BLOOD_PRESSURE(128, 14),
         MONITOR_A(128, 15),
         SUMMARY(128, 20),
+        GLUCOSE(128, 21),
+        TRACKING_RECORDS(128, 22),
+        TRACKING_EVENTS(128, 23),
+        VECTOR(128, 25),
         MONITOR_DAILY(128, 28),
         RECORDS(128, 29),
+        ALERT(128, 30),
         UNKNOWN_31(128, 31), // sent by HRM Pro Plus
         MONITOR(128, 32),
         MLT_SPORT(128, 33),
         SEGMENTS(128, 34),
         SEGMENT_LIST(128, 35),
+        GOLF(128, 36),
         CLUBS(128, 37),
         SCORE(128, 38),
         ADJUSTMENTS(128, 39),
         HMD(128, 40),
         CHANGELOG(128, 41),
         METRICS(128, 44),
+        BAT_SWING(128, 45),
+        ROSTER(128, 46),
+        DIVE_PLAN(128, 47),
+        HSA_DATA(128, 48),
         SLEEP(128, 49),
+        SOFTWARE(128, 50),
+        CHALLENGE_RESULT(128, 51),
+        USER_BEHAVIOR_LOG(128, 52),
+        CHRONO_ROUND(128, 53),
         CHRONO_SHOT(128, 54), // Garmin Xero C1 Pro Chronograph
+        CHRONO_SCORECARD(128, 55),
         PACE_BANDS(128, 56),
         SPORTS_BACKUP(128, 57), // Garmin Edge 530 - #5265, Garmin Edge 830
         DEVICE_58(128, 58), // just "Device" in Fenix 7s
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 f7b39a7f7c..71eba986c5 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
@@ -72,6 +72,7 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(1, 1932, "Forerunner 15"),
             AntGadget(1, 1936, "Approach S6"),
             AntGadget(1, 1967, "Fenix 2"),
+            AntGadget(1, 1988, "Epix"),
             AntGadget(1, 2050, "Fenix 3"),
             AntGadget(1, 2067, "Edge 520"),
             AntGadget(1, 2130, "Forerunner 920XT"),
@@ -84,6 +85,7 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(1, 2161, "Vector 2"),
             AntGadget(1, 2204, "Edge Explore 1000"),
             AntGadget(1, 2238, "Edge 20"),
+            AntGadget(1, 2262, "D2 Bravo"),
             AntGadget(1, 2266, "Approach S20"),
             AntGadget(1, 2288, "Edge 25"),
             AntGadget(1, 2292, "Approach X40"),
@@ -95,12 +97,14 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(1, 2413, "Fenix 3"),
             AntGadget(1, 2431, "Forerunner 235"),
             AntGadget(1, 2432, "Fenix 3 Chronos"),
+            AntGadget(1, 2444, "Rino 700"),
             AntGadget(1, 2497, "Vivoactive HR"),
             AntGadget(1, 2503, "Forerunner 35"),
             AntGadget(1, 2512, "Oregon 700"),
             AntGadget(1, 2530, "Edge 820"),
             AntGadget(1, 2531, "Edge Explore 820"),
             AntGadget(1, 2544, "Fenix 5S"),
+            AntGadget(1, 2547, "D2 Bravo Titanium"),
             AntGadget(1, 2567, "Varia UT800"),
             AntGadget(1, 2593, "RD Pod"),
             AntGadget(1, 2599, "Edge 820 China"),
@@ -338,6 +342,7 @@ data class AntGadget(val manufacturer: Int, val product: Int, val name: String)
             AntGadget(28, 0, "TrainingPeaks"),
             AntGadget(29, 1031, "Power2max S"),
             AntGadget(32, 0, "Wahoo"),
+            AntGadget(29, 1031, "Power2max S"),
             AntGadget(32, 8, "TICKRX"),
             AntGadget(32, 28, "ELEMNT"),
             AntGadget(32, 31, "ELEMNT BOLT"),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionGoalType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionGoalType.java
index 364e91cc64..395f2a95d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionGoalType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionGoalType.java
@@ -39,7 +39,9 @@ public class FieldDefinitionGoalType extends FieldDefinition {
         frequency(3),
         steps(4),
         ascent(5),
-        active_minutes(6)
+        active_minutes(6),
+        hydration(7),
+        weight(8),
         ;
 
         private final int id;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionLanguage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionLanguage.java
index baf3e66f4a..6d48169869 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionLanguage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/fieldDefinitions/FieldDefinitionLanguage.java
@@ -70,7 +70,9 @@ public class FieldDefinitionLanguage extends FieldDefinition {
         malaysian(34),
         vietnamese(35),
         burmese(36),
-        mongolian(37)
+        mongolian(37),
+        estonian(38),
+        lithuanian(39),
         ;
 
         private final int id;