diff --git a/index.html b/index.html
index acb74f0..5581af3 100644
--- a/index.html
+++ b/index.html
@@ -21,26 +21,26 @@ use it in GPXSee.</small></p>
 <tr>
 <td><a href="maps/4UMaps.xml" download><img src="tiles/4UMaps.png" alt="Map Preview" width="256" height="256"/></a><br/>4UMaps</td>
 <td><a href="maps/CyclOSM.xml" download><img src="tiles/CyclOSM.png" alt="Map Preview" width="256" height="256"/></a><br/>CyclOSM</td>
-<td><a href="maps/HikeBikeMap.xml" download><img src="tiles/HikeBikeMap.png" alt="Map Preview" width="256" height="256"/></a><br/>HikeBikeMap</td>
-<td><a href="maps/MapTiler.tpl" download><img src="tiles/MapTiler.png" alt="Map Preview" width="256" height="256"/></a><br/>MapTiler</td>
-</tr><tr>
-<td><a href="maps/OPNVKarte.xml" download><img src="tiles/OPNVKarte.png" alt="Map Preview" width="256" height="256"/></a><br/>ÖPNVKarte</td>
-<td><a href="maps/OpenStreetMap-BW.xml" download><img src="tiles/OpenStreetMap-BW.png" alt="Map Preview" width="256" height="256"/></a><br/>Open Street Map - Black and White</td>
-<td><a href="maps/OpenStreetMap-HiDPI.xml" download><img src="tiles/OpenStreetMap-HiDPI.png" alt="Map Preview" width="256" height="256"/></a><br/>Open Street Map - HiDPI</td>
-<td><a href="maps/OpenStreetMap.xml" download><img src="tiles/OpenStreetMap.png" alt="Map Preview" width="256" height="256"/></a><br/>Open Street Map</td>
-</tr><tr>
-<td><a href="maps/OpenTopoMap.xml" download><img src="tiles/OpenTopoMap.png" alt="Map Preview" width="256" height="256"/></a><br/>Open Topo Map</td>
-<td><a href="maps/Thunderforest-Landscape.tpl" download><img src="tiles/Thunderforest-Landscape.png" alt="Map Preview" width="256" height="256"/></a><br/>Thunderforest - Landscape</td>
-<td><a href="maps/Thunderforest-OpenCycleMap.tpl" download><img src="tiles/Thunderforest-OpenCycleMap.png" alt="Map Preview" width="256" height="256"/></a><br/>Thunderforest - OpenCycleMap</td>
-<td><a href="maps/Thunderforest-Outdoors.tpl" download><img src="tiles/Thunderforest-Outdoors.png" alt="Map Preview" width="256" height="256"/></a><br/>Thunderforest - Outdoors</td>
-</tr><tr>
-<td><a href="maps/Thunderforest-Transport.tpl" download><img src="tiles/Thunderforest-Transport.png" alt="Map Preview" width="256" height="256"/></a><br/>Thunderforest - Transport</td>
 <td><a href="maps/heidelberg.tpl" download><img src="tiles/heidelberg.png" alt="Map Preview" width="256" height="256"/></a><br/>GIScience Heidelberg</td>
 <td><a href="maps/here-aerial.tpl" download><img src="tiles/here-aerial.jpg" alt="Map Preview" width="256" height="256"/></a><br/>HERE Aerial Map</td>
+</tr><tr>
 <td><a href="maps/here-base.tpl" download><img src="tiles/here-base.png" alt="Map Preview" width="256" height="256"/></a><br/>HERE Base Map</td>
