diff --git a/data_sources/basemapat_gelaende/basemap_at_logo.png b/data_sources/basemapat_gelaende/basemap_at_logo.png
new file mode 100644
index 0000000..8641287
Binary files /dev/null and b/data_sources/basemapat_gelaende/basemap_at_logo.png differ
diff --git a/data_sources/basemapat_gelaende/metadata.ini b/data_sources/basemapat_gelaende/metadata.ini
new file mode 100644
index 0000000..f5e3bb7
--- /dev/null
+++ b/data_sources/basemapat_gelaende/metadata.ini
@@ -0,0 +1,26 @@
+[general]
+id = basemapat_gelaende
+type = TMS
+
+[ui]
+group = basemapat
+alias = GELAENDE
+icon = basemap_at_logo.png
+
+[license]
+name = Open Government Data Österreich Lizenz CC-BY 4.0
+link = https://creativecommons.org/licenses/by/4.0/deed.de
+copyright_text = Data source: <a href="https://www.basemap.at/">www.basemap.at</a>
+copyright_link = https://basemap.at/
+terms_of_use = https://basemap.at/en/#lizenz
+
+[tms]
+url = https://mapsneu.wien.gv.at/basemap/bmapgelaende/grau/google3857/{z}/{y}/{x}.jpeg
+zmin = 0
+zmax = 19
+y_origin_top = 1
+tile_ranges = None
+tsize1 = None
+origin_x = None
+origin_y = None
+
diff --git a/data_sources/basemapat_gray/metadata.ini b/data_sources/basemapat_gray/metadata.ini
index e8d1041..5fa85b4 100644
--- a/data_sources/basemapat_gray/metadata.ini
+++ b/data_sources/basemapat_gray/metadata.ini
@@ -8,14 +8,14 @@ alias = GRAY
 icon = basemap_at_logo.png
 
 [license]
-name = Open Government Data Österreich Lizenz CC-BY 3.0 AT
-link = https://creativecommons.org/licenses/by/3.0/at/deed.de
+name = Open Government Data Österreich Lizenz CC-BY 4.0
+link = https://creativecommons.org/licenses/by/4.0/deed.de
 copyright_text = Data source: <a href="https://www.basemap.at/">www.basemap.at</a>
-copyright_link = https://www.basemap.at/index_en.html#sec-nutzung
-terms_of_use = https://www.basemap.at/index_en.html#sec-nutzung
+copyright_link = https://basemap.at/
+terms_of_use = https://basemap.at/en/#lizenz
 
 [tms]
-url = https://maps.wien.gv.at/basemap/bmapgrau/normal/google3857/{z}/{y}/{x}.png
+url = https://mapsneu.wien.gv.at/basemap/bmapgrau/normal/google3857/{z}/{y}/{x}.png
 zmin = 0
 zmax = 19
 y_origin_top = 1
diff --git a/data_sources/basemapat_high_dpi/metadata.ini b/data_sources/basemapat_high_dpi/metadata.ini
index 5fb657c..fc4d84d 100644
--- a/data_sources/basemapat_high_dpi/metadata.ini
+++ b/data_sources/basemapat_high_dpi/metadata.ini
@@ -8,14 +8,14 @@ alias = HIGH DPI
 icon = basemap_at_logo.png
 
 [license]
-name = Open Government Data Österreich Lizenz CC-BY 3.0 AT
-link = https://creativecommons.org/licenses/by/3.0/at/deed.de
+name = Open Government Data Österreich Lizenz CC-BY 4.0
+link = https://creativecommons.org/licenses/by/4.0/deed.de
 copyright_text = Data source: <a href="https://www.basemap.at/">www.basemap.at</a>
-copyright_link = https://www.basemap.at/index_en.html#sec-nutzung
-terms_of_use = https://www.basemap.at/index_en.html#sec-nutzung
+copyright_link = https://basemap.at/
+terms_of_use = https://basemap.at/en/#lizenz
 
 [tms]
-url = https://maps.wien.gv.at/basemap/bmaphidpi/normal/google3857/{z}/{y}/{x}.jpeg
+url = https://mapsneu.wien.gv.at/basemap/bmaphidpi/normal/google3857/{z}/{y}/{x}.jpeg
 zmin = 0
 zmax = 19
 y_origin_top = 1
