diff --git a/website/src/lib/assets/img/docs/getting-started/interface.webp b/website/src/lib/assets/img/docs/getting-started/interface.webp
index f220b710c..b0a1b12a7 100644
Binary files a/website/src/lib/assets/img/docs/getting-started/interface.webp and b/website/src/lib/assets/img/docs/getting-started/interface.webp differ
diff --git a/website/src/lib/assets/img/docs/maps/topo.png b/website/src/lib/assets/img/docs/maps/topo.png
new file mode 100644
index 000000000..613ed106a
Binary files /dev/null and b/website/src/lib/assets/img/docs/maps/topo.png differ
diff --git a/website/src/lib/assets/img/docs/maps/waymarked.png b/website/src/lib/assets/img/docs/maps/waymarked.png
new file mode 100644
index 000000000..8f636ef11
Binary files /dev/null and b/website/src/lib/assets/img/docs/maps/waymarked.png differ
diff --git a/website/src/lib/assets/img/docs/tools/routing.png b/website/src/lib/assets/img/docs/tools/routing.png
index 6b3aa548d..a1893d22f 100644
Binary files a/website/src/lib/assets/img/docs/tools/routing.png and b/website/src/lib/assets/img/docs/tools/routing.png differ
diff --git a/website/src/lib/assets/img/docs/tools/split.png b/website/src/lib/assets/img/docs/tools/split.png
index 0927a2252..74919c82e 100644
Binary files a/website/src/lib/assets/img/docs/tools/split.png and b/website/src/lib/assets/img/docs/tools/split.png differ
diff --git a/website/src/lib/assets/img/home/maptiler-topo.png b/website/src/lib/assets/img/home/maptiler-topo.png
deleted file mode 100644
index 4357a9e6f..000000000
Binary files a/website/src/lib/assets/img/home/maptiler-topo.png and /dev/null differ
diff --git a/website/src/lib/assets/img/home/waymarked.png b/website/src/lib/assets/img/home/waymarked.png
deleted file mode 100644
index 034bf1281..000000000
Binary files a/website/src/lib/assets/img/home/waymarked.png and /dev/null differ
diff --git a/website/src/lib/assets/layers.ts b/website/src/lib/assets/layers.ts
index ddd98532d..f6d9823f1 100644
--- a/website/src/lib/assets/layers.ts
+++ b/website/src/lib/assets/layers.ts
@@ -31,10 +31,10 @@ import bikerouterGravel from './custom/bikerouter-gravel.json';
 export const maptilerKeyPlaceHolder = 'MAPTILER_KEY';
 
 export const basemaps: { [key: string]: string | StyleSpecification } = {
-    maptilerStreets: `https://api.maptiler.com/maps/streets-v4/style.json?key=${maptilerKeyPlaceHolder}`,
-    maptilerTopo: `https://api.maptiler.com/maps/topo-v4/style.json?key=${maptilerKeyPlaceHolder}`,
-    maptilerOutdoors: `https://api.maptiler.com/maps/outdoor-v4/style.json?key=${maptilerKeyPlaceHolder}`,
-    maptilerSatellite: `https://api.maptiler.com/maps/hybrid-v4/style.json?key=${maptilerKeyPlaceHolder}`,
+    libertyTopo: 'https://styles.gpx.studio/liberty-topo.json',
+    libertySatellite: 'https://styles.gpx.studio/liberty-satellite.json',
+    osm: 'https://styles.gpx.studio/osm.json',
+    osmTopo: 'https://styles.gpx.studio/osm-topo.json',
     esriSatellite: {
         version: 8,
         sources: {
@@ -799,10 +799,10 @@ export type LayerTreeType = { [key: string]: LayerTreeType | boolean };
 export const basemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            maptilerStreets: true,
-            maptilerTopo: true,
-            maptilerOutdoors: true,
-            maptilerSatellite: true,
+            libertyTopo: true,
+            libertySatellite: true,
+            osm: true,
+            osmTopo: true,
             esriSatellite: true,
             openStreetMap: true,
             openTopoMap: true,
@@ -936,7 +936,7 @@ export const overpassTree: LayerTreeType = {
 };
 
 // Default basemap used
-export const defaultBasemap = 'maptilerStreets';
+export const defaultBasemap = 'libertyTopo';
 
 // Default overlays used (none)
 export const defaultOverlays: LayerTreeType = {
@@ -1025,10 +1025,10 @@ export const defaultOverpassQueries: LayerTreeType = {
 export const defaultBasemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            maptilerStreets: true,
-            maptilerTopo: true,
-            maptilerOutdoors: true,
-            maptilerSatellite: true,
+            libertyTopo: true,
+            libertySatellite: true,
+            osm: true,
+            osmTopo: true,
             esriSatellite: false,
             openStreetMap: true,
             openTopoMap: true,
@@ -1487,14 +1487,11 @@ export const overpassQueryData: Record<string, OverpassQueryData> = {
 };
 
 export const terrainSources: { [key: string]: RasterDEMSourceSpecification } = {
-    'maptiler-dem': {
-        type: 'raster-dem',
-        url: `https://api.maptiler.com/tiles/terrain-rgb-v2/tiles.json?key=${maptilerKeyPlaceHolder}`,
-    },
     mapterhorn: {
         type: 'raster-dem',
-        url: 'https://tiles.mapterhorn.com/tilejson.json',
+        url: 'https://tiles.gpx.studio/mapterhorn.json',
+        encoding: 'terrarium',
     },
 };
 
-export const defaultTerrainSource = 'maptiler-dem';
+export const defaultTerrainSource = 'mapterhorn';
diff --git a/website/src/lib/components/Logo.svelte b/website/src/lib/components/Logo.svelte
index c23a18bb6..77f47ea2a 100644
--- a/website/src/lib/components/Logo.svelte
+++ b/website/src/lib/components/Logo.svelte
@@ -8,7 +8,7 @@
         ...others
     }: {
         iconOnly?: boolean;
-        company?: 'gpx.studio' | 'maptiler' | 'github' | 'crowdin' | 'facebook' | 'reddit';
+        company?: 'gpx.studio' | 'github' | 'crowdin' | 'facebook' | 'reddit';
         [key: string]: any;
     } = $props();
 </script>
@@ -19,12 +19,6 @@
         alt="Logo of gpx.studio."
         {...others}
     />
-{:else if company === 'maptiler'}
-    <img
-        src="{base}/maptiler-logo{mode.current === 'dark' ? '-dark' : ''}.svg"
-        alt="Logo of Maptiler."
-        {...others}
-    />
 {:else if company === 'github'}
     <svg
         role="img"
diff --git a/website/src/lib/components/docs/DocsLayers.svelte b/website/src/lib/components/docs/DocsLayers.svelte
index ba6e46ba3..d7e7b4083 100644
--- a/website/src/lib/components/docs/DocsLayers.svelte
+++ b/website/src/lib/components/docs/DocsLayers.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-    import maptilerTopoMap from '$lib/assets/img/home/maptiler-topo.png?enhanced';
-    import waymarkedMap from '$lib/assets/img/home/waymarked.png?enhanced';
+    import topoMap from '$lib/assets/img/docs/maps/topo.png?enhanced';
+    import waymarkedMap from '$lib/assets/img/docs/maps/waymarked.png?enhanced';
 </script>
 
 <div class="relative h-80 aspect-square rounded-2xl shadow-xl overflow-clip">
-    <enhanced:img src={maptilerTopoMap} alt="MapTiler Topo map screenshot." class="absolute" />
+    <enhanced:img src={topoMap} alt="Topo map screenshot." class="absolute" />
     <enhanced:img
         src={waymarkedMap}
         alt="Waymarked Trails map screenshot."
diff --git a/website/src/lib/components/embedding/embedding.ts b/website/src/lib/components/embedding/embedding.ts
index 4116b1878..05914fc8f 100644
--- a/website/src/lib/components/embedding/embedding.ts
+++ b/website/src/lib/components/embedding/embedding.ts
@@ -29,7 +29,7 @@ export const defaultEmbeddingOptions = {
     key: '',
     files: [],
     ids: [],
-    basemap: 'maptilerStreets',
+    basemap: 'libertyTopo',
     elevation: {
         show: true,
         height: 170,
@@ -126,7 +126,7 @@ export function convertOldEmbeddingOptions(options: URLSearchParams): any {
     if (options.has('source')) {
         let basemap = options.get('source')!;
         if (basemap === 'satellite') {
-            newOptions.basemap = 'maptilerSatellite';
+            newOptions.basemap = 'libertySatellite';
         } else if (basemap === 'otm') {
             newOptions.basemap = 'openTopoMap';
         } else if (basemap === 'ohm') {
diff --git a/website/src/lib/components/map/gpx-layer/distance-markers.ts b/website/src/lib/components/map/gpx-layer/distance-markers.ts
index b6c38a225..7a7f9da23 100644
--- a/website/src/lib/components/map/gpx-layer/distance-markers.ts
+++ b/website/src/lib/components/map/gpx-layer/distance-markers.ts
@@ -74,7 +74,7 @@ export class DistanceMarkers {
                             layout: {
                                 'text-field': ['get', 'distance'],
                                 'text-size': 14,
-                                'text-font': ['Open Sans Bold'],
+                                'text-font': ['Noto Sans Bold'],
                             },
                             paint: {
                                 'text-color': 'black',
diff --git a/website/src/lib/components/map/gpx-layer/gpx-layer.ts b/website/src/lib/components/map/gpx-layer/gpx-layer.ts
index 3a874ed8a..fe2b227ab 100644
--- a/website/src/lib/components/map/gpx-layer/gpx-layer.ts
+++ b/website/src/lib/components/map/gpx-layer/gpx-layer.ts
@@ -251,11 +251,11 @@ export class GPXLayer {
                             source: this.fileId,
                             layout: {
                                 'text-field': '»',
-                                'text-offset': [0, -0.06],
+                                'text-offset': [0, -0.1],
                                 'text-keep-upright': false,
                                 'text-max-angle': 361,
                                 'text-allow-overlap': true,
-                                'text-font': ['Open Sans Bold'],
+                                'text-font': ['Noto Sans Bold'],
                                 'symbol-placement': 'line',
                                 'symbol-spacing': 20,
                             },
diff --git a/website/src/lib/components/map/style.ts b/website/src/lib/components/map/style.ts
index e0bb416fe..dafc6f06e 100644
--- a/website/src/lib/components/map/style.ts
+++ b/website/src/lib/components/map/style.ts
@@ -10,7 +10,8 @@ import {
 import { getLayers } from '$lib/components/map/layer-control/utils';
 import { i18n } from '$lib/i18n.svelte';
 
-const { currentBasemap, currentOverlays, customLayers, opacities, terrainSource } = settings;
+const { currentBasemap, currentOverlays, customLayers, opacities, terrainSource, distanceUnits } =
+    settings;
 
 const emptySource: maplibregl.GeoJSONSourceSpecification = {
     type: 'geojson',
@@ -57,15 +58,21 @@ export class StyleManager {
         opacities.subscribe(() => this.updateOverlays());
         terrainSource.subscribe(() => this.updateTerrain());
         customLayers.subscribe(() => this.updateBasemap());
+        distanceUnits.subscribe(() => {
+            if (get(currentBasemap) === 'libertyTopo') this.updateBasemap();
+        });
     }
 
     updateBasemap() {
         const map_ = get(this._map);
         if (!map_) return;
-        this.buildStyle().then((style) => map_.setStyle(style));
+        let basemap = get(currentBasemap);
+        this.buildStyle(basemap).then((style) => {
+            if (get(currentBasemap) === basemap) map_.setStyle(style);
+        });
     }
 
-    async buildStyle(): Promise<maplibregl.StyleSpecification> {
+    async buildStyle(basemap: string): Promise<maplibregl.StyleSpecification> {
         const custom = get(customLayers);
 
         const style: maplibregl.StyleSpecification = {
@@ -79,22 +86,31 @@ export class StyleManager {
             layers: [],
         };
 
-        let basemap = get(currentBasemap);
         const basemapInfo = basemaps[basemap] ?? custom[basemap]?.value ?? basemaps[defaultBasemap];
 
         let basemapStyle = basemaps.openStreetMap as maplibregl.StyleSpecification;
         try {
             basemapStyle = await this.get(basemapInfo);
+            for (const source in basemapStyle.sources) {
+                const src = basemapStyle.sources[source];
+                if (
+                    src &&
+                    typeof src === 'object' &&
+                    'url' in src &&
+                    typeof src.url === 'string' &&
+                    src.url.includes(maptilerKeyPlaceHolder)
+                ) {
+                    src.url = src.url.replace(maptilerKeyPlaceHolder, this._maptilerKey);
+                }
+            }
         } catch (e) {
             console.error(e.message);
         }
         this.merge(style, basemapStyle);
 
-        if (this._maptilerKey !== '') {
-            const terrain = this.getCurrentTerrain();
-            style.sources[terrain.source] = terrainSources[terrain.source];
-            style.terrain = terrain.exaggeration > 0 ? terrain : undefined;
-        }
+        const terrain = this.getCurrentTerrain();
+        style.sources[terrain.source] = terrainSources[terrain.source];
+        style.terrain = terrain.exaggeration > 0 ? terrain : undefined;
 
         style.layers.push(...anchorLayers);
 
@@ -166,7 +182,6 @@ export class StyleManager {
     }
 
     updateTerrain() {
-        if (this._maptilerKey === '') return;
         const map_ = get(this._map);
         if (!map_) return;
 
@@ -189,9 +204,6 @@ export class StyleManager {
     ): Promise<maplibregl.StyleSpecification> {
         if (typeof styleInfo === 'string') {
             let styleUrl = styleInfo as string;
-            if (styleUrl.includes(maptilerKeyPlaceHolder)) {
-                styleUrl = styleUrl.replace(maptilerKeyPlaceHolder, this._maptilerKey);
-            }
             const response = await fetch(styleUrl, { cache: 'force-cache' });
             if (!response.ok) {
                 throw new Error(`HTTP error fetching style "${styleInfo}": ${response.status}`);
@@ -205,23 +217,46 @@ export class StyleManager {
 
     merge(style: maplibregl.StyleSpecification, other: maplibregl.StyleSpecification) {
         style.sources = { ...style.sources, ...other.sources };
+        const units = get(distanceUnits);
         for (let layer of other.layers ?? []) {
+            if ('source' in layer) {
+                if (layer.source == 'contours_m' && units === 'imperial') continue;
+                if (layer.source == 'contours_ft' && units !== 'imperial') continue;
+            }
             if (layer.type === 'symbol' && layer.layout && layer.layout['text-field']) {
                 const textField = layer.layout['text-field'];
-                if (
-                    Array.isArray(textField) &&
-                    textField.length >= 2 &&
-                    textField[0] === 'coalesce' &&
-                    Array.isArray(textField[1]) &&
-                    textField[1][0] === 'get' &&
-                    typeof textField[1][1] === 'string' &&
-                    textField[1][1].startsWith('name')
-                ) {
-                    layer.layout['text-field'] = [
-                        'coalesce',
-                        ['get', `name:${i18n.lang}`],
-                        ['get', 'name'],
-                    ];
+                if (Array.isArray(textField)) {
+                    if (
+                        textField.length == 4 &&
+                        Array.isArray(textField[3]) &&
+                        textField[3][0] === 'coalesce' &&
+                        Array.isArray(textField[3][1]) &&
+                        textField[3][1][0] === 'get' &&
+                        typeof textField[3][1][1] === 'string' &&
+                        textField[3][1][1].startsWith('name')
+                    ) {
+                        // OpenFreeMap styles
+                        layer.layout['text-field'] = [
+                            'coalesce',
+                            ['get', `name:${i18n.lang}`],
+                            ['get', 'name'],
+                        ];
+                    }
+                    if (
+                        textField.length == 3 &&
+                        textField[0] === 'coalesce' &&
+                        Array.isArray(textField[1]) &&
+                        textField[1][0] === 'get' &&
+                        typeof textField[1][1] === 'string' &&
+                        textField[1][1].startsWith('name')
+                    ) {
+                        // OpenMapTiles styles
+                        layer.layout['text-field'] = [
+                            'coalesce',
+                            ['get', `name:${i18n.lang}`],
+                            ['get', 'name'],
+                        ];
+                    }
                 }
             }
             style.layers.push(layer);
@@ -236,10 +271,6 @@ export class StyleManager {
 
     getCurrentTerrain() {
         const terrain = get(terrainSource);
-        const source = terrainSources[terrain];
-        if (source.url && source.url.includes(maptilerKeyPlaceHolder)) {
-            source.url = source.url.replace(maptilerKeyPlaceHolder, this._maptilerKey);
-        }
         const map_ = get(this._map);
         return {
             source: terrain,
diff --git a/website/src/lib/docs/be/map-controls.mdx b/website/src/lib/docs/be/map-controls.mdx
index 1ab0793ab..19c170fab 100644
--- a/website/src/lib/docs/be/map-controls.mdx
+++ b/website/src/lib/docs/be/map-controls.mdx
@@ -59,7 +59,7 @@ These controls allow you to navigate the map, zoom in and out, and switch betwee
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/be/toolbar/elevation.mdx b/website/src/lib/docs/be/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/be/toolbar/elevation.mdx
+++ b/website/src/lib/docs/be/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/ca/map-controls.mdx b/website/src/lib/docs/ca/map-controls.mdx
index eebd771e6..9ad48f9aa 100644
--- a/website/src/lib/docs/ca/map-controls.mdx
+++ b/website/src/lib/docs/ca/map-controls.mdx
@@ -59,7 +59,7 @@ El botó de capa de mapa permet canviar entre diferents mapes base i alternar ca
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/ca/toolbar/elevation.mdx b/website/src/lib/docs/ca/toolbar/elevation.mdx
index 8cd217c69..040602c10 100644
--- a/website/src/lib/docs/ca/toolbar/elevation.mdx
+++ b/website/src/lib/docs/ca/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Aquesta eina permet afegir dades d'elevació a traces i [punts d'interès](../gp
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/cs/map-controls.mdx b/website/src/lib/docs/cs/map-controls.mdx
index 7bd5fdd05..7caf0a0bb 100644
--- a/website/src/lib/docs/cs/map-controls.mdx
+++ b/website/src/lib/docs/cs/map-controls.mdx
@@ -59,7 +59,7 @@ Tlačítko mapové vrstvy umožňuje přepínat mezi různými podkladovými map
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/cs/toolbar/elevation.mdx b/website/src/lib/docs/cs/toolbar/elevation.mdx
index 184430780..8adfa1336 100644
--- a/website/src/lib/docs/cs/toolbar/elevation.mdx
+++ b/website/src/lib/docs/cs/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Tento nástroj umožňuje přidat údaje o nadmořské výšce ke stopám a [bod
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/da/map-controls.mdx b/website/src/lib/docs/da/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/da/map-controls.mdx
+++ b/website/src/lib/docs/da/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/da/toolbar/elevation.mdx b/website/src/lib/docs/da/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/da/toolbar/elevation.mdx
+++ b/website/src/lib/docs/da/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/de/map-controls.mdx b/website/src/lib/docs/de/map-controls.mdx
index 897218e85..221f93996 100644
--- a/website/src/lib/docs/de/map-controls.mdx
+++ b/website/src/lib/docs/de/map-controls.mdx
@@ -59,7 +59,7 @@ Mit der Schaltfläche Karten-Ebenen können Sie zwischen verschiedenen Basemaps
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Fahre mit der Maus über die Karte, um die <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails-Wanderkarte</a> über der <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a>-Basiskarte anzuzeigen.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/de/toolbar/elevation.mdx b/website/src/lib/docs/de/toolbar/elevation.mdx
index 15bf75e55..935a2da97 100644
--- a/website/src/lib/docs/de/toolbar/elevation.mdx
+++ b/website/src/lib/docs/de/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Mit diesem Tool kannst du Höhendaten zu Routen und [Points of Interest] (../gpx
 
 <DocsNote>
 
-Die Höhendaten werden von <a href="https://maptiler.com" target="_blank">MapTiler</a> bereitgestellt.
-Mehr über die Herkunft und Genauigkeit erfährst du in der <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">Dokumentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/el/map-controls.mdx b/website/src/lib/docs/el/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/el/map-controls.mdx
+++ b/website/src/lib/docs/el/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/el/toolbar/elevation.mdx b/website/src/lib/docs/el/toolbar/elevation.mdx
index 0b64d6f6c..8db5fd8d9 100644
--- a/website/src/lib/docs/el/toolbar/elevation.mdx
+++ b/website/src/lib/docs/el/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/en/map-controls.mdx b/website/src/lib/docs/en/map-controls.mdx
index fbb80d125..b72f7414c 100644
--- a/website/src/lib/docs/en/map-controls.mdx
+++ b/website/src/lib/docs/en/map-controls.mdx
@@ -59,7 +59,7 @@ Only one basemap can be displayed at a time.
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/en/toolbar/elevation.mdx b/website/src/lib/docs/en/toolbar/elevation.mdx
index fedae8c99..a2022a778 100644
--- a/website/src/lib/docs/en/toolbar/elevation.mdx
+++ b/website/src/lib/docs/en/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
\ No newline at end of file
diff --git a/website/src/lib/docs/es/map-controls.mdx b/website/src/lib/docs/es/map-controls.mdx
index b1cea96d3..46bf341b5 100644
--- a/website/src/lib/docs/es/map-controls.mdx
+++ b/website/src/lib/docs/es/map-controls.mdx
@@ -59,7 +59,7 @@ El botón de capas de mapa le permite cambiar entre diferentes mapas bases y alt
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Pasa el ratón sobre el mapa para que la capa de <a href="https://hiking.waymarkedtrails.org" target="_blank">Caminatas por Sendas Marcadas</a> aparezca superpuesta al mapa base <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler</a>.
+Pasa el ratón sobre el mapa para que la capa de <a href="https://hiking.waymarkedtrails.org" target="_blank">Caminatas por Sendas Marcadas</a> aparezca superpuesta al mapa base topográfico.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/es/toolbar/elevation.mdx b/website/src/lib/docs/es/toolbar/elevation.mdx
index 322f0d1e8..68580786f 100644
--- a/website/src/lib/docs/es/toolbar/elevation.mdx
+++ b/website/src/lib/docs/es/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Esta herramienta permite añadir datos de elevación a los rastros y [puntos de
 
 <DocsNote>
 
-Los datos de notificación son proporcionados por <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-Puedes aprender más sobre su origen y precisión en la <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentación</a>.
+Los datos de elevación son proporcionados por <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+Puede aprender más sobre su origen y precisión en la <a href="https://mapterhorn.com/attribution/" target="_blank">documentación</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/eu/map-controls.mdx b/website/src/lib/docs/eu/map-controls.mdx
index 047051e2d..b208f7964 100644
--- a/website/src/lib/docs/eu/map-controls.mdx
+++ b/website/src/lib/docs/eu/map-controls.mdx
@@ -59,7 +59,7 @@ Maparen geruzen botoiak mapa-oinarri desberdinen artean aldatzeko aukera ematen
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/eu/toolbar/elevation.mdx b/website/src/lib/docs/eu/toolbar/elevation.mdx
index 2f479a25e..b68f5e101 100644
--- a/website/src/lib/docs/eu/toolbar/elevation.mdx
+++ b/website/src/lib/docs/eu/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Tresna honen bidez elebazio datuak gehitzen ahal dira ibilbidetan eta [interesgu
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/fi/map-controls.mdx b/website/src/lib/docs/fi/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/fi/map-controls.mdx
+++ b/website/src/lib/docs/fi/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/fi/toolbar/elevation.mdx b/website/src/lib/docs/fi/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/fi/toolbar/elevation.mdx
+++ b/website/src/lib/docs/fi/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/fr/map-controls.mdx b/website/src/lib/docs/fr/map-controls.mdx
index bb579a221..7eabe12c4 100644
--- a/website/src/lib/docs/fr/map-controls.mdx
+++ b/website/src/lib/docs/fr/map-controls.mdx
@@ -59,7 +59,7 @@ Le bouton des couches de la carte vous permet de basculer entre différents fond
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Survolez la carte pour afficher la superposition des chemins de randonnée <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails</a> au fond de carte <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a>.
+Survolez la carte pour afficher la superposition des chemins de randonnée <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails</a> au fond de carte topographique.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/fr/toolbar/elevation.mdx b/website/src/lib/docs/fr/toolbar/elevation.mdx
index d115cd08c..0c18477bd 100644
--- a/website/src/lib/docs/fr/toolbar/elevation.mdx
+++ b/website/src/lib/docs/fr/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Cet outil vous permet d'ajouter des données d'altitude aux traces et aux [point
 
 <DocsNote>
 
-Les données d'altitude sont fournies par <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-Vous pouvez en apprendre plus sur leur origine et précision dans la <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Les données d'altitude sont fournies par <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+Vous pouvez en apprendre plus sur leur origine et précision dans la <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/he/map-controls.mdx b/website/src/lib/docs/he/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/he/map-controls.mdx
+++ b/website/src/lib/docs/he/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/he/toolbar/elevation.mdx b/website/src/lib/docs/he/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/he/toolbar/elevation.mdx
+++ b/website/src/lib/docs/he/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/hu/map-controls.mdx b/website/src/lib/docs/hu/map-controls.mdx
index c8ee528bf..9bf11bd24 100644
--- a/website/src/lib/docs/hu/map-controls.mdx
+++ b/website/src/lib/docs/hu/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/hu/toolbar/elevation.mdx b/website/src/lib/docs/hu/toolbar/elevation.mdx
index 4a87922c7..9c12f309d 100644
--- a/website/src/lib/docs/hu/toolbar/elevation.mdx
+++ b/website/src/lib/docs/hu/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Ez az eszköz lehetővé teszi magassági adatok hozzáadását a nyomvonalakhoz
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/id/map-controls.mdx b/website/src/lib/docs/id/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/id/map-controls.mdx
+++ b/website/src/lib/docs/id/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/id/toolbar/elevation.mdx b/website/src/lib/docs/id/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/id/toolbar/elevation.mdx
+++ b/website/src/lib/docs/id/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/it/map-controls.mdx b/website/src/lib/docs/it/map-controls.mdx
index 0d3ad658c..b7e0fdd6a 100644
--- a/website/src/lib/docs/it/map-controls.mdx
+++ b/website/src/lib/docs/it/map-controls.mdx
@@ -59,7 +59,7 @@ Il pulsante dei livelli di mappa consente di passare da una basemap all'altra, e
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/it/toolbar/elevation.mdx b/website/src/lib/docs/it/toolbar/elevation.mdx
index 54f096320..c9d855031 100644
--- a/website/src/lib/docs/it/toolbar/elevation.mdx
+++ b/website/src/lib/docs/it/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Questo strumento ti permette di aggiungere dati di altimetria a tracce e [punti
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/ko/map-controls.mdx b/website/src/lib/docs/ko/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/ko/map-controls.mdx
+++ b/website/src/lib/docs/ko/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/ko/toolbar/elevation.mdx b/website/src/lib/docs/ko/toolbar/elevation.mdx
index 55e6d80ab..206192072 100644
--- a/website/src/lib/docs/ko/toolbar/elevation.mdx
+++ b/website/src/lib/docs/ko/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/lt/map-controls.mdx b/website/src/lib/docs/lt/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/lt/map-controls.mdx
+++ b/website/src/lib/docs/lt/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/lt/toolbar/elevation.mdx b/website/src/lib/docs/lt/toolbar/elevation.mdx
index 2e997097b..adb0ed759 100644
--- a/website/src/lib/docs/lt/toolbar/elevation.mdx
+++ b/website/src/lib/docs/lt/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/lv/map-controls.mdx b/website/src/lib/docs/lv/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/lv/map-controls.mdx
+++ b/website/src/lib/docs/lv/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/lv/toolbar/elevation.mdx b/website/src/lib/docs/lv/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/lv/toolbar/elevation.mdx
+++ b/website/src/lib/docs/lv/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/nl/map-controls.mdx b/website/src/lib/docs/nl/map-controls.mdx
index 584f64da4..0b1be760d 100644
--- a/website/src/lib/docs/nl/map-controls.mdx
+++ b/website/src/lib/docs/nl/map-controls.mdx
@@ -59,7 +59,7 @@ Met de kaartlagen knop kun je wisselen tussen verschillende basiskaarten, en kaa
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Beweeg over de kaart om de <a href="https://hiking.waymarkedtrails.org" target="_blank">Gemarkeerde sporen wandelen</a> overlay te tonen bovenop de <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/nl/toolbar/elevation.mdx b/website/src/lib/docs/nl/toolbar/elevation.mdx
index 8a1e9682b..fda22ed9d 100644
--- a/website/src/lib/docs/nl/toolbar/elevation.mdx
+++ b/website/src/lib/docs/nl/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Met dit gereedschap kun je hoogtegegevens toevoegen aan sporen en [interessante
 
 <DocsNote>
 
-Hoogtegegevens worden verstrekt door <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-Je kunt meer leren over de oorsprong en nauwkeurigheid in de <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentatie</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/no/map-controls.mdx b/website/src/lib/docs/no/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/no/map-controls.mdx
+++ b/website/src/lib/docs/no/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/no/toolbar/elevation.mdx b/website/src/lib/docs/no/toolbar/elevation.mdx
index e4153ab4e..a79cee7d7 100644
--- a/website/src/lib/docs/no/toolbar/elevation.mdx
+++ b/website/src/lib/docs/no/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/pl/map-controls.mdx b/website/src/lib/docs/pl/map-controls.mdx
index 35d7d3a7d..11a8bb8a3 100644
--- a/website/src/lib/docs/pl/map-controls.mdx
+++ b/website/src/lib/docs/pl/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/pl/toolbar/elevation.mdx b/website/src/lib/docs/pl/toolbar/elevation.mdx
index 2c3886d3c..364c1c752 100644
--- a/website/src/lib/docs/pl/toolbar/elevation.mdx
+++ b/website/src/lib/docs/pl/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ To narzędzie pozwala dodawać dane dotyczące wysokości do tras i [punktów za
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/pt-BR/map-controls.mdx b/website/src/lib/docs/pt-BR/map-controls.mdx
index 1dacb00de..8802a8c1e 100644
--- a/website/src/lib/docs/pt-BR/map-controls.mdx
+++ b/website/src/lib/docs/pt-BR/map-controls.mdx
@@ -59,7 +59,7 @@ O botão de camadas de mapa permite que você alterne entre diferentes mapas e a
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/pt-BR/toolbar/elevation.mdx b/website/src/lib/docs/pt-BR/toolbar/elevation.mdx
index 9ee293ebf..223ff91fc 100644
--- a/website/src/lib/docs/pt-BR/toolbar/elevation.mdx
+++ b/website/src/lib/docs/pt-BR/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Esta ferramenta permite que você adicione dados de elevação a rastros e [pont
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/pt/map-controls.mdx b/website/src/lib/docs/pt/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/pt/map-controls.mdx
+++ b/website/src/lib/docs/pt/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/pt/toolbar/elevation.mdx b/website/src/lib/docs/pt/toolbar/elevation.mdx
index 91e6e7b0f..b91db6b15 100644
--- a/website/src/lib/docs/pt/toolbar/elevation.mdx
+++ b/website/src/lib/docs/pt/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/ro/map-controls.mdx b/website/src/lib/docs/ro/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/ro/map-controls.mdx
+++ b/website/src/lib/docs/ro/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/ro/toolbar/elevation.mdx b/website/src/lib/docs/ro/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/ro/toolbar/elevation.mdx
+++ b/website/src/lib/docs/ro/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/ru/map-controls.mdx b/website/src/lib/docs/ru/map-controls.mdx
index a39ee366e..28efd1197 100644
--- a/website/src/lib/docs/ru/map-controls.mdx
+++ b/website/src/lib/docs/ru/map-controls.mdx
@@ -59,7 +59,7 @@ The map controls are located on the right side of the interface.
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/ru/toolbar/elevation.mdx b/website/src/lib/docs/ru/toolbar/elevation.mdx
index cc15c8c3d..718fc2164 100644
--- a/website/src/lib/docs/ru/toolbar/elevation.mdx
+++ b/website/src/lib/docs/ru/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ title: Высота
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/sr/map-controls.mdx b/website/src/lib/docs/sr/map-controls.mdx
index 0e84f9cf7..13aa33cc0 100644
--- a/website/src/lib/docs/sr/map-controls.mdx
+++ b/website/src/lib/docs/sr/map-controls.mdx
@@ -59,7 +59,7 @@ Dugme za slojeve mape vam omogućava da prelazite između različitih osnovnih
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Postavite pokazivač miša iznad mape da biste prikazali preklapanje <a href="https://hiking.waymarkedtrails.org" target="_blank">Planinarske staze sa obeleženim putevima</a> preko osnovne mape <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a>.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/sr/toolbar/elevation.mdx b/website/src/lib/docs/sr/toolbar/elevation.mdx
index 310a6ae78..0188595b5 100644
--- a/website/src/lib/docs/sr/toolbar/elevation.mdx
+++ b/website/src/lib/docs/sr/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Ovaj alat vam omogućava da dodate podatke o nadmorskoj visini trasama i [tačk
 
 <DocsNote>
 
-Podatke o nadmorskoj visini obezbeđuje <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-Više o njegovom poreklu i tačnosti možete saznati u <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">dokumentaciji</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/sv/map-controls.mdx b/website/src/lib/docs/sv/map-controls.mdx
index 21d24cac5..d5bebc956 100644
--- a/website/src/lib/docs/sv/map-controls.mdx
+++ b/website/src/lib/docs/sv/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/sv/toolbar/elevation.mdx b/website/src/lib/docs/sv/toolbar/elevation.mdx
index d285dc406..9ce1405dc 100644
--- a/website/src/lib/docs/sv/toolbar/elevation.mdx
+++ b/website/src/lib/docs/sv/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Detta verktyg låter dig lägga till höjddata till spår och [intressanta plats
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/th/map-controls.mdx b/website/src/lib/docs/th/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/th/map-controls.mdx
+++ b/website/src/lib/docs/th/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/th/toolbar/elevation.mdx b/website/src/lib/docs/th/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/th/toolbar/elevation.mdx
+++ b/website/src/lib/docs/th/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/tr/map-controls.mdx b/website/src/lib/docs/tr/map-controls.mdx
index f72c55f75..4994d7490 100644
--- a/website/src/lib/docs/tr/map-controls.mdx
+++ b/website/src/lib/docs/tr/map-controls.mdx
@@ -59,7 +59,7 @@ Harita katmanları düğmesi, farklı temel haritalar arasında geçiş yapmanı
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/tr/toolbar/elevation.mdx b/website/src/lib/docs/tr/toolbar/elevation.mdx
index c578e5e2c..62af7eb5d 100644
--- a/website/src/lib/docs/tr/toolbar/elevation.mdx
+++ b/website/src/lib/docs/tr/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Bu araç izlere ve [ilgi noktalarına](../gpx) yükseklik verisi eklemenizi veya
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/uk/map-controls.mdx b/website/src/lib/docs/uk/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/uk/map-controls.mdx
+++ b/website/src/lib/docs/uk/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/uk/toolbar/elevation.mdx b/website/src/lib/docs/uk/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/uk/toolbar/elevation.mdx
+++ b/website/src/lib/docs/uk/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/vi/map-controls.mdx b/website/src/lib/docs/vi/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/vi/map-controls.mdx
+++ b/website/src/lib/docs/vi/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/vi/toolbar/elevation.mdx b/website/src/lib/docs/vi/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/vi/toolbar/elevation.mdx
+++ b/website/src/lib/docs/vi/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/zh-HK/map-controls.mdx b/website/src/lib/docs/zh-HK/map-controls.mdx
index f2c81a728..14e163f34 100644
--- a/website/src/lib/docs/zh-HK/map-controls.mdx
+++ b/website/src/lib/docs/zh-HK/map-controls.mdx
@@ -59,7 +59,7 @@ The map layers button allows you to switch between different basemaps, and toggl
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/zh-HK/toolbar/elevation.mdx b/website/src/lib/docs/zh-HK/toolbar/elevation.mdx
index b92994df1..55e7c7f52 100644
--- a/website/src/lib/docs/zh-HK/toolbar/elevation.mdx
+++ b/website/src/lib/docs/zh-HK/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](..
 
 <DocsNote>
 
-Elevation data is provided by <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">documentation</a>.
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/zh/map-controls.mdx b/website/src/lib/docs/zh/map-controls.mdx
index 7d7a2c2b9..d4c57f459 100644
--- a/website/src/lib/docs/zh/map-controls.mdx
+++ b/website/src/lib/docs/zh/map-controls.mdx
@@ -59,7 +59,7 @@ title: 地图控件
 <DocsLayers />
 <span class="text-sm text-center mt-2">
 
-Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the <a href="https://www.maptiler.com/maps/outdoor-topo/" target="_blank">MapTiler Topo</a> basemap.
+Hover over the map to show the <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay on top of the topographic basemap.
 
 </span>
 </div>
diff --git a/website/src/lib/docs/zh/toolbar/elevation.mdx b/website/src/lib/docs/zh/toolbar/elevation.mdx
index 3728feac1..c1ebe34c2 100644
--- a/website/src/lib/docs/zh/toolbar/elevation.mdx
+++ b/website/src/lib/docs/zh/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ title: 请求海拔数据
 
 <DocsNote>
 
-海拔数据来自 <a href="https://maptiler.com" target="_blank">MapTiler</a>.
-查阅 <a href="https://docs.maptiler.com/guides/map-tiling-hosting/data-hosting/rgb-terrain-by-maptiler/" target="_blank">官方文档</a> 以了解海拔数据来源及其准确度。
+Elevation data is provided by <a href="https://mapterhorn.com" target="_blank">Mapterhorn</a>.
+You can learn more about its origin and accuracy in the <a href="https://mapterhorn.com/attribution/" target="_blank">documentation</a>.
 
 </DocsNote>
diff --git a/website/src/lib/logic/settings.ts b/website/src/lib/logic/settings.ts
index 4f808e945..e7377b159 100644
--- a/website/src/lib/logic/settings.ts
+++ b/website/src/lib/logic/settings.ts
@@ -210,7 +210,7 @@ type RoutingProfile =
     | 'motorcycle'
     | 'water'
     | 'railway';
-type TerrainSource = 'maptiler-dem' | 'mapterhorn';
+type TerrainSource = 'mapterhorn';
 type StreetViewSource = 'mapillary' | 'google';
 
 export const settings = {
@@ -308,7 +308,7 @@ export const settings = {
     terrainSource: new Setting<TerrainSource>(
         'terrainSource',
         defaultTerrainSource,
-        getValueValidator(['maptiler-dem', 'mapterhorn'], defaultTerrainSource)
+        getValueValidator(['mapterhorn'], defaultTerrainSource)
     ),
     directionMarkers: new Setting('directionMarkers', false),
     distanceMarkers: new Setting('distanceMarkers', false),
diff --git a/website/src/lib/utils.ts b/website/src/lib/utils.ts
index 3c9dd330d..f5bd8f362 100644
--- a/website/src/lib/utils.ts
+++ b/website/src/lib/utils.ts
@@ -7,7 +7,6 @@ import maplibregl from 'maplibre-gl';
 import { pointToTile, pointToTileFraction } from '@mapbox/tilebelt';
 import type { GPXStatisticsTree } from '$lib/logic/statistics-tree';
 import { ListTrackSegmentItem } from '$lib/components/file-list/file-list';
-import { PUBLIC_MAPTILER_KEY } from '$env/static/public';
 
 export function cn(...inputs: ClassValue[]) {
     return twMerge(clsx(inputs));
@@ -101,7 +100,7 @@ export function getClosestTrackSegments(
 
 export function getElevation(
     points: (TrackPoint | Waypoint | Coordinates)[],
-    ELEVATION_ZOOM: number = 13,
+    ELEVATION_ZOOM: number = 12,
     tileSize = 512
 ): Promise<number[]> {
     let coordinates = points.map((point) =>
@@ -122,10 +121,9 @@ export function getElevation(
     };
 
     let promises = uniqueTiles.map((tile) =>
-        fetch(
-            `https://api.maptiler.com/tiles/terrain-rgb-v2/${ELEVATION_ZOOM}/${tile[0]}/${tile[1]}.webp?key=${PUBLIC_MAPTILER_KEY}`,
-            { cache: 'force-cache' }
-        )
+        fetch(`https://tiles.gpx.studio/mapterhorn/${ELEVATION_ZOOM}/${tile[0]}/${tile[1]}.webp`, {
+            cache: 'force-cache',
+        })
             .then((response) => response.blob())
             .then(
                 (blob) =>
@@ -180,10 +178,10 @@ export function getElevation(
                 _y + (_y + 1 == tileSize ? 0 : 1)
             );
 
-            let ele00 = -10000 + (p00[0] * 256 * 256 + p00[1] * 256 + p00[2]) * 0.1;
-            let ele01 = -10000 + (p01[0] * 256 * 256 + p01[1] * 256 + p01[2]) * 0.1;
-            let ele10 = -10000 + (p10[0] * 256 * 256 + p10[1] * 256 + p10[2]) * 0.1;
-            let ele11 = -10000 + (p11[0] * 256 * 256 + p11[1] * 256 + p11[2]) * 0.1;
+            let ele00 = -32768 + p00[0] * 256 + p00[1] + p00[2] / 256;
+            let ele01 = -32768 + p01[0] * 256 + p01[1] + p01[2] / 256;
+            let ele10 = -32768 + p10[0] * 256 + p10[1] + p10[2] / 256;
+            let ele11 = -32768 + p11[0] * 256 + p11[1] + p11[2] / 256;
 
             return (
                 ele00 * (1 - dx) * (1 - dy) +
diff --git a/website/src/locales/be.json b/website/src/locales/be.json
index af2c8bc41..aa76da69b 100644
--- a/website/src/locales/be.json
+++ b/website/src/locales/be.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/ca.json b/website/src/locales/ca.json
index b4ff3fd59..bc71b6e31 100644
--- a/website/src/locales/ca.json
+++ b/website/src/locales/ca.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Sol·licita dades d'altimetria",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Seleccioneu un fitxer per sol·licitar dades d'altimetria."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Suïssa",
             "united_kingdom": "Regne Unit",
             "united_states": "Estats Units",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Parada de tramvia",
             "bus-stop": "Parada d'autobús",
             "ferry": "Ferri",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/cs.json b/website/src/locales/cs.json
index e0173134e..60a11d3ce 100644
--- a/website/src/locales/cs.json
+++ b/website/src/locales/cs.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Vyžádat si výškové údaje",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Vyberte položku souboru pro vyžádání výškových dat."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Švýcarsko",
             "united_kingdom": "Velká Británie",
             "united_states": "Spojené státy",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Zastávka tramvaje",
             "bus-stop": "Autobusová zastávka",
             "ferry": "Trajekt",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/da.json b/website/src/locales/da.json
index 46928ad64..65f9d48fa 100644
--- a/website/src/locales/da.json
+++ b/website/src/locales/da.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/de.json b/website/src/locales/de.json
index 1fae4f78c..799ca7ad0 100644
--- a/website/src/locales/de.json
+++ b/website/src/locales/de.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Höhendaten anfragen",
-            "help": "Das Anfordern von Höhendaten löscht die vorhandenen Höhendaten, falls vorhanden, und ersetzt diese durch Daten von MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Wählen Sie ein Datei-Element, um Höhendaten anzufordern."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Schweiz",
             "united_kingdom": "Großbritannien",
             "united_states": "USA",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Straßenbahnhaltestelle",
             "bus-stop": "Bushaltestelle",
             "ferry": "Fähre",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/el.json b/website/src/locales/el.json
index 7a5867ccb..d53ef099c 100644
--- a/website/src/locales/el.json
+++ b/website/src/locales/el.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/en.json b/website/src/locales/en.json
index a49f4f8d6..4cb0946d7 100644
--- a/website/src/locales/en.json
+++ b/website/src/locales/en.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/es.json b/website/src/locales/es.json
index ccb633ab3..0c5e74731 100644
--- a/website/src/locales/es.json
+++ b/website/src/locales/es.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Solicitar datos de desnivel",
-            "help": "La solicitud de datos de desnivel borrará los datos de desnivel existentes, si los hay, y los reemplazará con datos de Mapbox.",
+            "help": "La solicitud de datos de elevación borrará los datos de elevación existentes, si los hay, y los reemplazará con datos de Mapterhorn.",
             "help_no_selection": "Seleccione un elemento del archivo para solicitar datos de desnivel."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Suiza",
             "united_kingdom": "Reino Unido",
             "united_states": "Estados Unidos",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Parada de tranvía",
             "bus-stop": "Parada de autobús",
             "ferry": "Ferri",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/eu.json b/website/src/locales/eu.json
index f72282498..2b01ceaca 100644
--- a/website/src/locales/eu.json
+++ b/website/src/locales/eu.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Eskatu altueraren datuak",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Aukeratu fitxategi bat altuera datuak eskatzeko."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Suitza",
             "united_kingdom": "Erresuma Batua",
             "united_states": "Ameriketako Estatu Batuak",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tranbia geltokia",
             "bus-stop": "Autobus geltokia",
             "ferry": "Ferria",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/fi.json b/website/src/locales/fi.json
index ee2d16a79..7030c8f31 100644
--- a/website/src/locales/fi.json
+++ b/website/src/locales/fi.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Hae korkeustiedot",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Valitse tiedosto, jolle haet korkeustietoja."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Sveitsi",
             "united_kingdom": "Iso-Britannia",
             "united_states": "Yhdysvallat",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Raitiovaunupysäkit",
             "bus-stop": "Linja-autopysäkit",
             "ferry": "Lautat",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/fr.json b/website/src/locales/fr.json
index 31367368f..720028fe5 100644
--- a/website/src/locales/fr.json
+++ b/website/src/locales/fr.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Ajouter des données d'altitude",
-            "help": "Ajouter des données d'altitude effacera les données d'altitude existantes, le cas échéant, et les remplacera par des données fournies par MapTiler.",
+            "help": "Ajouter des données d'altitude effacera les données d'altitude existantes, le cas échéant, et les remplacera par des données fournies par Mapterhorn.",
             "help_no_selection": "Sélectionnez un élément de fichier pour ajouter des données d'altitude."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Suisse",
             "united_kingdom": "Royaume-Uni",
             "united_states": "États-Unis",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Arrêt de tram",
             "bus-stop": "Arrêt de bus",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/he.json b/website/src/locales/he.json
index fdc668222..69c00c41b 100644
--- a/website/src/locales/he.json
+++ b/website/src/locales/he.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/hu.json b/website/src/locales/hu.json
index bc4df4437..f5b49809d 100644
--- a/website/src/locales/hu.json
+++ b/website/src/locales/hu.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Magassági információk lekérése",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Svájc",
             "united_kingdom": "Anglia",
             "united_states": "Amerika",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Villamos megálló",
             "bus-stop": "Buszmegálló",
             "ferry": "Komp",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/id.json b/website/src/locales/id.json
index 3e0b11022..4cfa57332 100644
--- a/website/src/locales/id.json
+++ b/website/src/locales/id.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Minta data elevasi",
-            "help": "Meminta data elevasi akan menghapus data elevasi yang ada, jika ada, dan menggantinya dengan data dari MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Pilih item file untuk meminta data elevasi."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Swiss",
             "united_kingdom": "Britania Raya",
             "united_states": "Amerika Serikat",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Halt trem",
             "bus-stop": "Pemberhentian Bus",
             "ferry": "Feri",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/it.json b/website/src/locales/it.json
index 17f8e8038..58725fc71 100644
--- a/website/src/locales/it.json
+++ b/website/src/locales/it.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Richiedi dati elevazione",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Seleziona un file per richiedere i dati di altitudine."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Svizzera",
             "united_kingdom": "United Kingdom",
             "united_states": "Stati Uniti",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Fermata del tram",
             "bus-stop": "Fermata dell'autobus",
             "ferry": "Traghetto",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/ko.json b/website/src/locales/ko.json
index 2d7e9b3be..1d353fec2 100644
--- a/website/src/locales/ko.json
+++ b/website/src/locales/ko.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "스위스",
             "united_kingdom": "영국",
             "united_states": "미국",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "오픈스트리트맵",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "트램 정류장",
             "bus-stop": "버스 정류장",
             "ferry": "페리",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/lt.json b/website/src/locales/lt.json
index 83c7e7d04..999742302 100644
--- a/website/src/locales/lt.json
+++ b/website/src/locales/lt.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Šveicarija",
             "united_kingdom": "Jungtinė Karalystė",
             "united_states": "Jungtinės Amerikos Valstijos",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tramvajaus stotelė",
             "bus-stop": "Autobusų stotelė",
             "ferry": "Keltas",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/lv.json b/website/src/locales/lv.json
index a37d38b5b..75030d1db 100644
--- a/website/src/locales/lv.json
+++ b/website/src/locales/lv.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/nl.json b/website/src/locales/nl.json
index bd159629a..da21ad48d 100644
--- a/website/src/locales/nl.json
+++ b/website/src/locales/nl.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Hoogtegegevens opvragen",
-            "help": "Het opvragen van hoogtegegevens verwijdert de bestaande hoogtegegevens, indien aanwezig, en vervangt deze door gegevens van MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Selecteer een bestand om hoogte gegevens op te vragen."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Zwitserland",
             "united_kingdom": "Verenigd Koninkrijk",
             "united_states": "Verenigde Staten",
-            "maptilerStreets": "MapTiler straten",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Buiten",
-            "maptilerSatellite": "MapTiler satelliet",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tramhalte",
             "bus-stop": "Bushalte",
             "ferry": "Veerboot",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/no.json b/website/src/locales/no.json
index 5bfc044dc..1e8e64b12 100644
--- a/website/src/locales/no.json
+++ b/website/src/locales/no.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Be om høydedata",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Velg et element for å be om høydedata."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Sveits",
             "united_kingdom": "Storbritannia",
             "united_states": "USA",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Trikkestopp",
             "bus-stop": "Bussholdeplass",
             "ferry": "Ferge",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/pl.json b/website/src/locales/pl.json
index f62ee7560..a6df029a8 100644
--- a/website/src/locales/pl.json
+++ b/website/src/locales/pl.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Dodaj dane o wysokości terenu",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Wybierz plik do wczytania danych o wysokości w terenie."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Szwajcaria",
             "united_kingdom": "Wielka Brytania",
             "united_states": "Stany Zjednoczone",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Przystanek tramwajowy",
             "bus-stop": "Przystanek autobusowy",
             "ferry": "Prom",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/pt-BR.json b/website/src/locales/pt-BR.json
index cd777708b..84178c116 100644
--- a/website/src/locales/pt-BR.json
+++ b/website/src/locales/pt-BR.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Solicitar dados de elevação",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Selecione um item de arquivo para solicitar os dados de elevação."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Suíça",
             "united_kingdom": "Reino Unido",
             "united_states": "Estados Unidos",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Parada de bonde",
             "bus-stop": "Parada de Ônibus",
             "ferry": "Balsa",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/pt.json b/website/src/locales/pt.json
index 619264344..12042552c 100644
--- a/website/src/locales/pt.json
+++ b/website/src/locales/pt.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Suíça",
             "united_kingdom": "Reino Unido",
             "united_states": "Estados Unidos",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Parada de bonde",
             "bus-stop": "Parada de Ônibus",
             "ferry": "Balsa",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/ro.json b/website/src/locales/ro.json
index 19f8cb030..fcd15ada5 100644
--- a/website/src/locales/ro.json
+++ b/website/src/locales/ro.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Elveția",
             "united_kingdom": "Regatul Unit",
             "united_states": "Statele Unite ale Americii",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Stație de autobuz",
             "ferry": "Feribot",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/ru.json b/website/src/locales/ru.json
index 0d42fd75e..12962d95f 100644
--- a/website/src/locales/ru.json
+++ b/website/src/locales/ru.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Запросить данные о высоте",
-            "help": "Запрос данных о высотах приведет к удалению существующих данных о высотах, если таковые имеются, и замене их данными из MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Выберите файл для запроса данных о высоте."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Швейцария",
             "united_kingdom": "Великобритания",
             "united_states": "Соединенные Штаты Америки",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Трамвайная остановка",
             "bus-stop": "Автобусная остановка",
             "ferry": "Паром",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/sr.json b/website/src/locales/sr.json
index 63bc2460c..f477a9fae 100644
--- a/website/src/locales/sr.json
+++ b/website/src/locales/sr.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Zatražite podatke o nadmorskoj visini",
-            "help": "Zahtevanje podataka o nadmorskoj visini će obrisati postojeće podatke o nadmorskoj visini, ako ih ima, i zameniti ih podacima iz MapTiler-a.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Izaberite stavku datoteke da biste zatražili podatke o nadmorskoj visini."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Švajcarska",
             "united_kingdom": "Ujedinjeno Kraljevstvo",
             "united_states": "Sjеdinjеnе Američke Državе",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tramvajsko stajalište",
             "bus-stop": "Autobusko stajalište",
             "ferry": "Trajekt",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/sv.json b/website/src/locales/sv.json
index 070269946..73295f9e2 100644
--- a/website/src/locales/sv.json
+++ b/website/src/locales/sv.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Schweiz",
             "united_kingdom": "Storbritannien",
             "united_states": "USA",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Spårvagnshållplats",
             "bus-stop": "Busshållplats",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/th.json b/website/src/locales/th.json
index dc22ea690..5f7355ea9 100644
--- a/website/src/locales/th.json
+++ b/website/src/locales/th.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/tr.json b/website/src/locales/tr.json
index d2f2ca5f6..8d0eaae62 100644
--- a/website/src/locales/tr.json
+++ b/website/src/locales/tr.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Yükselti verisi talep et",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Yükselti verisi talep etmek için bir dosya öğesi seçin."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "İsviçre",
             "united_kingdom": "Birleşik Krallık",
             "united_states": "Birlişik Devletler",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tramvay Durağı",
             "bus-stop": "Otobüs Durağı",
             "ferry": "Feribot",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/uk.json b/website/src/locales/uk.json
index 97ea79733..a756320cf 100644
--- a/website/src/locales/uk.json
+++ b/website/src/locales/uk.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Запит даних висот",
-            "help": "Запит даних про висоту призведе до видалення наявних даних про висоту (якщо такі є) та їх заміни даними з MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Виберіть елемент файлу, щоб запросити дані про висоту."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Швейцарія",
             "united_kingdom": "Велика Британія\nВеликобританія",
             "united_states": "Сполучені Штати",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Трамвайна Зупинка",
             "bus-stop": "Автобусна Зупинка",
             "ferry": "Пором",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/vi.json b/website/src/locales/vi.json
index 6773126fb..fc3ee70bb 100644
--- a/website/src/locales/vi.json
+++ b/website/src/locales/vi.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/zh-HK.json b/website/src/locales/zh-HK.json
index 0e44443a6..4e97bab1d 100644
--- a/website/src/locales/zh-HK.json
+++ b/website/src/locales/zh-HK.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/locales/zh.json b/website/src/locales/zh.json
index 7518e68ea..8b7a9d75c 100644
--- a/website/src/locales/zh.json
+++ b/website/src/locales/zh.json
@@ -235,7 +235,7 @@
         },
         "elevation": {
             "button": "请求海拔数据",
-            "help": "请求成功后将移除原有的海拔数据，并使用 MapTiler 的海拔数据替换原有数据。",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.",
             "help_no_selection": "选择要请求海拔数据的文件。"
         },
         "waypoint": {
@@ -304,10 +304,10 @@
             "switzerland": "瑞士",
             "united_kingdom": "英国",
             "united_states": "美国",
-            "maptilerStreets": "MapTiler Streets",
-            "maptilerTopo": "MapTiler Topo",
-            "maptilerOutdoors": "MapTiler Outdoors",
-            "maptilerSatellite": "MapTiler Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
@@ -388,7 +388,6 @@
             "tram-stop": "有轨电车站",
             "bus-stop": "小型公交站台",
             "ferry": "渡口",
-            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
diff --git a/website/src/routes/[[language]]/embed/+page.svelte b/website/src/routes/[[language]]/embed/+page.svelte
index 4111fe6bc..baf9a9bb8 100644
--- a/website/src/routes/[[language]]/embed/+page.svelte
+++ b/website/src/routes/[[language]]/embed/+page.svelte
@@ -19,8 +19,8 @@
             return;
         }
         embeddingOptions = getMergedEmbeddingOptions(options);
-        if (embeddingOptions.key === '' && embeddingOptions.basemap.startsWith('maptiler')) {
-            embeddingOptions.basemap = 'openStreetMap';
+        if (embeddingOptions.key === '' && embeddingOptions.basemap === 'satellite') {
+            embeddingOptions.basemap = 'libertyTopo';
         }
     });
 </script>
diff --git a/website/static/maptiler-logo-dark.svg b/website/static/maptiler-logo-dark.svg
deleted file mode 100644
index 2f60017f2..000000000
--- a/website/static/maptiler-logo-dark.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Vrstva_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 812 212" style="enable-background:new 0 0 812 212;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#3A1888;}
-	.st1{fill:#03A1C4;}
-	.st2{fill:#05D0DF;}
-	.st3{fill:#761FE8;}
-	.st4{fill:#FFAA01;}
-	.st5{fill:#F1175D;}
-	.st6{fill:#FB3A1B;}
-	.st7{fill:#FBC935;}
-	.st8{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st0" d="M94.3,164.2c9.2,9.2,33.8,34.3,33.8,34.3c-0.1,0.2,24.4-24.5,34.2-34.2l-34.1-34.1L94.3,164.2z"/>
-	<path class="st1" d="M128.3,130.2l34.1,34.1c0.1-0.1,0.1-0.1,0.2-0.2l34-34L162.5,96L128.3,130.2z"/>
-	<path class="st2" d="M196.6,130.1L196.6,130.1c18.9-18.9,18.9-49.4,0.1-68.3L162.5,96L196.6,130.1z"/>
-	<path class="st3" d="M94.1,96l-34,34c0,0,0,0,0,0l34.1,34.1c0,0,0,0,0.1,0.1l34-34L94.1,96z"/>
-	<path class="st4" d="M128.3,61.8L162.5,96l34.2-34.2c0,0,0,0-0.1-0.1l-34.1-34.1c0,0,0,0,0,0L128.3,61.8z"/>
-	<path class="st5" d="M60,61.9c-18.7,18.9-18.6,49.3,0.1,68.1l34-34L60,61.9z"/>
-	<path class="st6" d="M128.3,61.8L94.2,27.7l-34,34c-0.1,0.1-0.1,0.1-0.2,0.2L94.1,96L128.3,61.8z"/>
-	<path class="st7" d="M162.5,27.6c-18.9-18.8-49.4-18.8-68.2,0l-0.1,0.1l34.1,34.1L162.5,27.6z"/>
-</g>
-<path class="st8" d="M303.8,138.6v-34.9c0-8.6-4.5-16.4-13.3-16.4c-8.7,0-13.9,7.8-13.9,16.4v34.9h-16.1V73.4h14.9l1.2,7.9
-	c3.4-6.6,11-9,17.2-9c7.8,0,15.6,3.2,19.3,12.2c5.8-9.2,13.3-11.9,21.8-11.9c18.5,0,27.6,11.4,27.6,30.9v35.1h-16.1v-35.1
-	c0-8.6-3.6-15.9-12.3-15.9c-8.7,0-14.1,7.5-14.1,16.1v34.9H303.8z"/>
-<path class="st8" d="M430.5,73.5h15.5v65.1h-15.2l-0.8-9.5c-3.7,7.7-13.9,11.4-21.1,11.5c-19.3,0.1-33.6-11.8-33.6-34.6
-	c0-22.5,14.9-34.2,34-34.1c8.7,0,17,4.1,20.7,10.6L430.5,73.5z M391.4,106c0,12.4,8.6,19.8,19.3,19.8c25.4,0,25.4-39.5,0-39.5
-	C399.9,86.3,391.4,93.6,391.4,106z"/>
-<path class="st8" d="M459.5,165.8V73.5h15.1l1.1,9c5-7.3,13.7-10.4,21.1-10.4c20.1,0,33.4,14.9,33.4,34.1c0,19-12,34.1-32.9,34.1
-	c-6.9,0-17-2.1-21.7-9.3v34.9H459.5z M514.1,106.1c0-10.2-6.9-18.5-18.5-18.5c-11.6,0-18.5,8.3-18.5,18.5c0,10.2,7.5,18.5,18.5,18.5
-	C506.6,124.6,514.1,116.3,514.1,106.1z"/>
-<path class="st8" d="M559,53.7v19.7h22.2v5.4H559v39.8c0,8.8,1.9,15.1,12,15.1c3.2,0,6.7-1.1,10-2.6l2.2,5.3
-	c-4.1,2-8.2,3.3-12.3,3.3c-13.9,0-18.4-8.2-18.4-21V78.8h-13.9v-5.4h13.9v-19L559,53.7z"/>
-<path class="st8" d="M604.7,52.1c0,6.9-10.4,6.9-10.4,0C594.3,45.2,604.7,45.2,604.7,52.1z M596.1,73.1v65.5h6.5V73.1H596.1z"/>
-<path class="st8" d="M627.6,46.2v92.5h-6.5V46.2H627.6z"/>
-<path class="st8" d="M730.2,73.4l0.3,11.6c4.1-8.9,13.3-12.3,21.7-12.3c4.9-0.1,9.6,1.2,14,3.8l-2.9,5.3c-3.4-2.1-7.3-3-11.1-3
-	c-12.2,0.1-21.5,9.9-21.5,21.8v38h-6.5V73.4H730.2z"/>
-<g>
-	<path class="st8" d="M675.1,134.7c-11.5,0-21.4-7.2-25.5-17.4l0,0l0,0c0,0,0,0,0,0l52.8-14c0,0,0,0,0,0.1l5.6-1.5
-		c-2.3-16.5-16.2-29.3-33-29.3c-18.4,0-33.3,15.2-33.3,34c0,18.8,14.9,34,33.3,34c13.8,0,25.6-8.5,30.6-20.7l-5.3-2.3
-		C696.2,127.6,686.4,134.7,675.1,134.7z M647.5,106.6c0-15.5,12.3-28.1,27.5-28.1c11.9,0,22,7.7,25.9,18.5L647.9,111
-		C647.6,109.5,647.5,108.1,647.5,106.6z"/>
-</g>
-</svg>
diff --git a/website/static/maptiler-logo.svg b/website/static/maptiler-logo.svg
deleted file mode 100644
index 626f9f69b..000000000
--- a/website/static/maptiler-logo.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Vrstva_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 812 212" style="enable-background:new 0 0 812 212;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#3A1888;}
-	.st1{fill:#03A1C4;}
-	.st2{fill:#05D0DF;}
-	.st3{fill:#761FE8;}
-	.st4{fill:#FFAA01;}
-	.st5{fill:#F1175D;}
-	.st6{fill:#FB3A1B;}
-	.st7{fill:#FBC935;}
-	.st8{fill:#333359;}
-</style>
-<path class="st0" d="M94.3,164.2c9.2,9.2,33.8,34.3,33.8,34.3c-0.1,0.2,24.4-24.5,34.2-34.2l-34.1-34.1L94.3,164.2z"/>
-<path class="st1" d="M128.3,130.2l34.1,34.1c0.1-0.1,0.1-0.1,0.2-0.2l34-34L162.5,96L128.3,130.2z"/>
-<path class="st2" d="M196.6,130.1L196.6,130.1c18.9-18.9,18.9-49.4,0.1-68.3L162.5,96L196.6,130.1z"/>
-<path class="st3" d="M94.1,96l-34,34c0,0,0,0,0,0l34.1,34.1c0,0,0,0,0.1,0.1l34-34L94.1,96z"/>
-<path class="st4" d="M128.3,61.8L162.5,96l34.2-34.2c0,0,0,0-0.1-0.1l-34.1-34.1c0,0,0,0,0,0L128.3,61.8z"/>
-<path class="st5" d="M60,61.9c-18.7,18.9-18.6,49.3,0.1,68.1l34-34L60,61.9z"/>
-<path class="st6" d="M128.3,61.8L94.2,27.7l-34,34c-0.1,0.1-0.1,0.1-0.2,0.2L94.1,96L128.3,61.8z"/>
-<path class="st7" d="M162.5,27.6c-18.9-18.8-49.4-18.8-68.2,0l-0.1,0.1l34.1,34.1L162.5,27.6z"/>
-<path class="st8" d="M303.7,138.6v-34.9c0-8.6-4.5-16.4-13.3-16.4c-8.7,0-13.9,7.8-13.9,16.4v34.9h-16.1V73.4h14.9l1.2,7.9
-	c3.4-6.6,11-9,17.2-9c7.8,0,15.6,3.2,19.3,12.2c5.8-9.2,13.3-11.9,21.8-11.9c18.5,0,27.6,11.4,27.6,30.9v35.1h-16.1v-35.1
-	c0-8.6-3.6-15.9-12.3-15.9c-8.7,0-14.1,7.5-14.1,16.1v34.9H303.7z"/>
-<path class="st8" d="M430.3,73.5h15.5v65.1h-15.2l-0.8-9.5c-3.7,7.7-13.9,11.4-21.1,11.5c-19.3,0.1-33.6-11.8-33.6-34.6
-	c0-22.5,14.9-34.2,34-34.1c8.7,0,17,4.1,20.7,10.6L430.3,73.5z M391.2,106c0,12.4,8.6,19.8,19.3,19.8c25.4,0,25.4-39.5,0-39.5
-	C399.8,86.3,391.2,93.6,391.2,106z"/>
-<path class="st8" d="M459.4,165.8V73.5h15.1l1.1,9c5-7.3,13.7-10.4,21.1-10.4c20.1,0,33.4,14.9,33.4,34.1c0,19-12,34.1-32.9,34.1
-	c-6.9,0-17-2.1-21.7-9.3v34.9H459.4z M514,106.1c0-10.2-6.9-18.5-18.5-18.5c-11.6,0-18.5,8.3-18.5,18.5c0,10.2,7.5,18.5,18.5,18.5
-	C506.4,124.6,514,116.3,514,106.1z"/>
-<path class="st8" d="M558.9,53.7v19.7h22.2v5.4h-22.2v39.8c0,8.8,1.9,15.1,12,15.1c3.2,0,6.7-1.1,10-2.6l2.2,5.3
-	c-4.1,2-8.2,3.3-12.3,3.3c-13.9,0-18.4-8.2-18.4-21V78.8h-13.9v-5.4h13.9v-19L558.9,53.7z"/>
-<path class="st8" d="M604.6,52.1c0,6.9-10.4,6.9-10.4,0C594.1,45.2,604.6,45.2,604.6,52.1z M596,73.1v65.5h6.5V73.1H596z"/>
-<path class="st8" d="M627.4,46.2v92.5H621V46.2H627.4z"/>
-<path class="st8" d="M730.1,73.4l0.3,11.6c4.1-8.9,13.3-12.3,21.7-12.3c4.9-0.1,9.6,1.2,14,3.8l-2.9,5.3c-3.4-2.1-7.3-3-11.1-3
-	c-12.2,0.1-21.5,9.9-21.5,21.8v38H724V73.4H730.1z"/>
-<g>
-	<path class="st8" d="M674.9,134.7c-11.5,0-21.4-7.2-25.5-17.4l0,0l0,0c0,0,0,0,0,0l52.8-14c0,0,0,0,0,0.1l5.6-1.5
-		c-2.3-16.5-16.2-29.3-33-29.3c-18.4,0-33.3,15.2-33.3,34c0,18.8,14.9,34,33.3,34c13.8,0,25.6-8.5,30.6-20.7l-5.3-2.3
-		C696.1,127.6,686.3,134.7,674.9,134.7z M647.4,106.6c0-15.5,12.3-28.1,27.5-28.1c11.9,0,22,7.7,25.9,18.5L647.7,111
-		C647.5,109.5,647.4,108.1,647.4,106.6z"/>
-</g>
-</svg>