diff --git a/SupportedDivecomputers.html b/SupportedDivecomputers.html
index 2436c089a..45d05858b 100644
--- a/SupportedDivecomputers.html
+++ b/SupportedDivecomputers.html
@@ -6,7 +6,7 @@
 	    <li>Quantum X</li></ul>
     </dd>
     <dt>Aqualung</dt><dd><ul>
-	    <li>i100, i200, i200C, i200Cv2, i300, i300C, i450T, i470TC, i550, i550C, i750TC, i770R</li></ul>
+	    <li>i100, i200, i200C, i300, i300C, i450T, i470TC, i550, i550C, i750TC, i770R</li></ul>
     </dd>
     <dt>Atomic Aquatics</dt><dd><ul>
 	    <li>Cobalt, Cobalt 2</li></ul>
@@ -21,7 +21,7 @@
 	    <li>Commander I, Commander II, Commander TM, EMC-14, EMC-16, EMC-20H</li></ul>
     </dd>
     <dt>Cressi</dt><dd><ul>
-	    <li>Cartesio, Donatello, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton</li></ul>
+	    <li>Cartesio, Donatello, Drake, Edy, Giotto, Goa, Leonardo, Leonardo 2.0, Michelangelo, Neon, Nepto, Newton</li></ul>
     </dd>
     <dt>Crest</dt><dd><ul>
 	    <li>CR-4</li></ul>
@@ -45,7 +45,7 @@
 	    <li>File import</li></ul>
     </dd>
     <dt>Garmin</dt><dd><ul>
-	    <li>Descent Mk1, Descent Mk2/Mk2i</li></ul>
+	    <li>Descent Mk1, Descent Mk2(i)/Mk3(i)</li></ul>
     </dd>
     <dt>Genesis</dt><dd><ul>
 	    <li>Centauri, React Pro, React Pro White</li></ul>
@@ -60,7 +60,7 @@
 	    <li>Kaon, Lynx, Xen, Xeo</li></ul>
     </dd>
     <dt>Mares</dt><dd><ul>
-	    <li>Airlab, Darwin, Darwin Air, Genius, Horizon, Icon HD, Icon HD Net Ready, M1, M2, Matrix, Nemo, Nemo Air, Nemo Apneist, Nemo Excel, Nemo Steel, Nemo Titanium, Nemo Wide, Nemo Wide 2, Puck, Puck 2, Puck Air, Puck Pro, Puck Pro +, Quad, Quad Air, Smart, Smart Air, Smart Apnea</li></ul>
+	    <li>Airlab, Darwin, Darwin Air, Genius, Horizon, Icon HD, Icon HD Net Ready, M1, M2, Matrix, Nemo, Nemo Air, Nemo Apneist, Nemo Excel, Nemo Steel, Nemo Titanium, Nemo Wide, Nemo Wide 2, Puck, Puck 2, Puck 4, Puck Air, Puck Air 2, Puck Pro, Puck Pro +, Quad, Quad Air, Quad Ci, Sirius, Smart, Smart Air, Smart Apnea</li></ul>
     </dd>
     <dt>McLean</dt><dd><ul>
 	    <li>Extreme</li></ul>
@@ -93,7 +93,7 @@
 	    <li>XP5</li></ul>
     </dd>
     <dt>Shearwater</dt><dd><ul>
-	    <li>Nerd, Nerd 2, Perdix, Perdix 2, Perdix AI, Peregrine, Petrel, Petrel 2, Petrel 3, Predator, Teric, Tern</li></ul>
+	    <li>Nerd, Nerd 2, Perdix, Perdix 2, Perdix AI, Peregrine, Peregrine TX, Petrel, Petrel 2, Petrel 3, Predator, Teric, Tern, Tern TX</li></ul>
     </dd>
     <dt>Sherwood</dt><dd><ul>
 	    <li>Amphos, Amphos 2.0, Amphos Air, Amphos Air 2.0, Beacon, Insight, Insight 2, Sage, Vision, Wisdom, Wisdom 2, Wisdom 3, Wisdom 4</li></ul>
@@ -117,7 +117,7 @@
 	    <li>Zürich SDA</li></ul>
     </dd>
     <dt>Uwatec</dt><dd><ul>
-	    <li>Aladin 2G, Aladin Air Twin, Aladin Air Z, Aladin Air Z Nitrox, Aladin Air Z O2, Aladin Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, Aladin Tec 3G, Galileo Luna, Galileo Sol, Galileo Terra, Galileo Trimix, Memomouse, Smart Com, Smart Pro, Smart Tec, Smart Z</li></ul>
+	    <li>Aladin 2G, Aladin Air Twin, Aladin Air Z, Aladin Air Z Nitrox, Aladin Air Z O2, Aladin One, Aladin Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, Aladin Tec 3G, Galileo Luna, Galileo Sol, Galileo Terra, Galileo Trimix, Memomouse, Smart Com, Smart Pro, Smart Tec, Smart Z</li></ul>
     </dd>
     <dt>Zeagle</dt><dd><ul>
 	    <li>N2iTiON3</li>
diff --git a/SupportedDivecomputers.txt b/SupportedDivecomputers.txt
index 07c3ef172..2c256e063 100644
--- a/SupportedDivecomputers.txt
+++ b/SupportedDivecomputers.txt
@@ -1,12 +1,12 @@
 #  This file is automatically generated, please edit scripts/parse-descriptor.pl
 Aeris: 500 AI, A300, A300 AI, A300CS, Atmos 2, Atmos AI, Atmos AI 2, Compumask, Elite, Elite T3, Epic, F10, F11, Manta, XR-1 NX, XR-2
 Apeks: Quantum X