+<td><a href="maps/HikeBikeMap.xml" download><img src="tiles/HikeBikeMap.png" alt="Map Preview" width="256" height="256"/></a><br/>HikeBikeMap</td>
+<td><a href="maps/MapTiler.tpl" download><img src="tiles/MapTiler.png" alt="Map Preview" width="256" height="256"/></a><br/>MapTiler</td>
+<td><a href="maps/OpenStreetMap.xml" download><img src="tiles/OpenStreetMap.png" alt="Map Preview" width="256" height="256"/></a><br/>Open Street Map</td>
+</tr><tr>
+<td><a href="maps/OpenStreetMap-BW.xml" download><img src="tiles/OpenStreetMap-BW.png" alt="Map Preview" width="256" height="256"/></a><br/>Open Street Map - Black and White</td>
+<td><a href="maps/OpenStreetMap-HiDPI.xml" download><img src="tiles/OpenStreetMap-HiDPI.png" alt="Map Preview" width="256" height="256"/></a><br/>Open Street Map - HiDPI</td>
+<td><a href="maps/OpenTopoMap.xml" download><img src="tiles/OpenTopoMap.png" alt="Map Preview" width="256" height="256"/></a><br/>Open Topo Map</td>
+<td><a href="maps/Thunderforest-Landscape.tpl" download><img src="tiles/Thunderforest-Landscape.png" alt="Map Preview" width="256" height="256"/></a><br/>Thunderforest - Landscape</td>
+</tr><tr>
+<td><a href="maps/Thunderforest-OpenCycleMap.tpl" download><img src="tiles/Thunderforest-OpenCycleMap.png" alt="Map Preview" width="256" height="256"/></a><br/>Thunderforest - OpenCycleMap</td>
+<td><a href="maps/Thunderforest-Outdoors.tpl" download><img src="tiles/Thunderforest-Outdoors.png" alt="Map Preview" width="256" height="256"/></a><br/>Thunderforest - Outdoors</td>
+<td><a href="maps/Thunderforest-Transport.tpl" download><img src="tiles/Thunderforest-Transport.png" alt="Map Preview" width="256" height="256"/></a><br/>Thunderforest - Transport</td>
+<td><a href="maps/unesco.xml" download><img src="tiles/unesco.png" alt="Map Preview" width="256" height="256"/></a><br/>UNESCO</td>
 </tr><tr>
 <td><a href="maps/marshruty.ru.xml" download><img src="tiles/marshruty.ru.jpg" alt="Map Preview" width="256" height="256"/></a><br/>marshruty.ru</td>
-<td><a href="maps/unesco.xml" download><img src="tiles/unesco.png" alt="Map Preview" width="256" height="256"/></a><br/>UNESCO</td>
+<td><a href="maps/OPNVKarte.xml" download><img src="tiles/OPNVKarte.png" alt="Map Preview" width="256" height="256"/></a><br/>ÖPNVKarte</td>
 </tr>
 </table>
 <h2>Antarctica</h2>
@@ -99,10 +99,10 @@ use it in GPXSee.</small></p>
 <h3>Czech Republic</h3>
 <table>
 <tr>
-<td><a href="maps/CUZK-ortofoto.xml" download><img src="tiles/CUZK-ortofoto.png" alt="Map Preview" width="256" height="256"/></a><br/>ČÚZK - Ortofoto</td>
-<td><a href="maps/CUZK-zm.xml" download><img src="tiles/CUZK-zm.png" alt="Map Preview" width="256" height="256"/></a><br/>ČÚZK - Základní mapy</td>
 <td><a href="maps/Poloha.Net.xml" download><img src="tiles/Poloha.Net.png" alt="Map Preview" width="256" height="256"/></a><br/>Poloha.Net</td>
 <td><a href="maps/prahounakole.xml" download><img src="tiles/prahounakole.png" alt="Map Preview" width="256" height="256"/></a><br/>Prahou na kole</td>
+<td><a href="maps/CUZK-ortofoto.xml" download><img src="tiles/CUZK-ortofoto.png" alt="Map Preview" width="256" height="256"/></a><br/>ČÚZK - Ortofoto</td>
+<td><a href="maps/CUZK-zm.xml" download><img src="tiles/CUZK-zm.png" alt="Map Preview" width="256" height="256"/></a><br/>ČÚZK - Základní mapy</td>
 </tr>
 </table>
 <h3>Finland</h3>
