diff --git a/SupportedDivecomputers.html b/SupportedDivecomputers.html
index 244826a04..0cabd137e 100644
--- a/SupportedDivecomputers.html
+++ b/SupportedDivecomputers.html
@@ -1,106 +1,106 @@
-<ul><li>Aeris
+<dl><dt>Aeris</dt><dd>
 	<ul>
 	    <li>Atmos 2, A300 AI, Atmos AI, Atmos AI 2, Compumask, Elite, Elite T3, Elite T3, Epic, Epic, F10, Manta, XR-2</li>
 	</ul>
-    </li>
-    <li>Apeks
+    </dd>
+    <dt>Apeks</dt><dd>
 	<ul>
 	    <li>Quantum X</li>
 	</ul>
-    </li>
-    <li>Atomic Aquatics
+    </dd>
+    <dt>Atomic Aquatics</dt><dd>
 	<ul>
 	    <li>Cobalt</li>
 	</ul>
-    </li>
-    <li>Cressi
+    </dd>
+    <dt>Cressi</dt><dd>
 	<ul>
 	    <li>Edy, Leonardo</li>
 	</ul>
-    </li>
-    <li>DiveRite
+    </dd>
+    <dt>DiveRite</dt><dd>
 	<ul>
 	    <li>NiTek Trio</li>
 	</ul>
-    </li>
-    <li>Genesis
+    </dd>
+    <dt>Genesis</dt><dd>
 	<ul>
 	    <li>React Pro, React Pro White</li>
 	</ul>
-    </li>
-    <li>Heinrichs Weikamp
+    </dd>
+    <dt>Heinrichs Weikamp</dt><dd>
 	<ul>
 	    <li>DR5, Frog, OSTC, OSTC 2N, OSTC 3, OSTC Mk2</li>
 	</ul>
-    </li>
-    <li>Hollis
+    </dd>
+    <dt>Hollis</dt><dd>
 	<ul>
 	    <li>DG03</li>
 	</ul>
-    </li>
-    <li>Mares
+    </dd>
+    <dt>Mares</dt><dd>
 	<ul>
 	    <li>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</li>
 	</ul>
-    </li>
-    <li>Oceanic
+    </dd>
+    <dt>Oceanic</dt><dd>
 	<ul>
 	    <li>Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, Geo, Geo 2.0, OC1, OC1, OC1, OCi, OCS, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Versa Pro, VT 4.1, VT Pro, VT3, VT4</li>
 	</ul>
-    </li>
-    <li>Reefnet
+    </dd>
+    <dt>Reefnet</dt><dd>
 	<ul>
 	    <li>Sensus, Sensus Pro, Sensus Ultra</li>
 	</ul>
-    </li>
-    <li>Seemann
+    </dd>
+    <dt>Seemann</dt><dd>
 	<ul>
 	    <li>XP5</li>
 	</ul>
-    </li>
-    <li>Shearwater
+    </dd>
+    <dt>Shearwater</dt><dd>
 	<ul>
 	    <li>Petrel, Predator</li>
 	</ul>
-    </li>
-    <li>Sherwood
+    </dd>
+    <dt>Sherwood</dt><dd>
 	<ul>
 	    <li>Amphos, Insight, Insight 2, Wisdom, Wisdom 2, Wisdom 3</li>
 	</ul>
-    </li>
-    <li>Subgear
+    </dd>
+    <dt>Subgear</dt><dd>
 	<ul>
 	    <li>XP Air, XP-10</li>
 	</ul>
-    </li>
-    <li>Suunto
+    </dd>
+    <dt>Suunto</dt><dd>
 	<ul>
 	    <li>Cobra, Cobra 2, Cobra 3, D3, D4, D4i, D6, D6i, D9, D9tx, DX, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vytec, Zoop</li>
 	</ul>
-    </li>
-    <li>Tusa
+    </dd>
+    <dt>Tusa</dt><dd>
 	<ul>
 	    <li>Element II (IQ-750), Zen (IQ-900), Zen Air (IQ-950)</li>
 	</ul>
-    </li>
-    <li>Uemis
+    </dd>
+    <dt>Uemis</dt><dd>
 	<ul>
 	    <li>Zürich</li>
 	</ul>
-    </li>
-    <li>Uwatec
+    </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>
-    <li>xDeep
+    </dd>
+    <dt>xDeep</dt><dd>
 	<ul>
 	    <li>Black</li>
 	</ul>
-    </li>
-    <li>Zeagle
+    </dd>
+    <dt>Zeagle</dt><dd>
 	<ul>
 	    <li>N2iTiON3</li>
 	</ul>
-    </li>
-<ul>
\ No newline at end of file
+    </dd>
+</dl>
\ No newline at end of file
diff --git a/scripts/parse-descriptor.pl b/scripts/parse-descriptor.pl
index 604bfe568..e29658bee 100644
--- a/scripts/parse-descriptor.pl
+++ b/scripts/parse-descriptor.pl
@@ -15,9 +15,9 @@ while (<$fh>) {
 	    printf(", %s", $mod);
 	} else {
 	    if ($lastVend eq "") {
-		printf("<ul><li>%s\n\t<ul>\n\t    <li>%s", $vend, $mod);
+		printf("<dl><dt>%s</dt><dd>\n\t<ul>\n\t    <li>%s", $vend, $mod);
 	    } else {
-		printf("</li>\n\t</ul>\n    </li>\n    <li>%s\n\t<ul>\n\t    <li>%s", $vend, $mod);
+		printf("</li>\n\t</ul>\n    </dd>\n    <dt>%s</dt><dd>\n\t<ul>\n\t    <li>%s", $vend, $mod);
 	    }
 	}
     } else {
@@ -34,6 +34,6 @@ while (<$fh>) {
     $lastVend = $vend;
 }
 if ($type eq "html") {
-    print("</li>\n\t</ul>\n    </li>\n<ul>");
+    print("</li>\n\t</ul>\n    </dd>\n</dl>");
 }
 close $fh;