diff --git a/src/data_sources/mapsurfer_contour_lines/metadata.ini b/src/data_sources/mapsurfer_contour_lines/metadata.ini
deleted file mode 100644
index 959d1ae..0000000
--- a/src/data_sources/mapsurfer_contour_lines/metadata.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[general]
-id = mapsurfer_countiur_lines
-type = TMS
-is_contrib = False
-
-[ui]
-group = mapsurfer
-alias = MapSurfer ASTER GDEM contour lines
-alias[ru] = MapSurfer Изолинии рельефа (ASTER GDEM)
-icon = mapsurfer.png
-
-[license]
-name = CC-BY-SA 2.0
-link = http://creativecommons.org/licenses/by-sa/2.0/
-copyright_text =ASTER GDEM is a product of METI and NASA, Imagery GIScience Research Group @ Heidelberg University
-copyright_link = https://lpdaac.usgs.gov/products/aster_policies;
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
-
-[tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/asterc/x={x}&y={y}&z={z}
-zmin = 13
-zmax = 17
diff --git a/src/data_sources/mapsurfer_hillshade/metadata.ini b/src/data_sources/mapsurfer_hillshade/metadata.ini
index fca31c0..c55462f 100644
--- a/src/data_sources/mapsurfer_hillshade/metadata.ini
+++ b/src/data_sources/mapsurfer_hillshade/metadata.ini
@@ -14,8 +14,8 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =SRTM, ASTER GDEM is a product of METI and NASA, Imagery GIScience Research Group @ Heidelberg University
 copyright_link = http://srtm.csi.cgiar.org/; https://lpdaac.usgs.gov/products/aster_policies;
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/asterh/x={x}&y={y}&z={z}
+url = https://maps.heigit.org/openmapsurfer/tiles/asterh/webmercator/{z}/{x}/{y}.png
 #zmax = 19
diff --git a/src/data_sources/mapsurfer_osm_ administrative_boundaries/mapsurfer.png b/src/data_sources/mapsurfer_osm_ administrative_boundaries/mapsurfer.png
deleted file mode 100644
index ef2bcb1..0000000
Binary files a/src/data_sources/mapsurfer_osm_ administrative_boundaries/mapsurfer.png and /dev/null differ
diff --git a/src/data_sources/mapsurfer_contour_lines/mapsurfer.png b/src/data_sources/mapsurfer_osm_administrative_boundaries/mapsurfer.png
similarity index 100%
rename from src/data_sources/mapsurfer_contour_lines/mapsurfer.png
rename to src/data_sources/mapsurfer_osm_administrative_boundaries/mapsurfer.png
diff --git a/src/data_sources/mapsurfer_osm_ administrative_boundaries/metadata.ini b/src/data_sources/mapsurfer_osm_administrative_boundaries/metadata.ini
similarity index 77%
rename from src/data_sources/mapsurfer_osm_ administrative_boundaries/metadata.ini
rename to src/data_sources/mapsurfer_osm_administrative_boundaries/metadata.ini
index 594b387..0739711 100644
--- a/src/data_sources/mapsurfer_osm_ administrative_boundaries/metadata.ini	
+++ b/src/data_sources/mapsurfer_osm_administrative_boundaries/metadata.ini
@@ -14,8 +14,8 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =©OpenStreetMap contributors, ODbL, Imagery GIScience Research Group @ Heidelberg University
 copyright_link = https://www.openstreetmap.org/copyright
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/adminb/x={x}&y={y}&z={z}
+url = https://maps.heigit.org/openmapsurfer/tiles/adminb/webmercator/{z}/{x}/{y}.png
 #zmax = 19
diff --git a/src/data_sources/mapsurfer_osm_roads/metadata.ini b/src/data_sources/mapsurfer_osm_roads/metadata.ini
index d7e4551..a12127a 100644
--- a/src/data_sources/mapsurfer_osm_roads/metadata.ini
+++ b/src/data_sources/mapsurfer_osm_roads/metadata.ini
@@ -14,7 +14,7 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =©OpenStreetMap contributors, ODbL, Imagery GIScience Research Group @ Heidelberg University
 copyright_link = https://www.openstreetmap.org/copyright
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
 url = https://maps.heigit.org/openmapsurfer/tiles/roads/webmercator/{z}/{x}/{y}.png
diff --git a/src/data_sources/mapsurfer_osm_roads_grayscale/mapsurfer.png b/src/data_sources/mapsurfer_osm_roads_grayscale/mapsurfer.png
deleted file mode 100644
index ef2bcb1..0000000
Binary files a/src/data_sources/mapsurfer_osm_roads_grayscale/mapsurfer.png and /dev/null differ
diff --git a/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini b/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini
deleted file mode 100644
index 15ebdf0..0000000
--- a/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[general]
-id = mapsurfer_osm_roads_grayscale
-type = TMS
-is_contrib = False
-
-[ui]
-group = mapsurfer
-alias = MapSurfer OSM Roads Grayscale
-alias[ru] = Базовая карта MapSurfer ч/б
-icon = mapsurfer.png
-
-[license]
-name = CC-BY-SA 2.0
-link = http://creativecommons.org/licenses/by-sa/2.0/
-copyright_text =© OpenStreetMap contributors, CC-BY-SA
-copyright_link = https://www.openstreetmap.org/copyright
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
-
-[tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/roadsg/x={x}&y={y}&z={z}
-#zmax = 19
diff --git a/src/data_sources/mapsurfer_osm_semitransparent/metadata.ini b/src/data_sources/mapsurfer_osm_semitransparent/metadata.ini
index 0f5aeb2..69eb248 100644
--- a/src/data_sources/mapsurfer_osm_semitransparent/metadata.ini
+++ b/src/data_sources/mapsurfer_osm_semitransparent/metadata.ini
@@ -14,8 +14,8 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =©OpenStreetMap contributors, ODbL, Imagery GIScience Research Group @ Heidelberg University
 copyright_link = https://www.openstreetmap.org/copyright
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/hybrid/x={x}&y={y}&z={z}
+url = https://maps.heigit.org/openmapsurfer/tiles/hybrid/webmercator/{z}/{x}/{y}.png
 #zmax = 19