diff --git a/SupportedDivecomputers.html b/SupportedDivecomputers.html
index bd07a26e7..b1f106be4 100644
--- a/SupportedDivecomputers.html
+++ b/SupportedDivecomputers.html
@@ -1,80 +1,80 @@
 <dl><dt>Aeris</dt><dd><ul>
-            <li>500AI, A300, A300 AI, A300CS, Atmos 2, Atmos AI, Atmos AI 2, Compumask, Elite, Elite T3, Elite T3, Epic, Epic, F10, F11, Manta, XR-1 NX, XR-2</li></ul>
+	    <li>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</li></ul>
     </dd>
     <dt>Apeks</dt><dd><ul>
-            <li>Quantum X</li></ul>
+	    <li>Quantum X</li></ul>
     </dd>
-    <dt>AquaLung</dt><dd><ul>
-	<li>i300, i450T, i550T</li></ul>
+    <dt>Aqualung</dt><dd><ul>
+	    <li>i300, i450T, i550T</li></ul>
     </dd>
     <dt>Atomic Aquatics</dt><dd><ul>
-            <li>Cobalt, Cobalt 2</li></ul>
+	    <li>Cobalt, Cobalt 2</li></ul>
     </dd>
     <dt>Beuchat</dt><dd><ul>
-            <li>Mundial 2, Mundial 3, Voyager 2G</li></ul>
+	    <li>Mundial 2, Mundial 3, Voyager 2G</li></ul>
     </dd>
     <dt>Citizen</dt><dd><ul>
-            <li>Hyper Aqualand</li></ul>
+	    <li>Hyper Aqualand</li></ul>
     </dd>
     <dt>Cochran</dt><dd><ul>
 	    <li>Commander, EMC-14, EMC-16, EMC-20H</li></ul>
     </dd>
     <dt>Cressi</dt><dd><ul>
-            <li>Edy, Giotto, Leonardo, Newton</li></ul>
+	    <li>Edy, Giotto, Leonardo, Newton</li></ul>
     </dd>
     <dt>Dive Rite</dt><dd><ul>
-            <li>NiTek Q, NiTek Trio</li></ul>
+	    <li>NiTek Q, NiTek Trio</li></ul>
     </dd>
     <dt>DiveSystem</dt><dd><ul>
-            <li>Orca, iDive DAN, iDive Deep, iDive Easy, iDive Free, iDive Pro, iDive Reb, iDive Stealth, iDive Tech, iDive X3M, iX3M Deep, iX3M Easy, iX3M Reb, iX3M Tec</li></ul>
+	    <li>Orca, iDive DAN, iDive Deep, iDive Easy, iDive Free, iDive Pro, iDive Reb, iDive Stealth, iDive Tech, iDive X3M, iX3M Deep, iX3M Easy, iX3M Reb, iX3M Tec</li></ul>
     </dd>
     <dt>Genesis</dt><dd><ul>
-            <li>React Pro, React Pro White</li></ul>
+	    <li>React Pro, React Pro White</li></ul>
     </dd>
     <dt>Heinrichs Weikamp</dt><dd><ul>
-            <li>Frog, OSTC, OSTC 2, OSTC 2C, OSTC 2N, OSTC 3, OSTC 3+, OSTC 4, OSTC Mk2, OSTC Sport, OSTC cR</li></ul>
+	    <li>Frog, OSTC, OSTC 2, OSTC 2C, OSTC 2N, OSTC 3, OSTC 3+, OSTC 4, OSTC Mk2, OSTC Sport, OSTC cR</li></ul>
     </dd>
     <dt>Hollis</dt><dd><ul>
-            <li>DG03, TX1</li></ul>
+	    <li>DG03, TX1</li></ul>
     </dd>
     <dt>Mares</dt><dd><ul>
-            <li>Airlab, Darwin, Darwin Air, 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, Smart, Smart Apnea</li></ul>
+	    <li>Airlab, Darwin, Darwin Air, 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, Smart, Smart Apnea</li></ul>
     </dd>
     <dt>Oceanic</dt><dd><ul>
-            <li>Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F11, Geo, Geo 2.0, OC1, OC1, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Versa Pro</li></ul>
+	    <li>Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F11, Geo, Geo 2.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Versa Pro</li></ul>
     </dd>
     <dt>Reefnet</dt><dd><ul>
-            <li>Sensus, Sensus Pro, Sensus Ultra</li></ul>
+	    <li>Sensus, Sensus Pro, Sensus Ultra</li></ul>
     </dd>
     <dt>Scubapro</dt><dd><ul>
-            <li>Chromis, Mantis, Mantis 2, Meridian, XTender 5</li></ul>
+	    <li>Chromis, Mantis, Mantis 2, Meridian, XTender 5</li></ul>
     </dd>
     <dt>Seemann</dt><dd><ul>
