diff --git a/index.html b/index.html
index 39c14da..fdf8d39 100644
--- a/index.html
+++ b/index.html
@@ -137,14 +137,14 @@ can use it in GPXSee.</small></p>
 <h3>Finland</h3>
 <table>
 <tr>
-<td><a href="maps/Ilmakuva.tpl" download><img src="tiles/Ilmakuva.jpg" alt="Map Preview" width="256" height="256"/></a><br/>Ilmakuva (Aerial image)</td>
+<td><a href="maps/Ilmakuva.tpl" download><img src="tiles/Ilmakuva.jpg" alt="Map Preview" width="256" height="256"/></a><br/>Ilmakuva (Aerial image)  <small>[TPL]</small></td>
 <td><a href="maps/Karjalankartta100k.xml" download><img src="tiles/Karjalankartta100k.png" alt="Map Preview" width="256" height="256"/></a><br/>Karjalankartta (Maps of Karelia) 100k</td>
 <td><a href="maps/Karjalankartta20k.xml" download><img src="tiles/Karjalankartta20k.png" alt="Map Preview" width="256" height="256"/></a><br/>Karjalankartta (Maps of Karelia) 20k</td>
-<td><a href="maps/Maastokartta.tpl" download><img src="tiles/Maastokartta.png" alt="Map Preview" width="256" height="256"/></a><br/>Maastokartta (Topographic map)</td>
+<td><a href="maps/Maastokartta.tpl" download><img src="tiles/Maastokartta.png" alt="Map Preview" width="256" height="256"/></a><br/>Maastokartta (Topographic map)  <small>[TPL]</small></td>
 </tr><tr>
 <td><a href="maps/MapAnt.xml" download><img src="tiles/MapAnt.png" alt="Map Preview" width="256" height="256"/></a><br/>MapAnt</td>
-<td><a href="maps/Selkokartta.tpl" download><img src="tiles/Selkokartta.png" alt="Map Preview" width="256" height="256"/></a><br/>Selkokartta (Plain map)</td>
-<td><a href="maps/Taustakartta.tpl" download><img src="tiles/Taustakartta.png" alt="Map Preview" width="256" height="256"/></a><br/>Taustakartta (Background map)</td>
+<td><a href="maps/Selkokartta.tpl" download><img src="tiles/Selkokartta.png" alt="Map Preview" width="256" height="256"/></a><br/>Selkokartta (Plain map)  <small>[TPL]</small></td>
+<td><a href="maps/Taustakartta.tpl" download><img src="tiles/Taustakartta.png" alt="Map Preview" width="256" height="256"/></a><br/>Taustakartta (Background map)  <small>[TPL]</small></td>
 </tr>
 </table>
 <h3>France</h3>
@@ -281,8 +281,8 @@ can use it in GPXSee.</small></p>
 <tr>
 <td><a href="maps/OpenStreetMap-Switzerland.xml" download><img src="tiles/OpenStreetMap-Switzerland.png" alt="Map Preview" width="256" height="256"/></a><br/>OSM Switzerland</td>
 <td><a href="maps/OpenStreetMap-Swiss-Style.xml" download><img src="tiles/OpenStreetMap-Swiss-Style.png" alt="Map Preview" width="256" height="256"/></a><br/>OSM Switzerland Swiss Style</td>
-<td><a href="maps/Swisstopo.tpl" download><img src="tiles/Swisstopo.png" alt="Map Preview" width="256" height="256"/></a><br/>Swisstopo  <small>[TPL]</small></td>
-<td><a href="maps/Swisstopo-Aerial.tpl" download><img src="tiles/Swisstopo-Aerial.png" alt="Map Preview" width="256" height="256"/></a><br/>Swisstopo Aerial  <small>[TPL]</small></td>
+<td><a href="maps/Swisstopo-Landeskarte.xml" download><img src="tiles/Swisstopo-Landeskarte.png" alt="Map Preview" width="256" height="256"/></a><br/>Swisstopo - Landeskarte</td>
+<td><a href="maps/Swisstopo-Swissimage.xml" download><img src="tiles/Swisstopo-Swissimage.png" alt="Map Preview" width="256" height="256"/></a><br/>Swisstopo - Swissimage</td>
 </tr>
 </table>
 <h3>United Kingdom (Great Britain)</h3>
diff --git a/maps/Swisstopo-Aerial.tpl b/maps/Swisstopo-Aerial.tpl
deleted file mode 100644
index 532035f..0000000
--- a/maps/Swisstopo-Aerial.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.4" type="WMS">
-	<name>Swisstopo Aerial</name>
-	<url>https://wms.swisstopo.admin.ch</url>
-	<copyright>Federal Topographical Office</copyright>
-	<layer>ch.swisstopo.images-swissimage</layer>
-	<crs>EPSG:21781</crs>
-	<authorization username="insert-your-username-here" password="insert-your-password-here"/>
-</map>
diff --git a/maps/Swisstopo-Landeskarte.xml b/maps/Swisstopo-Landeskarte.xml
new file mode 100644
index 0000000..b243fd2
--- /dev/null
+++ b/maps/Swisstopo-Landeskarte.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Swisstopo uses yet another nonstandard CRS urn format. Support for this format
+was added in GPXSee 8.9, the map will not work with older versions of GPXSee.
+-->
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
+	<name>Swisstopo - Landeskarte</name>
+	<url type="REST">https://wmts.geo.admin.ch/EPSG/3857/1.0.0/WMTSCapabilities.xml</url>
+	<copyright>Bundesamt für Landestopografie swisstopo</copyright>
+	<layer>ch.swisstopo.pixelkarte-farbe</layer>
+	<style>ch.swisstopo.pixelkarte-farbe</style>
+	<set>3857_19</set>
+	<dimension id="Time">current</dimension>
+</map>
diff --git a/maps/Swisstopo-Swissimage.xml b/maps/Swisstopo-Swissimage.xml
new file mode 100644
index 0000000..303c7cc
--- /dev/null
+++ b/maps/Swisstopo-Swissimage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Swisstopo uses yet another nonstandard CRS urn format. Support for this format
+was added in GPXSee 8.9, the map will not work with older versions of GPXSee.
+-->
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
+	<name>Swisstopo - Swissimage</name>
+	<url type="REST">https://wmts.geo.admin.ch/EPSG/3857/1.0.0/WMTSCapabilities.xml</url>
+	<copyright>Bundesamt für Landestopografie swisstopo</copyright>
+	<layer>ch.swisstopo.swissimage</layer>
+	<style>ch.swisstopo.swissimage</style>
+	<set>3857_21</set>
+	<dimension id="Time">current</dimension>
+</map>
diff --git a/maps/Swisstopo.tpl b/maps/Swisstopo.tpl
deleted file mode 100644
index 3f3c8af..0000000
--- a/maps/Swisstopo.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.4" type="WMS">
-	<name>Swisstopo</name>
-	<url>https://wms.swisstopo.admin.ch</url>
-	<copyright>Federal Topographical Office</copyright>
-	<layer>ch.swisstopo.pixelkarte-farbe</layer>
-	<crs>EPSG:21781</crs>
-	<authorization username="insert-your-username-here" password="insert-your-password-here"/>
-</map>
diff --git a/tiles/Swisstopo.png b/tiles/Swisstopo-Landeskarte.png
similarity index 100%
rename from tiles/Swisstopo.png
rename to tiles/Swisstopo-Landeskarte.png
diff --git a/tiles/Swisstopo-Aerial.png b/tiles/Swisstopo-Swissimage.png
similarity index 100%
rename from tiles/Swisstopo-Aerial.png
rename to tiles/Swisstopo-Swissimage.png