diff --git a/index.html b/index.html
index d486792..33422de 100644
--- a/index.html
+++ b/index.html
@@ -89,6 +89,13 @@ can use it in GPXSee.</small></p>
 <td><a href="maps/mtbmap.cz.xml" download><img src="tiles/mtbmap.cz.png" alt="Map Preview" width="256" height="256"/></a><br/>mtbmap.cz</td>
 </tr>
 </table>
+<h3>Andorra</h3>
+<table>
+<tr>
+<td><a href="maps/andorra-orto.xml" download><img src="tiles/andorra-orto.png" alt="Map Preview" width="256" height="256"/></a><br/>Andorra Orto</td>
+<td><a href="maps/andorra-topo.xml" download><img src="tiles/andorra-topo.png" alt="Map Preview" width="256" height="256"/></a><br/>Andorra Topo</td>
+</tr>
+</table>
 <h3>Austria</h3>
 <table>
 <tr>
diff --git a/maps/MA-KAART.xml b/maps/MA-KAART.xml
index 4923250..4619860 100644
--- a/maps/MA-KAART.xml
+++ b/maps/MA-KAART.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1" type="WMS">
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMS">
 	<name>Maa-amet Topo</name>
 	<url>https://kaart.maaamet.ee/wms/kaart</url>
 	<!--
diff --git a/maps/andorra-orto.xml b/maps/andorra-orto.xml
new file mode 100644
index 0000000..b3ae206
--- /dev/null
+++ b/maps/andorra-orto.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMS">
+	<name>Andorra Orto</name>
+	<url>https://www.ideandorra.ad/Serveis/wms</url>
+	<copyright>IDE Andorra</copyright>
+	<layer>wmsorto2012:orto2012</layer>
+	<crs>EPSG:23031</crs>
+</map>
diff --git a/maps/andorra-topo.xml b/maps/andorra-topo.xml
new file mode 100644
index 0000000..652f75e
--- /dev/null
+++ b/maps/andorra-topo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMS">
+	<name>Andorra Topo</name>
+	<url>https://www.ideandorra.ad/Serveis/wms</url>
+	<copyright>IDE Andorra</copyright>
+	<layer>fons</layer>
+	<crs>EPSG:23031</crs>
+</map>
diff --git a/maps/nakarte-slazav-mountains.xml b/maps/nakarte-slazav-mountains.xml
index d79d00c..022ba38 100644
--- a/maps/nakarte-slazav-mountains.xml
+++ b/maps/nakarte-slazav-mountains.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.4" type="TMS">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>Slazav mountains</name>
-	<url>https://tiles.nakarte.me/map_hr/$z/$x/$y</url>
+	<url>https://slazav.xyz/tiles/hr/$x-$y-$z.png</url>
 	<zoom min="7" max="13"/>
 	<bounds left="40.00" right="142.00" bottom="31.00" top="71.00"/>
 	<copyright>© Vladislav Zavjalov</copyright>
diff --git a/maps/nakarte-slazav.xml b/maps/nakarte-slazav.xml
index 13fb30e..94cf5db 100644
--- a/maps/nakarte-slazav.xml
+++ b/maps/nakarte-slazav.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.4" type="TMS">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>Slazav map</name>
-	<url>https://tiles.nakarte.me/map_podm/$z/$x/$y</url>
+	<url>https://slazav.xyz/tiles/podm/$x-$y-$z.png</url>
 	<zoom min="5" max="14"/>
 	<bounds left="32.00" right="41.00" bottom="54.00" top="58.00"/>
 	<copyright>© Vladislav Zavjalov</copyright>
diff --git a/tiles/andorra-orto.png b/tiles/andorra-orto.png
new file mode 100644
index 0000000..54e9cf8
Binary files /dev/null and b/tiles/andorra-orto.png differ
diff --git a/tiles/andorra-topo.png b/tiles/andorra-topo.png
new file mode 100644
index 0000000..40b16e4
Binary files /dev/null and b/tiles/andorra-topo.png differ