-            <li>XP5</li></ul>
+	    <li>XP5</li></ul>
     </dd>
     <dt>Shearwater</dt><dd><ul>
-            <li>Nerd, Petrel, Petrel 2, Predator</li></ul>
+	    <li>Nerd, Perdix, Petrel, Petrel 2, Predator</li></ul>
     </dd>
     <dt>Sherwood</dt><dd><ul>
-            <li>Amphos, Amphos Air, Insight, Insight 2, Vision, Wisdom, Wisdom 2, Wisdom 3</li></ul>
+	    <li>Amphos, Amphos Air, Insight, Insight 2, Vision, Wisdom, Wisdom 2, Wisdom 3</li></ul>
     </dd>
     <dt>Subgear</dt><dd><ul>
-            <li>XP Air, XP-10, XP-3G</li></ul>
+	    <li>XP Air, XP-10, XP-3G, XP-Air</li></ul>
     </dd>
     <dt>Suunto</dt><dd><ul>
-            <li>Cobra, Cobra 2, Cobra 3, D3, D4, D4i, D6, D6i, D9, D9tx, DX, EON Steel, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vyper Novo, Vytec, Zoop, Zoop Novo</li></ul>
+	    <li>Cobra, Cobra 2, Cobra 3, D3, D4, D4i, D6, D6i, D9, D9tx, DX, EON Steel, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vyper Novo, Vytec, Zoop, Zoop Novo</li></ul>
     </dd>
     <dt>Tusa</dt><dd><ul>
-            <li>Element II (IQ-750), IQ-700, Zen (IQ-900), Zen Air (IQ-950)</li></ul>
+	    <li>Element II (IQ-750), IQ-700, Zen (IQ-900), Zen Air (IQ-950)</li></ul>
     </dd>
     <dt>Uemis</dt><dd><ul>
-            <li>Zürich SDA</li></ul>
+	    <li>Zürich SDA</li></ul>
     </dd>
     <dt>Uwatec</dt><dd><ul>
-            <li>Aladin 2G, 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 Plus, Aladin Tec, Aladin Tec 2G, 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 Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, 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>
-        </ul>
+	    <li>N2iTiON3</li>
+	</ul>
     </dd>
 </dl>
\ No newline at end of file
diff --git a/SupportedDivecomputers.txt b/SupportedDivecomputers.txt
index 4d73e7469..e880e4a04 100644
--- a/SupportedDivecomputers.txt
+++ b/SupportedDivecomputers.txt
@@ -1,6 +1,6 @@
-Aeris: 500AI, A300, A300 AI, A300CS, Atmos 2, Atmos AI, Atmos AI 2, Compumask, Elite, Elite T3, Elite T3, Epic, Epic, F10, F11, Manta, XR-1 NX, XR-2
+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: i300, i450T, i550T
+Aqualung: i300, i450T, i550T
 Atomic Aquatics: Cobalt, Cobalt 2
 Beuchat: Mundial 2, Mundial 3, Voyager 2G
 Citizen: Hyper Aqualand
@@ -12,15 +12,15 @@ Genesis: React Pro, React Pro White
 Heinrichs Weikamp: Frog, OSTC, OSTC 2, OSTC 2C, OSTC 2N, OSTC 3, OSTC 3+, OSTC 4, OSTC Mk2, OSTC Sport, OSTC cR
 Hollis: DG03, TX1
 Mares: Airlab, Darwin, Darwin Air, 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, Smart, Smart Apnea
-Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F11, Geo, Geo 2.0, OC1, OC1, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Versa Pro
+Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F11, Geo, Geo 2.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Versa Pro
 Reefnet: Sensus, Sensus Pro, Sensus Ultra
 Scubapro: Chromis, Mantis, Mantis 2, Meridian, XTender 5
 Seemann: XP5
-Shearwater: Nerd, Petrel, Petrel 2, Predator
+Shearwater: Nerd, Perdix, Petrel, Petrel 2, Predator
 Sherwood: Amphos, Amphos Air, Insight, Insight 2, Vision, Wisdom, Wisdom 2, Wisdom 3
-Subgear: XP Air, XP-10, XP-3G
+Subgear: XP Air, XP-10, XP-3G, XP-Air
 Suunto: Cobra, Cobra 2, Cobra 3, D3, D4, D4i, D6, D6i, D9, D9tx, DX, EON Steel, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vyper Novo, Vytec, Zoop, Zoop Novo
 Tusa: Element II (IQ-750), IQ-700, Zen (IQ-900), Zen Air (IQ-950)
 Uemis: Zürich SDA
-Uwatec: Aladin 2G, 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 Plus, Aladin Tec, Aladin Tec 2G, 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 Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, 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