diff --git a/index.html b/index.html
index 90188b2..10f88f4 100644
--- a/index.html
+++ b/index.html
@@ -172,20 +172,22 @@ can use it in GPXSee.</small></p>
 <table>
 <tr>
 <td><a href="maps/Bayern-DOP.xml" download><img src="tiles/Bayern-DOP.png" alt="Map Preview" width="256" height="256"/></a><br/>Bayern DOP</td>
+<td><a href="maps/Bayern-Topo.xml" download><img src="tiles/Bayern-Topo.png" alt="Map Preview" width="256" height="256"/></a><br/>Bayern Topo</td>
+<td><a href="maps/Bayern-Web.xml" download><img src="tiles/Bayern-Web.png" alt="Map Preview" width="256" height="256"/></a><br/>Bayern Web</td>
 <td><a href="maps/Berlin-DOP.xml" download><img src="tiles/Berlin-DOP.png" alt="Map Preview" width="256" height="256"/></a><br/>Berlin DOP</td>
+</tr><tr>
 <td><a href="maps/Berlin-DTK10.xml" download><img src="tiles/Berlin-DTK10.png" alt="Map Preview" width="256" height="256"/></a><br/>Berlin DTK10</td>
 <td><a href="maps/Berlin-DTK50.xml" download><img src="tiles/Berlin-DTK50.png" alt="Map Preview" width="256" height="256"/></a><br/>Berlin DTK50</td>
-</tr><tr>
 <td><a href="maps/Hamburg-DOP.xml" download><img src="tiles/Hamburg-DOP.png" alt="Map Preview" width="256" height="256"/></a><br/>Hamburg DOP</td>
 <td><a href="maps/NRW-DOP.xml" download><img src="tiles/NRW-DOP.png" alt="Map Preview" width="256" height="256"/></a><br/>Nordrhein-Westfalen DOP</td>
+</tr><tr>
 <td><a href="maps/Rheinland-Pfalz-DOP.xml" download><img src="tiles/Rheinland-Pfalz-DOP.png" alt="Map Preview" width="256" height="256"/></a><br/>Rheinland-Pfalz DOP</td>
 <td><a href="maps/Rheinland-Pfalz-DTK25.xml" download><img src="tiles/Rheinland-Pfalz-DTK25.png" alt="Map Preview" width="256" height="256"/></a><br/>Rheinland-Pfalz DTK25</td>
-</tr><tr>
 <td><a href="maps/Rheinland-Pfalz-DTK5.xml" download><img src="tiles/Rheinland-Pfalz-DTK5.png" alt="Map Preview" width="256" height="256"/></a><br/>Rheinland-Pfalz DTK5</td>
 <td><a href="maps/Sachsen-DOP.xml" download><img src="tiles/Sachsen-DOP.png" alt="Map Preview" width="256" height="256"/></a><br/>Sachsen DOP</td>
+</tr><tr>
 <td><a href="maps/Sachsen-WebAtlas.xml" download><img src="tiles/Sachsen-WebAtlas.png" alt="Map Preview" width="256" height="256"/></a><br/>Sachsen WebAtlas</td>
 <td><a href="maps/Sachsen-Anhalt-DOP.xml" download><img src="tiles/Sachsen-Anhalt-DOP.png" alt="Map Preview" width="256" height="256"/></a><br/>Sachsen-Anhalt DOP</td>
-</tr><tr>
 <td><a href="maps/TopPlusOpen.xml" download><img src="tiles/TopPlusOpen.png" alt="Map Preview" width="256" height="256"/></a><br/>TopPlusOpen</td>
 <td><a href="maps/WebVektor.xml" download><img src="tiles/WebVektor.png" alt="Map Preview" width="256" height="256"/></a><br/>WebVektor</td>
 </tr>
diff --git a/maps/Bayern-DOP.xml b/maps/Bayern-DOP.xml
index d40c7f1..644b929 100644
--- a/maps/Bayern-DOP.xml
+++ b/maps/Bayern-DOP.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.4" type="WMS">
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
 	<name>Bayern DOP</name>
-	<url>https://geoservices.bayern.de/wms/v2/ogc_dop80_oa.cgi</url>
+	<url type="REST">https://geoservices.bayern.de/od/wmts/geobasis/v1/1.0.0/WMTSCapabilities.xml</url>
 	<copyright>Landesamt für Digitalisierung, Breitband und Vermessung</copyright>
-	<layer>by_dop80c</layer>
-	<crs>EPSG:25833</crs>
+	<layer>by_dop</layer>
+	<set>bvv_gk4</set>
 </map>
diff --git a/maps/Bayern-Topo.xml b/maps/Bayern-Topo.xml
new file mode 100644
index 0000000..f51c5fe
--- /dev/null
+++ b/maps/Bayern-Topo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
+	<name>Bayern Topo</name>
+	<url type="REST">https://geoservices.bayern.de/od/wmts/geobasis/v1/1.0.0/WMTSCapabilities.xml</url>
+	<copyright>Landesamt für Digitalisierung, Breitband und Vermessung</copyright>
+	<layer>by_amtl_karte</layer>
+	<set>bvv_gk4</set>
+</map>
diff --git a/maps/Bayern-Web.xml b/maps/Bayern-Web.xml
new file mode 100644
index 0000000..23b4d28
--- /dev/null
+++ b/maps/Bayern-Web.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
+	<name>Bayern Web</name>
+	<url type="REST">https://geoservices.bayern.de/od/wmts/geobasis/v1/1.0.0/WMTSCapabilities.xml</url>
+	<copyright>Landesamt für Digitalisierung, Breitband und Vermessung</copyright>
+	<layer>by_webkarte</layer>
+	<set>bvv_gk4</set>
+</map>
diff --git a/tiles/Bayern-Topo.png b/tiles/Bayern-Topo.png
new file mode 100644
index 0000000..599cc44
Binary files /dev/null and b/tiles/Bayern-Topo.png differ
diff --git a/tiles/Bayern-Web.png b/tiles/Bayern-Web.png
new file mode 100644
index 0000000..b000492
Binary files /dev/null and b/tiles/Bayern-Web.png differ