diff --git a/grmn/devices.py b/grmn/devices.py
index 08897f3..00e7d23 100644
--- a/grmn/devices.py
+++ b/grmn/devices.py
@@ -105,8 +105,8 @@ DEVICES = {
      695: "eTrex Summit HC/Venture HC",
      696: "eTrex H",
      697: "BMW Motorrad Navigator III plus",
-     698: "Zumo BMW",
-     711: "Zumo Honda",
+     698: "zumo BMW",
+     711: "zumo Honda",
      717: "Forerunner 405",
      723: "nuvi 5xx",
      726: "nuvi 8xx",
@@ -114,7 +114,7 @@ DEVICES = {
      733: "GPS Chipset Type M",
      737: "nuvi 2xxW",
      739: "GPS Chipset Type M2",
-     743: "Nuvi 5000",
+     743: "nuvi 5000",
      745: "GPSMAP 695/696",
      754: "nuvi 7xx",
      775: "GPS Chipset Type B",
@@ -132,8 +132,8 @@ DEVICES = {
      836: "nuvi 760 TWN",
      851: "nuvi 2x5",
      853: "StreetPilot C5XX Cendant-Avis Australia",
-     855: "nuvi 300/350 MLC",
-     856: "nuvi 310/360/370 MLC",
+     855: "nuvi 300/350 (MLC)",
+     856: "nuvi 310/360/370 (MLC)",
      861: "GolfLogix Black",
      862: "GXM40 Software",
      865: "GPS 18x 5Hz",
@@ -152,9 +152,9 @@ DEVICES = {
      969: "Firmware Update for FMI Cables with Traffic",
      970: "Mount Software",
      971: "nuvi 12xx",
-     972: "nuvi 13xx and 14xx",
+     972: "nuvi 13xx/14xx",
      977: "Firmware Update for Bluetooth",
-     978: "nuvi 7x5 DSP Software",
+     978: "nuvi 7x5, DSP Software",
      979: "GPS Chipset Type M3",
      983: "Oregon TWN",
      988: "FR60",
@@ -162,21 +162,21 @@ DEVICES = {
     1007: "nuvi 765 TWN",
     1018: "Forerunner 310XT",
     1020: "Foretrex 301/401",
-    1033: "zumo 66x Echo Cancellation Software",
+    1033: "zumo 66x, Echo Cancellation Software",
     1036: "Edge 500",
     1039: "Forerunner 405CX",
     1046: "nuvi 16xx NA",
-    1058: "Nuvi 5xx TWN",
+    1058: "nuvi 5xx TWN",
     1059: "GPS Chipset Type M3",
     1063: "aera 5xx",
-    1073: "Firmware Update for ecoRoute HD",
-    1074: "nuvi 2x5 MTK",
-    1091: "nuvi 2x5W MTK",
+    1073: "ecoRoute HD",
+    1074: "nuvi 2x5 (MTK)",
+    1091: "nuvi 2x5W (MTK)",
     1095: "GPS 72H",
     1101: "nuvi 37xx",
-    1103: "Nuvi 13xx TWN",
-    1104: "nuvi 13xx and 14xx MTK",
-    1106: "nuvi 12xx MTK",
+    1103: "nuvi 13xx TWN",
+    1104: "nuvi 13xx/14xx (MTK)",
+    1106: "nuvi 12xx (MTK)",
     1113: "GPSMAP 62/78",
     1118: "KNA-G600",
     1120: "Oregon x50 TWN",
@@ -184,13 +184,13 @@ DEVICES = {
     1128: "Aera DSP Software",
     1132: "nuvi 16xx EU",
     1136: "Approach G3",
-    1137: "Nuvi 1480 TWN",
+    1137: "nuvi 1480 TWN",
     1138: "zumo 2x0",
     1142: "Oregon 550 Thai",
     1147: "zumo 665",
     1156: "nuvi 16xx AU",
     1157: "nuvi 16xx CA",
-    1161: "Nuvi 16xx TWN",
+    1161: "nuvi 16xx TWN",
     1169: "Edge 800",
     1186: "nuvi 22xx",
     1187: "nuvi 23xx",
@@ -199,16 +199,16 @@ DEVICES = {
     1201: "GTU 10 US",
     1204: "Dakota TWN",
     1209: "Oregon 550 Korea",
-    1211: "Nuvi 37xx, Touchscreen",
+    1211: "nuvi 37xx, Touchscreen",
     1213: "Edge 500 JPN",
     1247: "Rino 6xx",
     1250: "Forerunner 410",
     1252: "Oregon 450tc Japan",
     1254: "nuLink 23xx",
     1258: "nuvi 35xx",
-    1259: "Nuvi 37xx, Taiwan",
+    1259: "nuvi 37xx, Taiwan",
     1264: "Forerunner 210",
-    1266: "Nuvi 2585 TWN",
+    1266: "nuvi 2585 TWN",
     1269: "dezl 560",
     1271: "Approach S1",
     1273: "nuvi 24xx",
@@ -218,7 +218,7 @@ DEVICES = {
     1305: "eTrex 20/30",
     1318: "GPSMAP Series with SDCard",
     1325: "Edge 200",
-    1327: "Nuvi 24x5 Taiwan",
+    1327: "nuvi 24x5 Taiwan",
     1328: "Forerunner 910XT",
     1331: "GTU 10 EU",
     1334: "Edge 800 JPN",
@@ -228,16 +228,16 @@ DEVICES = {
     1344: "GTU 10 CA",
     1345: "Forerunner 610",
     1349: "nuvi 30",
-    1350: "nuvi 40 and 50",
-    1352: "Nuvi 25x5 Taiwan",
+    1350: "nuvi 40/50",
+    1352: "nuvi 25x5 Taiwan",
     1353: "GPSMAP 62S Korea",
     1354: "GPSMAP 62S/78S Thai & Indonesia",
     1364: "aera 7xx",
-    1371: "nuvi 24x5 and 25x5",
+    1371: "nuvi 24x5/25x5",
     1376: "nuvi 34xx",
     1379: "GPS Chipset Type M3",
     1381: "Vector",
-    1389: "Nuvi 2585LT EU",
+    1389: "nuvi 2585LT EU",
     1392: "GPS 19x HVS",
     1400: "DC20/DC30/DC40",
     1405: "Approach G10",
@@ -247,12 +247,12 @@ DEVICES = {
     1429: "Montana 650t Taiwan",
     1431: "Montana Korea",
     1441: "nuvi 3595,JPN",
-    1443: "Nuvi 40/50 China",
+    1443: "nuvi 40/50 China",
     1445: "nuvi 2495 LT GLONASS",
     1446: "Forerunner 310XT",
     1452: "Approach G6",
     1461: "UAT 163",
-    1463: "Nuvi 2585 Russia",
+    1463: "nuvi 2585 Russia",
     1468: "FujiMY16 v1/Fuji MY17 ",
     1469: "Approach S3",
     1471: "eTrex 20/30 JPN",
@@ -268,40 +268,41 @@ DEVICES = {
     1499: "Garmin Swim",
     1504: "eTrex 10 SEA",
     1506: "Nordic Rino650",
-    1510: "Nuvi 40/50 Taiwan",
+    1510: "nuvi 40/50 Taiwan",
     1516: "dezl 760",
-    1517: "nuvi 27x7 and 27x8",
-    1521: "Nuvi 35xx Taiwan",
-    1522: "Nuvi 2460 India",
+    1517: "nuvi 27x7/27x8",
+    1521: "nuvi 35xx Taiwan",
+    1522: "nuvi 2460 India",
     1525: "Oregon 550 China",
     1532: "GPSMAP 62sc China",
     1533: "GPSMAP 62sc Japan",
-    1535: "Nuvi 2580 South America",
+    1535: "nuvi 2580 South America",
     1536: "Oregon 550tc Japan",
     1537: "Forerunner 910XT China",
     1541: "BMW Motorrad Navigator V",
     1545: "TT10",
     1546: "Firmware Update for GTMxx Digital Radio Type S",
     1548: "Yushan",
-    1550: "Zumo 660 Taiwan",
+    1550: "zumo 660 Taiwan",
     1551: "fenix/D2/tactix",
+    1555: "Edge 200 Taiwan",
     1556: "eTrex 20/30 China",
     1561: "Edge 510",
     1562: "Alpha 100",
-    1563: "Nuvi 3595 Taiwan",
+    1563: "nuvi 3595 Taiwan",
     1566: "Garmin Swim Strings",
     1567: "Edge 810",
-    1582: "nuvi 2xx7 and 2xx8",
+    1582: "nuvi 2xx7/2xx8",
     1587: "Rino 6xx China",
-    1593: "Nuvi 2568 India",
+    1593: "nuvi 2568 India",
     1594: "eTrex 20/30 Taiwan",
     1595: "nuvi 140/150",
     1597: "Approach S3 APAC",
     1599: "GPSmap 62stc Taiwan",
     1600: "ForeAthlete 910XTJ Japan",
-    1603: "nuvi 35x7 and 35x8",
-    1613: "nuvi x2 and x4",
-    1617: "Nuvi c155/c165/c175 China",
+    1603: "nuvi 35x7/35x8",
+    1613: "nuvi x2/x4",
+    1617: "nuvi c155/c165/c175 China",
     1619: "GPS Chipset Type M5",
     1620: "GPS Chipset Type M5",
     1621: "GPS Chipset Type M5 (MT3333) w/o Galileo",
@@ -318,30 +319,30 @@ DEVICES = {
     1677: "fenix Japan",
     1678: "fenix Korea",
     1679: "fenix Taiwan",
-    1681: "Nuvi 2795 Japan",
+    1681: "nuvi 2795 Japan",
     1688: "ForeAthlete 10J",
     1689: "GPS Chipset Type M426",
     1692: "quatix",
     1696: "DC 50",
     1697: "nuvi 53/55/56",
     1708: "fleet 590 EU",
-    1711: "Nuvi 2795 South America",
-    1712: "Nuvi 42/52 SGMY",
-    1714: "Nuvi 42/52 Taiwan",
+    1711: "nuvi 2795 South America",
+    1712: "nuvi 42/52 SGMY",
+    1714: "nuvi 42/52 Taiwan",
     1716: "Monterra",
     1719: "GPSMAP 62sc SEA",
     1721: "Edge 810, Japan",
-    1722: "Nuvi 24x7/25x7 Taiwan",
-    1723: "Nuvi 3590 CHN",
-    1724: "Nuvi 3592 SGMY",
-    1725: "Nuvi 3592 THAI",
+    1722: "nuvi 24x7/25x7 Taiwan",
+    1723: "nuvi 3590 CHN",
+    1724: "nuvi 3592 SGMY",
+    1725: "nuvi 3592 THAI",
     1726: "Monterra Outdoor Software",
-    1730: "RV and Camper 760",
-    1731: "Nuvi 3590 TWN",
+    1730: "RV/Camper 760",
+    1731: "nuvi 3590 TWN",
     1735: "VIRB China",
     1736: "Edge Touring",
     1739: "GPSMAP 629sc CHN",
-    1740: "Nuvi 1690 lite Taiwan",
+    1740: "nuvi 1690 lite Taiwan",
     1741: "eTrex 20S SG",
     1742: "Edge 510, Japan",
     1743: "HRM-Tri",
@@ -349,7 +350,7 @@ DEVICES = {
     1752: "HRM-Run",
     1758: "nuvi 25x9",
     1765: "Forerunner 920XT",
-    1766: "Nuvi 42/52 India",
+    1766: "nuvi 42/52 India",
     1769: "SIRIUS/XM Weather Support File",
     1772: "nuvi 26x9",
     1786: "GPS 15x|15xH/xL|16x|18x OEM/5Hz 1786",
@@ -372,7 +373,7 @@ DEVICES = {
     1876: "Rino 6xx Korea",
     1878: "GPSMAP 7x08",
     1879: "GPSMAP 7x10/7x12",
-    1884: "Nuvi 2798",
+    1884: "nuvi 2798",
     1885: "vivoki",
     1891: "Approach S2 JPN",
     1895: "Monterra, GPS/BeiDou CHN",
@@ -398,7 +399,7 @@ DEVICES = {
     1956: "vivosmart",
     1958: "nuvi C255 China",
     1959: "nuvi C265 China",
-    1966: "Nuvi 55TV Brazil",
+    1966: "nuvi 55TV Brazil",
     1967: "fenix 2",
     1969: "Forerunner 15, ANT",
     1982: "MWNavV Japan",
@@ -413,7 +414,7 @@ DEVICES = {
     2032: "T 5, TT 15",
     2035: "Approach S4 APAC",
     2043: "nuviCam",
-    2044: "nuviCam Camera Firmware",
+    2044: "nuviCam, Camera",
     2047: "ANT/BLE N1 Firmware",
     2050: "fenix 3/tactix Bravo/quatix 3",
     2051: "fenix 3/tactix Bravo/quatix 3, Display",
@@ -467,8 +468,9 @@ DEVICES = {
     2194: "Approach S6 APAC",
     2196: "Wi-Fi A1 Firmware",
     2197: "Forerunner 630, Touchscreen",
-    2198: "Dash Cam 30",
-    2199: "Dash Cam 35",
+    2198: "Dash Cam 30 (2198)",
+    2199: "Dash Cam 35 (2199)",
+    2200: "GPS 73",
     2201: "GPS 12H",
     2204: "Edge Explore 1000",
     2219: "Forerunner 225 Asia",
@@ -486,8 +488,8 @@ DEVICES = {
     2261: "Edge 520 Japan",
     2262: "D2 Bravo",
     2266: "Approach S20",
-    2267: "Drive and DriveSmart 40/50",
-    2268: "Drive, DriveSmart 60/70 and DriveTrack 70",
+    2267: "Drive / DriveSmart 40/50",
+    2268: "Drive / DriveSmart 60/70 / DriveTrack 70",
     2269: "DriveLuxe 50",
     2270: "DriveAssist 50",
     2273: "ANT/BLE N2 Firmware",
@@ -529,7 +531,7 @@ DEVICES = {
     2397: "ForeAthlete 235J",
     2398: "Varia Vision",
     2400: "aera 660",
-    2405: "Approach X40 BLE Firmware",
+    2405: "Approach X40, BT_BLE",
     2406: "vivofit3",
     2407: "fenix 3, K65, Korea",
     2408: "fenix 3, K65, SEA",
@@ -541,8 +543,8 @@ DEVICES = {
     2429: "Index Smart Scale",
     2431: "Forerunner 235",
     2432: "fenix Chronos",
-    2435: "Zumo 3x5",
-    2436: "Zumo 595",
+    2435: "zumo 3x5",
+    2436: "zumo 595",
     2440: "GDR E350/C300",
     2442: "Astro 430/Alpha 50",
     2444: "Rino 7xx",
@@ -553,9 +555,9 @@ DEVICES = {
     2471: "Varia Vision APAC",
     2473: "fenix 3 HR, K26, CHN",
     2478: "zumo 590 APAC",
-    2479: "GPSMAP 276cx",
+    2479: "GPSMAP 276Cx",
     2485: "GDR E350 Japan",
-    2495: "DriveAssist 50 Camera FW",
+    2495: "DriveAssist 50, Camera",
     2496: "Garmin Nautix",
     2497: "vivoactive HR APAC",
     2503: "Forerunner 35",
@@ -567,8 +569,8 @@ DEVICES = {
     2533: "Forerunner 735XT APAC",
     2534: "ForeAthlete 735XTJ",
     2544: "fenix 5S",
-    2545: "Dash Cam 30",
-    2546: "Dash Cam 35",
+    2545: "Dash Cam 30 (2545)",
+    2546: "Dash Cam 35 (2546)",
     2547: "D2 Bravo Titanium",
     2559: "Approach S20 APAC",
     2560: "D2 Bravo Titanium, Sensor Hub",
@@ -579,7 +581,7 @@ DEVICES = {
     2576: "eTrex Venture Mariner",
     2583: "Delta Smart nRF51",
     2584: "BMW Motorrad Navigator VI",
-    2586: "Drive and DriveSmart 51",
+    2586: "Drive/DriveSmart 51",
     2587: "Drive 61",
     2588: "DriveSmart 61",
     2589: "DriveLuxe 51",
@@ -591,6 +593,7 @@ DEVICES = {
     2604: "fenix 5X/tactix Charlie",
     2605: "fenix 5X/tactix Charlie, Display",
     2606: "vivofit jr",
+    2607: "DriveSmart 61/Camper/RV 770, Touchscreen",
     2614: "GPSMAP 64sc",
     2622: "vivosmart 3",
     2623: "vivosport",
@@ -598,6 +601,8 @@ DEVICES = {
     2628: "Edge 820 Taiwan",
     2629: "Edge 820 Korea",
     2630: "Edge 820 SEA",
+    2635: "Dash Cam 45-S",
+    2636: "Dash Cam 55",
     2639: "vivosmart HR plus Israel",
     2641: "Xero A1(i)",
     2650: "Forerunner 35 Israel",
@@ -605,6 +610,7 @@ DEVICES = {
     2653: "Forerunner 235, NFC CIB",
     2655: "Forerunner 235, Sensor Hub",
     2656: "Approach S60",
+    2657: "Approach S60, Display",
     2659: "vivosmart 3, Sensor Hub",
     2660: "vivosport, Sensor Hub",
     2661: "fenix 5/quatix 5, Sensor Hub",
@@ -614,7 +620,7 @@ DEVICES = {
     2665: "Forerunner 935, Sensor Hub",
     2667: "Forerunner 35 APAC",
     2668: "Forerunner 35 JPN",
-    2675: "fenix CHRONOS APAC",
+    2675: "fenix Chronos APAC",
     2681: "Oregon 7xx APAC",
     2684: "RV/Camper 770",
     2691: "Forerunner 935",
@@ -626,20 +632,24 @@ DEVICES = {
     2726: "aera 660 China",
     2727: "Forerunner 35 SEA",
     2733: "Forerunner 235, NFC, ExpressPay",
+    2752: "Approach S60, Sensor Hub",
     2763: "GPSMAP 64sc JPN",
     2764: "GPSMAP 64sc SEA",
     2769: "Foretrex 601/701",
     2771: "Impact",
     2772: "vivomove HR",
     2773: "vivomove HR, Sensor Hub",
+    2776: "Approach G30, Touchscreen",
     2777: "Rino 700",
     2778: "GPS Chipset Type M4",
     2779: "GPS Chipset Type M426",
     2781: "vivosport, Touchpanel",
+    2787: "Vector 3",
     2796: "fenix 5 APAC",
     2797: "fenix 5S APAC",
     2798: "fenix 5X APAC",
-    2803: "Drive and DriveSmart 51 APAC",
+    2803: "Drive/DriveSmart 51 APAC",
+    2806: "Approach Z80",
     2807: "echoMAP Plus 4x",
     2808: "echoMAP Plus 6x",
     2809: "echoMAP Plus 7x/9x",
@@ -651,7 +661,10 @@ DEVICES = {
     2831: "vivosmart 3 APAC",
     2832: "vivosport APAC",
     2833: "Forerunner 935 APAC",
+    2838: "Dash Cam 65W",
+    2858: "Dash Cam 45-O",
     2859: "Descent Mk1",
+    2864: "Approach Z80, Aux",
     2869: "Descent Mk1, Display",
     2886: "Forerunner 645",
     2887: "Forerunner 645, ANT_BLE_BT",
@@ -660,13 +673,15 @@ DEVICES = {
     2893: "Atemos 50",
     2894: "Atemos 100",
     2896: "Forerunner 645, Sensor Hub",
-    2900: "fenix 5 Plus",
+    2900: "fenix 5S Plus",
     2907: "Approach S60 APAC, Host",
     2924: "Edge 1030 APAC",
     2927: "vivosmart 4",
     2930: "vivosmart 4, Sensor Hub",
     2931: "vivosmart 4, Touchpanel",
     2945: "vivomove HR APAC",
+    2954: "Varia Radar Tail Light 510, Light",
+    2955: "Varia Radar Tail Light 510, Radar",
     2956: "Alpha 50 CHN",
     2957: "GPS Chipset Type M5 (MT3333) with Galileo",
     2962: "Approach X10",
@@ -679,6 +694,7 @@ DEVICES = {
     2997: "eTrex 302 CHN",
     3003: "Forerunner 645 APAC",
     3004: "Forerunner 645M APAC",
+    3011: "Edge Explore",
     3013: "fenix 5S Plus, Sensor Hub",
     3014: "fenix 5 Plus, Sensor Hub",
     3015: "fenix 5X Plus, Sensor Hub",
@@ -688,15 +704,21 @@ DEVICES = {
     3077: "Forerunner 245 Music",
     3078: "Forerunner 245, Sensor Hub",
     3079: "Forerunner 245 Music, Sensor Hub",
+    3085: "Approach G80",
     3089: "fenix 5 Plus APAC",
     3092: "Edge 130 APAC",
     3095: "Edge 1030 Bontrager",
+    3098: "Astro 900",
     3107: "GPS Chipset Type S1",
     3109: "DriveAssist 51 APAC",
+    3110: "fenix 5 Plus",
+    3111: "fenix 5X Plus",
     3112: "Edge 520 Plus",
     3113: "Forerunner 945",
     3114: "Forerunner 945, Sensor Hub",
     3115: "GPSMAP 64sc SiteSurvey",
+    3121: "Edge 530",
+    3122: "Edge 830",
     3126: "Instinct",
     3127: "Instinct, Sensor Hub",
     3134: "fenix 5S Plus APAC",
@@ -706,6 +728,7 @@ DEVICES = {
     3144: "Forerunner 235 Lite APAC",
     3153: "fenix 5 Plus, ANT_BLE_BT",
     3163: "vivoactive 3 Music APAC, WiFi",
+    3187: "Rino 7xx GMRS",
     3196: "D2 Delta",
     3197: "D2 Delta S",
     3198: "D2 Delta PX",
@@ -713,16 +736,25 @@ DEVICES = {
     3205: "Forerunner 245 Music, ANT_BLE_BT",
     3218: "vivosmart 4 APAC",
     3220: "NFC 3rd Party Applets",
-    3246: "MARQ series (non-Aviator)",
+    3246: "MARQ Driver",
     3247: "MARQ Aviator",
+    3248: "MARQ Captain",
+    3250: "MARQ Expedition",
+    3251: "MARQ Athlete",
     3252: "MARQ series, Sensor Hub",
     3253: "MARQ series, BT_BLE_ANT",
     3260: "D2 Delta, ANT_BLE_BT",
+    3262: "GPSMAP 276Cx APAC",
     3282: "Forerunner 45",
     3303: "Forerunner 945, ANT_BLE_BT",
     3313: "GPS Chipset Type M5",
+    3314: "Approach S40",
+    3315: "Approach S40, Sensor Hub",
+    3316: "Approach S40, Touchscreen",
     3411: "GPS Chipset Type M5",
     3413: "GPS Chipset Type M5",
+    3431: "GPSMAP 64sx",
+    3432: "GPSMAP 64csx",
     3446: "vivoactive 3t(trainer)",
     3506: "GPS Chipset Type S1",
 }