diff --git a/data_sources/basemapat_oberflaeche/basemap_at_logo.png b/data_sources/basemapat_oberflaeche/basemap_at_logo.png
new file mode 100644
index 0000000..8641287
Binary files /dev/null and b/data_sources/basemapat_oberflaeche/basemap_at_logo.png differ
diff --git a/data_sources/basemapat_oberflaeche/metadata.ini b/data_sources/basemapat_oberflaeche/metadata.ini
new file mode 100644
index 0000000..7c611ad
--- /dev/null
+++ b/data_sources/basemapat_oberflaeche/metadata.ini
@@ -0,0 +1,26 @@
+[general]
+id = basemapat_oberflaeche
+type = TMS
+
+[ui]
+group = basemapat
+alias = OBERFLAECHE
+icon = basemap_at_logo.png
+
+[license]
+name = Open Government Data Österreich Lizenz CC-BY 4.0
+link = https://creativecommons.org/licenses/by/4.0/deed.de
+copyright_text = Data source: <a href="https://www.basemap.at/">www.basemap.at</a>
+copyright_link = https://basemap.at/
+terms_of_use = https://basemap.at/en/#lizenz
+
+[tms]
+url = https://mapsneu.wien.gv.at/basemap/bmapoberflaeche/grau/google3857/{z}/{y}/{x}.jpeg
+zmin = 0
+zmax = 19
+y_origin_top = 1
+tile_ranges = None
+tsize1 = None
+origin_x = None
+origin_y = None
+
diff --git a/data_sources/basemapat_orthofoto/metadata.ini b/data_sources/basemapat_orthofoto/metadata.ini
index 3f9f9ea..76061f5 100644
--- a/data_sources/basemapat_orthofoto/metadata.ini
+++ b/data_sources/basemapat_orthofoto/metadata.ini
@@ -8,14 +8,14 @@ alias = ORTHOFOTO
 icon = basemap_at_logo.png
 
 [license]
-name = Open Government Data Österreich Lizenz CC-BY 3.0 AT
-link = https://creativecommons.org/licenses/by/3.0/at/deed.de
+name = Open Government Data Österreich Lizenz CC-BY 4.0
+link = https://creativecommons.org/licenses/by/4.0/deed.de
 copyright_text = Data source: <a href="https://www.basemap.at/">www.basemap.at</a>
-copyright_link = https://www.basemap.at/index_en.html#sec-nutzung
-terms_of_use = https://www.basemap.at/index_en.html#sec-nutzung
+copyright_link = https://basemap.at/
+terms_of_use = https://basemap.at/en/#lizenz
 
 [tms]
-url = https://maps.wien.gv.at/basemap/bmaporthofoto30cm/normal/google3857/{z}/{y}/{x}.jpeg
+url = https://mapsneu.wien.gv.at/basemap/bmaporthofoto30cm/normal/google3857/{z}/{y}/{x}.jpeg
 zmin = 0
 zmax = 19
 y_origin_top = 1
diff --git a/data_sources/basemapat_overlay/metadata.ini b/data_sources/basemapat_overlay/metadata.ini
index 1e1927d..d44c45f 100644
--- a/data_sources/basemapat_overlay/metadata.ini
+++ b/data_sources/basemapat_overlay/metadata.ini
@@ -8,14 +8,14 @@ alias = OVERLAY
 icon = basemap_at_logo.png
 
 [license]
-name = Open Government Data Österreich Lizenz CC-BY 3.0 AT
-link = https://creativecommons.org/licenses/by/3.0/at/deed.de
+name = Open Government Data Österreich Lizenz CC-BY 4.0
+link = https://creativecommons.org/licenses/by/4.0/deed.de
 copyright_text = Data source: <a href="https://www.basemap.at/">www.basemap.at</a>
-copyright_link = https://www.basemap.at/index_en.html#sec-nutzung
-terms_of_use = https://www.basemap.at/index_en.html#sec-nutzung
+copyright_link = https://basemap.at/
+terms_of_use = https://basemap.at/en/#lizenz
 
 [tms]
-url = https://maps.wien.gv.at/basemap/bmapoverlay/normal/google3857/{z}/{y}/{x}.png
+url = https://mapsneu.wien.gv.at/basemap/bmapoverlay/normal/google3857/{z}/{y}/{x}.png
 zmin = 0
 zmax = 19
 y_origin_top = 1
diff --git a/data_sources/basemapat_standard/metadata.ini b/data_sources/basemapat_standard/metadata.ini
index dafff99..a2f6809 100644
--- a/data_sources/basemapat_standard/metadata.ini
+++ b/data_sources/basemapat_standard/metadata.ini
@@ -8,14 +8,14 @@ alias = STANDARD
 icon = basemap_at_logo.png
 
 [license]
-name = Open Government Data Österreich Lizenz CC-BY 3.0 AT
-link = https://creativecommons.org/licenses/by/3.0/at/deed.de
+name = Open Government Data Österreich Lizenz CC-BY 4.0
+link = https://creativecommons.org/licenses/by/4.0/deed.de
 copyright_text = Data source: <a href="https://www.basemap.at/">www.basemap.at</a>
-copyright_link = https://www.basemap.at/index_en.html#sec-nutzung
-terms_of_use = https://www.basemap.at/index_en.html#sec-nutzung
+copyright_link = https://basemap.at/
+terms_of_use = https://basemap.at/en/#lizenz
 
 [tms]
-url = https://maps.wien.gv.at/basemap/geolandbasemap/normal/google3857/{z}/{y}/{x}.png
+url = https://mapsneu.wien.gv.at/basemap/geolandbasemap/normal/google3857/{z}/{y}/{x}.png
 zmin = 0
 zmax = 19
 y_origin_top = 1