diff --git a/SupportedDivecomputers.html b/SupportedDivecomputers.html
index 82ecbdf37..4541cfdaf 100644
--- a/SupportedDivecomputers.html
+++ b/SupportedDivecomputers.html
@@ -33,13 +33,13 @@
 	    <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 4, OSTC Mk2, OSTC Plus, OSTC Sport, OSTC cR</li></ul>
+	    <li>Frog, OSTC, OSTC 2, OSTC 2 TR, OSTC 2C, OSTC 2N, OSTC 3, OSTC 4, OSTC Mk2, OSTC Plus, OSTC Sport, OSTC cR</li></ul>
     </dd>
     <dt>Hollis</dt><dd><ul>
 	    <li>DG02, 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, Quad, 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, Quad, Quad Air, 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, F10, 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>
@@ -51,16 +51,19 @@
 	    <li>Sensus, Sensus Pro, Sensus Ultra</li></ul>
     </dd>
     <dt>Scubapro</dt><dd><ul>
-	    <li>Chromis, G2, Mantis, Mantis 2, Meridian, XTender 5</li></ul>
+	    <li>Aladin Sport Matrix, Aladin Square, Chromis, G2, Mantis, Mantis 2, Meridian, XTender 5</li></ul>
     </dd>
     <dt>Seabaer</dt><dd><ul>
 	    <li>T1, H3, HUDC</li></ul>
     </dd>
+    <dt>Seac</dt><dd><ul>
+	    <li>Jack</li></ul>
+    </dd>
     <dt>Seemann</dt><dd><ul>
 	    <li>XP5</li></ul>
     </dd>
     <dt>Shearwater</dt><dd><ul>
-	    <li>Nerd, Perdix, Perdix AI, Petrel, Petrel 2, Predator</li></ul>
+	    <li>Nerd, Nerd 2, Perdix, Perdix AI, 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>
@@ -69,7 +72,7 @@
 	    <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, D4f, 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, D4f, D4i, D6, D6i, D9, D9tx, DX, EON Core, 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>
diff --git a/SupportedDivecomputers.txt b/SupportedDivecomputers.txt
index 087993e61..52609b022 100644
--- a/SupportedDivecomputers.txt
+++ b/SupportedDivecomputers.txt
@@ -10,19 +10,20 @@ Cressi: Drake, Edy, Giotto, Leonardo, Newton
 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
 Genesis: React Pro, React Pro White
-Heinrichs Weikamp: Frog, OSTC, OSTC 2, OSTC 2C, OSTC 2N, OSTC 3, OSTC 4, OSTC Mk2, OSTC Plus, OSTC Sport, OSTC cR
+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
-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, Quad, Smart, Smart Apnea
+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, Quad, Quad Air, Smart, Smart Apnea
 Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, 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
 Ratio: iDive Deep, iDive Easy, iDive Free, iDive Tech+, iX3M Deep, iX3M Easy, iX3M Pro Deep, iX3M Pro Easy, iX3M Pro Tech+, iX3M Reb, iX3M Tech+
 Reefnet: Sensus, Sensus Pro, Sensus Ultra
-Scubapro: Chromis, G2, Mantis, Mantis 2, Meridian, XTender 5
+Scubapro: Aladin Sport Matrix, Aladin Square, Chromis, G2, Mantis, Mantis 2, Meridian, XTender 5
 Seabaer: T1, H3, HUDC
+Seac: Jack
 Seemann: XP5
-Shearwater: Nerd, Perdix, Perdix AI, Petrel, Petrel 2, Predator
+Shearwater: Nerd, Nerd 2, Perdix, Perdix AI, Petrel, Petrel 2, Predator
 Sherwood: Amphos, Amphos Air, Insight, Insight 2, Vision, Wisdom, Wisdom 2, Wisdom 3
 Subgear: XP Air, XP-10, XP-3G, XP-Air
-Suunto: Cobra, Cobra 2, Cobra 3, D3, D4, D4f, 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
+Suunto: Cobra, Cobra 2, Cobra 3, D3, D4, D4f, D4i, D6, D6i, D9, D9tx, DX, EON Core, 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 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