-Aqualung: i100, i200, i200C, i200Cv2, i300, i300C, i450T, i470TC, i550, i550C, i750TC, i770R
+Aqualung: i100, i200, i200C, i300, i300C, i450T, i470TC, i550, i550C, i750TC, i770R
 Atomic Aquatics: Cobalt, Cobalt 2
 Beuchat: Mundial 2, Mundial 3, Voyager 2G
 Citizen: Hyper Aqualand
 Cochran: Commander I, Commander II, Commander TM, EMC-14, EMC-16, EMC-20H
-Cressi: Cartesio, Donatello, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton
+Cressi: Cartesio, Donatello, Drake, Edy, Giotto, Goa, Leonardo, Leonardo 2.0, Michelangelo, Neon, Nepto, Newton
 Crest: CR-4
 Deep Six: Excursion
 Deepblu: Cosmiq+
@@ -14,12 +14,12 @@ Dive Rite: NiTek Q, NiTek Trio
 DiveSystem: Orca, iDive DAN, iDive Deep, iDive Easy, iDive Free, iDive Pro, iDive Reb, iDive Stealth, iDive Tech, iDive X3M
 Divesoft: Freedom, Liberty
 FIT: File import
-Garmin: Descent Mk1, Descent Mk2/Mk2i
+Garmin: Descent Mk1, Descent Mk2(i)/Mk3(i)
 Genesis: Centauri, React Pro, React Pro White
 Heinrichs Weikamp: Frog, OSTC, OSTC 2, OSTC 2 TR, OSTC 2C, OSTC 2N, OSTC 3, OSTC 4, OSTC Mk2, OSTC Plus, OSTC Sport, OSTC cR
 Hollis: DG02, DG03, TX1
 Liquivision: Kaon, Lynx, Xen, Xeo
-Mares: Airlab, Darwin, Darwin Air, Genius, Horizon, Icon HD, Icon HD Net Ready, M1, M2, Matrix, Nemo, Nemo Air, Nemo Apneist, Nemo Excel, Nemo Steel, Nemo Titanium, Nemo Wide, Nemo Wide 2, Puck, Puck 2, Puck Air, Puck Pro, Puck Pro +, Quad, Quad Air, Smart, Smart Air, Smart Apnea
+Mares: Airlab, Darwin, Darwin Air, Genius, Horizon, Icon HD, Icon HD Net Ready, M1, M2, Matrix, Nemo, Nemo Air, Nemo Apneist, Nemo Excel, Nemo Steel, Nemo Titanium, Nemo Wide, Nemo Wide 2, Puck, Puck 2, Puck 4, Puck Air, Puck Air 2, Puck Pro, Puck Pro +, Quad, Quad Air, Quad Ci, Sirius, Smart, Smart Air, Smart Apnea
 McLean: Extreme
 Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, Geo 4.0, Geo Air, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Pro Plus 4, Pro Plus X, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Veo 4.0, Versa Pro
 Oceans: S1
@@ -30,7 +30,7 @@ Scubapro: Aladin A1, Aladin A2, Aladin H Matrix, Aladin Sport Matrix, Aladin Squ
 Seabaer: T1, H3, HUDC
 Seac: Action, Guru, Jack, Screen
 Seemann: XP5
-Shearwater: Nerd, Nerd 2, Perdix, Perdix 2, Perdix AI, Peregrine, Petrel, Petrel 2, Petrel 3, Predator, Teric, Tern
+Shearwater: Nerd, Nerd 2, Perdix, Perdix 2, Perdix AI, Peregrine, Peregrine TX, Petrel, Petrel 2, Petrel 3, Predator, Teric, Tern, Tern TX
 Sherwood: Amphos, Amphos 2.0, Amphos Air, Amphos Air 2.0, Beacon, Insight, Insight 2, Sage, Vision, Wisdom, Wisdom 2, Wisdom 3, Wisdom 4
 Sporasub: SP2
 Subgear: XP Air, XP-10, XP-3G, XP-Air
@@ -38,5 +38,5 @@ Suunto: Cobra, Cobra 2, Cobra 3, D3, D4, D4f, D4i, D5, D6, D6i, D9, D9tx, DX, EO
 Tecdiving: DiveComputer.eu
 Tusa: Element II (IQ-750), IQ-700, Talis, Zen (IQ-900), Zen Air (IQ-950)
 Uemis: Zürich SDA
-Uwatec: Aladin 2G, Aladin Air Twin, Aladin Air Z, Aladin Air Z Nitrox, Aladin Air Z O2, Aladin Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, Aladin Tec 3G, Galileo Luna, Galileo Sol, Galileo Terra, Galileo Trimix, Memomouse, Smart Com, Smart Pro, Smart Tec, Smart Z
+Uwatec: Aladin 2G, Aladin Air Twin, Aladin Air Z, Aladin Air Z Nitrox, Aladin Air Z O2, Aladin One, Aladin Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, Aladin Tec 3G, Galileo Luna, Galileo Sol, Galileo Terra, Galileo Trimix, Memomouse, Smart Com, Smart Pro, Smart Tec, Smart Z
 Zeagle: N2iTiON3
\ No newline at end of file