@@ -131,9 +131,9 @@ use it in GPXSee.</small></p>
 <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/Berlin-DOP.xml" download><img src="tiles/Berlin-DOP.png" alt="Map Preview" width="256" height="256"/></a><br/>Berlin DOP</td>
 <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/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/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-Anhalt-DOP.xml" download><img src="tiles/Sachsen-Anhalt-DOP.png" alt="Map Preview" width="256" height="256"/></a><br/>Sachsen-Anhalt DOP</td>
 <td><a href="maps/TopPlusOpen.xml" download><img src="tiles/TopPlusOpen.png" alt="Map Preview" width="256" height="256"/></a><br/>TopPlusOpen</td>
 </tr>
 </table>
@@ -162,31 +162,31 @@ use it in GPXSee.</small></p>
 <table>
 <tr>
 <td><a href="maps/JanMayen_Basiskart.xml" download><img src="tiles/JanMayen_Basiskart.png" alt="Map Preview" width="256" height="256"/></a><br/>Jan Mayen Topography</td>
-<td><a href="maps/Norgeskart.xml" download><img src="tiles/Norgeskart.png" alt="Map Preview" width="256" height="256"/></a><br/>Topografisk Norgeskart</td>
-<td><a href="maps/Svalbard_Basiskart.xml" download><img src="tiles/Svalbard_Basiskart.png" alt="Map Preview" width="256" height="256"/></a><br/>Svalbard Topography</td>
 <td><a href="maps/Svalbard_Ortofoto.xml" download><img src="tiles/Svalbard_Ortofoto.jpg" alt="Map Preview" width="256" height="256"/></a><br/>Svalbard Orthophoto</td>
-</tr><tr>
 <td><a href="maps/Svalbard_Satellitt.xml" download><img src="tiles/Svalbard_Satellitt.jpg" alt="Map Preview" width="256" height="256"/></a><br/>Svalbard Satellite Imagery</td>
+<td><a href="maps/Svalbard_Basiskart.xml" download><img src="tiles/Svalbard_Basiskart.png" alt="Map Preview" width="256" height="256"/></a><br/>Svalbard Topography</td>
+</tr><tr>
+<td><a href="maps/Norgeskart.xml" download><img src="tiles/Norgeskart.png" alt="Map Preview" width="256" height="256"/></a><br/>Topografisk Norgeskart</td>
 </tr>
 </table>
 <h3>Poland</h3>
 <table>
 <tr>
-<td><a href="maps/GUGIK-orto.xml" download><img src="tiles/GUGIK-orto.jpg" alt="Map Preview" width="256" height="256"/></a><br/>GUGIK Ortofotomapa</td>
 <td><a href="maps/GUGIK-topo.xml" download><img src="tiles/GUGIK-topo.jpg" alt="Map Preview" width="256" height="256"/></a><br/>GUGIK Mapa Topograficzna</td>
+<td><a href="maps/GUGIK-orto.xml" download><img src="tiles/GUGIK-orto.jpg" alt="Map Preview" width="256" height="256"/></a><br/>GUGIK Ortofotomapa</td>
 <td><a href="maps/UMP-pcPL.xml" download><img src="tiles/UMP-pcPL.png" alt="Map Preview" width="256" height="256"/></a><br/>UMP-pcPL</td>
 </tr>
 </table>
 <h3>Russian Federation</h3>
 <table>
 <tr>
-<td><a href="maps/nakarte-adraces.xml" download><img src="tiles/nakarte-adraces.png" alt="Map Preview" width="256" height="256"/></a><br/>Races</td>
 <td><a href="maps/nakarte-ggc1000.xml" download><img src="tiles/nakarte-ggc1000.png" alt="Map Preview" width="256" height="256"/></a><br/>GGC 1km</td>
-<td><a href="maps/nakarte-ggc2000.xml" download><img src="tiles/nakarte-ggc2000.png" alt="Map Preview" width="256" height="256"/></a><br/>GGC 2km</td>
 <td><a href="maps/nakarte-ggc250.xml" download><img src="tiles/nakarte-ggc250.png" alt="Map Preview" width="256" height="256"/></a><br/>GGC 250m</td>
-</tr><tr>
+<td><a href="maps/nakarte-ggc2000.xml" download><img src="tiles/nakarte-ggc2000.png" alt="Map Preview" width="256" height="256"/></a><br/>GGC 2km</td>
 <td><a href="maps/nakarte-ggc500.xml" download><img src="tiles/nakarte-ggc500.png" alt="Map Preview" width="256" height="256"/></a><br/>GGC 500m</td>
+</tr><tr>
 <td><a href="maps/nakarte-osport.xml" download><img src="tiles/nakarte-osport.png" alt="Map Preview" width="256" height="256"/></a><br/>O-sport</td>
+<td><a href="maps/nakarte-adraces.xml" download><img src="tiles/nakarte-adraces.png" alt="Map Preview" width="256" height="256"/></a><br/>Races</td>
 <td><a href="maps/nakarte-slazav.xml" download><img src="tiles/nakarte-slazav.png" alt="Map Preview" width="256" height="256"/></a><br/>Slazav map</td>
 <td><a href="maps/nakarte-topo1000.xml" download><img src="tiles/nakarte-topo1000.png" alt="Map Preview" width="256" height="256"/></a><br/>Topo 1km</td>
 </tr><tr>
@@ -198,8 +198,8 @@ use it in GPXSee.</small></p>
 <table>
 <tr>
 <td><a href="maps/FreemapSlovakia.xml" download><img src="tiles/FreemapSlovakia.png" alt="Map Preview" width="256" height="256"/></a><br/>Freemap Slovakia</td>
-<td><a href="maps/GKU-ZBGIS.xml" download><img src="tiles/GKU-ZBGIS.png" alt="Map Preview" width="256" height="256"/></a><br/>GKÚ - ZBGIS</td>
 <td><a href="maps/GKU-ortofoto.xml" download><img src="tiles/GKU-ortofoto.jpg" alt="Map Preview" width="256" height="256"/></a><br/>GKÚ - Ortofotomozaika</td>
+<td><a href="maps/GKU-ZBGIS.xml" download><img src="tiles/GKU-ZBGIS.png" alt="Map Preview" width="256" height="256"/></a><br/>GKÚ - ZBGIS</td>
 </tr>
 </table>
 <h3>Slovenia</h3>
@@ -219,10 +219,10 @@ use it in GPXSee.</small></p>
 <h3>Switzerland</h3>
 <table>
 <tr>
-<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/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/Swisstopo-Aerial.tpl" download><img src="tiles/Swisstopo-Aerial.png" alt="Map Preview" width="256" height="256"/></a><br/>Swisstopo Aerial</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</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</td>
 </tr>
 </table>
 <h2>North America</h2>
diff --git a/scripts/mapgen.py b/scripts/mapgen.py
index d81a1b0..e5e1dc4 100755
--- a/scripts/mapgen.py
+++ b/scripts/mapgen.py
@@ -298,11 +298,14 @@ def mapinfo(xmlfile):
 def processmaps(maps, htmlfile):
 	htmlfile.write("<table>\n<tr>\n")
 
-	i = 0
-	maps.sort()
+	items = []
 	for xmlfile in maps:
 		shutil.copyfile(xmlfile, "../maps/" + os.path.basename(xmlfile))
-		info = mapinfo(xmlfile)
+		items.append(mapinfo(xmlfile))
+	items.sort(key=lambda tup: tup["name"])
+
+	i = 0
+	for info in items:
 		if i and i % 4 == 0:
 			htmlfile.write("</tr><tr>\n")
 		htmlfile.write("<td>" + "<a href=\"" + info["url"] + "\" download><img src=\""