From 7586f0399886993061bc0dbda2e6bcae2dfe3177 Mon Sep 17 00:00:00 2001
From: vcoppe <vianney.coppe@gmail.com>
Date: Thu, 2 Apr 2026 18:43:41 +0200
Subject: [PATCH] New Crowdin updates (#307)

* New translations en.json (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Vietnamese)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Indonesian)

* New translations en.json (Thai)

* New translations en.json (Latvian)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.json (Serbian (Latin))

* New translations funding.mdx (Dutch)

* New translations en.json (Dutch)

* New translations en.json (Spanish)

* New translations en.json (Basque)

* New translations en.json (Dutch)

* New translations en.json (Catalan)

* New translations en.json (Romanian)

* New translations en.json (French)

* New translations en.json (Spanish)

* New translations en.json (Belarusian)

* New translations en.json (Czech)

* New translations en.json (Danish)

* New translations en.json (German)

* New translations en.json (Greek)

* New translations en.json (Finnish)

* New translations en.json (Hebrew)

* New translations en.json (Hungarian)

* New translations en.json (Italian)

* New translations en.json (Korean)

* New translations en.json (Lithuanian)

* New translations en.json (Norwegian)

* New translations en.json (Polish)

* New translations en.json (Portuguese)

* New translations en.json (Russian)

* New translations en.json (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Vietnamese)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Indonesian)

* New translations en.json (Thai)

* New translations en.json (Latvian)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.json (Serbian (Latin))

* New translations files-and-stats.mdx (Romanian)

* New translations files-and-stats.mdx (French)

* New translations files-and-stats.mdx (Spanish)

* New translations files-and-stats.mdx (Belarusian)

* New translations files-and-stats.mdx (Catalan)

* New translations files-and-stats.mdx (Czech)

* New translations files-and-stats.mdx (Danish)

* New translations files-and-stats.mdx (German)

* New translations files-and-stats.mdx (Greek)

* New translations files-and-stats.mdx (Basque)

* New translations files-and-stats.mdx (Finnish)

* New translations files-and-stats.mdx (Hebrew)

* New translations files-and-stats.mdx (Hungarian)

* New translations files-and-stats.mdx (Italian)

* New translations files-and-stats.mdx (Korean)

* New translations files-and-stats.mdx (Lithuanian)

* New translations files-and-stats.mdx (Dutch)

* New translations files-and-stats.mdx (Norwegian)

* New translations files-and-stats.mdx (Polish)

* New translations files-and-stats.mdx (Portuguese)

* New translations files-and-stats.mdx (Russian)

* New translations files-and-stats.mdx (Swedish)

* New translations files-and-stats.mdx (Turkish)

* New translations files-and-stats.mdx (Ukrainian)

* New translations files-and-stats.mdx (Chinese Simplified)

* New translations files-and-stats.mdx (Vietnamese)

* New translations files-and-stats.mdx (Portuguese, Brazilian)

* New translations files-and-stats.mdx (Indonesian)

* New translations files-and-stats.mdx (Thai)

* New translations files-and-stats.mdx (Latvian)

* New translations files-and-stats.mdx (Chinese Traditional, Hong Kong)

* New translations files-and-stats.mdx (Serbian (Latin))

* New translations integration.mdx (Romanian)

* New translations integration.mdx (French)

* New translations integration.mdx (Spanish)

* New translations integration.mdx (Belarusian)

* New translations integration.mdx (Catalan)

* New translations integration.mdx (Czech)

* New translations integration.mdx (Danish)

* New translations integration.mdx (German)

* New translations integration.mdx (Greek)

* New translations integration.mdx (Basque)

* New translations integration.mdx (Finnish)

* New translations integration.mdx (Hebrew)

* New translations integration.mdx (Hungarian)

* New translations integration.mdx (Italian)

* New translations integration.mdx (Korean)

* New translations integration.mdx (Lithuanian)

* New translations integration.mdx (Dutch)

* New translations integration.mdx (Norwegian)

* New translations integration.mdx (Polish)

* New translations integration.mdx (Portuguese)

* New translations integration.mdx (Russian)

* New translations integration.mdx (Swedish)

* New translations integration.mdx (Turkish)

* New translations integration.mdx (Ukrainian)

* New translations integration.mdx (Chinese Simplified)

* New translations integration.mdx (Vietnamese)

* New translations integration.mdx (Portuguese, Brazilian)

* New translations integration.mdx (Indonesian)

* New translations integration.mdx (Thai)

* New translations integration.mdx (Latvian)

* New translations integration.mdx (Chinese Traditional, Hong Kong)

* New translations integration.mdx (Serbian (Latin))

* New translations merge.mdx (Romanian)

* New translations merge.mdx (French)

* New translations merge.mdx (Spanish)

* New translations merge.mdx (Belarusian)

* New translations merge.mdx (Catalan)

* New translations merge.mdx (Czech)

* New translations merge.mdx (Danish)

* New translations merge.mdx (German)

* New translations merge.mdx (Greek)

* New translations merge.mdx (Basque)

* New translations merge.mdx (Finnish)

* New translations merge.mdx (Hebrew)

* New translations merge.mdx (Hungarian)

* New translations merge.mdx (Italian)

* New translations merge.mdx (Korean)

* New translations merge.mdx (Lithuanian)

* New translations merge.mdx (Dutch)

* New translations merge.mdx (Norwegian)

* New translations merge.mdx (Polish)

* New translations merge.mdx (Portuguese)

* New translations merge.mdx (Russian)

* New translations merge.mdx (Swedish)

* New translations merge.mdx (Turkish)

* New translations merge.mdx (Ukrainian)

* New translations merge.mdx (Chinese Simplified)

* New translations merge.mdx (Vietnamese)

* New translations merge.mdx (Portuguese, Brazilian)

* New translations merge.mdx (Indonesian)

* New translations merge.mdx (Thai)

* New translations merge.mdx (Latvian)

* New translations merge.mdx (Chinese Traditional, Hong Kong)

* New translations merge.mdx (Serbian (Latin))

* New translations map-controls.mdx (Romanian)

* New translations map-controls.mdx (French)

* New translations map-controls.mdx (Spanish)

* New translations map-controls.mdx (Belarusian)

* New translations map-controls.mdx (Catalan)

* New translations map-controls.mdx (Czech)

* New translations map-controls.mdx (Danish)

* New translations map-controls.mdx (German)

* New translations map-controls.mdx (Greek)

* New translations map-controls.mdx (Basque)

* New translations map-controls.mdx (Finnish)

* New translations map-controls.mdx (Hebrew)

* New translations map-controls.mdx (Hungarian)

* New translations map-controls.mdx (Italian)

* New translations map-controls.mdx (Korean)

* New translations map-controls.mdx (Lithuanian)

* New translations map-controls.mdx (Dutch)

* New translations map-controls.mdx (Norwegian)

* New translations map-controls.mdx (Polish)

* New translations map-controls.mdx (Portuguese)

* New translations map-controls.mdx (Russian)

* New translations map-controls.mdx (Swedish)

* New translations map-controls.mdx (Turkish)

* New translations map-controls.mdx (Ukrainian)

* New translations map-controls.mdx (Chinese Simplified)

* New translations map-controls.mdx (Vietnamese)

* New translations map-controls.mdx (Portuguese, Brazilian)

* New translations map-controls.mdx (Indonesian)

* New translations map-controls.mdx (Thai)

* New translations map-controls.mdx (Latvian)

* New translations map-controls.mdx (Chinese Traditional, Hong Kong)

* New translations map-controls.mdx (Serbian (Latin))

* New translations en.json (French)

* New translations integration.mdx (French)

* New translations map-controls.mdx (French)

* New translations merge.mdx (French)

* New translations elevation.mdx (French)

* New translations en.json (Basque)

* New translations en.json (Dutch)

* New translations en.json (Catalan)

* New translations en.json (Romanian)

* New translations en.json (French)

* New translations en.json (Spanish)

* New translations en.json (Belarusian)

* New translations en.json (Czech)

* New translations en.json (Danish)

* New translations en.json (German)

* New translations en.json (Greek)

* New translations en.json (Finnish)

* New translations en.json (Hebrew)

* New translations en.json (Hungarian)

* New translations en.json (Italian)

* New translations en.json (Korean)

* New translations en.json (Lithuanian)

* New translations en.json (Norwegian)

* New translations en.json (Polish)

* New translations en.json (Portuguese)

* New translations en.json (Russian)

* New translations en.json (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Vietnamese)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Indonesian)

* New translations en.json (Thai)

* New translations en.json (Latvian)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.json (Serbian (Latin))

* New translations integration.mdx (Dutch)

* New translations map-controls.mdx (Spanish)

* New translations map-controls.mdx (Dutch)

* New translations merge.mdx (Dutch)

* New translations en.json (Basque)

* New translations en.json (Dutch)

* New translations en.json (Catalan)

* New translations en.json (Romanian)

* New translations en.json (French)

* New translations en.json (Spanish)

* New translations en.json (Belarusian)

* New translations en.json (Czech)

* New translations en.json (Danish)

* New translations en.json (German)

* New translations en.json (Greek)

* New translations en.json (Finnish)

* New translations en.json (Hebrew)

* New translations en.json (Hungarian)

* New translations en.json (Italian)

* New translations en.json (Korean)

* New translations en.json (Lithuanian)

* New translations en.json (Norwegian)

* New translations en.json (Polish)

* New translations en.json (Portuguese)

* New translations en.json (Russian)

* New translations en.json (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Vietnamese)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Indonesian)

* New translations en.json (Thai)

* New translations en.json (Latvian)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.json (Serbian (Latin))

* New translations en.json (Dutch)

* New translations en.json (French)

* New translations en.json (Spanish)
---
 website/src/lib/docs/be/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/be/home/funding.mdx      |  2 +-
 website/src/lib/docs/be/integration.mdx       |  4 +-
 website/src/lib/docs/be/map-controls.mdx      | 12 +++---
 website/src/lib/docs/be/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/be/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/ca/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/ca/home/funding.mdx      |  2 +-
 website/src/lib/docs/ca/integration.mdx       |  4 +-
 website/src/lib/docs/ca/map-controls.mdx      | 11 +++--
 website/src/lib/docs/ca/menu/file.mdx         |  8 ++--
 website/src/lib/docs/ca/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/ca/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/cs/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/cs/home/funding.mdx      |  2 +-
 website/src/lib/docs/cs/integration.mdx       |  4 +-
 website/src/lib/docs/cs/map-controls.mdx      | 12 +++---
 website/src/lib/docs/cs/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/cs/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/da/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/da/home/funding.mdx      |  2 +-
 website/src/lib/docs/da/integration.mdx       |  4 +-
 website/src/lib/docs/da/map-controls.mdx      | 12 +++---
 website/src/lib/docs/da/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/da/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/de/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/de/home/funding.mdx      |  2 +-
 website/src/lib/docs/de/home/mapbox.mdx       |  6 +--
 website/src/lib/docs/de/integration.mdx       |  4 +-
 website/src/lib/docs/de/map-controls.mdx      | 12 +++---
 website/src/lib/docs/de/menu/file.mdx         |  2 +-
 website/src/lib/docs/de/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/de/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/el/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/el/home/funding.mdx      |  2 +-
 website/src/lib/docs/el/home/translation.mdx  | 10 ++---
 website/src/lib/docs/el/integration.mdx       |  4 +-
 website/src/lib/docs/el/map-controls.mdx      | 12 +++---
 website/src/lib/docs/el/menu/settings.mdx     |  6 +--
 website/src/lib/docs/el/toolbar/clean.mdx     |  6 +--
 website/src/lib/docs/el/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/el/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/es/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/es/home/funding.mdx      |  2 +-
 website/src/lib/docs/es/integration.mdx       |  4 +-
 website/src/lib/docs/es/map-controls.mdx      | 12 +++---
 website/src/lib/docs/es/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/es/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/eu/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/eu/home/funding.mdx      |  3 +-
 website/src/lib/docs/eu/integration.mdx       |  4 +-
 website/src/lib/docs/eu/map-controls.mdx      | 12 +++---
 website/src/lib/docs/eu/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/eu/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/fi/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/fi/home/funding.mdx      |  2 +-
 website/src/lib/docs/fi/integration.mdx       |  4 +-
 website/src/lib/docs/fi/map-controls.mdx      | 12 +++---
 website/src/lib/docs/fi/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/fi/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/fr/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/fr/home/funding.mdx      |  2 +-
 website/src/lib/docs/fr/integration.mdx       |  4 +-
 website/src/lib/docs/fr/map-controls.mdx      | 12 +++---
 website/src/lib/docs/fr/menu/file.mdx         |  2 +-
 website/src/lib/docs/fr/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/fr/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/he/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/he/home/funding.mdx      |  2 +-
 website/src/lib/docs/he/integration.mdx       |  4 +-
 website/src/lib/docs/he/map-controls.mdx      | 12 +++---
 website/src/lib/docs/he/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/he/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/hu/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/hu/home/funding.mdx      |  3 +-
 website/src/lib/docs/hu/integration.mdx       |  4 +-
 website/src/lib/docs/hu/map-controls.mdx      | 12 +++---
 website/src/lib/docs/hu/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/hu/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/id/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/id/home/funding.mdx      |  2 +-
 website/src/lib/docs/id/integration.mdx       |  4 +-
 website/src/lib/docs/id/map-controls.mdx      | 12 +++---
 website/src/lib/docs/id/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/id/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/it/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/it/home/funding.mdx      |  2 +-
 website/src/lib/docs/it/integration.mdx       |  4 +-
 website/src/lib/docs/it/map-controls.mdx      | 12 +++---
 website/src/lib/docs/it/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/it/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/ko/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/ko/home/funding.mdx      |  2 +-
 website/src/lib/docs/ko/integration.mdx       |  4 +-
 website/src/lib/docs/ko/map-controls.mdx      | 12 +++---
 website/src/lib/docs/ko/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/ko/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/lt/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/lt/home/funding.mdx      |  2 +-
 website/src/lib/docs/lt/integration.mdx       |  4 +-
 website/src/lib/docs/lt/map-controls.mdx      | 12 +++---
 website/src/lib/docs/lt/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/lt/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/lv/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/lv/home/funding.mdx      |  2 +-
 website/src/lib/docs/lv/integration.mdx       |  4 +-
 website/src/lib/docs/lv/map-controls.mdx      | 12 +++---
 website/src/lib/docs/lv/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/lv/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/nl/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/nl/integration.mdx       |  4 +-
 website/src/lib/docs/nl/map-controls.mdx      | 12 +++---
 website/src/lib/docs/nl/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/nl/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/no/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/no/home/funding.mdx      |  2 +-
 website/src/lib/docs/no/integration.mdx       |  4 +-
 website/src/lib/docs/no/map-controls.mdx      | 12 +++---
 website/src/lib/docs/no/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/no/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/pl/faq.mdx               |  6 +--
 website/src/lib/docs/pl/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/pl/getting-started.mdx   | 12 +++---
 website/src/lib/docs/pl/home/funding.mdx      |  4 +-
 website/src/lib/docs/pl/home/translation.mdx  |  6 +--
 website/src/lib/docs/pl/integration.mdx       |  4 +-
 website/src/lib/docs/pl/map-controls.mdx      | 38 +++++++++--------
 website/src/lib/docs/pl/menu/file.mdx         | 32 +++++++-------
 website/src/lib/docs/pl/menu/settings.mdx     |  8 ++--
 website/src/lib/docs/pl/menu/view.mdx         | 18 ++++----
 website/src/lib/docs/pl/toolbar/elevation.mdx |  6 +--
 website/src/lib/docs/pl/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/pl/toolbar/routing.mdx   |  6 +--
 website/src/lib/docs/pl/toolbar/scissors.mdx  |  2 +-
 website/src/lib/docs/pl/toolbar/time.mdx      | 10 ++---
 .../src/lib/docs/pt-BR/files-and-stats.mdx    | 21 +++++-----
 website/src/lib/docs/pt-BR/home/funding.mdx   |  2 +-
 website/src/lib/docs/pt-BR/integration.mdx    |  4 +-
 website/src/lib/docs/pt-BR/map-controls.mdx   | 12 +++---
 website/src/lib/docs/pt-BR/menu/file.mdx      |  2 +-
 .../src/lib/docs/pt-BR/toolbar/elevation.mdx  |  4 +-
 website/src/lib/docs/pt-BR/toolbar/merge.mdx  |  8 ++++
 website/src/lib/docs/pt/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/pt/home/funding.mdx      |  2 +-
 website/src/lib/docs/pt/integration.mdx       |  4 +-
 website/src/lib/docs/pt/map-controls.mdx      | 12 +++---
 website/src/lib/docs/pt/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/pt/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/ro/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/ro/home/funding.mdx      |  2 +-
 website/src/lib/docs/ro/integration.mdx       |  4 +-
 website/src/lib/docs/ro/map-controls.mdx      | 12 +++---
 website/src/lib/docs/ro/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/ro/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/ru/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/ru/home/funding.mdx      |  2 +-
 website/src/lib/docs/ru/integration.mdx       |  4 +-
 website/src/lib/docs/ru/map-controls.mdx      | 12 +++---
 website/src/lib/docs/ru/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/ru/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/sr/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/sr/home/funding.mdx      |  2 +-
 website/src/lib/docs/sr/integration.mdx       |  4 +-
 website/src/lib/docs/sr/map-controls.mdx      | 12 +++---
 website/src/lib/docs/sr/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/sr/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/sv/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/sv/home/funding.mdx      |  2 +-
 website/src/lib/docs/sv/integration.mdx       |  4 +-
 website/src/lib/docs/sv/map-controls.mdx      | 13 +++---
 website/src/lib/docs/sv/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/sv/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/th/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/th/home/funding.mdx      |  2 +-
 website/src/lib/docs/th/integration.mdx       |  4 +-
 website/src/lib/docs/th/map-controls.mdx      | 12 +++---
 website/src/lib/docs/th/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/th/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/tr/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/tr/home/funding.mdx      |  2 +-
 website/src/lib/docs/tr/integration.mdx       |  4 +-
 website/src/lib/docs/tr/map-controls.mdx      | 11 +++--
 website/src/lib/docs/tr/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/tr/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/uk/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/uk/home/funding.mdx      |  5 ++-
 website/src/lib/docs/uk/home/translation.mdx  |  2 +-
 website/src/lib/docs/uk/integration.mdx       |  4 +-
 website/src/lib/docs/uk/map-controls.mdx      | 12 +++---
 website/src/lib/docs/uk/menu/file.mdx         |  2 +-
 website/src/lib/docs/uk/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/uk/toolbar/merge.mdx     |  8 ++++
 website/src/lib/docs/vi/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/vi/home/funding.mdx      |  2 +-
 website/src/lib/docs/vi/integration.mdx       |  4 +-
 website/src/lib/docs/vi/map-controls.mdx      | 12 +++---
 website/src/lib/docs/vi/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/vi/toolbar/merge.mdx     |  8 ++++
 .../src/lib/docs/zh-HK/files-and-stats.mdx    | 17 ++++----
 website/src/lib/docs/zh-HK/home/funding.mdx   |  2 +-
 website/src/lib/docs/zh-HK/integration.mdx    |  4 +-
 website/src/lib/docs/zh-HK/map-controls.mdx   | 12 +++---
 .../src/lib/docs/zh-HK/toolbar/elevation.mdx  |  4 +-
 website/src/lib/docs/zh-HK/toolbar/merge.mdx  |  8 ++++
 website/src/lib/docs/zh/files-and-stats.mdx   | 17 ++++----
 website/src/lib/docs/zh/home/funding.mdx      |  2 +-
 website/src/lib/docs/zh/integration.mdx       |  4 +-
 website/src/lib/docs/zh/map-controls.mdx      | 12 +++---
 website/src/lib/docs/zh/toolbar/elevation.mdx |  4 +-
 website/src/lib/docs/zh/toolbar/merge.mdx     |  8 ++++
 website/src/locales/be.json                   | 30 +++++++++----
 website/src/locales/ca.json                   | 38 +++++++++++------
 website/src/locales/cs.json                   | 30 +++++++++----
 website/src/locales/da.json                   | 30 +++++++++----
 website/src/locales/de.json                   | 42 ++++++++++++-------
 website/src/locales/el.json                   | 30 +++++++++----
 website/src/locales/es.json                   | 30 +++++++++----
 website/src/locales/eu.json                   | 32 +++++++++-----
 website/src/locales/fi.json                   | 30 +++++++++----
 website/src/locales/fr.json                   | 30 +++++++++----
 website/src/locales/he.json                   | 30 +++++++++----
 website/src/locales/hu.json                   | 42 ++++++++++++-------
 website/src/locales/id.json                   | 32 +++++++++-----
 website/src/locales/it.json                   | 36 ++++++++++------
 website/src/locales/ko.json                   | 30 +++++++++----
 website/src/locales/lt.json                   | 30 +++++++++----
 website/src/locales/lv.json                   | 30 +++++++++----
 website/src/locales/nl.json                   | 32 +++++++++-----
 website/src/locales/no.json                   | 36 ++++++++++------
 website/src/locales/pl.json                   | 34 ++++++++++-----
 website/src/locales/pt-BR.json                | 30 +++++++++----
 website/src/locales/pt.json                   | 30 +++++++++----
 website/src/locales/ro.json                   | 30 +++++++++----
 website/src/locales/ru.json                   | 30 +++++++++----
 website/src/locales/sr.json                   | 30 +++++++++----
 website/src/locales/sv.json                   | 30 +++++++++----
 website/src/locales/th.json                   | 30 +++++++++----
 website/src/locales/tr.json                   | 30 +++++++++----
 website/src/locales/uk.json                   | 30 +++++++++----
 website/src/locales/vi.json                   | 30 +++++++++----
 website/src/locales/zh-HK.json                | 30 +++++++++----
 website/src/locales/zh.json                   | 30 +++++++++----
 242 files changed, 1690 insertions(+), 1010 deletions(-)

diff --git a/website/src/lib/docs/be/files-and-stats.mdx b/website/src/lib/docs/be/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/be/files-and-stats.mdx
+++ b/website/src/lib/docs/be/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/be/home/funding.mdx b/website/src/lib/docs/be/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/be/home/funding.mdx
+++ b/website/src/lib/docs/be/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/be/integration.mdx b/website/src/lib/docs/be/integration.mdx
index 689ffb6de..e09b4756e 100644
--- a/website/src/lib/docs/be/integration.mdx
+++ b/website/src/lib/docs/be/integration.mdx
@@ -13,8 +13,8 @@ title: Інтэграцыя
 
 Усё, што вам трэба, гэта:
 
-1. <a href="https://account.mapbox.com/auth/signup" target="_blank">Ключ доступу Mapbox</a> для загрузкі карты і
-2. Файлы GPX, размешчаныя на вашым серверы або на Google Drive, або даступныя праз публічны URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Затым вы можаце пагуляць з канфігуратарам ніжэй, каб наладзіць сваю карту і стварыць адпаведны HTML-код.
 
diff --git a/website/src/lib/docs/be/map-controls.mdx b/website/src/lib/docs/be/map-controls.mdx
index 5aa77b9ef..1ab0793ab 100644
--- a/website/src/lib/docs/be/map-controls.mdx
+++ b/website/src/lib/docs/be/map-controls.mdx
@@ -56,10 +56,12 @@ These controls allow you to navigate the map, zoom in and out, and switch betwee
 - **Кропкі цікавасці** можна дадаць на карту, каб паказаць розныя катэгорыі месцаў, такіх як крамы, рэстараны або жыллё.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        Навядзіце курсор мышы на карту, каб паказаць накладанне <a href="https://hiking.waymarkedtrails.org" target="_blank">Пешаходных Сцежак</a> на базавай карце <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a>.
-    </span>
+<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.
+
+</span>
 </div>
 
 Вялікая калекцыя глабальных і лакальных базавых карт і накладанняў даступная ў **gpx.studio**, а таксама выбар катэгорый кропак цікавасці.
@@ -67,4 +69,4 @@ These controls allow you to navigate the map, zoom in and out, and switch betwee
 
 У гэтых наладах вы таксама можаце кіраваць непразрыстасцю накладанняў.
 
-Для прасунутых карыстальнікаў можна дадаваць карыстальніцкія базавыя карты і накладкі, дадаўшы URL-адрасы <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a> або <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">JSON у стылі Mapbox</a>.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/be/toolbar/elevation.mdx b/website/src/lib/docs/be/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/be/toolbar/merge.mdx b/website/src/lib/docs/be/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/be/toolbar/merge.mdx
+++ b/website/src/lib/docs/be/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/ca/files-and-stats.mdx b/website/src/lib/docs/ca/files-and-stats.mdx
index 1efe9ccd4..fd2aef495 100644
--- a/website/src/lib/docs/ca/files-and-stats.mdx
+++ b/website/src/lib/docs/ca/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Fitxers i estadístiques
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ També pots utilitzar la rodeta del ratolí per apropar o allunyar el perfil d'e
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Dades addicionals
diff --git a/website/src/lib/docs/ca/home/funding.mdx b/website/src/lib/docs/ca/home/funding.mdx
index bea155a63..09431a551 100644
--- a/website/src/lib/docs/ca/home/funding.mdx
+++ b/website/src/lib/docs/ca/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Ajuda a mantenir aquesta pàgina web gratuïta (i sense anuncis)
 
 Cada cop que afegeixes o mous un punt GPS, els nostres servidors calculen la millor ruta possible.
-També utilitzen l'API de <a href="https://mapbox.com" target="_blank">Mapbox</a> per ensenyar mapes bonics, donar informació sobre l'altitud i permetre la cerca de llocs d'interès.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Desafortunadament, això és car.
 Si gaudeixes aquesta eina i la trobes valuosa, si us plau, considera fer una petita donació per ajudar a mantenir la pàgina web gratuïta i sense anuncis.
diff --git a/website/src/lib/docs/ca/integration.mdx b/website/src/lib/docs/ca/integration.mdx
index 66e218875..1b1f88789 100644
--- a/website/src/lib/docs/ca/integration.mdx
+++ b/website/src/lib/docs/ca/integration.mdx
@@ -13,8 +13,8 @@ Pots utilitzar **gpx.studio** per crear mapes que mostrin els teus arxius GPX i
 
 Tot el que necessites és:
 
-1. Un <a href="https://account.mapbox.com/auth/signup" target="_blank"> token d'accés a Mapbox</a> per carregar el mapa i
-2. Arxius GPX allotjats en el teu servidor, a Google Drive o accessibles a través d'una URL pública.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Aleshores pots jugar amb el configurador de sota per personalitzar el teu mapa i generar el corresponent codi HTML.
 
diff --git a/website/src/lib/docs/ca/map-controls.mdx b/website/src/lib/docs/ca/map-controls.mdx
index a429295ba..eebd771e6 100644
--- a/website/src/lib/docs/ca/map-controls.mdx
+++ b/website/src/lib/docs/ca/map-controls.mdx
@@ -55,8 +55,13 @@ El botó de capa de mapa permet canviar entre diferents mapes base i alternar ca
 - Les **Capes sobreposades** són capes addicionals que es poden mostrar sobre el mapa base per proporcionar informació complementària.
 - Els **Punts d'interès** es poden afegir al mapa per mostrar diferents categories de llocs, com botigues, restaurants o allotjaments.
 
-<div class="flex flex-col items-center"><DocsLayers /><span class="text-sm text-center mt-2">Situa el cursor sobre el mapa per mostrar la capa <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> sobreposada sobre del <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> mapa base.
-    </span>
+<div class="flex flex-col items-center">
+<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.
+
+</span>
 </div>
 
 Una gran col·lecció de mapes i capes sobreposades globals i locals està disponible a **gpx.studio**, així com una selecció de categories de punts d'interès.
@@ -64,4 +69,4 @@ Poden activar-se en el [configuració de capes del mapa](./menu/settings).
 
 En aquests ajustaments pots gestionar l'opacitat de les capes sobreposades.
 
-Per a usuaris avançats és possible afegir mapes base i sobreposicions personalitzades proporcionant <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, o <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">JSON tipus Mapbox</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/ca/menu/file.mdx b/website/src/lib/docs/ca/menu/file.mdx
index 508a7d68d..17b5f5449 100644
--- a/website/src/lib/docs/ca/menu/file.mdx
+++ b/website/src/lib/docs/ca/menu/file.mdx
@@ -29,13 +29,13 @@ Pots arrossegar y deixar arxius directament des del seu sistema d'arxius cap a l
 
 Crear una còpia dels arxius seleccionats.
 
-### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete
+### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Esborra
 
-Delete the currently selected files.
+Esborra l'arxiu seleccinat.
 
-### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete all
+### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Esborra-ho tot
 
-Delete all files.
+Esborra tots els fitxers.
 
 ### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Exportar...
 
diff --git a/website/src/lib/docs/ca/toolbar/elevation.mdx b/website/src/lib/docs/ca/toolbar/elevation.mdx
index dbfe6214e..8cd217c69 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>
 
-Dades d'elevació subministrades per <a href="https://mapbox.com" target="_blank">Mapbox</a>.
-Pots aprendre més sobre els seus orígens i precisió en la <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentació</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/ca/toolbar/merge.mdx b/website/src/lib/docs/ca/toolbar/merge.mdx
index 8f6cf8e8d..0711d0326 100644
--- a/website/src/lib/docs/ca/toolbar/merge.mdx
+++ b/website/src/lib/docs/ca/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Fusionar
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Per utilitzar aquesta eina, s'ha de [seleccionar](../files-and-stats) múltiples
 - La segona opció es pot utilitzar per a crear o gestionar arxius amb múltiples [tracs o segments](../gpx).
   Fusionar arxius (o tracs) crearà un sol arxiu (o trac) que contindrà tots els tracs (o segments) seleccionats.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/cs/files-and-stats.mdx b/website/src/lib/docs/cs/files-and-stats.mdx
index 89ac2d726..4caa7fcd9 100644
--- a/website/src/lib/docs/cs/files-and-stats.mdx
+++ b/website/src/lib/docs/cs/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Soubory a statistiky
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ Pomocí kolečka myši můžete také výškový profil přiblížit a oddálit
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Doplňující údaje
diff --git a/website/src/lib/docs/cs/home/funding.mdx b/website/src/lib/docs/cs/home/funding.mdx
index e55c5f2fe..23aa5dd4a 100644
--- a/website/src/lib/docs/cs/home/funding.mdx
+++ b/website/src/lib/docs/cs/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Pomozte udržet web zdarma (a bez reklam)
 
 Vždy, když přidáte nebo přesunete GPS body, naše servery vypočítají nejlepší cestu po silniční síti.
-Používáme také API z <a href="https://mapbox.com" target="_blank">Mapboxu</a> pro zobrazení krásných map, získání dat o nadmořské výšce a vyhledávání míst.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Bohužel, to vše je nákladné.
 Pokud rádi používáte tento nástroj a zdá se vám hodnotný, zvažte prosím malý příspěvek k udržení webu zdarma a bez reklam.
diff --git a/website/src/lib/docs/cs/integration.mdx b/website/src/lib/docs/cs/integration.mdx
index 3c1b91ed3..2cd8e9c3b 100644
--- a/website/src/lib/docs/cs/integration.mdx
+++ b/website/src/lib/docs/cs/integration.mdx
@@ -13,8 +13,8 @@ Pomocí **gpx.studio** můžete vytvářet mapy se zobrazením souborů GPX a vk
 
 Vše, co potřebujete, je:
 
-1. <a href="https://account.mapbox.com/auth/signup" target="_blank">Přístupový token Mapboxu</a> k načtení mapy,
-2. Soubory GPX umístěné na vašem serveru nebo na Disku Google, nebo přístupné prostřednictvím veřejné adresy URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 V níže zobrazeném konfigurátoru si pak můžete mapu přizpůsobit a vygenerovat odpovídající kód HTML.
 
diff --git a/website/src/lib/docs/cs/map-controls.mdx b/website/src/lib/docs/cs/map-controls.mdx
index 8fece1038..7bd5fdd05 100644
--- a/website/src/lib/docs/cs/map-controls.mdx
+++ b/website/src/lib/docs/cs/map-controls.mdx
@@ -56,10 +56,12 @@ Tlačítko mapové vrstvy umožňuje přepínat mezi různými podkladovými map
 - **Body zájmu** lze přidat do mapy a zobrazit tak různé kategorie míst, jako jsou obchody, restaurace nebo ubytování.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        Po najetí myší nad mapu se zobrazí překryv<a href="https://hiking.waymarkedtrails.org" target="_blank">značených stezek pro pěší turistiku</a> na podkladové mapě <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a>.
-    </span>
+<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.
+
+</span>
 </div>
 
 V **gpx.studio** je k dispozici rozsáhlá sbírka globálních a místních podkladových map a překryvů a také řada kategorií bodů zájmu.
@@ -67,4 +69,4 @@ Lze je povolit v nabídce [nastavení mapových vrstev](./menu/settings).
 
 V tomto nastavení můžete také spravovat neprůhlednost překryvů.
 
-Pokročilí uživatelé mohou přidávat vlastní podkladové mapy a překryvy pomocí <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a> nebo URL <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox stylu JSON</a>.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/cs/toolbar/elevation.mdx b/website/src/lib/docs/cs/toolbar/elevation.mdx
index 61df1f3d1..184430780 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>
 
-Údaje o nadmořské výšce poskytuje <a href="https://mapbox.com" target="_blank">Mapbox</a>.
-Více informací o jejich původu a přesnosti najdete v <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">dokumentaci</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/cs/toolbar/merge.mdx b/website/src/lib/docs/cs/toolbar/merge.mdx
index 821213601..91c90c363 100644
--- a/website/src/lib/docs/cs/toolbar/merge.mdx
+++ b/website/src/lib/docs/cs/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Sloučit
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Chcete-li použít tento nástroj, musíte [vybrat](../files-and-stats) více so
 - Druhá možnost může být použita k vytvoření nebo správě souborů s více [trasami nebo segmenty](../gpx).
   Sloučením souborů (nebo tras) vznikne jeden soubor (nebo trasa) obsahující všechny trasy (nebo úseky) z výběru.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/da/files-and-stats.mdx b/website/src/lib/docs/da/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/da/files-and-stats.mdx
+++ b/website/src/lib/docs/da/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/da/home/funding.mdx b/website/src/lib/docs/da/home/funding.mdx
index 4b8cfdc14..90ea86b65 100644
--- a/website/src/lib/docs/da/home/funding.mdx
+++ b/website/src/lib/docs/da/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/da/integration.mdx b/website/src/lib/docs/da/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/da/integration.mdx
+++ b/website/src/lib/docs/da/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/da/map-controls.mdx b/website/src/lib/docs/da/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/da/map-controls.mdx
+++ b/website/src/lib/docs/da/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/da/toolbar/elevation.mdx b/website/src/lib/docs/da/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/da/toolbar/merge.mdx b/website/src/lib/docs/da/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/da/toolbar/merge.mdx
+++ b/website/src/lib/docs/da/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/de/files-and-stats.mdx b/website/src/lib/docs/de/files-and-stats.mdx
index 7a35d45bb..3e6949a27 100644
--- a/website/src/lib/docs/de/files-and-stats.mdx
+++ b/website/src/lib/docs/de/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Dateien und Statistiken
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ Sie können auch das Mausrad verwenden, um auf dem Höhenprofil heranzuzoomen un
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Zusätzliche Daten
diff --git a/website/src/lib/docs/de/home/funding.mdx b/website/src/lib/docs/de/home/funding.mdx
index 72af39d7d..6fec1e0ee 100644
--- a/website/src/lib/docs/de/home/funding.mdx
+++ b/website/src/lib/docs/de/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Helfen Sie, die Website kostenlos (und werbefrei) zu erhalten
 
 Jedes Mal, wenn Sie GPS-Punkte hinzufügen oder verschieben, berechnen unsere Server die beste Route im Straßennetz.
-Wir verwenden auch APIs von <a href="https://mapbox.com" target="_blank">Mapbox</a>, um schöne Karten anzuzeigen, Höhendaten abzurufen und Ihnen die Suche nach Orten zu ermöglichen.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Leider ist dies mit hohen Kosten verbunden.
 Wenn Sie dieses Tool gerne verwenden und es wertvoll finden, erwägen Sie bitte eine kleine Spende, um die Website kostenlos und werbefrei zu halten.
diff --git a/website/src/lib/docs/de/home/mapbox.mdx b/website/src/lib/docs/de/home/mapbox.mdx
index 6c4372a89..4ab8f6267 100644
--- a/website/src/lib/docs/de/home/mapbox.mdx
+++ b/website/src/lib/docs/de/home/mapbox.mdx
@@ -1,5 +1,5 @@
-Mapbox ist das Unternehmen, das einige der schönen Karten auf dieser Website zur Verfügung stellt.
-Sie entwickeln auch die <a href="https://github.com/mapbox/mapbox-gl-js" target="_blank">Karten-Engine</a> welche **gpx.studio** unterstützt.
+Mapbox stellt einige der auf dieser Website verwendeten Karten bereit.
+Sie entwickeln auch die <a href="https://github.com/mapbox/mapbox-gl-js" target="_blank">Karten-Engine</a>, die **gpx.studio** unterstützt.
 
-Wir sind äußerst glücklich und dankbar, Teil ihres <a href="https://mapbox.com/community" target="_blank">Community</a> Programms zu sein, das gemeinnützige Organisationen, Bildungseinrichtungen und Organisationen mit positivem Einfluss unterstützt.
+Wir sind froh und dankbar, Teil ihres <a href="https://mapbox.com/community" target="_blank">Community</a> Programms zu sein, das gemeinnützige Organisationen, Bildungseinrichtungen und Organisationen unterstützt.
 Diese Partnerschaft ermöglicht es **gpx.studio**, von den Mapbox-Tools zu ermäßigten Preisen zu profitieren, was erheblich zur finanziellen Tragfähigkeit des Projekts beiträgt und es uns ermöglicht, die bestmögliche Benutzererfahrung zu bieten.
diff --git a/website/src/lib/docs/de/integration.mdx b/website/src/lib/docs/de/integration.mdx
index d366fc8db..6206d6b9d 100644
--- a/website/src/lib/docs/de/integration.mdx
+++ b/website/src/lib/docs/de/integration.mdx
@@ -13,8 +13,8 @@ Du kannst **gpx.studio** verwenden, um Karten zu erstellen, die deine GPX-Dateie
 
 Alles was Sie brauchen:
 
-1. Eine <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox Zugriffstoken</a> zum Laden der Karte, und
-2. GPX-Dateien, die auf Ihrem Server oder Google Drive gehostet werden oder über eine öffentliche URL erreichbar sind.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Sie können dann mit dem Konfigurator unten spielen, um Ihre Karte anzupassen und den entsprechenden HTML-Code zu generieren.
 
diff --git a/website/src/lib/docs/de/map-controls.mdx b/website/src/lib/docs/de/map-controls.mdx
index 01a532080..c3e3fdbcb 100644
--- a/website/src/lib/docs/de/map-controls.mdx
+++ b/website/src/lib/docs/de/map-controls.mdx
@@ -56,10 +56,12 @@ Mit der Schaltfläche Karten-Ebenen können Sie zwischen verschiedenen Basemaps
 - **Punkte von Interesse** können auf der Karte angezeigt werden, um verschiedene Kategorien von Orten wie Geschäfte, Restaurants oder Unterkünfte anzuzeigen.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        Fahren Sie über der Karte, um die <a href="https://hiking.waymarkedtrails.org" target="_blank">Wegmarkierte Wanderwege</a> Overlay oben auf die <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> Basemap anzuzeigen.
-    </span>
+<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.
+
+</span>
 </div>
 
 Eine große Sammlung globaler und lokaler Basemaps und Overlays ist im **gpx.studio** sowie eine Auswahl von Point-of-Interest Kategorien verfügbar.
@@ -67,4 +69,4 @@ Sie können im [Einstellungsdialog für die Kartenlayer Einstellungen](./menu/se
 
 In diesen Einstellungen können Sie auch die Deckkraft der Overlays verwalten.
 
-Für fortgeschrittene Benutzer ist es möglich, benutzerdefinierte Basemaps und Overlays durch die Bereitstellung von <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>hinzuzufügen, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>oder <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox Stil JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/de/menu/file.mdx b/website/src/lib/docs/de/menu/file.mdx
index dd38d8252..67c28c7de 100644
--- a/website/src/lib/docs/de/menu/file.mdx
+++ b/website/src/lib/docs/de/menu/file.mdx
@@ -33,7 +33,7 @@ Erstelle eine Kopie der aktuell ausgewählten Dateien.
 
 Delete the currently selected files.
 
-### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete all
+### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Lösche alles
 
 Delete all files.
 
diff --git a/website/src/lib/docs/de/toolbar/elevation.mdx b/website/src/lib/docs/de/toolbar/elevation.mdx
index 9ace7b674..02cd3c371 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>
 
-Höhendaten werden von <a href="https://mapbox.com" target="_blank">Mapbox</a> bereitgestellt.
-Du kannst mehr über den Ursprung und die Genauigkeit des Tools in der <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">Dokumentation</a> erfahren.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/de/toolbar/merge.mdx b/website/src/lib/docs/de/toolbar/merge.mdx
index bec625228..4a47e3468 100644
--- a/website/src/lib/docs/de/toolbar/merge.mdx
+++ b/website/src/lib/docs/de/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Zusammenfügen
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Um dieses Tool nutzen zu können, musst du [select](../files-and-stats) mehrere
 - Die zweite Option kann verwendet werden, um Dateien mit mehreren [Tracks oder Segments](../gpx) zu erstellen oder zu verwalten.
   Das Zusammenführen von Dateien (oder Tracks) führt zu einer einzigen Datei (oder Track), die alle Tracks (oder Segmente) aus der Auswahl enthält.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/el/files-and-stats.mdx b/website/src/lib/docs/el/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/el/files-and-stats.mdx
+++ b/website/src/lib/docs/el/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/el/home/funding.mdx b/website/src/lib/docs/el/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/el/home/funding.mdx
+++ b/website/src/lib/docs/el/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/el/home/translation.mdx b/website/src/lib/docs/el/home/translation.mdx
index 8615f7d5a..8d5fc5998 100644
--- a/website/src/lib/docs/el/home/translation.mdx
+++ b/website/src/lib/docs/el/home/translation.mdx
@@ -2,11 +2,11 @@
     import { Languages } from '@lucide/svelte';
 </script>
 
-## <Languages size="18" class="inline-block align-baseline" /> Translation
+## <Languages size="18" class="inline-block align-baseline" />Μετάφραση
 
-The website is translated by volunteers using a collaborative translation platform.
-You can contribute by adding or improving translations on our <a href="https://crowdin.com/project/gpxstudio" target="_blank">Crowdin project</a>.
+Αυτός ο ιστότοπος μεταφράζεται από εθελοντές μέσω μια πλατφόρμας συνεργατικής μετάφρασης.
+Μπορείτε να συνεισφέρετε προσθέτοντας ή βελτιώνοντας μεταφράσεις στο <a href="https://crowdin.com/project/gpxstudio" target="_blank"> Crowdin έργο</a>.
 
-If you would like to start translating into a new language, please <a href="#contact">get in touch</a>.
+Αν θέλετε να ξεκινήσετε μετάφραση μιας νέας γλώσσας, παρακαλώ <a href="#contact">επικοινωνήστε μαζί μας<a href="#contact">.
 
-Any help is greatly appreciated!
+Οποιαδήποτε βοήθεια εκτιμάται ιδιαίτερα!
diff --git a/website/src/lib/docs/el/integration.mdx b/website/src/lib/docs/el/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/el/integration.mdx
+++ b/website/src/lib/docs/el/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/el/map-controls.mdx b/website/src/lib/docs/el/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/el/map-controls.mdx
+++ b/website/src/lib/docs/el/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/el/menu/settings.mdx b/website/src/lib/docs/el/menu/settings.mdx
index 6fdf26cde..5e0d95b68 100644
--- a/website/src/lib/docs/el/menu/settings.mdx
+++ b/website/src/lib/docs/el/menu/settings.mdx
@@ -28,9 +28,9 @@ Change the language used in the interface.
 
 <DocsNote>
 
-You can contribute by adding or improving translations on our <a href="https://crowdin.com/project/gpxstudio" target="_blank">Crowdin project</a>.
-If you would like to start translating into a new language, please <a href="#contact">get in touch</a>.
-Any help is greatly appreciated!
+Μπορείτε να συνεισφέρετε προσθέτοντας ή βελτιώνοντας μεταφράσεις στο <a href="https://crowdin.com/project/gpxstudio" target="_blank"> Crowdin έργο</a>.
+Αν θέλετε να ξεκινήσετε μετάφραση μιας νέας γλώσσας, παρακαλώ <a href="#contact">επικοινωνήστε μαζί μας<a href="#contact">.
+Οποιαδήποτε βοήθεια εκτιμάται ιδιαίτερα!
 
 </DocsNote>
 
diff --git a/website/src/lib/docs/el/toolbar/clean.mdx b/website/src/lib/docs/el/toolbar/clean.mdx
index 5b98149fb..c3d4d4602 100644
--- a/website/src/lib/docs/el/toolbar/clean.mdx
+++ b/website/src/lib/docs/el/toolbar/clean.mdx
@@ -1,5 +1,5 @@
 ---
-title: Clean
+title: Καθαρισμός
 ---
 
 <script>
@@ -9,9 +9,9 @@ title: Clean
 
 # <SquareDashedMousePointer size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
 
-When the clean tool is selected, dragging the map will create a rectangular selection.
+Όταν επιλεχθεί το εργαλείο καθαρισμού, σέρνοντας το χάρτη δημιουργείται μια ορθογώνια επιλογή.
 
-Depending on the options selected in the dialog shown below, clicking the delete button will remove GPS points and/or [points of interest](../gpx) located either inside or outside the selection.
+Ανάλογα με τις επιλεγμένες ρυθμίσεις στο παράθυρο παρακάτω, πατώντας το κουμπί διαγραφής θα αφαιρεθούν σημεία GPS και/ή [σημεία ενδιαφέροντος](../gpx) που βρίσκονται είτε μέσα είτε έξω από την επιλογή.
 
 <div class="flex flex-row justify-center">
     <Clean class="text-foreground p-3 border rounded-md shadow-lg" />
diff --git a/website/src/lib/docs/el/toolbar/elevation.mdx b/website/src/lib/docs/el/toolbar/elevation.mdx
index 2cd6e4743..0b64d6f6c 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/el/toolbar/merge.mdx b/website/src/lib/docs/el/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/el/toolbar/merge.mdx
+++ b/website/src/lib/docs/el/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/es/files-and-stats.mdx b/website/src/lib/docs/es/files-and-stats.mdx
index 5349ea5e4..c1eaf7738 100644
--- a/website/src/lib/docs/es/files-and-stats.mdx
+++ b/website/src/lib/docs/es/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Archivos y estadísticas
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ Puede usar el ratón para acercar o alejar el perfil de elevación y moverse hac
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Datos adicionales
diff --git a/website/src/lib/docs/es/home/funding.mdx b/website/src/lib/docs/es/home/funding.mdx
index 292c7bc37..07ab634b4 100644
--- a/website/src/lib/docs/es/home/funding.mdx
+++ b/website/src/lib/docs/es/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Ayude a mantener este sitio gratis (y libre de anuncios)
 
 Cada vez que añade o mueve puntos GPS, nuestros servidores calculan la mejor ruta en la red de carreteras.
-También usamos APIs de <a href="https://mapbox.com" target="_blank">Mapbox</a> para mostrar hermosos mapas, obtener datos de elevación y permitirle buscar lugares.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Por desgracia, esto tiene un coste económico.
 Si disfruta usando esta herramienta y la encuentra valiosa, por favor considere hacer una pequeña donación para ayudar a mantener este sitio gratis y libre de anuncios.
diff --git a/website/src/lib/docs/es/integration.mdx b/website/src/lib/docs/es/integration.mdx
index ea521fbb0..32498bf96 100644
--- a/website/src/lib/docs/es/integration.mdx
+++ b/website/src/lib/docs/es/integration.mdx
@@ -13,8 +13,8 @@ Puede usar **gpx.studio** para crear mapas que muestren sus archivos GPX e integ
 
 Todo lo que necesita es:
 
-1. Un <a href="https://account.mapbox.com/auth/signup" target="_blank">token de acceso a Mapbox</a> para cargar el mapa, y
-2. Archivos GPX alojados en su servidor, en Google Drive o accesibles a través de una URL pública.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Luego puede jugar con el configurador de abajo para personalizar su mapa y generar el código HTML correspondiente.
 
diff --git a/website/src/lib/docs/es/map-controls.mdx b/website/src/lib/docs/es/map-controls.mdx
index 4c1fb3b2d..23b7c4ddb 100644
--- a/website/src/lib/docs/es/map-controls.mdx
+++ b/website/src/lib/docs/es/map-controls.mdx
@@ -56,10 +56,12 @@ El botón de capas de mapa le permite cambiar entre diferentes mapas bases y alt
 - Los **puntos de interés** se pueden añadir al mapa para mostrar diferentes categorías de lugares, como tiendas, restaurantes o alojamientos.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        Sitúe el cursor sobre el mapa para mostrar la capa <a href="https://hiking.waymarkedtrails.org" target="_blank">Rutas Señalizadas de senderismo</a> sobre el mapa base <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Exteriores</a>.
-    </span>
+<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>.
+
+</span>
 </div>
 
 Una gran colección de mapas y capas superpuestas globales y locales está disponible en **gpx.studio**, así como una selección de categorías de puntos de interés.
@@ -67,4 +69,4 @@ Pueden activarse en la [configuración de capas del mapa](./menu/settings).
 
 En estos ajustes, también puede administrar la opacidad de las capas superpuestas.
 
-Para los usuarios avanzados, es posible añadir mapas base y superposiciones personalizadas proporcionando <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a> o URLs <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">JSON estilo Mapbox</a>.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/es/toolbar/elevation.mdx b/website/src/lib/docs/es/toolbar/elevation.mdx
index 488242fcd..0a55ecd2b 100644
--- a/website/src/lib/docs/es/toolbar/elevation.mdx
+++ b/website/src/lib/docs/es/toolbar/elevation.mdx
@@ -18,7 +18,7 @@ Le permite añadir datos de desnivel a trazas y [puntos de interés](../gpx), o
 
 <DocsNote>
 
-Los datos de desnivel son proporcionados por <a href="https://mapbox.com" target="_blank">Mapbox</a>.
-Puede aprender más sobre su origen y precisión en la <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentación</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/es/toolbar/merge.mdx b/website/src/lib/docs/es/toolbar/merge.mdx
index 731e188ab..73f0d7cbb 100644
--- a/website/src/lib/docs/es/toolbar/merge.mdx
+++ b/website/src/lib/docs/es/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Combinar
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Para usar esta herramienta, necesita [seleccionar](../files-and-stats) múltiple
 - La segunda opción se puede usar para crear o gestionar archivos con múltiples [pistas o segmentos](../gpx).
   Combinar archivos (o pistas) dará como resultado un único archivo (o pista) que contendrá todas las pistas (o segmentos) de la selección.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/eu/files-and-stats.mdx b/website/src/lib/docs/eu/files-and-stats.mdx
index cf176e2a4..6798588b8 100644
--- a/website/src/lib/docs/eu/files-and-stats.mdx
+++ b/website/src/lib/docs/eu/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Fitxategiak eta estatistikak
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -83,19 +84,17 @@ Saguaren gurpila ere erabil dezakezu altueren profila handitzeko eta mugitzeko e
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Datu osagarriak
diff --git a/website/src/lib/docs/eu/home/funding.mdx b/website/src/lib/docs/eu/home/funding.mdx
index f6b0190ab..f3e44b9b5 100644
--- a/website/src/lib/docs/eu/home/funding.mdx
+++ b/website/src/lib/docs/eu/home/funding.mdx
@@ -4,7 +4,8 @@
 
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Lagundu mantentzen webgunea doan (eta propagandarik gabe)
 
-GPS puntuak gehitzen edo mugitzen dituzun bakoitzean, gure zerbitzariek bide sareko ibilbide onena kalkulatzen dute.<a href="https://mapbox.com" target="_blank">Mapbox</a>en APIak erabiltzen ditugu erakusteko mapa argiak, kota-datuak eskaintzeko eta ahalbidetzeko lekuen bilaketa.
+GPS puntuak gehitzen edo mugitzen dituzun bakoitzean, gure zerbitzariek bide sareko ibilbide onena kalkulatzen dute.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Tamalez, hau garestia da.
 Tresna hau erabiltzen baduzu eta baliotsua suertatzen bazaizu, kontuan hartu dohaintza txiki bat egitea webgunea doakoa eta iragarkirik gabe mantentzen laguntzeko.
diff --git a/website/src/lib/docs/eu/integration.mdx b/website/src/lib/docs/eu/integration.mdx
index 952c8f1a2..bca48afba 100644
--- a/website/src/lib/docs/eu/integration.mdx
+++ b/website/src/lib/docs/eu/integration.mdx
@@ -13,8 +13,8 @@ title: Integrazioa
 
 Behar duzun guztia hau da:
 
-1. <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox sarbiderako tokena</a> mapa kargatzeko, eta
-2. GPX fitxategiak zure zerbitzarian, hodeian, Google Drive-n edo eskuragarri URL publiko baten bidez.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Ondoren, konfiguratzailearekin jolastu dezakezu zure mapa pertsonalizatzeko eta dagokion HTML kodea sortzeko.
 
diff --git a/website/src/lib/docs/eu/map-controls.mdx b/website/src/lib/docs/eu/map-controls.mdx
index 46c47ecc1..047051e2d 100644
--- a/website/src/lib/docs/eu/map-controls.mdx
+++ b/website/src/lib/docs/eu/map-controls.mdx
@@ -56,10 +56,12 @@ Maparen geruzen botoiak mapa-oinarri desberdinen artean aldatzeko aukera ematen
 - **Interesguneak** mapan gehitu daiteke leku kategoria desberdinak erakusteko, hala nola dendak, jatetxeak edo ostatuak.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        Pasa maparen gainetik <a href="https://hiking.waymarkedtrails.org" target="_blank">mendiko bideak</a> ikusteko <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> mapa oinarriaren gainean.
-    </span>
+<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.
+
+</span>
 </div>
 
 Global eta tokiko mapa oinarri bilduma handia dago **gpx.studio**-n eskuragarri, bai eta interesguneen kategorien aukeraketa ere.
@@ -67,4 +69,4 @@ Global eta tokiko mapa oinarri bilduma handia dago **gpx.studio**-n eskuragarri,
 
 Ezarpen horietan, gainjartzeen opakutasuna ere kudeatu dezakezu.
 
-Erabiltzaile aurreratuetarako, mapa oinarri pertsonalizatuak gehitu daitezke <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank"> WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, edo <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox Style Json</a> URLak gehituz.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/eu/toolbar/elevation.mdx b/website/src/lib/docs/eu/toolbar/elevation.mdx
index 36dc12c65..2f479a25e 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>
 
-Altuera datuen iturria <a href="https://mapbox.com" target="_blank">Mapbox</a> da.
-Hauen jatorriaz edo xehetasunez informazio gehiago <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">dokumentazioan</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/eu/toolbar/merge.mdx b/website/src/lib/docs/eu/toolbar/merge.mdx
index 29c240061..c23098ef9 100644
--- a/website/src/lib/docs/eu/toolbar/merge.mdx
+++ b/website/src/lib/docs/eu/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Batu
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Tresna hau erabiltzeko [hautatu](../files-and-stats) behar duzu hainbat fitxateg
 - Bigarren aukera bat izan daiteke hainbat [arrasto edo segmentu](../gpx) biltzen duen fitxategiak sortzea edo kudeatzea.
   Fitxategiak (edo arrastoak) batzearen emaitza fitxategi (edo arrasto) bakarra sortzea da zeinak hautapenaren arrastoak (edo segmentuak) biltzen duena.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/fi/files-and-stats.mdx b/website/src/lib/docs/fi/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/fi/files-and-stats.mdx
+++ b/website/src/lib/docs/fi/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/fi/home/funding.mdx b/website/src/lib/docs/fi/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/fi/home/funding.mdx
+++ b/website/src/lib/docs/fi/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/fi/integration.mdx b/website/src/lib/docs/fi/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/fi/integration.mdx
+++ b/website/src/lib/docs/fi/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/fi/map-controls.mdx b/website/src/lib/docs/fi/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/fi/map-controls.mdx
+++ b/website/src/lib/docs/fi/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/fi/toolbar/elevation.mdx b/website/src/lib/docs/fi/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/fi/toolbar/merge.mdx b/website/src/lib/docs/fi/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/fi/toolbar/merge.mdx
+++ b/website/src/lib/docs/fi/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/fr/files-and-stats.mdx b/website/src/lib/docs/fr/files-and-stats.mdx
index 614501764..84c465a8f 100644
--- a/website/src/lib/docs/fr/files-and-stats.mdx
+++ b/website/src/lib/docs/fr/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Fichiers et statistiques
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ Vous pouvez également utiliser la molette de la souris pour zoomer ou dézoomer
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Données supplémentaires
diff --git a/website/src/lib/docs/fr/home/funding.mdx b/website/src/lib/docs/fr/home/funding.mdx
index 39ac642d3..17b40c945 100644
--- a/website/src/lib/docs/fr/home/funding.mdx
+++ b/website/src/lib/docs/fr/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Aidez à garder le site gratuit (et sans pub)
 
 Chaque fois que vous ajoutez ou déplacez des points GPS, nos serveurs calculent le meilleur itinéraire sur le réseau routier.
-Nous utilisons également des services de <a href="https://mapbox.com" target="_blank">Mapbox</a> pour afficher de magnifiques cartes, récupérer des données d'altitude et vous permettre de rechercher des adresses.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Malheureusement, cela est coûteux.
 Si vous aimez utiliser cet outil et le trouvez utile, veuillez envisager de faire même un petit don pour aider à garder le site gratuit et sans pub.
diff --git a/website/src/lib/docs/fr/integration.mdx b/website/src/lib/docs/fr/integration.mdx
index 989e8c9c7..4bea3d31a 100644
--- a/website/src/lib/docs/fr/integration.mdx
+++ b/website/src/lib/docs/fr/integration.mdx
@@ -13,8 +13,8 @@ Vous pouvez utiliser **gpx.studio** pour créer des cartes affichant vos fichier
 
 Tout ce dont vous avez besoin est :
 
-1. Un <a href="https://account.mapbox.com/auth/signup" target="_blank">jeton d'accès Mapbox</a> pour charger la carte, et
-2. Un ou plusieurs fichiers GPX hébergés sur votre serveur ou sur Google Drive, ou accessibles via une URL publique.
+1. Un ou plusieurs fichiers GPX hébergés sur votre serveur ou sur Google Drive, ou accessibles via une URL publique ;
+2. _Optionnel :_ une <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">clé MapTiler</a> pour afficher les cartes MapTiler.
 
 Vous pouvez ensuite jouer avec le configurateur ci-dessous pour personnaliser votre carte et générer le code HTML correspondant.
 
diff --git a/website/src/lib/docs/fr/map-controls.mdx b/website/src/lib/docs/fr/map-controls.mdx
index 0085d14be..bb579a221 100644
--- a/website/src/lib/docs/fr/map-controls.mdx
+++ b/website/src/lib/docs/fr/map-controls.mdx
@@ -56,10 +56,12 @@ Le bouton des couches de la carte vous permet de basculer entre différents fond
 - Les **points d'intérêt** peuvent être ajoutés à la carte pour montrer différentes catégories d'endroits, comme les magasins, les restaurants ou les hébergements.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        Survolez la carte pour afficher la surcouche <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails Randonnée</a> par-dessus le fond de carte <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a>.
-    </span>
+<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>.
+
+</span>
 </div>
 
 Une grande collection de fonds de carte et de surcouches mondiales et locales est disponible dans **gpx.studio**, ainsi qu'une sélection de catégories de points d'intérêt.
@@ -67,4 +69,4 @@ Ceux-ci peuvent être activés dans la [fenêtre de configuration des couches de
 
 Dans ces paramètres, vous pouvez également gérer l'opacité des surcouches.
 
-Pour les utilisateurs expérimentés, il est possible d'ajouter des fonds de carte et des surcouches personnalisés en fournissant des URLs <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, ou <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a>.
+Pour les utilisateurs expérimentés, il est possible d'ajouter des fonds de carte et des surcouches personnalisés en fournissant des URLs <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, ou <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a>.
diff --git a/website/src/lib/docs/fr/menu/file.mdx b/website/src/lib/docs/fr/menu/file.mdx
index 78bd6a914..f86dda963 100644
--- a/website/src/lib/docs/fr/menu/file.mdx
+++ b/website/src/lib/docs/fr/menu/file.mdx
@@ -35,7 +35,7 @@ Supprimer les fichiers sélectionnés.
 
 ### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Supprimer tout
 
-Supprimer toutes les fichiers.
+Supprimer tous les fichiers.
 
 ### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Exporter...
 
diff --git a/website/src/lib/docs/fr/toolbar/elevation.mdx b/website/src/lib/docs/fr/toolbar/elevation.mdx
index 6f8227c6e..d115cd08c 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://mapbox.com" target="_blank">Mapbox</a>.
-Vous pouvez en apprendre plus sur leur origine et précision dans la <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/fr/toolbar/merge.mdx b/website/src/lib/docs/fr/toolbar/merge.mdx
index 3162161b3..81a920e7b 100644
--- a/website/src/lib/docs/fr/toolbar/merge.mdx
+++ b/website/src/lib/docs/fr/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Fusionner
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Pour utiliser cet outil, vous devez [sélectionner](../files-and-stats) plusieur
 - La deuxième option peut être utilisée pour créer ou gérer des fichiers avec plusieurs [pistes ou segments](../gpx).
   Fusionner des fichiers (ou des pistes) résultera en un seul fichier (ou piste) contenant toutes les pistes (ou tous les segments) de la sélection.
 
+<DocsNote>
+
+Les éléments sélectionnés sont fusionnés dans l'ordre dans lequel ils apparaissent dans la liste des fichiers.
+Vous pouvez réordonner les éléments par glisser-déposer si besoin.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/he/files-and-stats.mdx b/website/src/lib/docs/he/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/he/files-and-stats.mdx
+++ b/website/src/lib/docs/he/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/he/home/funding.mdx b/website/src/lib/docs/he/home/funding.mdx
index 8df430bfa..6cdfaf5ec 100644
--- a/website/src/lib/docs/he/home/funding.mdx
+++ b/website/src/lib/docs/he/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 בכל פעם שאתה מוסיף או מעביר נקודות GPS, השרתים שלנו מחשבים את המסלול הטוב ביותר ברשת הדרכים.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/he/integration.mdx b/website/src/lib/docs/he/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/he/integration.mdx
+++ b/website/src/lib/docs/he/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/he/map-controls.mdx b/website/src/lib/docs/he/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/he/map-controls.mdx
+++ b/website/src/lib/docs/he/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/he/toolbar/elevation.mdx b/website/src/lib/docs/he/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/he/toolbar/merge.mdx b/website/src/lib/docs/he/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/he/toolbar/merge.mdx
+++ b/website/src/lib/docs/he/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/hu/files-and-stats.mdx b/website/src/lib/docs/hu/files-and-stats.mdx
index 538088a54..df4f793cd 100644
--- a/website/src/lib/docs/hu/files-and-stats.mdx
+++ b/website/src/lib/docs/hu/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Fájlok és statisztikák
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ Az egérgörgővel is méretezheti a magassági profilt. Balra és jobbra mozogh
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/hu/home/funding.mdx b/website/src/lib/docs/hu/home/funding.mdx
index eac8aa262..c293f74da 100644
--- a/website/src/lib/docs/hu/home/funding.mdx
+++ b/website/src/lib/docs/hu/home/funding.mdx
@@ -4,7 +4,8 @@
 
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
-Minden alkalommal, amikor GPS-pontokat ad hozzá vagy mozgat, szervereink kiszámítják a legjobb útvonalat az úthálózaton.<a href="https://mapbox.com" target="_blank">Mapbox</a> API-jait használjuk a gyönyörű térképek megjelenítésére, a magassági adatok lekérésére és a helyek keresésére.
+Minden alkalommal, amikor GPS-pontokat ad hozzá vagy mozgat, szervereink kiszámítják a legjobb útvonalat az úthálózaton.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Sajnos ez magas költségű.
 Ha tetszik ez az alkalmazás, kérjük, fontoljon meg egy kis adományt, hogy a webhely továbbra is ingyenes és hirdetésmentes legyen.
diff --git a/website/src/lib/docs/hu/integration.mdx b/website/src/lib/docs/hu/integration.mdx
index 8368e062b..b1f005680 100644
--- a/website/src/lib/docs/hu/integration.mdx
+++ b/website/src/lib/docs/hu/integration.mdx
@@ -13,8 +13,8 @@ A **gpx.studio** segítségével létrehozhatja a GPX-fájlokat ábrázoló tér
 
 Minden amire szüksége van:
 
-1. Egy <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox hozzáférési token</a> a térkép betöltéséhez, és
-2. A szerverén vagy a Google Drive-on tárolt GPX-fájlok, vagy nyilvános URL-en keresztül érhetők el.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Ezután játszhat az alábbi konfigurátorral a térkép testreszabásához és a megfelelő HTML-kód létrehozásához.
 
diff --git a/website/src/lib/docs/hu/map-controls.mdx b/website/src/lib/docs/hu/map-controls.mdx
index 5e038774b..c8ee528bf 100644
--- a/website/src/lib/docs/hu/map-controls.mdx
+++ b/website/src/lib/docs/hu/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/hu/toolbar/elevation.mdx b/website/src/lib/docs/hu/toolbar/elevation.mdx
index a1776e703..4a87922c7 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>
 
-A magassági adatokat a <a href="https://mapbox.com" target="_blank">Mapbox</a> biztosítja.
-Eredetéről és pontosságáról a <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">dokumentációban</a> tudhat meg többet.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/hu/toolbar/merge.mdx b/website/src/lib/docs/hu/toolbar/merge.mdx
index 0dfe6bcaf..b55250cf2 100644
--- a/website/src/lib/docs/hu/toolbar/merge.mdx
+++ b/website/src/lib/docs/hu/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Egyesítés
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Az eszköz használatához [ki kell választania](../files-and-stats) több fáj
 - A második lehetőség több [sávot vagy szegmenst] tartalmazó fájlok létrehozására vagy kezelésére használható (../gpx).
   A fájlok (vagy útvonalak) egyesítése egyetlen fájlt (vagy útvonalat) eredményez, amely tartalmazza a kijelölés összes útvonalát (vagy szegmensét).
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/id/files-and-stats.mdx b/website/src/lib/docs/id/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/id/files-and-stats.mdx
+++ b/website/src/lib/docs/id/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/id/home/funding.mdx b/website/src/lib/docs/id/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/id/home/funding.mdx
+++ b/website/src/lib/docs/id/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/id/integration.mdx b/website/src/lib/docs/id/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/id/integration.mdx
+++ b/website/src/lib/docs/id/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/id/map-controls.mdx b/website/src/lib/docs/id/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/id/map-controls.mdx
+++ b/website/src/lib/docs/id/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/id/toolbar/elevation.mdx b/website/src/lib/docs/id/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/id/toolbar/merge.mdx b/website/src/lib/docs/id/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/id/toolbar/merge.mdx
+++ b/website/src/lib/docs/id/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/it/files-and-stats.mdx b/website/src/lib/docs/it/files-and-stats.mdx
index 9fc453316..aee3a17b8 100644
--- a/website/src/lib/docs/it/files-and-stats.mdx
+++ b/website/src/lib/docs/it/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: File e statistiche
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ Fare clic sul profilo per resettare la selezione.
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Dati aggiuntivi
diff --git a/website/src/lib/docs/it/home/funding.mdx b/website/src/lib/docs/it/home/funding.mdx
index 8a8771504..590483779 100644
--- a/website/src/lib/docs/it/home/funding.mdx
+++ b/website/src/lib/docs/it/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Aiuta a mantenere il sito gratuito (e senza pubblicità)
 
 Ogni volta che aggiungi o sposti i punti GPS, i nostri server calcolano il percorso migliore sulla rete stradale.
-Utilizziamo anche le API di <a href="https://mapbox.com" target="_blank">Mapbox</a> per visualizzare mappe stupende, recuperare i dati altimetrici e consentire la ricerca di luoghi.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Sfortunatamente, fare tutto ciò è costoso.
 Se ti piace utilizzare questo strumento e lo trovi utile, per favore considera di fare una piccola donazione per aiutare a mantenere il sito web gratuito e senza pubblicità.
diff --git a/website/src/lib/docs/it/integration.mdx b/website/src/lib/docs/it/integration.mdx
index 6e204fd99..a9fe52ee5 100644
--- a/website/src/lib/docs/it/integration.mdx
+++ b/website/src/lib/docs/it/integration.mdx
@@ -13,8 +13,8 @@ Puoi usare **gpx.studio** per creare delle mappe che mostrino i tuoi file GPX ed
 
 Tutto ciò di cui hai bisogno è:
 
-1. Un <a href="https://account.mapbox.com/auth/signup" target="_blank">token di accesso a Mapbox</a> per caricare la mappa, e
-2. Dei file GPX ospitati sul tuo server, su Google Drive, o accessibili tramite un URL pubblico.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Potrai quindi divertirti ad utilizzare il configuratore che trovi qua sotto per personalizzare la tua mappa e per generare il codice HTML corrispondente.
 
diff --git a/website/src/lib/docs/it/map-controls.mdx b/website/src/lib/docs/it/map-controls.mdx
index 7d756c1d7..0d3ad658c 100644
--- a/website/src/lib/docs/it/map-controls.mdx
+++ b/website/src/lib/docs/it/map-controls.mdx
@@ -56,10 +56,12 @@ Il pulsante dei livelli di mappa consente di passare da una basemap all'altra, e
 - **Punti di interesse** possono essere aggiunti alla mappa per mostrare diverse categorie di luoghi, come negozi, ristoranti, o alloggi.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        Passa sulla mappa per mostrare  <a href="https://hiking.waymarkedtrails.org" target="_blank">i sentieri escursionistici marcati</a> sulla <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 Una vasta collezione di basemaps e sovrapposizioni globali e locali è disponibile in **gpx.studio**, così come una selezione di categorie di punti di interesse.
@@ -67,4 +69,4 @@ Possono essere abilitati nella [finestra delle impostazioni dei livelli mappa](.
 
 In queste impostazioni è anche possibile gestire l'opacità delle sovrapposizioni.
 
-Per gli utenti avanzati, è possibile aggiungere basemaps personalizzati e sovrapposizioni fornendo <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a> o <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">JSON in stile Mapbox</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/it/toolbar/elevation.mdx b/website/src/lib/docs/it/toolbar/elevation.mdx
index d933a6103..54f096320 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>
 
-I dati altimertrici sono forniti da <a href="https://mapbox.com" target="_blank">Mapbox</a>.
-Puoi saperne di più sulla sua origine e accuratezza nella <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentazione</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/it/toolbar/merge.mdx b/website/src/lib/docs/it/toolbar/merge.mdx
index c6905f81c..efb3e506e 100644
--- a/website/src/lib/docs/it/toolbar/merge.mdx
+++ b/website/src/lib/docs/it/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Unisci
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Per utilizzare questo strumento, è necessario [selezionare](../files-and-stats)
 - La seconda opzione può essere utilizzata per creare o gestire file con più [tracce o segmenti](../gpx).
   L'unione di file (o tracce) comporterà un singolo file (o traccia) contenente tutte le tracce (o segmenti) dalla selezione.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/ko/files-and-stats.mdx b/website/src/lib/docs/ko/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/ko/files-and-stats.mdx
+++ b/website/src/lib/docs/ko/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/ko/home/funding.mdx b/website/src/lib/docs/ko/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/ko/home/funding.mdx
+++ b/website/src/lib/docs/ko/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/ko/integration.mdx b/website/src/lib/docs/ko/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/ko/integration.mdx
+++ b/website/src/lib/docs/ko/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/ko/map-controls.mdx b/website/src/lib/docs/ko/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/ko/map-controls.mdx
+++ b/website/src/lib/docs/ko/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/ko/toolbar/elevation.mdx b/website/src/lib/docs/ko/toolbar/elevation.mdx
index dfcafedf1..55e6d80ab 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/ko/toolbar/merge.mdx b/website/src/lib/docs/ko/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/ko/toolbar/merge.mdx
+++ b/website/src/lib/docs/ko/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/lt/files-and-stats.mdx b/website/src/lib/docs/lt/files-and-stats.mdx
index 7896cedb0..5f9bc49ee 100644
--- a/website/src/lib/docs/lt/files-and-stats.mdx
+++ b/website/src/lib/docs/lt/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Puslapis nerastas
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/lt/home/funding.mdx b/website/src/lib/docs/lt/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/lt/home/funding.mdx
+++ b/website/src/lib/docs/lt/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/lt/integration.mdx b/website/src/lib/docs/lt/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/lt/integration.mdx
+++ b/website/src/lib/docs/lt/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/lt/map-controls.mdx b/website/src/lib/docs/lt/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/lt/map-controls.mdx
+++ b/website/src/lib/docs/lt/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/lt/toolbar/elevation.mdx b/website/src/lib/docs/lt/toolbar/elevation.mdx
index 14aa8e098..2e997097b 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/lt/toolbar/merge.mdx b/website/src/lib/docs/lt/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/lt/toolbar/merge.mdx
+++ b/website/src/lib/docs/lt/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/lv/files-and-stats.mdx b/website/src/lib/docs/lv/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/lv/files-and-stats.mdx
+++ b/website/src/lib/docs/lv/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/lv/home/funding.mdx b/website/src/lib/docs/lv/home/funding.mdx
index 2d3ef3358..d28346144 100644
--- a/website/src/lib/docs/lv/home/funding.mdx
+++ b/website/src/lib/docs/lv/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/lv/integration.mdx b/website/src/lib/docs/lv/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/lv/integration.mdx
+++ b/website/src/lib/docs/lv/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/lv/map-controls.mdx b/website/src/lib/docs/lv/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/lv/map-controls.mdx
+++ b/website/src/lib/docs/lv/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/lv/toolbar/elevation.mdx b/website/src/lib/docs/lv/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/lv/toolbar/merge.mdx b/website/src/lib/docs/lv/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/lv/toolbar/merge.mdx
+++ b/website/src/lib/docs/lv/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/nl/files-and-stats.mdx b/website/src/lib/docs/nl/files-and-stats.mdx
index ff49af3b5..18809cdc7 100644
--- a/website/src/lib/docs/nl/files-and-stats.mdx
+++ b/website/src/lib/docs/nl/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Bestanden en statistieken
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ Je kunt het muiswiel ook gebruiken om in en uit te zoomen op het hoogte profiel,
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Aanvullende gegevens
diff --git a/website/src/lib/docs/nl/integration.mdx b/website/src/lib/docs/nl/integration.mdx
index 0d24b59d3..ead1345de 100644
--- a/website/src/lib/docs/nl/integration.mdx
+++ b/website/src/lib/docs/nl/integration.mdx
@@ -13,8 +13,8 @@ Je kunt **gpx.studio** gebruiken om kaarten te maken die je GPX bestanden laten
 
 Alles wat je nodig hebt is:
 
-1. Een <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> om de kaart te laden, en
-2. GPX-bestanden gehost op uw server of op Google Drive, of toegankelijk via een openbare URL.
+1. GPX-bestanden gehost op uw server of op Google Drive, of toegankelijk via een openbare URL;
+2. _Optioneel:_ een <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> om de MapTiler kaarten te laden.
 
 Je kunt dan met de onderstaande configurator spelen om de kaart aan te passen en de corresponderende HTML-code te genereren.
 
diff --git a/website/src/lib/docs/nl/map-controls.mdx b/website/src/lib/docs/nl/map-controls.mdx
index c6cbd396f..3cf8611e0 100644
--- a/website/src/lib/docs/nl/map-controls.mdx
+++ b/website/src/lib/docs/nl/map-controls.mdx
@@ -56,10 +56,12 @@ Met de kaartlagen knop kun je wisselen tussen verschillende basiskaarten, en kaa
 - **POI's (Interessante punten)** kunnen worden toegevoegd aan de kaart om verschillende categorieën plaatsen te tonen, zoals winkels, restaurants, of accommodaties.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-Beweeg boven de kaart om de <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> overlay te tonen bovenop de <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basiskaart.
-    </span>
+<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.
+
+</span>
 </div>
 
 Een grote verzameling van globale en lokale basiskaarten en lagen is beschikbaar in **gpx.studio**, evenals een aantal POI-categorieën.
@@ -67,4 +69,4 @@ Ze kunnen worden ingeschakeld in het [map layer settings dialoog](./menu/setting
 
 In deze instellingen kun je ook de transparantie van de lagen beheren.
 
-Voor gevorderde gebruikers is het mogelijk om aangepaste basiskaarten en lagen toe te voegen door <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, of <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/nl/toolbar/elevation.mdx b/website/src/lib/docs/nl/toolbar/elevation.mdx
index 16a72cd9e..0eff75966 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://mapbox.com" target="_blank">Mapbox</a>.
-Je kunt meer leren over de oorsprong en nauwkeurigheid in de <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentatie</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/nl/toolbar/merge.mdx b/website/src/lib/docs/nl/toolbar/merge.mdx
index d3f4edd3e..c6ec5808d 100644
--- a/website/src/lib/docs/nl/toolbar/merge.mdx
+++ b/website/src/lib/docs/nl/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Samenvoegen
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Om dit gereedschap te gebruiken, moet je [select](../files-and-stats) meerdere b
 - De tweede optie kan worden gebruikt om bestanden te maken of te beheren met meerdere [routes of segmenten](../gpx).
   Bestanden (of routes) samenvoegen resulteert in één enkel bestand (of route) met alle routes (of segmenten) uit de selectie.
 
+<DocsNote>
+
+Geselecteerde items worden samengevoegd in de volgorde waarin ze worden weergegeven in de lijst met bestanden.
+Herschik onderdelen door te slepen en te plakken indien nodig.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/no/files-and-stats.mdx b/website/src/lib/docs/no/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/no/files-and-stats.mdx
+++ b/website/src/lib/docs/no/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/no/home/funding.mdx b/website/src/lib/docs/no/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/no/home/funding.mdx
+++ b/website/src/lib/docs/no/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/no/integration.mdx b/website/src/lib/docs/no/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/no/integration.mdx
+++ b/website/src/lib/docs/no/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/no/map-controls.mdx b/website/src/lib/docs/no/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/no/map-controls.mdx
+++ b/website/src/lib/docs/no/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/no/toolbar/elevation.mdx b/website/src/lib/docs/no/toolbar/elevation.mdx
index f4b9fef0e..e4153ab4e 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/no/toolbar/merge.mdx b/website/src/lib/docs/no/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/no/toolbar/merge.mdx
+++ b/website/src/lib/docs/no/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/pl/faq.mdx b/website/src/lib/docs/pl/faq.mdx
index 9a64bbe94..4e2809fda 100644
--- a/website/src/lib/docs/pl/faq.mdx
+++ b/website/src/lib/docs/pl/faq.mdx
@@ -8,11 +8,11 @@ title: FAQ
 
 # { title }
 
-### Do I need to donate to use the website?
+### Czy muszę przekazać darowiznę za korzystanie ze strony internetowej?
 
 Nie.
-The website is free to use and always will be (as long as it is financially sustainable).
-However, donations are appreciated and help keep the website running.
+Strona internetowa jest darmowa i zawsze będzie (o ile będzie się zgadzał rachunek).
+Darowizny są jednak doceniane i pomagają utrzymać funkcjonowanie strony.
 
 ### Why is this route chosen over that one? _Or_ how can I add something to the map?
 
diff --git a/website/src/lib/docs/pl/files-and-stats.mdx b/website/src/lib/docs/pl/files-and-stats.mdx
index 78c9d15d9..cbcfb09d6 100644
--- a/website/src/lib/docs/pl/files-and-stats.mdx
+++ b/website/src/lib/docs/pl/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Pliki i statystyki
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Dodatkowe informacje
diff --git a/website/src/lib/docs/pl/getting-started.mdx b/website/src/lib/docs/pl/getting-started.mdx
index 562dc84ea..13919a6e2 100644
--- a/website/src/lib/docs/pl/getting-started.mdx
+++ b/website/src/lib/docs/pl/getting-started.mdx
@@ -8,12 +8,12 @@ title: Wprowadzenie
 
 # { title }
 
-Welcome to the official guide for **gpx.studio**!
-This guide will walk you through all the components and tools of the interface, helping you become a proficient user of the application.
+Witamy w oficjalnym przewodniku dla **gpx.studio**!
+Ten przewodnik przeprowadzi Cię przez wszystkie komponenty i narzędzia interfejsu, co pomoże stać się wydajnym użytkownikiem aplikacji.
 
 <DocsImage src="getting-started/interface" alt="The gpx.studio interface." />
 
-As shown in the screenshot above, the interface is divided into four main sections organized around the map. 
+Jak pokazano na zrzucie ekranu powyżej, interfejs jest podzielony na cztery główne sekcje zorganizowane wokół mapy. 
 Before we dive into the details of each section, let's have a quick overview of the interface.
 
 ## Menu główne
@@ -31,7 +31,7 @@ In the [dedicated section](./files-and-stats), we will explain how to select mul
 
 On the left side of the interface, you will find the [toolbar](./toolbar), which contains all the tools you can use to edit your files.
 
-## Map controls
+## Sterowanie mapą
 
-Finally, on the right side of the interface, you will find the [map controls](./map-controls).
-These controls allow you to navigate the map, zoom in and out, and switch between different map styles.
+Na koniec, po prawej stronie interfejsu znajdziesz [sterowanie mapą] (./map-controls).
+Za pomocą tych elementów sterujących można poruszać się po mapie, powiększać i pomniejszać widok oraz przełączać się między różnymi stylami mapy.
diff --git a/website/src/lib/docs/pl/home/funding.mdx b/website/src/lib/docs/pl/home/funding.mdx
index 6c979ac2a..71c868f7c 100644
--- a/website/src/lib/docs/pl/home/funding.mdx
+++ b/website/src/lib/docs/pl/home/funding.mdx
@@ -2,10 +2,10 @@
     import { HeartHandshake } from '@lucide/svelte';
 </script>
 
-## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
+## <HeartHandshake size="18" class="inline-block align-baseline" /> Pomóż nam utrzymać tę stronę jako bezpłatną (i wolną od reklam)
 
 Za każdym razem, gdy dodasz lub przenosisz punkty GPS, nasze serwery obliczają najlepszą trasę w sieci drogowej.
-Używamy również API z <a href="https://mapbox.com" target="_blank">Mapbox</a> do wyświetlania pięknych map, pobierania danych wysokości i wyszukiwania miejsc.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Niestety jest to kosztowne.
 Jeśli podoba Ci się korzystanie z tego narzędzia i uznajesz je za wartościowe, rozważ przekazanie małej darowizny, aby pomóc w utrzymaniu strony bez reklam.
diff --git a/website/src/lib/docs/pl/home/translation.mdx b/website/src/lib/docs/pl/home/translation.mdx
index 583c8341d..402d1c646 100644
--- a/website/src/lib/docs/pl/home/translation.mdx
+++ b/website/src/lib/docs/pl/home/translation.mdx
@@ -2,11 +2,11 @@
     import { Languages } from '@lucide/svelte';
 </script>
 
-## <Languages size="18" class="inline-block align-baseline" /> Translation
+## <Languages size="18" class="inline-block align-baseline" /> Tłumaczenie
 
 Strona internetowa jest tłumaczona przez wolontariuszy na platformie do współpracy w tłumaczeniu.
-Możesz pomóc dodając i sprawdzając istniejące tłumaczenie w <a href="https://crowdin.com/project/gpxstudio" target="_blank">projekcie Crowdin</a>.
+Możesz przyczynić się do rozwoju naszego projektu, dodając lub ulepszając tłumaczenia w ramach <a href="https://crowdin.com/project/gpxstudio" target="_blank">projektu Crowdin</a>.
 
-Jeśli chciałbyś dodać język, którego nie ma na liście <a href="#contact">skontaktuj się</a>.
+Jeśli chciałbyś dodać język, którego nie ma na liście <a href="#contact">skontaktuj się z nami</a>.
 
 Każda pomoc jest bardzo mile widziana!
diff --git a/website/src/lib/docs/pl/integration.mdx b/website/src/lib/docs/pl/integration.mdx
index de3ac7fca..fb9c9ed10 100644
--- a/website/src/lib/docs/pl/integration.mdx
+++ b/website/src/lib/docs/pl/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 Wszystko, czego potrzebujesz to:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/pl/map-controls.mdx b/website/src/lib/docs/pl/map-controls.mdx
index a880fb51f..35d7d3a7d 100644
--- a/website/src/lib/docs/pl/map-controls.mdx
+++ b/website/src/lib/docs/pl/map-controls.mdx
@@ -1,5 +1,5 @@
 ---
-title: Map controls
+title: Sterowanie mapą
 ---
 
 <script>
@@ -10,36 +10,36 @@ title: Map controls
 
 # { title }
 
-The map controls are located on the right side of the interface.
-These controls allow you to navigate the map, zoom in and out, and switch between different map styles.
+Elementy sterujące mapą znajdują się po prawej stronie interfejsu.
+Za pomocą tych elementów sterujących można poruszać się po mapie, powiększać i pomniejszać widok oraz przełączać się między różnymi stylami mapy.
 
-### <Diff size="16" class="inline-block" style="margin-bottom: 2px" /> Map navigation
+### <Diff size="16" class="inline-block" style="margin-bottom: 2px" /> Nawigacja mapą
 
-The controls at the top allow you to zoom in <Plus size="16" class="inline-block" style="margin-bottom: 2px" /> and out <Minus size="16" class="inline-block" style="margin-bottom: 2px" />, and to change the orientation and tilt of the map <Compass size="16" class="inline-block" style="margin-bottom: 2px" />.
+Sterowanie na górze pozwala powiększać <Plus size="16" class="inline-block" style="margin-bottom: 2px" /> i pomniejszać <Minus size="16" class="inline-block" style="margin-bottom: 2px" />, zmieniać orientacje oraz pochylenie mapy<Compass size="16" class="inline-block" style="margin-bottom: 2px" />.
 
 <DocsNote>
 
-To control the orientation and tilt of the map, you can also drag the map while holding <kbd>Ctrl</kbd>.
+Aby kontrolować orientację i pochylenie mapy, możesz również przeciągnąć mapę przytrzymując <kbd>Ctrl</kbd>.
 
 </DocsNote>
 
-### <Search size="16" class="inline-block" style="margin-bottom: 2px" /> Search bar
+### <Search size="16" class="inline-block" style="margin-bottom: 2px" /> Pasek wyszukiwania
 
-You can use the search bar to look for an address and navigate to it on the map.
+Możesz użyć paska wyszukiwania, aby wyszukać adres i przejść do niego na mapie.
 
-### <LocateFixed size="16" class="inline-block" style="margin-bottom: 2px" /> Locate button
+### <LocateFixed size="16" class="inline-block" style="margin-bottom: 2px" /> Przycisk lokalizacji
 
-The locate button centers the map on your current location.
+Przycisk lokalizacji wyśrodkuje mapę na bieżącej lokalizacji.
 
 <DocsNote>
 
-This only works if you have allowed your browser and <b>gpx.studio</b> to access your location.
+Działa tylko wtedy, gdy zezwoliłeś przeglądarce i <b>gpx.studio</b> na dostęp do Twojej lokalizacji.
 
 </DocsNote>
 
-### <PersonStanding size="16" class="inline-block" style="margin-bottom: 2px" /> Street view
+### <PersonStanding size="16" class="inline-block" style="margin-bottom: 2px" /> widok na ulicę, Street view
 
-This button can be used to enable street view mode on the map.
+Ten przycisk może być użyty do włączenia trybu street view na mapie.
 Depending on the street view source chosen in the [settings](./menu/settings), street view imagery can be accessed differently.
 
 - <a href="https://www.mapillary.com/" target="_blank">Mapillary</a>: the street view coverage will appear as green lines on the map. When zoomed in enough, green dots will show the exact locations where street view imagery is available. Hovering over a green dot will show the street view image at that location.
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/pl/menu/file.mdx b/website/src/lib/docs/pl/menu/file.mdx
index 73afcf0fd..ecf217770 100644
--- a/website/src/lib/docs/pl/menu/file.mdx
+++ b/website/src/lib/docs/pl/menu/file.mdx
@@ -9,44 +9,44 @@ title: Akcje menu Plik
 
 # { title }
 
-The file actions menu contains a set of pretty self-explanatory file operations.
+Menu operacji na plikach zawiera zestaw funkcji, których przeznaczenie jest dość oczywiste.
 
-### <Plus size="16" class="inline-block" style="margin-bottom: 2px" /> New
+### <Plus size="16" class="inline-block" style="margin-bottom: 2px" /> Nowy
 
 Tworzy nowy pusty plik.
 
-### <FolderOpen size="16" class="inline-block" style="margin-bottom: 2px" /> Open...
+### <FolderOpen size="16" class="inline-block" style="margin-bottom: 2px" /> Otwórz...
 
-Open files from your computer. 
+Otwórz pliki z komputera. 
 
 <DocsNote>
 
-You can also drag and drop files directly from your file system into the window.
+Można również przeciągać i upuszczać pliki bezpośrednio z systemu plików do okna.
 
 </DocsNote>
 
-### <Copy size="16" class="inline-block" style="margin-bottom: 2px" /> Duplicate
+### <Copy size="16" class="inline-block" style="margin-bottom: 2px" /> Duplikuj
 
-Create a copy of the currently selected files.
+Utwórz kopię aktualnie zaznaczonych plików.
 
-### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete
+### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Usuń
 
-Delete the currently selected files.
+Usuń aktualnie zaznaczone pliki.
 
-### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete all
+### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Usuń wszystko
 
-Delete all files.
+Usuń wszystkie pliki.
 
-### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Export...
+### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Eksport...
 
-Open the export dialog to save the currently selected files to your computer.
+Otwórz okno dialogowe eksportu, aby zapisać aktualnie wybrane pliki na komputerze.
 
-### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Export all...
+### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Eksportuj wszystko...
 
-Open the export dialog to save all files to your computer.
+Otwórz okno dialogowe eksportu, aby zapisać wszystkie pliki na komputerze.
 
 <DocsNote type="warning">
 
-If your download does not start after clicking the download button, please check your browser settings to allow downloads from <b>gpx.studio</b>.
+Jeśli po kliknięciu przycisku pobierania plik nie zacznie się pobierać, sprawdź ustawienia przeglądarki i upewnij się, że zezwalają one na pobieranie plików z witryny <b>gpx.studio</b>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/pl/menu/settings.mdx b/website/src/lib/docs/pl/menu/settings.mdx
index d44c682f9..cd2732721 100644
--- a/website/src/lib/docs/pl/menu/settings.mdx
+++ b/website/src/lib/docs/pl/menu/settings.mdx
@@ -11,11 +11,11 @@ title: Settings
 
 ### <Ruler size="16" class="inline-block" style="margin-bottom: 2px" /> Distance units
 
-Change the units used to display distances in the interface.
+Zmień jednostki stosowane do wyświetlania odległości w interfejsie.
 
 ### <Zap size="16" class="inline-block" style="margin-bottom: 2px" /> Velocity units
 
-Change the units used to display velocities in the interface.
+Zmień jednostki używane do wyświetlania prędkości w interfejsie.
 You can choose between distance per hour or minutes per distance, which can be more suitable for running activities.
 
 ### <Thermometer size="16" class="inline-block" style="margin-bottom: 2px" /> Temperature units
@@ -28,8 +28,8 @@ Change the language used in the interface.
 
 <DocsNote>
 
-Możesz pomóc dodając i sprawdzając istniejące tłumaczenie w <a href="https://crowdin.com/project/gpxstudio" target="_blank">projekcie Crowdin</a>.
-Jeśli chciałbyś dodać język, którego nie ma na liście <a href="#contact">skontaktuj się</a>.
+Możesz przyczynić się do rozwoju naszego projektu, dodając lub ulepszając tłumaczenia w ramach <a href="https://crowdin.com/project/gpxstudio" target="_blank">projektu Crowdin</a>.
+Jeśli chciałbyś dodać język, którego nie ma na liście <a href="#contact">skontaktuj się z nami</a>.
 Każda pomoc jest bardzo mile widziana!
 
 </DocsNote>
diff --git a/website/src/lib/docs/pl/menu/view.mdx b/website/src/lib/docs/pl/menu/view.mdx
index 5fd3cf97b..ef2d8f472 100644
--- a/website/src/lib/docs/pl/menu/view.mdx
+++ b/website/src/lib/docs/pl/menu/view.mdx
@@ -9,21 +9,21 @@ title: Akcje menu Widok
 
 # { title }
 
-This menu provides options to rearrange the interface and the map view.
+To menu zawiera opcje zmiany kolejności interfejsu i widoku mapy.
 
-### <ChartArea size="16" class="inline-block" style="margin-bottom: 2px" /> Elevation profile
+### <ChartArea size="16" class="inline-block" style="margin-bottom: 2px" /> Profil wysokościowy
 
-Hide the elevation profile to make room for the map, or show it to inspect the current selection.
+Ukryj profil ukształtowania terenu, aby zrobić miejsce na mapie lub pokaż go, aby sprawdzić bieżący wybór.
 
-### <ListTree size="16" class="inline-block" style="margin-bottom: 2px" /> File tree
+### <ListTree size="16" class="inline-block" style="margin-bottom: 2px" /> Drzewo plików
 
-Toggle the tree layout for the [file list](../files-and-stats).
+Przełącz układ drzewa na [listy plików](../files-and-stats).
 This layout is ideal for managing a large number of open files, as it organizes them into a vertical list on the right side of the map.
-In addition, the file tree view enables you to inspect the [tracks, segments, and points of interest](../gpx) contained inside the files through collapsible sections.
+Dodatkowo, widok drzewa plików umożliwia sprawdzenie [tras, segmentów, oraz punktów zainteresowania](../gpx) zawarte w plikach poprzez zwijalne sekcje.
 
-### <Map size="16" class="inline-block" style="margin-bottom: 2px" /> Switch to previous basemap
+### <Map size="16" class="inline-block" style="margin-bottom: 2px" /> Przełącz na poprzednią mapę
 
-Change the basemap to the one previously selected through the [map layer control](../map-controls).
+Zmień mapę na mapę wybraną poprzednio przez [sterowanie warstwą map](../map-controls).
 
 ### <Layers2 size="16" class="inline-block" style="margin-bottom: 2px" /> Toggle overlays
 
@@ -44,6 +44,6 @@ Włącza lub wychodzi z widoku mapy 3D.
 
 <DocsNote>
 
-To control the orientation and tilt of the map, you can also drag the map while holding <kbd>Ctrl</kbd>.
+Aby kontrolować orientację i pochylenie mapy, możesz również przeciągnąć mapę przytrzymując <kbd>Ctrl</kbd>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/pl/toolbar/elevation.mdx b/website/src/lib/docs/pl/toolbar/elevation.mdx
index 71927e4ba..2c3886d3c 100644
--- a/website/src/lib/docs/pl/toolbar/elevation.mdx
+++ b/website/src/lib/docs/pl/toolbar/elevation.mdx
@@ -10,7 +10,7 @@ title: Przewyższenie
 
 # <MountainSnow size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
 
-This tool allows you to add elevation data to traces and [points of interest](../gpx), or to replace the existing data.
+To narzędzie pozwala dodawać dane dotyczące wysokości do tras i [punktów zainteresowania](../gpx) lub zastępować istniejące dane.
 
 <div class="flex flex-row justify-center">
     <Elevation class="text-foreground p-3 border rounded-md shadow-lg" />
@@ -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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/pl/toolbar/merge.mdx b/website/src/lib/docs/pl/toolbar/merge.mdx
index c0717e9cc..fde1be35a 100644
--- a/website/src/lib/docs/pl/toolbar/merge.mdx
+++ b/website/src/lib/docs/pl/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Połącz
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/pl/toolbar/routing.mdx b/website/src/lib/docs/pl/toolbar/routing.mdx
index 778dbc415..9731708da 100644
--- a/website/src/lib/docs/pl/toolbar/routing.mdx
+++ b/website/src/lib/docs/pl/toolbar/routing.mdx
@@ -1,5 +1,5 @@
 ---
-title: Route planning and editing
+title: Planowanie i edycja trasy
 ---
 
 <script>
@@ -11,11 +11,11 @@ title: Route planning and editing
 
 # <Pencil size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
 
-The route planning and editing tool allows you to create and edit routes by placing or moving anchor points on the map.
+Narzędzie do planowania i edycji trasy pozwala na tworzenie i edytowanie tras poprzez umieszczanie lub przesuwanie punktów kotwiczenia na mapie.
 
 ## Settings
 
-As shown below, the tool dialog contains a few settings to control the routing behavior.
+Jak pokazano poniżej, okno dialogowe narzędzia zawiera kilka ustawień do kontrolowania zachowania rutingu.
 You can minimize the dialog to save space by clicking on <button><SquareArrowUpLeft size="16" class="inline-block" style="margin-bottom: 2px" /></button>.
 
 <div class="flex flex-row justify-center">
diff --git a/website/src/lib/docs/pl/toolbar/scissors.mdx b/website/src/lib/docs/pl/toolbar/scissors.mdx
index 7a333c005..6b28e6aa2 100644
--- a/website/src/lib/docs/pl/toolbar/scissors.mdx
+++ b/website/src/lib/docs/pl/toolbar/scissors.mdx
@@ -24,7 +24,7 @@ Validate the selection when you are satisfied with the result.
 ## Podziel
 
 To split the selected trace into two parts, click on one of the split markers displayed along the trace.
-To split at a specific point of your choice, hover over the trace on the map.
+Aby podzielić w wybranym przez Ciebie punkcie, zaznacz punkt na śladzie trasy.
 Scissors will appear at the cursor position, showing that you can split the trace at that point.
 
 You can choose to split the trace into two GPX files, or to keep the split parts in the same file as [tracks or segments](../gpx).
diff --git a/website/src/lib/docs/pl/toolbar/time.mdx b/website/src/lib/docs/pl/toolbar/time.mdx
index e80bb719f..f972cf667 100644
--- a/website/src/lib/docs/pl/toolbar/time.mdx
+++ b/website/src/lib/docs/pl/toolbar/time.mdx
@@ -10,18 +10,18 @@ title: Czas
 
 # <CalendarClock size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
 
-This tool allows you to change or add timestamps to a trace.
-You simply need to use the form shown below and validate it when you are done.
+To narzędzie pozwala na zmianę lub dodanie znaczników czasu do śladu.
+Musisz po prostu użyć poniższego formularza i potwierdzić go po zakończeniu.
 
 <div class="flex flex-row justify-center">
     <Time class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
 
-When you edit the speed, the moving time is adapted accordingly in the form, and vice versa.
-Similarly, when you edit the start time, the end time is updated to keep the same total duration, and vice versa.
+Podczas edycji prędkości, czas poruszania się jest odpowiednio dostosowywany w formularzu i odwrotnie.
+Podobnie, kiedy edytujesz czas rozpoczęcia, czas zakończenia jest aktualizowany, aby zachować ten sam czas trwania i odwrotnie.
 
 <DocsNote>
 
-When using this tool with existing timestamps, changing the time or speed will simply shift, stretch, or compress them accordingly.
+Gdy używasz to narzędzie z istniejącymi znacznikami czasu, zmiana czasu lub prędkości po prostu się zmieni, rozciągnij lub kompresuj je.
 
 </DocsNote>
diff --git a/website/src/lib/docs/pt-BR/files-and-stats.mdx b/website/src/lib/docs/pt-BR/files-and-stats.mdx
index d83e9e0fc..433612464 100644
--- a/website/src/lib/docs/pt-BR/files-and-stats.mdx
+++ b/website/src/lib/docs/pt-BR/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Arquivos e estatísticas
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -50,7 +51,7 @@ Clicando com o botão direito em uma aba arquivo, você pode acessar as mesmas a
 
 As mentioned in the [view options section](./menu/view), you can switch to a tree layout for the files list.
 This layout is ideal for managing a large number of open files, as it organizes them into a vertical list on the right side of the map.
-In addition, the file tree view enables you to inspect the [tracks, segments, and points of interest](./gpx) contained inside the files through collapsible sections.
+Além disso, a exibição de árvore de arquivos permite que você inspecione as [faixas, segmentos, e pontos de interesse](./gpx) contidos dentro dos arquivos através de seções recolhidas.
 
 Você também pode aplicar as [ações de edição](./menu/edit) e [ferramentas](./toolbar) para itens de arquivos internos.
 Além disso, você pode arrastar e soltar os itens internos para reordená-los, ou movê-los na hierarquia ou até mesmo para outro arquivo.
@@ -84,19 +85,17 @@ Você também pode usar a roda do mouse para aumentar e diminuir o zoom no perfi
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Dados adicionais
@@ -105,6 +104,6 @@ Using the <kbd><ChartNoAxesColumn size="16" class="inline-block" style="margin-b
 
 - **slope** information computed from the elevation data, or
 - **surface** or **category** data coming from <a href="https://www.openstreetmap.org/" target="_blank">OpenStreetMap</a>'s <a href="https://wiki.openstreetmap.org/wiki/Key:surface" target="_blank">surface</a> and <a href="https://wiki.openstreetmap.org/wiki/Key:highway" target="_blank">highway</a> tags.
-  This is only available for files created with **gpx.studio**.
+  Isso só está disponível para arquivos criados com **gpx.studio**.
 
 If your selection includes it, you can also visualize: **speed**, **heart rate**, **cadence**, **temperature** and **power** data on the elevation profile.
diff --git a/website/src/lib/docs/pt-BR/home/funding.mdx b/website/src/lib/docs/pt-BR/home/funding.mdx
index dacb1b76b..c65c600b8 100644
--- a/website/src/lib/docs/pt-BR/home/funding.mdx
+++ b/website/src/lib/docs/pt-BR/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Ajude a manter o site gratuito (e sem anúncios)
 
 Cada vez que você adiciona ou move pontos de GPS, nosso servidor calcula a melhor rota no mapa.
-Nos também usamos as APIs do <a href="https://mapbox.com" target="_blank">Mapbox</a> para mostrar mapas bonitos, pegar dados de elevação e permitir que você busque por lugares.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Infelizmente, isso é caro.
 Se você gosta dessa ferramenta e acha ela valiosa, considere fazer uma pequena doação para ajudar a manter o site grátis e sem propagandas.
diff --git a/website/src/lib/docs/pt-BR/integration.mdx b/website/src/lib/docs/pt-BR/integration.mdx
index a02d7e1cc..d3f8af128 100644
--- a/website/src/lib/docs/pt-BR/integration.mdx
+++ b/website/src/lib/docs/pt-BR/integration.mdx
@@ -13,8 +13,8 @@ Você pode usar **gpx.studio** para criar mapas mostrando os seus arquivos GPX e
 
 Tudo que você precisa é:
 
-1. Um <a href="https://account.mapbox.com/auth/signup" target="_blank">Token de acesso do Mapbox</a> para caeegar o mapa, e
-2. Arquivos GPX hospedados no seu servidor ou no Google Drive, ou acessíveis através de uma URL pública.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Você pode configurar abaixo a aparência do seu mapa e gerar o código HTML correspondente.
 
diff --git a/website/src/lib/docs/pt-BR/map-controls.mdx b/website/src/lib/docs/pt-BR/map-controls.mdx
index 2348af7cf..1dacb00de 100644
--- a/website/src/lib/docs/pt-BR/map-controls.mdx
+++ b/website/src/lib/docs/pt-BR/map-controls.mdx
@@ -56,10 +56,12 @@ O botão de camadas de mapa permite que você alterne entre diferentes mapas e a
 - **Pontos de interesse** podem ser adicionados ao mapa para mostrar diferentes categorias de lugares, como lojas, restaurantes ou acomodações.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        Passe o mouse por cima do mapa para mostrar a camada de <a href="https://hiking.waymarkedtrails.org" target="_blank">Trilhas demarcadas</a> sobre o mapa <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a>.
-    </span>
+<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.
+
+</span>
 </div>
 
 Uma grande diversidade de mapas globais e locais está disponível no **gpx.studio**, bem como uma seleção de pontos de interesse.
@@ -67,4 +69,4 @@ Eles podem ser ativados nas [configurações de camadas do mapa](./menu/settings
 
 Nessas configurações, você também pode gerenciar a opacidade das camadas.
 
-Para usuários avançados, é possível adicionar mapas e sobreposições personalizados, fornecendo <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, ou <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, ou ainda URLs com arquivos <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox JSON</a>.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/pt-BR/menu/file.mdx b/website/src/lib/docs/pt-BR/menu/file.mdx
index 07e497e93..3353ff7f7 100644
--- a/website/src/lib/docs/pt-BR/menu/file.mdx
+++ b/website/src/lib/docs/pt-BR/menu/file.mdx
@@ -35,7 +35,7 @@ Delete the currently selected files.
 
 ### <FileX size="16" class="inline-block" style="margin-bottom: 2px" /> Delete all
 
-Delete all files.
+Apagar todos os arquivos.
 
 ### <Download size="16" class="inline-block" style="margin-bottom: 2px" /> Exportar...
 
diff --git a/website/src/lib/docs/pt-BR/toolbar/elevation.mdx b/website/src/lib/docs/pt-BR/toolbar/elevation.mdx
index 548fa7b5a..9ee293ebf 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>
 
-Dados de elevação são fornecidos por <a href="https://mapbox.com" target="_blank">Mapbox</a>.
-Você pode aprender mais sobre sua origem e precisão na <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentação</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/pt-BR/toolbar/merge.mdx b/website/src/lib/docs/pt-BR/toolbar/merge.mdx
index 1da2e303c..92713e2a2 100644
--- a/website/src/lib/docs/pt-BR/toolbar/merge.mdx
+++ b/website/src/lib/docs/pt-BR/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Mesclar
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Para usar esta ferramenta, você precisa [selecionar](../files-and-stats) vário
 - A segunda opção pode ser usada para criar ou gerenciar arquivos com várias [faixas ou segmentos](../gpx).
   Mesclar arquivos (ou faixas) resultará em um único arquivo (ou faixa) contendo todas as faixas (ou segmentos) da seleção.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/pt/files-and-stats.mdx b/website/src/lib/docs/pt/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/pt/files-and-stats.mdx
+++ b/website/src/lib/docs/pt/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/pt/home/funding.mdx b/website/src/lib/docs/pt/home/funding.mdx
index 4f94aa4f1..7b64a16bc 100644
--- a/website/src/lib/docs/pt/home/funding.mdx
+++ b/website/src/lib/docs/pt/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Cada vez que você adiciona ou move pontos de GPS, nosso servidor calcula a melhor rota no mapa.
-Nos também usamos as APIs do <a href="https://mapbox.com" target="_blank">Mapbox</a> para mostrar mapas bonitos, pegar dados de elevação e permitir que você busque por lugares.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Infelizmente, isso é caro.
 Se você gosta dessa ferramenta e acha ela valiosa, considere fazer uma pequena doação para ajudar a manter o site grátis e sem propagandas.
diff --git a/website/src/lib/docs/pt/integration.mdx b/website/src/lib/docs/pt/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/pt/integration.mdx
+++ b/website/src/lib/docs/pt/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/pt/map-controls.mdx b/website/src/lib/docs/pt/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/pt/map-controls.mdx
+++ b/website/src/lib/docs/pt/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/pt/toolbar/elevation.mdx b/website/src/lib/docs/pt/toolbar/elevation.mdx
index 6ce74bf22..91e6e7b0f 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/pt/toolbar/merge.mdx b/website/src/lib/docs/pt/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/pt/toolbar/merge.mdx
+++ b/website/src/lib/docs/pt/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/ro/files-and-stats.mdx b/website/src/lib/docs/ro/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/ro/files-and-stats.mdx
+++ b/website/src/lib/docs/ro/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/ro/home/funding.mdx b/website/src/lib/docs/ro/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/ro/home/funding.mdx
+++ b/website/src/lib/docs/ro/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/ro/integration.mdx b/website/src/lib/docs/ro/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/ro/integration.mdx
+++ b/website/src/lib/docs/ro/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/ro/map-controls.mdx b/website/src/lib/docs/ro/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/ro/map-controls.mdx
+++ b/website/src/lib/docs/ro/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/ro/toolbar/elevation.mdx b/website/src/lib/docs/ro/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/ro/toolbar/merge.mdx b/website/src/lib/docs/ro/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/ro/toolbar/merge.mdx
+++ b/website/src/lib/docs/ro/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/ru/files-and-stats.mdx b/website/src/lib/docs/ru/files-and-stats.mdx
index 340be7482..0e7dec249 100644
--- a/website/src/lib/docs/ru/files-and-stats.mdx
+++ b/website/src/lib/docs/ru/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Файлы и статистика
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ In addition, the file tree view enables you to inspect the [tracks, segments, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/ru/home/funding.mdx b/website/src/lib/docs/ru/home/funding.mdx
index 8d5dc9164..f8affc6f5 100644
--- a/website/src/lib/docs/ru/home/funding.mdx
+++ b/website/src/lib/docs/ru/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Каждый раз при добавлении или перемещении точек GPS наши серверы рассчитывают наилучший маршрут по дорожной сети.
-Мы также используем API от <a href="https://mapbox.com" target="_blank">Mapbox</a> для отображения красивых карт, получения данных о высоте и возможности поиска мест.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 К сожалению, это дорого.
 Если вам нравится этот инструмент и вы находите его ценным, пожалуйста, сделайте небольшое пожертвование, чтобы сделать сайт бесплатным и без рекламы.
diff --git a/website/src/lib/docs/ru/integration.mdx b/website/src/lib/docs/ru/integration.mdx
index 64766c750..90f8b2c6a 100644
--- a/website/src/lib/docs/ru/integration.mdx
+++ b/website/src/lib/docs/ru/integration.mdx
@@ -13,8 +13,8 @@ title: Интеграция
 
 Все, что вам нужно это:
 
-1. <a href="https://account.mapbox.com/auth/signup" target="_blank">Токен доступа Mapbox</a> для загрузки карты и
-2. GPX файлы, размещенные на вашем сервере или на Google Drive, или доступны по URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Затем вы можете поиграть с конфигуратором ниже, чтобы настроить свою карту и сгенерировать соответствующий HTML-код.
 
diff --git a/website/src/lib/docs/ru/map-controls.mdx b/website/src/lib/docs/ru/map-controls.mdx
index 926805c04..a39ee366e 100644
--- a/website/src/lib/docs/ru/map-controls.mdx
+++ b/website/src/lib/docs/ru/map-controls.mdx
@@ -56,10 +56,12 @@ The map controls are located on the right side of the interface.
 - **Точки интереса** можно добавить на карту для показа различных категорий мест, таких как магазины, рестораны или размещения.
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        Наведите указатель мыши на карту, чтобы отобразить наложение <a href="https://hiking.waymarkedtrails.org" target="_blank">Пешеходные маршруты с метками</a> поверх базовой карты <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a>.
-    </span>
+<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.
+
+</span>
 </div>
 
 В **gpx.studio** доступна большая коллекция глобальных и локальных базовых карт и наложений, а также выбор категорий объектов интереса.
@@ -67,4 +69,4 @@ The map controls are located on the right side of the interface.
 
 В этих настройках вы также можете управлять непрозрачностью наложений.
 
-Для продвинутых пользователей возможно добавление пользовательских базовых карт и наложений, предоставив<a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/ru/toolbar/elevation.mdx b/website/src/lib/docs/ru/toolbar/elevation.mdx
index c43ac9aae..cc15c8c3d 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>
 
-Данные о высотах предоставляются <a href="https://mapbox.com" target="_blank">Mapbox</a>.
-Вы можете узнать больше о его происхождении и точности в <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">документации</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/ru/toolbar/merge.mdx b/website/src/lib/docs/ru/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/ru/toolbar/merge.mdx
+++ b/website/src/lib/docs/ru/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/sr/files-and-stats.mdx b/website/src/lib/docs/sr/files-and-stats.mdx
index f91eb222d..a6e5dfa54 100644
--- a/website/src/lib/docs/sr/files-and-stats.mdx
+++ b/website/src/lib/docs/sr/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Datoteke i statistike
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ Takođe možete da koristite točkić miša da zumirate i umanjite profil nadmo
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/sr/home/funding.mdx b/website/src/lib/docs/sr/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/sr/home/funding.mdx
+++ b/website/src/lib/docs/sr/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/sr/integration.mdx b/website/src/lib/docs/sr/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/sr/integration.mdx
+++ b/website/src/lib/docs/sr/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/sr/map-controls.mdx b/website/src/lib/docs/sr/map-controls.mdx
index f8e4f50bd..989e31fbf 100644
--- a/website/src/lib/docs/sr/map-controls.mdx
+++ b/website/src/lib/docs/sr/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/sr/toolbar/elevation.mdx b/website/src/lib/docs/sr/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 100644
--- a/website/src/lib/docs/sr/toolbar/elevation.mdx
+++ b/website/src/lib/docs/sr/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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/sr/toolbar/merge.mdx b/website/src/lib/docs/sr/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/sr/toolbar/merge.mdx
+++ b/website/src/lib/docs/sr/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/sv/files-and-stats.mdx b/website/src/lib/docs/sv/files-and-stats.mdx
index a800a6cea..4fe368e63 100644
--- a/website/src/lib/docs/sv/files-and-stats.mdx
+++ b/website/src/lib/docs/sv/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ Du kan också använda mushjulet för att zooma in och ut på höjdprofilen och
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/sv/home/funding.mdx b/website/src/lib/docs/sv/home/funding.mdx
index 082ac8cf3..b9df3b9c7 100644
--- a/website/src/lib/docs/sv/home/funding.mdx
+++ b/website/src/lib/docs/sv/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Varje gång du lägger till eller flyttar en spårpunkt skickar vi en förfrågan till våra servrar om att hämta en rutt på vägnätet.
-Vi använder även API:er från <a href="https://mapbox.com" target="_blank">Mapbox</a> för att visa tilltalande kartor, hämta markhöjddata och låta dig söka efter platser.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Tyvärr är detta dyrt.
 Om du tycker om att använda detta verktyg och finner det värdefullt, vänligen överväg att göra en liten donation för att hjälpa till att hålla webbplatsen gratis och annonsfri.
diff --git a/website/src/lib/docs/sv/integration.mdx b/website/src/lib/docs/sv/integration.mdx
index c6dacf8c4..4cd446372 100644
--- a/website/src/lib/docs/sv/integration.mdx
+++ b/website/src/lib/docs/sv/integration.mdx
@@ -13,8 +13,8 @@ Du kan använda **gpx.studio** för att skapa kartor som visar dina GPX-filer oc
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Du kan då ändra med konfiguratorn nedan för att anpassa din karta och generera den motsvarande HTML-koden.
 
diff --git a/website/src/lib/docs/sv/map-controls.mdx b/website/src/lib/docs/sv/map-controls.mdx
index 22cce36ad..21d24cac5 100644
--- a/website/src/lib/docs/sv/map-controls.mdx
+++ b/website/src/lib/docs/sv/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,5 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-För advancerade användare, är det möjligt att lägga till anpassade baskartor och överlägg 
-med <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/sv/toolbar/elevation.mdx b/website/src/lib/docs/sv/toolbar/elevation.mdx
index 10aca93e0..d285dc406 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://mapbox.com" target="_blank">Mapbox</a>.
-Du kan lära mer om dess ursprung och noggrannhet i <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">dokumentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/sv/toolbar/merge.mdx b/website/src/lib/docs/sv/toolbar/merge.mdx
index ca5a378c7..70a89331e 100644
--- a/website/src/lib/docs/sv/toolbar/merge.mdx
+++ b/website/src/lib/docs/sv/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Lägga ihop filer (eller spår) kommer att resultera i en enda fil (eller spår) med alla spår (eller segment) från urvalet.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/th/files-and-stats.mdx b/website/src/lib/docs/th/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/th/files-and-stats.mdx
+++ b/website/src/lib/docs/th/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/th/home/funding.mdx b/website/src/lib/docs/th/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/th/home/funding.mdx
+++ b/website/src/lib/docs/th/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/th/integration.mdx b/website/src/lib/docs/th/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/th/integration.mdx
+++ b/website/src/lib/docs/th/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/th/map-controls.mdx b/website/src/lib/docs/th/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/th/map-controls.mdx
+++ b/website/src/lib/docs/th/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/th/toolbar/elevation.mdx b/website/src/lib/docs/th/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/th/toolbar/merge.mdx b/website/src/lib/docs/th/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/th/toolbar/merge.mdx
+++ b/website/src/lib/docs/th/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/tr/files-and-stats.mdx b/website/src/lib/docs/tr/files-and-stats.mdx
index 80c502916..259e7de73 100644
--- a/website/src/lib/docs/tr/files-and-stats.mdx
+++ b/website/src/lib/docs/tr/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Dosyalar ve istatistikler
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -83,19 +84,17 @@ Ayrıca, fare tekerleği ile yükselti profiline yakınlaşıp uzaklaşabilir ve
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Ek veri
diff --git a/website/src/lib/docs/tr/home/funding.mdx b/website/src/lib/docs/tr/home/funding.mdx
index bef3c1f82..55b44a517 100644
--- a/website/src/lib/docs/tr/home/funding.mdx
+++ b/website/src/lib/docs/tr/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" />Web sayfasının ücretsiz (ve reklamsız) kalması için yardım et
 
 Her yeni nokta GPS noktası eklediğinizde veya hareket ettirdiğinizde, sunucularımız en uygun rotayı yol ağı üzerinden hesaplar.
-Ayrıca güzel haritalar göstermek için <a href="https://mapbox.com" target="_blank">Mapbox</a> APIleri kullanıyoruz, yütselti bilgisi almak için ve yer araması yapabilmeniz için.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Ne yazık ki bunlar pahallı.
 Eğer bu araçları kullunmaktan memnunsanız ve değerli buluyorsanız, lütfen küçük bir bağış yaparak web sayfasının ücretsiz ve reklamsız kalmasına yardım edin.
diff --git a/website/src/lib/docs/tr/integration.mdx b/website/src/lib/docs/tr/integration.mdx
index 830afde8c..00f744115 100644
--- a/website/src/lib/docs/tr/integration.mdx
+++ b/website/src/lib/docs/tr/integration.mdx
@@ -13,8 +13,8 @@ title: Entegrasyon
 
 Tüm ihtiyacınız olan:
 
-1. Haritayı yüklemek için bir <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a>, ve
-2. GPX dosyanıza erişebileceğiniz bir sunucu veya Google Drive, veya umumi bir URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 Daha sonra aşağıdaki yapılandırıcı ile haritanızı özelleştirebilir ve HTML kodu oluşturabilirsiniz.
 
diff --git a/website/src/lib/docs/tr/map-controls.mdx b/website/src/lib/docs/tr/map-controls.mdx
index ff75715d4..f72c55f75 100644
--- a/website/src/lib/docs/tr/map-controls.mdx
+++ b/website/src/lib/docs/tr/map-controls.mdx
@@ -55,8 +55,13 @@ Harita katmanları düğmesi, farklı temel haritalar arasında geçiş yapmanı
 - **Katmanlar**, tamamlayıcı bilgi sağlamak amacıyla temel haritanın üzerinde görüntülenebilen ek katmanlardır.
 - **İlgi noktaları**, mağazalar, restoranlar veya konaklama yerleri gibi farklı yer kategorilerini göstermek için haritaya eklenebilir.
 
-<div class="flex flex-col items-center"><DocsLayers /><span class="text-sm text-center mt-2">        <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> temel haritasında <a href="https://hiking.waymarkedtrails.org" target="_blank">yol işaretli patika yürüyüş</a> katmanını gönmek için harita üzerinde dur.
-    </span>
+<div class="flex flex-col items-center">
+<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.
+
+</span>
 </div>
 
 Büyük bir lokal temel harita koleksiyonu ve katmanlar **gpx.studio**'da mevcut bulunmakta, ilgi noktalarının yanı sıra.
@@ -64,4 +69,4 @@ Büyük bir lokal temel harita koleksiyonu ve katmanlar **gpx.studio**'da mevcut
 
 Bu ayarlarda ayrıca katmanların saydamlık ayarlarını da yapabilinsiniz.
 
-İleri seviye kullanıcılar için, <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, veya <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox stil JSON</a> URLleri sağlayarak özel temel harita ve katman eklemek mümkündür.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/tr/toolbar/elevation.mdx b/website/src/lib/docs/tr/toolbar/elevation.mdx
index 3ecb88348..c578e5e2c 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>
 
-Yükseklik verisi <a href="https://mapbox.com" target="_blank">Mapbox</a> tarafından sağlanmaktadır.
-Kaynağı ve hassasiyetiyle alakalı daha fazla bilgiyi <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">dökümantasyonda</a> bulabilirsiniz.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/tr/toolbar/merge.mdx b/website/src/lib/docs/tr/toolbar/merge.mdx
index 54f433d3d..f36bae017 100644
--- a/website/src/lib/docs/tr/toolbar/merge.mdx
+++ b/website/src/lib/docs/tr/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Birleştir
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ Bu aracı kullanmak için birden fazla dosya, [iz, veya segment](../gpx) [seçim
 - İkinci seçenek birden fazla [iz veya segment](../gpx) ile dosya oluşturma veya yönetmek için kullanılabilir.
   Dosyaları (veya izleri) birleştirmek bütün izleri (veya segmentleri) içeren tek bir dosya (veya iz) oluşturur.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/uk/files-and-stats.mdx b/website/src/lib/docs/uk/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/uk/files-and-stats.mdx
+++ b/website/src/lib/docs/uk/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/uk/home/funding.mdx b/website/src/lib/docs/uk/home/funding.mdx
index 7c782d8a8..30b887881 100644
--- a/website/src/lib/docs/uk/home/funding.mdx
+++ b/website/src/lib/docs/uk/home/funding.mdx
@@ -2,10 +2,11 @@
     import { HeartHandshake } from '@lucide/svelte';
 </script>
 
-## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
+## <HeartHandshake size="18" class="inline-block align-baseline" /> 
+Допоможіть нам залишати цей сайт безкоштовним (та без реклами)
 
 Кожного разу, коли ви додаєте або переміщуєте GPS точки, наші сервери обчислюють найкращий маршрут на мережі доріг.
-Ми також використовуємо API від <a href="https://mapbox.com" target="_blank">Mapbox</a> для зображення красивих карт, отримання даних висот та можливості пошуку місць.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 На жаль, це дорого.
 Якщо Вам подобається користуватися цим інструментом і він є цінним для Вас, будь ласка, зробіть невелику пожертву, щоб допомогти зберегти сайт безплатним та вільним від реклами.
diff --git a/website/src/lib/docs/uk/home/translation.mdx b/website/src/lib/docs/uk/home/translation.mdx
index 1e984e662..28121c3d2 100644
--- a/website/src/lib/docs/uk/home/translation.mdx
+++ b/website/src/lib/docs/uk/home/translation.mdx
@@ -2,7 +2,7 @@
     import { Languages } from '@lucide/svelte';
 </script>
 
-## <Languages size="18" class="inline-block align-baseline" /> Translation
+## <Languages size="18" class="inline-block align-baseline" /> Переклад
 
 Сайт перекладається волонтерами з використанням платформи для спільного перекладу.
 Ви можете зробити свій внесок, додаючи або покращуючи переклади в нашому <a href="https://crowdin.com/project/gpxstudio" target="_blank">проєкті Crowdin</a>.
diff --git a/website/src/lib/docs/uk/integration.mdx b/website/src/lib/docs/uk/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/uk/integration.mdx
+++ b/website/src/lib/docs/uk/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/uk/map-controls.mdx b/website/src/lib/docs/uk/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/uk/map-controls.mdx
+++ b/website/src/lib/docs/uk/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/uk/menu/file.mdx b/website/src/lib/docs/uk/menu/file.mdx
index 4ca98783a..ae6a3ada4 100644
--- a/website/src/lib/docs/uk/menu/file.mdx
+++ b/website/src/lib/docs/uk/menu/file.mdx
@@ -47,6 +47,6 @@ Open the export dialog to save all files to your computer.
 
 <DocsNote type="warning">
 
-If your download does not start after clicking the download button, please check your browser settings to allow downloads from <b>gpx.studio</b>.
+Якщо завантаження не починається після натискання кнопки завантаження, будь ласка, перевірте налаштування браузера, щоб дозволити завантаження з <b>gpx.studio</b>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/uk/toolbar/elevation.mdx b/website/src/lib/docs/uk/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/uk/toolbar/merge.mdx b/website/src/lib/docs/uk/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/uk/toolbar/merge.mdx
+++ b/website/src/lib/docs/uk/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/vi/files-and-stats.mdx b/website/src/lib/docs/vi/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/vi/files-and-stats.mdx
+++ b/website/src/lib/docs/vi/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/vi/home/funding.mdx b/website/src/lib/docs/vi/home/funding.mdx
index db88fd7a4..b8b02a12f 100644
--- a/website/src/lib/docs/vi/home/funding.mdx
+++ b/website/src/lib/docs/vi/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Hãy giúp duy trì trang web miễn phí (và không có quảng cáo)
 
 Khi bạn thêm hoặc di chuyển các điểm định vị, máy chủ của chúng tôi sẽ tính toán đoạn đường tốt nhất trên mạng lưới giao thông.
-Chúng tôi cũng sử dụng các API từ <a href="https://mapbox.com" target="_blank">Mapbox</a> để hiển thị đa dạng các bản đồ, lưu trữ các dữ liệu độ cao cũng như giúp bạn có thể tìm kiếm các địa điểm khác nhau.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Hơi tiếc một tí, rằng việc này khá tốn kém.
 Nếu bạn thích công cụ này và cảm thấy nó hữu ích, bạn có thể xem xét ủng hộ dù chỉ một ít để giúp duy trì trang web hoàn toàn miễn phí và không quảng cáo.
diff --git a/website/src/lib/docs/vi/integration.mdx b/website/src/lib/docs/vi/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/vi/integration.mdx
+++ b/website/src/lib/docs/vi/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/vi/map-controls.mdx b/website/src/lib/docs/vi/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/vi/map-controls.mdx
+++ b/website/src/lib/docs/vi/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/vi/toolbar/elevation.mdx b/website/src/lib/docs/vi/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/vi/toolbar/merge.mdx b/website/src/lib/docs/vi/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/vi/toolbar/merge.mdx
+++ b/website/src/lib/docs/vi/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/zh-HK/files-and-stats.mdx b/website/src/lib/docs/zh-HK/files-and-stats.mdx
index c682ff7fb..ee3bccf23 100644
--- a/website/src/lib/docs/zh-HK/files-and-stats.mdx
+++ b/website/src/lib/docs/zh-HK/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: Files and statistics
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ You can also use the mouse wheel to zoom in and out on the elevation profile, an
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### Additional data
diff --git a/website/src/lib/docs/zh-HK/home/funding.mdx b/website/src/lib/docs/zh-HK/home/funding.mdx
index e1584c2b8..aec66ffdd 100644
--- a/website/src/lib/docs/zh-HK/home/funding.mdx
+++ b/website/src/lib/docs/zh-HK/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
-We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 Unfortunately, this is expensive.
 If you enjoy using this tool and find it valuable, please consider making a small donation to help keep the website free and ad-free.
diff --git a/website/src/lib/docs/zh-HK/integration.mdx b/website/src/lib/docs/zh-HK/integration.mdx
index a08c54dfc..25023a999 100644
--- a/website/src/lib/docs/zh-HK/integration.mdx
+++ b/website/src/lib/docs/zh-HK/integration.mdx
@@ -13,8 +13,8 @@ You can use **gpx.studio** to create maps showing your GPX files and embed them
 
 All you need is:
 
-1. A <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox access token</a> to load the map, and
-2. GPX files hosted on your server or on Google Drive, or accessible via a public URL.
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 You can then play with the configurator below to customize your map and generate the corresponding HTML code.
 
diff --git a/website/src/lib/docs/zh-HK/map-controls.mdx b/website/src/lib/docs/zh-HK/map-controls.mdx
index a880fb51f..f2c81a728 100644
--- a/website/src/lib/docs/zh-HK/map-controls.mdx
+++ b/website/src/lib/docs/zh-HK/map-controls.mdx
@@ -56,10 +56,12 @@ The map layers button allows you to switch between different basemaps, and toggl
 - **Points of interest** can be added to the map to show different categories of places, such as shops, restaurants, or accommodations.
 
 <div class="flex flex-col items-center">
-    <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.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> basemap.
-    </span>
+<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.
+
+</span>
 </div>
 
 A large collection of global and local basemaps and overlays is available in **gpx.studio**, as well as a selection of point-of-interest categories.
@@ -67,4 +69,4 @@ They can be enabled in the [map layer settings dialog](./menu/settings).
 
 In these settings, you can also manage the opacity of the overlays.
 
-For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> URLs.
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/zh-HK/toolbar/elevation.mdx b/website/src/lib/docs/zh-HK/toolbar/elevation.mdx
index 3ba9b759b..b92994df1 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://mapbox.com" target="_blank">Mapbox</a>.
-You can learn more about its origin and accuracy in the <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">documentation</a>.
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/zh-HK/toolbar/merge.mdx b/website/src/lib/docs/zh-HK/toolbar/merge.mdx
index 6b0413cdc..a815beae8 100644
--- a/website/src/lib/docs/zh-HK/toolbar/merge.mdx
+++ b/website/src/lib/docs/zh-HK/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: Merge
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ To use this tool, you need to [select](../files-and-stats) multiple files, [trac
 - The second option can be used to create or manage files with multiple [tracks or segments](../gpx).
   Merging files (or tracks) will result in a single file (or track) containing all tracks (or segments) from the selection.
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/lib/docs/zh/files-and-stats.mdx b/website/src/lib/docs/zh/files-and-stats.mdx
index e7e6a3fc2..ecc7f0dca 100644
--- a/website/src/lib/docs/zh/files-and-stats.mdx
+++ b/website/src/lib/docs/zh/files-and-stats.mdx
@@ -12,6 +12,7 @@ title: 文件和统计
 
     let gpxStatistics = writable(exampleGPXFile.getStatistics());
     let slicedGPXStatistics = writable(undefined);
+    let hoveredPoint = writable(null);
     let additionalDatasets = writable(['speed', 'atemp']);
     let elevationFill = writable(undefined);
 </script>
@@ -84,19 +85,17 @@ title: 文件和统计
     <ElevationProfile
         {gpxStatistics}
         {slicedGPXStatistics}
+        {hoveredPoint}
         {additionalDatasets}
         {elevationFill}
     />
 </div>
-<div class="flex flex-col items-center -mt-6">
-    <div class="h-10 w-fit">
-        <GPXStatistics
-            {gpxStatistics}
-            {slicedGPXStatistics}
-            panelSize={120}
-            orientation={'horizontal'}
-        />
-    </div>
+<div class="flex flex-col items-center w-full">
+    <GPXStatistics
+        {gpxStatistics}
+        {slicedGPXStatistics}
+        orientation={'horizontal'}
+    />
 </div>
 
 ### 补充数据
diff --git a/website/src/lib/docs/zh/home/funding.mdx b/website/src/lib/docs/zh/home/funding.mdx
index 6ef4114c9..027abf2ca 100644
--- a/website/src/lib/docs/zh/home/funding.mdx
+++ b/website/src/lib/docs/zh/home/funding.mdx
@@ -5,7 +5,7 @@
 ## <HeartHandshake size="18" class="inline-block align-baseline" /> 帮助网站保持免费（且无广告）
 
 每当 GPS 点被添加或移动时，服务器都将重新计算最佳路线。
-此外，网站使用 <a href="https://mapbox.com" target="_blank">Mapbox</a> API 来提供各种美观的地图样式、检索海拔数据和搜索位置等服务。
+We also use APIs from <a href="https://maptiler.com" target="_blank">MapTiler</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
 
 不过实现以上功能的运行成本并不便宜。
 如果您喜欢本工具且认为它是有价值的，欢迎通过小额捐款来支持它。
diff --git a/website/src/lib/docs/zh/integration.mdx b/website/src/lib/docs/zh/integration.mdx
index d7fd6132a..15f8e270b 100644
--- a/website/src/lib/docs/zh/integration.mdx
+++ b/website/src/lib/docs/zh/integration.mdx
@@ -13,8 +13,8 @@ title: 集成
 
 只需：
 
-1. 拥有一个用于加载地图的 <a href="https://account.mapbox.com/auth/signup" target="_blank">Mapbox 密钥</a>；
-2. 将 GPX 文件存放在个人服务器或谷歌云盘上，或提供公开访问链接；
+1. GPX files hosted on your server or on Google Drive, or accessible via a public URL;
+2. _Optional:_ a <a href="https://cloud.maptiler.com/auth/widget?next=https://cloud.maptiler.com/maps/" target="_blank">MapTiler key</a> to load MapTiler maps.
 
 然后，使用下面的配置器来自定义地图并生成相应的 HTML 代码。
 
diff --git a/website/src/lib/docs/zh/map-controls.mdx b/website/src/lib/docs/zh/map-controls.mdx
index 6272f7c1d..3438b26d3 100644
--- a/website/src/lib/docs/zh/map-controls.mdx
+++ b/website/src/lib/docs/zh/map-controls.mdx
@@ -56,10 +56,12 @@ title: 地图控件
 - **兴趣点** 用来显示地图上不同类别的地点，如商店、餐馆或住宿等；
 
 <div class="flex flex-col items-center">
-    <DocsLayers />
-    <span class="text-sm text-center mt-2">
-        将鼠标悬停在 <a href="https://www.mapbox.com/maps/outdoors" target="_blank">Mapbox Outdoors</a> 底图上可显示 <a href="https://hiking.waymarkedtrails.org" target="_blank">Waymarked Trails hiking</a> 数据
-    </span>
+<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.
+
+</span>
 </div>
 
 **gpx.studio** 提供了大量全球和本地的底图、叠加层以及精选的兴趣点类别等数据，
@@ -67,4 +69,4 @@ title: 地图控件
 
 还可以设置叠加层的不透明度。
 
-本站还支持通过添加 <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>、<a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a> 或 <a href="https://docs.mapbox.com/help/glossary/style/" target="_blank">Mapbox style JSON</a> 链接的方式来自定义底图和叠加层。
+For advanced users, it is possible to add custom basemaps and overlays by providing <a href="https://en.wikipedia.org/wiki/Web_Map_Tile_Service" target="_blank">WMTS</a>, <a href="https://en.wikipedia.org/wiki/Web_Map_Service" target="_blank">WMS</a>, or <a href="https://maplibre.org/maplibre-style-spec/" target="_blank">MapLibre style JSON</a> URLs.
diff --git a/website/src/lib/docs/zh/toolbar/elevation.mdx b/website/src/lib/docs/zh/toolbar/elevation.mdx
index 9c8107f1c..c16f76095 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://mapbox.com" target="_blank">Mapbox</a> ，
-查阅 <a href="https://docs.mapbox.com/data/tilesets/reference/mapbox-terrain-dem-v1/#elevation-data" target="_blank">官方文档</a> 以了解更多。
+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>.
 
 </DocsNote>
diff --git a/website/src/lib/docs/zh/toolbar/merge.mdx b/website/src/lib/docs/zh/toolbar/merge.mdx
index 1a81b0ca3..2374ce738 100644
--- a/website/src/lib/docs/zh/toolbar/merge.mdx
+++ b/website/src/lib/docs/zh/toolbar/merge.mdx
@@ -5,6 +5,7 @@ title: 合并要素
 <script>
     import { Group } from '@lucide/svelte';
     import Merge from '$lib/components/toolbar/tools/Merge.svelte';
+    import DocsNote from '$lib/components/docs/DocsNote.svelte';
 </script>
 
 # <Group size="24" class="inline-block" style="margin-bottom: 5px" /> { title }
@@ -15,6 +16,13 @@ title: 合并要素
 - 第二个选项可用于创建或管理包含多个 [轨迹或路段](../gpx) 的文件。
   并将所有内容存储在一个文件（或轨迹）中，请选择 **合并但保持轨迹独立**；
 
+<DocsNote>
+
+Selected items are merged in the order they appear in the files list.
+Reorder items by drag-and-drop if needed.
+
+</DocsNote>
+
 <div class="flex flex-row justify-center">
     <Merge class="text-foreground p-3 border rounded-md shadow-lg" />
 </div>
diff --git a/website/src/locales/be.json b/website/src/locales/be.json
index 441bec5a2..0125cb4f5 100644
--- a/website/src/locales/be.json
+++ b/website/src/locales/be.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Click",
         "drag": "Drag",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Інфармацыя...",
             "name": "Назва",
@@ -190,6 +191,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Layer type",
             "basemap": "Basemap",
@@ -300,8 +303,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",
diff --git a/website/src/locales/ca.json b/website/src/locales/ca.json
index a20e4a770..170eee249 100644
--- a/website/src/locales/ca.json
+++ b/website/src/locales/ca.json
@@ -28,7 +28,7 @@
         "undo": "Desfer",
         "redo": "Refer",
         "delete": "Elimina el track",
-        "delete_all": "Delete all",
+        "delete_all": "Esborra-ho tot",
         "select_all": "Seleccionar-ho tot",
         "view": "Vista",
         "elevation_profile": "Perfil d’elevacions",
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Clic",
         "drag": "Arrossega",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informació...",
             "name": "Nom",
@@ -80,7 +81,7 @@
         "center": "Centrar",
         "open_in": "Obrir amb",
         "copy_coordinates": "Copiar coordenades",
-        "edit_osm": "Edit in OpenStreetMap"
+        "edit_osm": "Edita a OpenStreetMap"
     },
     "toolbar": {
         "routing": {
@@ -190,6 +191,8 @@
                 "from": "El punt d'inici és massa lluny de la via més propera",
                 "via": "El punt és massa lluny de la via més propera",
                 "to": "El punt final és massa lluny de la via més propera",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "El càlcul de la ruta tarda més del compte, prova d'afegir punts més propers entre si"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Sol·licita dades d'altimetria",
-            "help": "Sol·licitar dades d'altimetria eliminarà qualsevol dada d'altimetria existent i ho reemplaçarà amb dades de Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Seleccioneu un fitxer per sol·licitar dades d'altimetria."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nova capa a mida",
             "edit": "Edita una capa a mida",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS o Mapbox estil JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Zoom màxim",
             "layer_type": "Tipus de capa",
             "basemap": "Mapa base",
@@ -282,7 +285,7 @@
             "update": "Actualitza la capa"
         },
         "opacity": "Opacitat de la superposició",
-        "terrain": "Terrain source",
+        "terrain": "Terreny",
         "label": {
             "basemaps": "Mapes base",
             "overlays": "Capes",
@@ -300,8 +303,10 @@
             "switzerland": "Suïssa",
             "united_kingdom": "Regne Unit",
             "united_states": "Estats Units",
-            "mapboxOutdoors": "Mapbox a l'aire lliure",
-            "mapboxSatellite": "Mapbox Satèl·lit",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -356,7 +361,7 @@
             "water": "Aigua",
             "shower": "Dutxa",
             "shelter": "Refugi",
-            "cemetery": "Cemetery",
+            "cemetery": "Cementiri",
             "motorized": "Cotxes i motos",
             "fuel-station": "Gasolinera",
             "parking": "Aparcament",
@@ -381,7 +386,7 @@
             "tram-stop": "Parada de tramvia",
             "bus-stop": "Parada d'autobús",
             "ferry": "Ferri",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Correu electrònic",
         "contribute": "Contribuir-hi",
         "supported_by": "amb la col·laboració de",
-        "support_button": "Doneu suport a gpx.studio a Ko-fi",
+        "features": "Features",
         "route_planning": "Planificació de rutes",
         "route_planning_description": "Una interfície intuïtiva per crear itineraris a mida per cada esport basat en les dades d'OpenStreetMap.",
         "file_processing": "Processament avançat de fitxers",
@@ -497,8 +502,15 @@
         "maps_description": "Una gran col·lecció de mapes base, capes i punts d'interès per ajudar-vos a crear la vostra propera aventura a l'aire lliure o visualitzar els vostres últims reptes.",
         "data_visualization": "Visualització de dades",
         "data_visualization_description": "Un perfil d'altimetria interactiu amb estadístiques detallades per analitzar activitats enregistrades i futurs objectius.",
-        "identity": "Gratuït, sense anuncis i de codi obert",
-        "identity_description": "Aquest lloc web es pot usar gratuïtament, sense publicitat i el codi font es pot trobar a GitHub. Això és possible gràcies a l'increïble suport de la comunitat."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Milloreu la traducció a Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Crea el teu propi mapa",
-        "mapbox_token": "Token d'accés a Mapbox",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "URL dels fitxers (separades per comes)",
         "drive_ids": "ID del fitxer a Google Drive (separats per comes)",
         "basemap": "Mapa base",
diff --git a/website/src/locales/cs.json b/website/src/locales/cs.json
index 2df837ade..8208cc7c9 100644
--- a/website/src/locales/cs.json
+++ b/website/src/locales/cs.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Kliknout",
         "drag": "Přetáhnout",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informace...",
             "name": "Název",
@@ -190,6 +191,8 @@
                 "from": "Počáteční bod je příliš daleko od nejbližší cesty",
                 "via": "Průchozí bod je příliš daleko od nejbližší cesty",
                 "to": "Koncový bod je příliš daleko od nejbližší cesty",
+                "distance": "Koncový bod je příliš daleko od počátečního bodu",
+                "connection": "Mezi body nebylo nalezeno žádné spojení",
                 "timeout": "Výpočet trasy trval příliš dlouho, zkuste přidat body blíže k sobě"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Vyžádat si výškové údaje",
-            "help": "Vyžádáte-li si údaje o nadmořské výšce, vymažou se stávající výškové údaje, pokud existují, a nahradí se údaji z Mapboxu.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Vyberte položku souboru pro vyžádání výškových dat."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nová vlastní vrstva",
             "edit": "Upravit vlastní vrstvu",
             "urls": "Adresy URL",
-            "url_placeholder": "WMTS, WMS nebo Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max. přiblížení",
             "layer_type": "Typ vrstvy",
             "basemap": "Základní mapa",
@@ -300,8 +303,10 @@
             "switzerland": "Švýcarsko",
             "united_kingdom": "Velká Británie",
             "united_states": "Spojené státy",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Zastávka tramvaje",
             "bus-stop": "Autobusová zastávka",
             "ferry": "Trajekt",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "E-mail",
         "contribute": "Zapojte se",
         "supported_by": "podporuje",
-        "support_button": "Podpořte gpx.studio na Ko-fi",
+        "features": "Features",
         "route_planning": "Plánování trasy",
         "route_planning_description": "Intuitivní rozhraní pro vytváření itinerářů přizpůsobených jakémukoli sportu založené na OpenStreetMap datech.",
         "file_processing": "Pokročilé zpracování souborů",
@@ -497,8 +502,15 @@
         "maps_description": "Široká nabídka mapových podkladů, překryvů a bodů zájmu pro naplánování vašeho příštího dobrodružství v přírodě nebo vizualizaci vašich nejnovějších úspěchů.",
         "data_visualization": "Vizualizace dat",
         "data_visualization_description": "Interaktivní výškový profil s podrobnými statistikami pro analýzu zaznamenaných činností a budoucích cílů.",
-        "identity": "Zdarma, bez reklam a open source",
-        "identity_description": "Webová stránka je zdarma k použití, bez reklam a zdrojový kód je veřejně dostupný na GitHubu. To je možné jen díky neuvěřitelné podpoře komunity."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Zlepšete překlad na Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Vytvořte si vlastní mapu",
-        "mapbox_token": "Přístupový token Mapbox",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "URL souborů (oddělené čárkami)",
         "drive_ids": "ID souborů Google Drive (oddělené čárkami)",
         "basemap": "Základní mapa",
diff --git a/website/src/locales/da.json b/website/src/locales/da.json
index 282061a9a..b72c451fe 100644
--- a/website/src/locales/da.json
+++ b/website/src/locales/da.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Click",
         "drag": "Drag",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Name",
@@ -190,6 +191,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Layer type",
             "basemap": "Basemap",
@@ -300,8 +303,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",
diff --git a/website/src/locales/de.json b/website/src/locales/de.json
index f041ec3bc..7f33c5766 100644
--- a/website/src/locales/de.json
+++ b/website/src/locales/de.json
@@ -21,14 +21,14 @@
         "export_all": "Alle exportieren...",
         "export_options": "Export-Einstellungen",
         "support_message": "Das Tool darf frei benutzt werden, aber es darf nicht woanders aufgesetzt werden. Bitte unterstützen Sie die Website, wenn Sie sie häufig benutzen. Vielen Dank!",
-        "support_button": "Hilf dabei, die Webseite kostenlos zu belassen",
+        "support_button": "Hilf uns, die Website weiterhin kostenlos bereitzustellen",
         "download_file": "Datei herunterladen",
         "download_files": "Dateien herunterladen",
         "edit": "Bearbeiten",
         "undo": "Rückgängig",
         "redo": "Wiederholen",
         "delete": "Löschen",
-        "delete_all": "Delete all",
+        "delete_all": "Alle löschen",
         "select_all": "Alle auswählen",
         "view": "Ansicht",
         "elevation_profile": "Höhenprofil",
@@ -63,6 +63,7 @@
         "ctrl": "Strg",
         "click": "Klick",
         "drag": "Ziehen",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Bezeichnung",
@@ -80,7 +81,7 @@
         "center": "Zentrieren",
         "open_in": "Öffnen in",
         "copy_coordinates": "Koordinaten kopieren",
-        "edit_osm": "Edit in OpenStreetMap"
+        "edit_osm": "In OpenStreetMap bearbeiten"
     },
     "toolbar": {
         "routing": {
@@ -190,6 +191,8 @@
                 "from": "Der Startpunkt ist zu weit von der nächsten Straße entfernt",
                 "via": "Der Via-Punkt ist zu weit entfernt von der nächsten Straße",
                 "to": "Der Endpunkt ist zu weit von der nächsten Straße entfernt",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route-Berechnung benötigte zu viel Zeit; versuche, die Punkte näher aneinander zu setzen"
             }
         },
@@ -231,7 +234,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 Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Wählen Sie ein Datei-Element, um Höhendaten anzufordern."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Neue benutzerdefinierte Ebene",
             "edit": "Eigene Ebene bearbeiten",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS oder Mapbox Stil JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max. Zoom",
             "layer_type": "Ebenenart",
             "basemap": "Basiskarte",
@@ -282,7 +285,7 @@
             "update": "Layer aktualisieren"
         },
         "opacity": "Deckkraft der Überlagerung",
-        "terrain": "Terrain source",
+        "terrain": "Geländequelle",
         "label": {
             "basemaps": "Basiskarte",
             "overlays": "Ebenen",
@@ -300,8 +303,10 @@
             "switzerland": "Schweiz",
             "united_kingdom": "Großbritannien",
             "united_states": "USA",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellit",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -326,7 +331,7 @@
             "usgs": "USGS",
             "bikerouterGravel": "bikerouter.de Gravel",
             "cyclOSMlite": "CyclOSM Lite",
-            "mapterhornHillshade": "Mapterhorn Hillshade",
+            "mapterhornHillshade": "MapTiler Hillshade",
             "openRailwayMap": "OpenRailwayMap",
             "swisstopoSlope": "swisstopo Neigung",
             "swisstopoHiking": "swisstopo Wandern",
@@ -356,7 +361,7 @@
             "water": "Trinkwasser",
             "shower": "Dusche",
             "shelter": "Unterstand",
-            "cemetery": "Cemetery",
+            "cemetery": "Friedhof",
             "motorized": "Autos und Motorräder",
             "fuel-station": "Tankstelle",
             "parking": "Parken",
@@ -381,7 +386,7 @@
             "tram-stop": "Straßenbahnhaltestelle",
             "bus-stop": "Bushaltestelle",
             "ferry": "Fähre",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "E-Mail",
         "contribute": "Beitragen",
         "supported_by": "unterstützt durch",
-        "support_button": "Unterstütze gpx.studio auf Ko-fi",
+        "features": "Features",
         "route_planning": "Routenplanung",
         "route_planning_description": "Eine intuitive Benutzeroberfläche, um Routen für jeden Sport zu erstellen, basierend auf OpenStreetMap-Daten.",
         "file_processing": "Erweiterte Dateiverarbeitung",
@@ -497,8 +502,15 @@
         "maps_description": "Eine große Sammlung von Basemaps, Overlays und interessanten Punkten, die dir helfen dein nächstes Outdoor-Abenteuer zu gestalten oder deine neueste Errungenschaft zu visualisieren.",
         "data_visualization": "Datenvisualisierung",
         "data_visualization_description": "Ein interaktives Höhenprofil mit detaillierten Statistiken zur Analyse erfasster Aktivitäten und zukünftiger Ziele.",
-        "identity": "Kostenlos, werbefrei und Open Source",
-        "identity_description": "Die Website ist frei zu nutzen, ohne Werbung, und der Quellcode ist auf GitHub öffentlich zugänglich. Dies ist nur dank der unglaublichen Unterstützung der Gemeinschaft möglich."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Verbessere die Übersetzung auf Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Erstelle deine eigene Karte!",
-        "mapbox_token": "Mapbox Zugangs-Token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Datei URLs (getrennt durch Kommas)",
         "drive_ids": "Google Drive Datei IDs (getrennt durch Kommas)",
         "basemap": "Basiskarte",
diff --git a/website/src/locales/el.json b/website/src/locales/el.json
index 041f2726e..37485ddbf 100644
--- a/website/src/locales/el.json
+++ b/website/src/locales/el.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Click",
         "drag": "Drag",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Name",
@@ -190,6 +191,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Layer type",
             "basemap": "Βασικός Χάρτης",
@@ -300,8 +303,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Υπερσύνδεσμοι URL Αρχείων (διαχωρισμένοι με κόμμα)",
         "drive_ids": "Αναγνωριστικά αρχείων Google Drive ID (διαχωρισμένα με κόμματα)",
         "basemap": "Βασικός Χάρτης",
diff --git a/website/src/locales/es.json b/website/src/locales/es.json
index 5b09a025a..852583db6 100644
--- a/website/src/locales/es.json
+++ b/website/src/locales/es.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Clic",
         "drag": "Arrastrar",
+        "right_click_drag": "Arrastre con el botón derecho",
         "metadata": {
             "button": "Información...",
             "name": "Nombre",
@@ -190,6 +191,8 @@
                 "from": "El punto de inicio está demasiado lejos de la carretera más cercana",
                 "via": "El punto de paso está demasiado lejos de la carretera más cercana",
                 "to": "El punto final está demasiado lejos de la carretera más cercana",
+                "distance": "El punto final está demasiado lejos del punto inicial",
+                "connection": "No hay conexión entre los puntos",
                 "timeout": "Calcular la ruta llevó demasiado tiempo, intente añadir puntos más cercanos entre ellos"
             }
         },
@@ -231,7 +234,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": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Seleccione un elemento del archivo para solicitar datos de desnivel."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nueva capa personalizada",
             "edit": "Editar capa personalizada",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS o JSON estilo Mapbox",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Zoom máximo",
             "layer_type": "Tipo de capa",
             "basemap": "Mapa base",
@@ -300,8 +303,10 @@
             "switzerland": "Suiza",
             "united_kingdom": "Reino Unido",
             "united_states": "Estados Unidos",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Parada de tranvía",
             "bus-stop": "Parada de autobús",
             "ferry": "Ferri",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribuir",
         "supported_by": "con el apoyo de",
-        "support_button": "Apoyar gpx.studio en Ko-fi",
+        "features": "Features",
         "route_planning": "Planificación de ruta",
         "route_planning_description": "Una interfaz intuitiva para crear itinerarios adaptados a cada deporte, basada en datos de OpenStreetMap.",
         "file_processing": "Procesamiento avanzado de archivo",
@@ -497,8 +502,15 @@
         "maps_description": "Una gran colección de mapas base, capas y puntos de interés para ayudarle a crear su próxima aventura al aire libre o visualizar su último logro.",
         "data_visualization": "Visualización de datos",
         "data_visualization_description": "Un perfil de elevación interactivo con estadísticas detalladas para analizar actividades registradas y futuros objetivos.",
-        "identity": "Gratis, sin anuncios y código abierto",
-        "identity_description": "Este sitio web es de uso gratuito, sin anuncios y el código fuente está disponible públicamente en GitHub. Esto solo es posible gracias al increíble apoyo de la comunidad."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Tus archivos GPX nunca abandonan tu navegador. Sin seguimiento, sin recopilación de datos.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio tiene una comunidad asombrosa que ha cubierto sus costes a través de donaciones durante años, mientras ha dado forma al proyecto a través de sugerencias de características, informes de fallos y traducciones a muchos idiomas.",
+        "support_button": "Apoya a gpx.studio en Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Mejorar la traducción en Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Crear su propio mapa",
-        "mapbox_token": "Token de acceso Mapbox",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "URLs de archivo (separados por comas)",
         "drive_ids": "IDs de archivo de Google Drive (separados por comas)",
         "basemap": "Mapa base",
diff --git a/website/src/locales/eu.json b/website/src/locales/eu.json
index 7aac98cf2..0db212c2a 100644
--- a/website/src/locales/eu.json
+++ b/website/src/locales/eu.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Klik",
         "drag": "Arrastatu",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informazioa...",
             "name": "Izena",
@@ -190,6 +191,8 @@
                 "from": "Hasiera puntua errepide hurbilenetik oso hurrun dago",
                 "via": "Puntua errepide hurbilenetik oso hurrun dago",
                 "to": "Bukaera puntua errepide hurbilenetik oso hurrun dago",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Ibilbidea kalkulatzea luzeegi joan da, saiatu hurbilago dauden puntuak gehitzen"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Eskatu altueraren datuak",
-            "help": "Altueraren datuak eskatzeak beren egungo datuak ezabatzea ekarriko du, eta, baldin badago, Mapboxeko datuekin ordezkatzea.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Aukeratu fitxategi bat altuera datuak eskatzeko."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Geruza pertsonalizatu berria",
             "edit": "Editatu geruza pertsonalizatua",
             "urls": "URLa(k)",
-            "url_placeholder": "WMTS, WMS edo Mapbox-erako JSONa",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Zoom max",
             "layer_type": "Geruza mota",
             "basemap": "Oinarrizko-mapa",
@@ -282,7 +285,7 @@
             "update": "Eguneratu geruza"
         },
         "opacity": "Geruzaren opakutasuna",
-        "terrain": "Terrain source",
+        "terrain": "Lurrazala",
         "label": {
             "basemaps": "Oinarrizko mapak",
             "overlays": "Geruzak",
@@ -300,8 +303,10 @@
             "switzerland": "Suitza",
             "united_kingdom": "Erresuma Batua",
             "united_states": "Ameriketako Estatu Batuak",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satelitea",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tranbia geltokia",
             "bus-stop": "Autobus geltokia",
             "ferry": "Ferria",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Eposta",
         "contribute": "Lagundu",
         "supported_by": "hauek lagunduta",
-        "support_button": "Lagundu gpx.studio Ko-fi webgunean",
+        "features": "Features",
         "route_planning": "Bideak planifikatzea",
         "route_planning_description": "OpenStreetMapen datuetan oinarritutako interfaze erabilterraza kirol bakoitzerako ibilbideak sortzeko.",
         "file_processing": "Fitxategien prozesaketa aurreratua",
@@ -497,8 +502,15 @@
         "maps_description": "Oinarrizko mapa, geruza eta interes-puntuen bilduma zabala. Zure aire-libreko ekintzak planifikatzen lagunduko dizu!",
         "data_visualization": "Datuak bistaratzea",
         "data_visualization_description": "Grabatutako ekintzak edo etorkizuneko zure bideak aztertzeko altuera-profil interaktiboa.",
-        "identity": "Doakoa, iragarki gabea eta kode irekikoa",
-        "identity_description": "Webgunea erabiltzea doakoa da, ez du iragarkirik eta iturburu kodea GitHuben lortu daiteke. Hau komunitatearen laguntzari esker da posible."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Lagundu itzulpenarekin Crowdinen",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Sortu zure mapa",
-        "mapbox_token": "Mapbox sarbide-tokena",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Fitxategien URLak (komarekin banatuta)",
         "drive_ids": "Google Drive fitxategien IDak (komarekin banatuta)",
         "basemap": "Oinarrizko-mapa",
diff --git a/website/src/locales/fi.json b/website/src/locales/fi.json
index 754754d59..eb1b5f1b2 100644
--- a/website/src/locales/fi.json
+++ b/website/src/locales/fi.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Klikkaa",
         "drag": "Raahaa",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Tiedot...",
             "name": "Nimi",
@@ -190,6 +191,8 @@
                 "from": "Aloituspiste on liian kaukana lähimmästä tiestä",
                 "via": "Reittipiste on liian kaukana lähimmästä tiestä",
                 "to": "Päätepiste on liian kaukana lähimmästä tiestä",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Reitin laskenta kesti liian kauan. Tihennä reittipisteitä"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Hae korkeustiedot",
-            "help": "Tietojen haku korvaa aiemmat korkeustiedot Mapboxin tiedoilla.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Valitse tiedosto, jolle haet korkeustietoja."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Lisää oma karttataso",
             "edit": "Muokkaa omaa karttatasoa",
             "urls": "URL(t)",
-            "url_placeholder": "WMTS, WMS tai Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Enimmäissuurennus",
             "layer_type": "Tason tyyppi",
             "basemap": "Taustakartta",
@@ -300,8 +303,10 @@
             "switzerland": "Sveitsi",
             "united_kingdom": "Iso-Britannia",
             "united_states": "Yhdysvallat",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satelliittikuva",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Raitiovaunupysäkit",
             "bus-stop": "Linja-autopysäkit",
             "ferry": "Lautat",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Sähköposti",
         "contribute": "Osallistu",
         "supported_by": "tukijat:",
-        "support_button": "Tue gpx.studiota Ko-fi:ssa",
+        "features": "Features",
         "route_planning": "Reittisuunnittelu",
         "route_planning_description": "Käyttäjäystävällinen, OpenStreetMap-aineistoon pohjautuva reittisuunnittelutyökalu.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "Korkeusprofiili ja -tiedot suunnittelun ja analysoinnin tueksi.",
-        "identity": "Maksuton, mainokseton ja avoin",
-        "identity_description": "Sovellus on ilmainen, mainokseton, ja sen lähdekoodi on saatavilla Githubissa mahtavan yhteisön tuen ansiosta."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Paranna käännöstä Crowdinissa",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Luo oma kartta",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive tiedostotunnisteet (pilkkuerotetut)",
         "basemap": "Taustakartta",
diff --git a/website/src/locales/fr.json b/website/src/locales/fr.json
index 033e2068f..8d0096ff6 100644
--- a/website/src/locales/fr.json
+++ b/website/src/locales/fr.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Clic",
         "drag": "Glisser",
+        "right_click_drag": "Clic droit glisser",
         "metadata": {
             "button": "Infos...",
             "name": "Nom",
@@ -190,6 +191,8 @@
                 "from": "Le point de départ est trop éloigné de la route la plus proche",
                 "via": "Le point de passage est trop éloigné de la route la plus proche",
                 "to": "Le point d'arrivée est trop éloigné de la route la plus proche",
+                "distance": "Le point d'arrivée est trop loin du point de départ",
+                "connection": "Aucune connexion trouvée entre les points",
                 "timeout": "Le calcul de l'itinéraire a pris trop de temps, essayez d'ajouter des points plus rapprochés"
             }
         },
@@ -231,7 +234,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 de Mapbox.",
+            "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_no_selection": "Sélectionnez un élément de fichier pour ajouter des données d'altitude."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nouvelle couche personnalisée",
             "edit": "Modifier la couche personnalisée",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS ou Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS ou MapLibre style JSON",
             "max_zoom": "Zoom max",
             "layer_type": "Type de couche",
             "basemap": "Fond de carte",
@@ -300,8 +303,10 @@
             "switzerland": "Suisse",
             "united_kingdom": "Royaume-Uni",
             "united_states": "États-Unis",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Arrêt de tram",
             "bus-stop": "Arrêt de bus",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribuer",
         "supported_by": "soutenu par",
-        "support_button": "Soutenir gpx.studio sur Ko-fi",
+        "features": "Fonctionnalités ",
         "route_planning": "Planification d’itinéraire",
         "route_planning_description": "Une interface intuitive pour créer des itinéraires adaptés à chaque sport, basés sur les données d'OpenStreetMap.",
         "file_processing": "Traitement de fichiers avancé",
@@ -497,8 +502,15 @@
         "maps_description": "Une vaste collection de fonds de carte, de surcouches et de points d'intérêt pour vous aider à planifier votre prochaine aventure en plein air ou à visualiser vos dernières expéditions.",
         "data_visualization": "Visualisation de données",
         "data_visualization_description": "Un profil altimétrique interactif avec des statistiques détaillées pour analyser les activités enregistrées et les objectifs futurs.",
-        "identity": "Gratuit, sans pub et open source",
-        "identity_description": "Le site Web est gratuit, sans publicité, et le code source est disponible publiquement sur GitHub. Cela est possible uniquement grâce au soutien incroyable de la communauté."
+        "philosophy": "Philosophie",
+        "foss": "Gratuit, sans pub et open source",
+        "foss_description": "Le site web est gratuit, sans publicité, et le code source est disponible publiquement sur GitHub.",
+        "privacy": "Respectueux de la vie privée",
+        "privacy_description": "Vos fichiers GPX ne quittent jamais votre navigateur. Aucun suivi, aucune collecte de données.",
+        "community": "Rendu possible par la communauté",
+        "community_description": "gpx.studio a une communauté incroyable dont les dons financent les coûts du projet depuis plusieurs années, tout en contribuant à l'améliorer à travers des suggestions de nouvelles fonctionnalités, des signalements de bugs et la traduction du site dans de nombreuses langues.",
+        "support_button": "Soutenir gpx.studio sur Open Collective",
+        "translate_button": "Aidez à traduire le site sur Crowdin"
     },
     "docs": {
         "translate": "Améliorer la traduction sur Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Créez votre propre carte",
-        "mapbox_token": "Jeton d'accès Mapbox",
+        "maptiler_key": "Clé MapTiler (optionnelle, uniquement nécessaire pour les cartes MapTiler)",
         "file_urls": "URLs des fichiers (séparées par des virgules)",
         "drive_ids": "IDs des fichiers Google Drive (séparés par des virgules)",
         "basemap": "Fond de carte",
diff --git a/website/src/locales/he.json b/website/src/locales/he.json
index 2e2b27c2f..91f137be7 100644
--- a/website/src/locales/he.json
+++ b/website/src/locales/he.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Click",
         "drag": "Drag",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Name",
@@ -190,6 +191,8 @@
                 "from": "נקודת ההתחלה רחוקה מדיי מהכביש הקרוב ביותר",
                 "via": "נקודת המעבר רחוקה מדיי מהכביש הקרוב ביותר",
                 "to": "נקודת הסיום רחוקה מדיי מהכביש הקרוב ביותר",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Layer type",
             "basemap": "Basemap",
@@ -300,8 +303,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "לתרום",
         "supported_by": "נתמך ע\"י",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",
diff --git a/website/src/locales/hu.json b/website/src/locales/hu.json
index 0e9c76af8..d4ea7d3a4 100644
--- a/website/src/locales/hu.json
+++ b/website/src/locales/hu.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Kattints",
         "drag": "Húzza",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Infó...",
             "name": "Név",
@@ -190,6 +191,8 @@
                 "from": "A kiindulási pont túl messze van a legközelebbi úttól",
                 "via": "A köztes pont túl messze van a legközelebbi úttól",
                 "to": "A végpont túl messze van a legközelebbi úttól",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Az útvonal kiszámítása túl sokáig tartott. Próbáljon meg közelebbi pontokat adni egymáshoz"
             }
         },
@@ -231,17 +234,17 @@
         },
         "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 Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
-            "tooltip": "Create and edit points of interest",
-            "icon": "Icon",
+            "tooltip": "PoI létrehozása és módosítása",
+            "icon": "Ikon",
             "link": "Link",
-            "longitude": "Longitude",
+            "longitude": "Földrajzi hosszúság",
             "latitude": "Szélesség",
             "create": "POI fájlba mentése",
-            "add": "Add point of interest to file",
+            "add": "PoI fájlhoz adása",
             "help": "Töltsd ki az űrlapot egy új POI létrehozásához, vagy kattints egy meglévőre a szerkesztéshez. Kattints a térképre a koordináták megadásához, vagy áthelyezéshez egérrel húzd el a POI-kat.",
             "help_no_selection": "Select a file to create or edit points of interest."
         },
@@ -249,8 +252,8 @@
             "tooltip": "Reduce the number of GPS points",
             "tolerance": "Tűréshatár",
             "number_of_points": "GPS pontok száma",
-            "button": "Minify",
-            "help": "Use the slider to choose the number of GPS points to keep.",
+            "button": "Minimalizálás",
+            "help": "",
             "help_no_selection": "Select a trace to reduce the number of its GPS points."
         },
         "clean": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "Webcím(ek)",
-            "url_placeholder": "WMTS, WMS vagy Mapbox stílus JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max nagyítás",
             "layer_type": "Réteg típus",
             "basemap": "Alap térkép",
@@ -300,8 +303,10 @@
             "switzerland": "Svájc",
             "united_kingdom": "Anglia",
             "united_states": "Amerika",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "Túraútvonal jelzések",
@@ -381,7 +386,7 @@
             "tram-stop": "Villamos megálló",
             "bus-stop": "Buszmegálló",
             "ferry": "Komp",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Hozzájárulás",
         "supported_by": "támogatók",
-        "support_button": "A gpx.studio támogatása a Ko-fi-n",
+        "features": "Features",
         "route_planning": "Útvonal tervezés",
         "route_planning_description": "Intuitív kezelőfelület az egyes sportágakra szabott útvonalak létrehozásához, OpenStreetMap adatok alapján.",
         "file_processing": "Fejlett olajfeldolgozás",
@@ -497,8 +502,15 @@
         "maps_description": "Alaptérképek, lefedések és érdekességek nagy gyűjteménye, amelyek segítenek megtervezni a következő szabadtéri kalandot, vagy megjeleníteni legújabb eredményeit.",
         "data_visualization": "Adatvizualizáció",
         "data_visualization_description": "Interaktív magassági profil részletes statisztikákkal a rögzített tevékenységek és a jövőbeni célok elemzéséhez.",
-        "identity": "Ingyenes, reklámmentes és nyílt forráskódú",
-        "identity_description": "A webhely ingyenesen használható, hirdetések nélkül, a forráskód pedig nyilvánosan elérhető a GitHubon. Ez csak a közösség hihetetlen támogatásának köszönhetően lehetséges."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Javítsd ki a fordítást Crowdinon",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Készítse el saját térképét",
-        "mapbox_token": "Mapbox hozzáférési token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Fájl elérési URL-ek (vesszővel elválasztva)",
         "drive_ids": "Google Drive ID-ik (a fájlazonosítók vesszővel elválasztva)",
         "basemap": "Alap térkép",
diff --git a/website/src/locales/id.json b/website/src/locales/id.json
index 6b63a575e..c92e4107b 100644
--- a/website/src/locales/id.json
+++ b/website/src/locales/id.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Klik",
         "drag": "Seret",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Nama",
@@ -190,6 +191,8 @@
                 "from": "Titik awal terlalu jauh dari jalan terdekat",
                 "via": "Titik via terlalu jauh dari jalan terdekat",
                 "to": "Titik akhir terlalu jauh dari jalan terdekat",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Perhitungan rute memakan waktu terlalu lama, coba tambahkan titik-titik yang lebih dekat satu sama lain"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Minta data elevasi",
-            "help": "Meminta data elevasi akan menghapus data elevasi yang ada, jika ada, dan menggantinya dengan data dari Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Pilih item file untuk meminta data elevasi."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Lapisan kustom baru",
             "edit": "Edit lapisan kustom",
             "urls": "URL",
-            "url_placeholder": "WMTS, WMS, atau JSON gaya Mapbox",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Zoom maksimum",
             "layer_type": "Tipe lapisan",
             "basemap": "Peta dasar",
@@ -300,8 +303,10 @@
             "switzerland": "Swiss",
             "united_kingdom": "Britania Raya",
             "united_states": "Amerika Serikat",
-            "mapboxOutdoors": "Mapbox Luar Ruang",
-            "mapboxSatellite": "Satelit Mapbox",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Halt trem",
             "bus-stop": "Pemberhentian Bus",
             "ferry": "Feri",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,17 +493,24 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
-        "file_processing": "Advanced file processing",
+        "file_processing": "Pengolahan file lanjutan",
         "file_processing_description": "A suite of tools for performing all common file processing tasks, and which can be applied to multiple files at once.",
         "maps": "Global and local maps",
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",
diff --git a/website/src/locales/it.json b/website/src/locales/it.json
index 0c52c4584..d38713d8a 100644
--- a/website/src/locales/it.json
+++ b/website/src/locales/it.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Click",
         "drag": "Trascina",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informazioni...",
             "name": "Nome",
@@ -84,10 +85,10 @@
     },
     "toolbar": {
         "routing": {
-            "tooltip": "Pianifica o modifica un percorsoo",
+            "tooltip": "Pianifica o modifica un percorso",
             "activity": "Attività",
             "use_routing": "Instradamento",
-            "use_routing_tooltip": "Collega i punti di ancoraggio tramite la rete stradale (o in linea retta se disabilitato)",
+            "use_routing_tooltip": "Collega i punti di ancoraggio tramite la rete stradale, o in linea retta se disabilitato",
             "allow_private": "Consenti strade private",
             "reverse": {
                 "button": "Inverti la traccia",
@@ -107,7 +108,7 @@
             "activities": {
                 "bike": "Bicicletta",
                 "racing_bike": "Bici da strada",
-                "gravel_bike": "Bici gravel",
+                "gravel_bike": "Bici da gravel",
                 "mountain_bike": "Mountain bike",
                 "foot": "Corsa/escursione",
                 "motorcycle": "Moto",
@@ -190,6 +191,8 @@
                 "from": "Il punto di partenza è troppo lontano dalla strada più vicina",
                 "via": "Il punto di arrivo è troppo lontano dalla strada più vicina",
                 "to": "Il punto di arrivo è troppo lontano dalla strada più vicina",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Il calcolo del percorso ha richiesto troppo tempo, prova ad aggiungere punti più vicini"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Richiedi dati elevazione",
-            "help": "Richiedere dati di altitudine cancellerà i dati di altitudine attuali, se presenti, e li rimpiazzerà con quelli provenienti da Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Seleziona un file per richiedere i dati di altitudine."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nuovo livello personalizzato",
             "edit": "Modifica livello personalizzato",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS o JSON in stile Mapbox",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Zoom massimo",
             "layer_type": "Tipo del layer",
             "basemap": "Mappa Base",
@@ -300,8 +303,10 @@
             "switzerland": "Svizzera",
             "united_kingdom": "United Kingdom",
             "united_states": "Stati Uniti",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Fermata del tram",
             "bus-stop": "Fermata dell'autobus",
             "ferry": "Traghetto",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribuire",
         "supported_by": "supportato da",
-        "support_button": "Supporta gpx.studio su Ko-fi",
+        "features": "Features",
         "route_planning": "Pianificazione del percorso",
         "route_planning_description": "Un'interfaccia intuitiva per creare itinerari su misura per ogni sport, basata sui dati OpenStreetMap.",
         "file_processing": "Elaborazione avanzata dei file",
@@ -497,8 +502,15 @@
         "maps_description": "Una vasta collezione di mappe di base, sovrapposizioni e punti d'interesse per aiutarti a creare la tua prossima avventura all'aperto o visualizzare la tua ultima impresa.",
         "data_visualization": "Visualizzazione dei dati",
         "data_visualization_description": "Un profilo di elevazione interattivo con statistiche dettagliate per analizzare attività registrate e obiettivi futuri.",
-        "identity": "Gratuito, senza pubblicità e open source",
-        "identity_description": "Il sito web è gratuito da usare, senza pubblicità, e il codice sorgente è pubblicamente disponibile su GitHub. Questo è possibile solo grazie all'incredibile sostegno della comunità."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Migliora la traduzione su Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Crea la tua mappa",
-        "mapbox_token": "Token di accesso a Mapbox",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "URL dei file (separati da virgole)",
         "drive_ids": "ID dei file in Google Drive (separati da virgole)",
         "basemap": "Mappa Base",
diff --git a/website/src/locales/ko.json b/website/src/locales/ko.json
index 918e9fcbe..5467e6f6d 100644
--- a/website/src/locales/ko.json
+++ b/website/src/locales/ko.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "",
         "drag": "Drag",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "정보...",
             "name": "이름",
@@ -190,6 +191,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "사용자 정의 레이어 생성",
             "edit": "사용자 정의 레이어 편집",
             "urls": "URL",
-            "url_placeholder": "WMTS, WMS 또는 Mapbox 스타일 JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "최대 확대 정도",
             "layer_type": "레이어 유형",
             "basemap": "배경 지도",
@@ -300,8 +303,10 @@
             "switzerland": "스위스",
             "united_kingdom": "영국",
             "united_states": "미국",
-            "mapboxOutdoors": "Mapbox 아웃도어",
-            "mapboxSatellite": "Mapbox 위성",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "오픈스트리트맵",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "트램 정류장",
             "bus-stop": "버스 정류장",
             "ferry": "페리",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "이메일",
         "contribute": "기여",
         "supported_by": "supported by",
-        "support_button": "Ko-fi에서 gpx.studio 후원",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "데이터 시각화",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",
diff --git a/website/src/locales/lt.json b/website/src/locales/lt.json
index 2ddc8046e..330cd5308 100644
--- a/website/src/locales/lt.json
+++ b/website/src/locales/lt.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Spustelėjimas",
         "drag": "Vilkti",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informacija...",
             "name": "Pavadinimas",
@@ -190,6 +191,8 @@
                 "from": "Pradžios taškas yra per toli nuo artimiausio kelio",
                 "via": "Tarpinis taškas yra per toli nuo artimiausio kelio",
                 "to": "Pabaigos taškas yra per toli nuo artimiausio kelio",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Maršruto skaičiavimas užtruko per ilgai, pabandykite pridėti taškus arčiau vienas kito"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Naujas vartotojo sluoksnis",
             "edit": "Keisti vartotojo sluoksnį",
             "urls": "URL adresas(-ai)",
-            "url_placeholder": "WMTS, WMS arba Mapbox stiliaus JSON failas",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Didžiausias mastelis",
             "layer_type": "Sluoksnio tipas",
             "basemap": "Pagrindas",
@@ -300,8 +303,10 @@
             "switzerland": "Šveicarija",
             "united_kingdom": "Jungtinė Karalystė",
             "united_states": "Jungtinės Amerikos Valstijos",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tramvajaus stotelė",
             "bus-stop": "Autobusų stotelė",
             "ferry": "Keltas",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "El. paštas",
         "contribute": "Prisidėti",
         "supported_by": "remia",
-        "support_button": "Paremkite „gpx.studio“ per „Ko-fi“",
+        "features": "Features",
         "route_planning": "Maršruto planavimas",
         "route_planning_description": "Lengvai suprantama sąsaja, leidžianti kurti maršrutus, pritaikytus kiekvienai sporto šakai, remiantis „OpenStreetMap“ duomenimis.",
         "file_processing": "Pažangus failo apdorojimas",
@@ -497,8 +502,15 @@
         "maps_description": "Didelis pagrindo žemėlapių, sluoksnių ir svarbių vietų rinkinys, padedantis pasiruošti kitam nuotykiui lauke arba atvaizduoti naujausią pasiekimą.",
         "data_visualization": "Duomenų atvaizdvimas",
         "data_visualization_description": "Interaktyvus aukščio profilis su išsamiais statistiniais duomenimis, kad būtų galima analizuoti užregistruotą veiklą ir būsimus tikslus.",
-        "identity": "Nemokamai, be reklamų ir atviro kodo",
-        "identity_description": "Tinklalapiu galima naudotis nemokamai, jame nėra reklamų, o kodas yra atviras ir prieinamas „GitHub“ svetainėje. Tai įmanoma tik dėl neįtikėtinos bendruomenės paramos."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Susikurkite savo žemėlapį",
-        "mapbox_token": "Prieigos prie „Mapbox“ atpažinimo ženklas",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Failų URL adresai (atskirti kableliais)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Pagrindo žemėlapis",
diff --git a/website/src/locales/lv.json b/website/src/locales/lv.json
index cbae3f1de..48585f846 100644
--- a/website/src/locales/lv.json
+++ b/website/src/locales/lv.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Click",
         "drag": "Drag",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Name",
@@ -190,6 +191,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Layer type",
             "basemap": "Basemap",
@@ -300,8 +303,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",
diff --git a/website/src/locales/nl.json b/website/src/locales/nl.json
index 2dbb7c18a..f6fbffea1 100644
--- a/website/src/locales/nl.json
+++ b/website/src/locales/nl.json
@@ -54,7 +54,7 @@
         "mapillary": "Mapillary",
         "google": "Google",
         "toggle_street_view": "Street view",
-        "layers": "Kaart lagen...",
+        "layers": "Kaartlagen...",
         "distance_markers": "Afstandsmarkeringen",
         "direction_markers": "Richtingspijlen",
         "help": "Help",
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Klik",
         "drag": "Slepen",
+        "right_click_drag": "Rechtsklik slepen",
         "metadata": {
             "button": "Info...",
             "name": "Naam",
@@ -190,6 +191,8 @@
                 "from": "Het startpunt ligt te ver van de dichtstbijzijnde weg",
                 "via": "Het via punt ligt te ver van de dichtstbijzijnde weg",
                 "to": "Het eindpunt is te ver van de dichtstbijzijnde weg",
+                "distance": "Het eindpunt is te ver vanaf het startpunt",
+                "connection": "Geen verbinding gevonden tussen de punten",
                 "timeout": "Routeberekening heeft te lang geduurd, probeer punten dichter bij elkaar toe te voegen"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Hoogtegegevens opvragen",
-            "help": "Het opvragen van hoogtegegevens zal de bestaande hoogtegegevens wissen, indien aanwezig, en vervangen door gegevens uit Mapbox.",
+            "help": "Het opvragen van hoogtegegevens verwijdert de bestaande hoogtegegevens, indien aanwezig, en vervangt deze door gegevens van MapTiler.",
             "help_no_selection": "Selecteer een bestand om hoogte gegevens op te vragen."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nieuwe aangepaste laag",
             "edit": "Aangepaste laag bewerken",
             "urls": "URL('s)",
-            "url_placeholder": "WMTS, WMS of Mapbox-stijl JSON",
+            "url_placeholder": "WMTS, WMS of MapLibre stijl JSON",
             "max_zoom": "Maximale zoom",
             "layer_type": "Type van de laag",
             "basemap": "Basiskaart",
@@ -300,8 +303,10 @@
             "switzerland": "Zwitserland",
             "united_kingdom": "Verenigd Koninkrijk",
             "united_states": "Verenigde Staten",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satelliet",
+            "maptilerStreets": "MapTiler straten",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Buiten",
+            "maptilerSatellite": "MapTiler satelliet",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tramhalte",
             "bus-stop": "Bushalte",
             "ferry": "Veerboot",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "E-mail",
         "contribute": "Draag bij",
         "supported_by": "ondersteund door",
-        "support_button": "Ondersteun gpx.studio op Ko-fi",
+        "features": "Functies",
         "route_planning": "Routeplannersoftware",
         "route_planning_description": "Een intuïtieve interface voor het maken van routes, aangepast aan elke sport, gebaseerd op OpenStreetMap gegevens.",
         "file_processing": "Geavanceerde bestandsverwerking",
@@ -497,8 +502,15 @@
         "maps_description": "Een grote verzameling van basiskaarten, lagen en interessante punten om je te helpen je volgende avontuur op te zetten, of om je laatste prestatie te visualiseren.",
         "data_visualization": "Data visualisatie",
         "data_visualization_description": "Een interactief hoogteprofiel met gedetailleerde statistieken om opgenomen activiteiten en toekomstige doelstellingen te analyseren.",
-        "identity": "Gratis, advertentievrij en open source",
-        "identity_description": "De website is gratis te gebruiken, zonder advertenties, en de broncode is publiekelijk beschikbaar op GitHub. Dit is alleen mogelijk dankzij de ongelooflijke steun van de gemeenschap."
+        "philosophy": "Filosofie",
+        "foss": "Gratis, advertentievrije en open source",
+        "foss_description": "De website is gratis te gebruiken, zonder advertenties, en de broncode is openbaar beschikbaar op GitHub.",
+        "privacy": "Privacyvriendelijk",
+        "privacy_description": "Uw GPX-bestanden verlaten nooit uw browser. Geen tracking, geen analyse.",
+        "community": "Mogelijk gemaakt door de community",
+        "community_description": "gpx.studio heeft een verbazingwekkende gemeenschap die zijn kosten al jaren dekt door donaties bij het vormgeven van het project door suggesties, foutrapporten en vertalingen in vele talen.",
+        "support_button": "Ondersteun gpx.studio op Open Collective",
+        "translate_button": "Help de website te vertalen op Crowdin"
     },
     "docs": {
         "translate": "Verbeter de vertaling op Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Maak je eigen kaart",
-        "mapbox_token": "Toegangstoken voor Mapbox",
+        "maptiler_key": "MapTiler sleutel (optioneel, alleen vereist voor MapTiler kaarten)",
         "file_urls": "Bestands URL's (komma gescheiden)",
         "drive_ids": "Google Drive bestand ID's (gescheiden door komma's)",
         "basemap": "Basiskaart",
diff --git a/website/src/locales/no.json b/website/src/locales/no.json
index 45baa5a48..384ef2a9d 100644
--- a/website/src/locales/no.json
+++ b/website/src/locales/no.json
@@ -28,7 +28,7 @@
         "undo": "Angre",
         "redo": "Gjenta",
         "delete": "Slett",
-        "delete_all": "Delete all",
+        "delete_all": "Slett alle",
         "select_all": "Velg alle",
         "view": "Visning",
         "elevation_profile": "Høydeprofil",
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Klikk",
         "drag": "Dra",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informasjon...",
             "name": "Navn",
@@ -80,7 +81,7 @@
         "center": "Sentrer",
         "open_in": "Åpne I",
         "copy_coordinates": "Kopier koordinater",
-        "edit_osm": "Edit in OpenStreetMap"
+        "edit_osm": "Rediger i OpenStreetMap"
     },
     "toolbar": {
         "routing": {
@@ -190,6 +191,8 @@
                 "from": "Startpunktet er for langt unna nærmeste vei",
                 "via": "Via-punktet er for langt fra nærmeste vei",
                 "to": "Sluttpunktet er for langt unna nærmeste vei",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Ruteberegning tok for lang tid, prøv å legge til flere punkter"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Be om høydedata",
-            "help": "Å be om høydedata sletter eksisterende høydedata, hvis noen, og erstatter det med data fra Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Velg et element for å be om høydedata."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nytt egendefinert lag",
             "edit": "Redigere egendefinert lag",
             "urls": "Nettadresse(r)",
-            "url_placeholder": "WMTS-, WMS-, eller Mapbox stil JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Maks forstørring",
             "layer_type": "Lagtype",
             "basemap": "Basiskart",
@@ -300,8 +303,10 @@
             "switzerland": "Sveits",
             "united_kingdom": "Storbritannia",
             "united_states": "USA",
-            "mapboxOutdoors": "Mapbox Utendørs",
-            "mapboxSatellite": "Mapbox Satellitt",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -356,7 +361,7 @@
             "water": "Vann",
             "shower": "Dusj",
             "shelter": "Ly",
-            "cemetery": "Cemetery",
+            "cemetery": "Gravplass",
             "motorized": "Biler og motorsykler",
             "fuel-station": "Bensinstasjon",
             "parking": "Parkering",
@@ -381,7 +386,7 @@
             "tram-stop": "Trikkestopp",
             "bus-stop": "Bussholdeplass",
             "ferry": "Ferge",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "E-post",
         "contribute": "Bidra",
         "supported_by": "støttet av",
-        "support_button": "Støtt gpx.studio på Ko-fi",
+        "features": "Features",
         "route_planning": "Ruteplanlegging",
         "route_planning_description": "Et intuitivt grensesnitt for å skape reiserute skreddersydd for enhver aktivitet, basert på OpenStreetMap data.",
         "file_processing": "Avansert filbehandling",
@@ -497,8 +502,15 @@
         "maps_description": "En stor samling med basemaper, overlegg og interessepunkter som hjelper deg å lage ditt neste utendørs eventyret, eller visualisere din nyeste prestasjon.",
         "data_visualization": "Data visualisering",
         "data_visualization_description": "En interaktiv høydeprofil med detaljert statistikk for å analysere registrerte aktiviteter og framtidige mål.",
-        "identity": "Gratis, reklamefri og åpen kildekode",
-        "identity_description": "Nettsiden er gratis å bruke, uten annonser, og kildekoden er offentlig tilgjengelig på GitHub. Dette er bare mulig takket være den utrolige støtten fra fellesskapet."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Forbedre oversettelsen på Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Lag ditt eget kart",
-        "mapbox_token": "Tilgangskode for Mapbox",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Fil URL'er (adskilt med komma)",
         "drive_ids": "Google Drive fil-ID'er (separert med komma)",
         "basemap": "Basiskart",
diff --git a/website/src/locales/pl.json b/website/src/locales/pl.json
index 4bbdbeb6c..acb743588 100644
--- a/website/src/locales/pl.json
+++ b/website/src/locales/pl.json
@@ -4,7 +4,7 @@
         "app_title": "Aplikacja",
         "embed_title": "Edytor plików GPX online",
         "help_title": "pomoc",
-        "404_title": "nie odnaleziono strony",
+        "404_title": "Strona nie odnaleziona",
         "description": "Przeglądaj, edytuj i twórz pliki GPX online z zaawansowanymi możliwościami planowania trasy i narzędziami do przetwarzania plików, pięknymi mapami i szczegółowymi wizualizacjami danych."
     },
     "menu": {
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Klik",
         "drag": "Przeciągnij",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informacje...",
             "name": "Nazwa",
@@ -190,6 +191,8 @@
                 "from": "Punkt początkowy jest zbyt daleko od najbliższej drogi",
                 "via": "Punkt przelotowy jest zbyt daleko od najbliższej drogi",
                 "to": "Punkt końcowy jest zbyt daleko od najbliższej drogi",
+                "distance": "Punkt końcowy jest zbyt daleko od punktu początkowego",
+                "connection": "Nie znaleziono połączenia między punktami",
                 "timeout": "Obliczanie trasy trwało zbyt długo, spróbuj dodać punkty bliżej siebie"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Dodaj dane o wysokości terenu",
-            "help": "Dodanie tych danych nadpisze wszystkie naniesione informacje o wysokościach danymi pobranymi z Mapbox. ",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Wybierz plik do wczytania danych o wysokości w terenie."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nowa warstwa niestandardowa",
             "edit": "Edytuj niestandardową warstwę",
             "urls": "URL(e)",
-            "url_placeholder": "JSON w stylu WMTS, WMS lub Mapbox",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Maksymalne powiększenie",
             "layer_type": "Rodzaj warstwy",
             "basemap": "Mapa bazowa",
@@ -300,8 +303,10 @@
             "switzerland": "Szwajcaria",
             "united_kingdom": "Wielka Brytania",
             "united_states": "Stany Zjednoczone",
-            "mapboxOutdoors": "Teren (Mapbox)",
-            "mapboxSatellite": "Satelita (Mapbox)",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -326,7 +331,7 @@
             "usgs": "USGS",
             "bikerouterGravel": "bikerouter.de Gravel",
             "cyclOSMlite": "CyclOSM Lite",
-            "mapterhornHillshade": "Mapterhorn Hillshade",
+            "mapterhornHillshade": "Cieniowanie terenu Mapterhorn",
             "openRailwayMap": "OpenRailwayMap",
             "swisstopoSlope": "swisstopo Stoki",
             "swisstopoHiking": "swisstopo Szlaki Turystyczne",
@@ -381,7 +386,7 @@
             "tram-stop": "Przystanek tramwajowy",
             "bus-stop": "Przystanek autobusowy",
             "ferry": "Prom",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Wesprzyj",
         "supported_by": "wspierane przez",
-        "support_button": "Wesprzyj gpx.studio na Ko-fi",
+        "features": "Features",
         "route_planning": "Planowanie trasy",
         "route_planning_description": "Intuicyjny interfejs do tworzenia tras dostosowanych do każdego sportu, na bazie danych OpenStreetMap.",
         "file_processing": "Rozbudowanie przetwarzanie plików",
@@ -497,8 +502,15 @@
         "maps_description": "Duża kolekcja podstawowych map, nakładek i ulubionych punktów, które pomogą Ci stworzyć następną przygodę lub zwizualizować swoje ostatnie osiągnięcie.",
         "data_visualization": "Prezentacja danych",
         "data_visualization_description": "Interaktywny profil ukształtowania terenu wraz ze szczegółowymi danymi statystycznymi, służącymi do analizy odbytych wycieczek i przyszłych aktywności.",
-        "identity": "Darmowa, wolna od reklam i w duchu open-source",
-        "identity_description": "Ta strona jest darmowa w użyciu, bez reklam, a kod źródłowy jest publicznie dostępny na platformie GitHub. Jest to możliwe tylko dzięki niesamowitemu wsparciu społeczności."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Ulepsz tłumaczenie na Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Utwórz własną mapę",
-        "mapbox_token": "Token dostępu do Mapbox",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Adres URL do pliku (rozdzielonego przecinkami)",
         "drive_ids": "ID pliku na Google Drive (rozdzielonego przecinkami)",
         "basemap": "Mapa bazowa",
diff --git a/website/src/locales/pt-BR.json b/website/src/locales/pt-BR.json
index bb9e3a59c..d93d1d9b3 100644
--- a/website/src/locales/pt-BR.json
+++ b/website/src/locales/pt-BR.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Clique",
         "drag": "Arrastar",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informações...",
             "name": "Nome",
@@ -190,6 +191,8 @@
                 "from": "O ponto de partida está muito longe da estrada mais próxima",
                 "via": "O ponto intermediário está muito longe da estrada mais próxima",
                 "to": "O ponto de chegada está muito longe da estrada mais próxima",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "O cálculo da rota demorou muito tempo, tente adicionar pontos mais próximos"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Solicitar dados de elevação",
-            "help": "Solicitar dados de elevação apagará os dados de elevação existentes, se houver, e os substituirá pelos dados do Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Selecione um item de arquivo para solicitar os dados de elevação."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nova camada personalizada",
             "edit": "Editar camada personalizada",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS ou JSON estilo Mapbox",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Zoom máximo",
             "layer_type": "Tipo de camada",
             "basemap": "Mapa-base",
@@ -300,8 +303,10 @@
             "switzerland": "Suíça",
             "united_kingdom": "Reino Unido",
             "united_states": "Estados Unidos",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Satélite do Mapbox",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Parada de bonde",
             "bus-stop": "Parada de Ônibus",
             "ferry": "Balsa",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribuir",
         "supported_by": "apoiado por",
-        "support_button": "Apoie o gpx.studio no Ko-fi",
+        "features": "Features",
         "route_planning": "Planejamento de rota",
         "route_planning_description": "Uma interface intuitiva para criar itinerários adaptados a cada esporte, com base em dados do OpenStreetMap.",
         "file_processing": "Processamento avançado de arquivo",
@@ -497,8 +502,15 @@
         "maps_description": "Uma grande coleção de mapas base, sobreposições e pontos de interesse para ajudá-lo a criar sua aventura ao ar livre, ou visualizar sua última conquista.",
         "data_visualization": "Visualização de dados",
         "data_visualization_description": "Um perfil de elevação interativo, com estatísticas detalhadas para analisar atividades gravadas e objetivos futuros.",
-        "identity": "Grátis, sem anúncios e de código aberto",
-        "identity_description": "O site é gratuito de usar, sem anúncios, e o código-fonte está disponível publicamente no GitHub. Isso só é possível graças ao apoio incrível da comunidade."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Melhore a tradução no Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Crie seu próprio mapa",
-        "mapbox_token": "Token de acesso do Mapbox",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "URLs de arquivos (separados por vírgula)",
         "drive_ids": "IDs de arquivos do Google Drive (separados por vírgulas)",
         "basemap": "Mapa-base",
diff --git a/website/src/locales/pt.json b/website/src/locales/pt.json
index 8dfbb1f3e..40aba96c1 100644
--- a/website/src/locales/pt.json
+++ b/website/src/locales/pt.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Clique",
         "drag": "Arrastar",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informações...",
             "name": "Nome",
@@ -190,6 +191,8 @@
                 "from": "O ponto de partida está muito longe da estrada mais próxima",
                 "via": "O ponto de partida está muito longe da estrada mais próxima",
                 "to": "O ponto final está muito longe do ponto de chegada",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "O recalculo da demorou muito tempo, tente adicionar ponto mais próximos"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Nova camada personalizada",
             "edit": "Editar camada personalizada",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Zoom máximo",
             "layer_type": "Tipo de camada",
             "basemap": "Mapa-base",
@@ -300,8 +303,10 @@
             "switzerland": "Suíça",
             "united_kingdom": "Reino Unido",
             "united_states": "Estados Unidos",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Satélite do Mapbox",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Parada de bonde",
             "bus-stop": "Parada de Ônibus",
             "ferry": "Balsa",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "\"Correio eletrónico\"",
         "contribute": "Contribute",
         "supported_by": "Apoiado por",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Grátis, sem anúncios e de código aberto",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Criar o seu próprio mapa",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Ficheiros URLs (separados por vírgulas)",
         "drive_ids": "‘IDs’ de ficheiro Google Drive (separados por vírgulas)",
         "basemap": "Mapa-base",
diff --git a/website/src/locales/ro.json b/website/src/locales/ro.json
index 3853df374..93ff592b5 100644
--- a/website/src/locales/ro.json
+++ b/website/src/locales/ro.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Click",
         "drag": "Drag",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Name",
@@ -190,6 +191,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Strat nou personalizat",
             "edit": "Editează strat personalizat",
             "urls": "URL(s)",
-            "url_placeholder": "Fișier JSON de tipul WMTS, WMS sau Mapbox",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Zoom maxim",
             "layer_type": "Tipul stratului",
             "basemap": "Hartă de bază",
@@ -300,8 +303,10 @@
             "switzerland": "Elveția",
             "united_kingdom": "Regatul Unit",
             "united_states": "Statele Unite ale Americii",
-            "mapboxOutdoors": "Mapbox exterior",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Stație de autobuz",
             "ferry": "Feribot",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",
diff --git a/website/src/locales/ru.json b/website/src/locales/ru.json
index 5b169ec3d..3ce27badb 100644
--- a/website/src/locales/ru.json
+++ b/website/src/locales/ru.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Клик",
         "drag": "Перетащить",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Информация...",
             "name": "Название",
@@ -190,6 +191,8 @@
                 "from": "Начальная точка слишком далеко от ближайшей дороги",
                 "via": "Точка маршрута слишком далеко от ближайшей дороги",
                 "to": "Конечная точка слишком далеко от ближайшей дороги",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Расчет маршрута занял слишком много времени, попробуйте добавить точки ближе"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Запросить данные о высоте",
-            "help": "При запросе данных о высоте будут удалены существующие данные о высотах, если таковые имеются, и заменены данными из Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Выберите файл для запроса данных о высоте."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Новый пользовательский слой",
             "edit": "Редактировать пользовательский слой",
             "urls": "URL-адрес(а)",
-            "url_placeholder": "WMTS, WMS или стиль Mapbox JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Максимальное приближение",
             "layer_type": "Тип слоя",
             "basemap": "Основная карта",
@@ -300,8 +303,10 @@
             "switzerland": "Швейцария",
             "united_kingdom": "Великобритания",
             "united_states": "Соединенные Штаты Америки",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Трамвайная остановка",
             "bus-stop": "Автобусная остановка",
             "ferry": "Паром",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Электронная почта",
         "contribute": "Внести вклад",
         "supported_by": "при поддержке",
-        "support_button": "Поддержите gpx.studio на Ko-fi",
+        "features": "Features",
         "route_planning": "Планирование маршрута",
         "route_planning_description": "Интуитивно понятный интерфейс для создания маршрутов, адаптированных к каждому виду спорта, на основе данных OpenStreetMap.",
         "file_processing": "Расширенная обработка файла",
@@ -497,8 +502,15 @@
         "maps_description": "Большая коллекция базовых карт, наложений и точек интереса, чтобы помочь вам спланировать ваше следующее приключение на свежем воздухе или визуализировать ваше последнее достижение.",
         "data_visualization": "Визуализация данных",
         "data_visualization_description": "Интерактивный профиль высоты с подробной статистикой для анализа записанных активностей и будущих целей.",
-        "identity": "Бесплатно, без рекламы и с открытым исходным кодом",
-        "identity_description": "Сайт бесплатен для использования, без рекламы, а исходный код доступен публично на GitHub. Это стало возможным только благодаря невероятной поддержке сообщества."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Улучшить перевод на Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Создайте свою собственную карту",
-        "mapbox_token": "Токен доступа Mapbox",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "URL-адреса файлов (разделенные запятыми)",
         "drive_ids": "Идентификаторы файлов Google Диска (разделенные запятыми)",
         "basemap": "Основная карта",
diff --git a/website/src/locales/sr.json b/website/src/locales/sr.json
index 53e80c876..03b389b28 100644
--- a/website/src/locales/sr.json
+++ b/website/src/locales/sr.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Klik",
         "drag": "Prevucite",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Informacije...",
             "name": "Naziv",
@@ -190,6 +191,8 @@
                 "from": "Početna tačka je predaleko od najbližeg puta",
                 "via": "Putna tačka je predaleko od najbližeg puta",
                 "to": "Krajnja tačka je predaleko od najbližeg puta",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Računanje rute je trajalo predugo, pokušajte da dodate putne tačke bliže jednu drugoj"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Zatražite podatke o nadmorskoj visini",
-            "help": "Zahtevanje podataka o nadmorskoj visini će izbrisati postojeće podatke o nadmorskoj visini, ako ih ima, i zameniti ih podacima iz Mapboksa.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Izaberite stavku datoteke da biste zatražili podatke o nadmorskoj visini."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Novi prilagođeni sloj",
             "edit": "Uredite prilagođeni sloj",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS ili JSON stila Mapbox",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Maksimalno uvećanje",
             "layer_type": "Tip sloja",
             "basemap": "Osnovna mapa",
@@ -300,8 +303,10 @@
             "switzerland": "Švajcarska",
             "united_kingdom": "Ujedinjeno Kraljevstvo",
             "united_states": "Sjеdinjеnе Američke Državе",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satelit",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tramvajsko stajalište",
             "bus-stop": "Autobusko stajalište",
             "ferry": "Trajekt",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "E-mail adresa",
         "contribute": "Doprinesi",
         "supported_by": "Podržan od strane",
-        "support_button": "Podrži gpx.studio na Ko-fi",
+        "features": "Features",
         "route_planning": "Planiranje rute",
         "route_planning_description": "Intuitivan interfejs za kreiranje itinerera prilagođenih svakom sportu, na osnovu OpenStreetMap podataka.",
         "file_processing": "Napredno procesiranje datoteke",
@@ -497,8 +502,15 @@
         "maps_description": "Velika kolekcija osnovnih mapa, slojeva i tačaka interesovanja koje će vam pomoći da napravite sledeću avanturu na otvorenom ili da vizuelizujete svoje najnovije dostignuće.",
         "data_visualization": "Vizualizacija podataka",
         "data_visualization_description": "Interaktivni profil nadmorske visine sa detaljnom statistikom za analizu zabeleženih aktivnosti i budućih ciljeva.",
-        "identity": "Besplatno, bez oglasa i otvorenog koda",
-        "identity_description": "Veb lokacija je besplatna za korišćenje, bez oglasa, a izvorni kod je javno dostupan na GitHub-u. Ovo je moguće samo zahvaljujući neverovatnoj podršci zajednice."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Poboljšajte prevod na Crowdin-u",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Napravi svoju mapu",
-        "mapbox_token": "Mapbox token pristupa",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "URL-ovi datoteka (razdvojeni zarezima)",
         "drive_ids": "Id datoteke sa Google diska (razdvojeni zarezima)",
         "basemap": "Osnovna mapa",
diff --git a/website/src/locales/sv.json b/website/src/locales/sv.json
index f6d259eda..7b783b160 100644
--- a/website/src/locales/sv.json
+++ b/website/src/locales/sv.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Klicka",
         "drag": "Dra",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Namn",
@@ -190,6 +191,8 @@
                 "from": "Startpunkten är för långt bort från närmaste väg",
                 "via": "Ruttpunkten är för långt bort från närmaste väg",
                 "to": "Slutpunkten är för långt bort från närmaste väg",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Ruttberäkningen tog för lång tid, försök att lägga punkterna närmare varandra"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Lagertyp",
             "basemap": "Baskarta",
@@ -300,8 +303,10 @@
             "switzerland": "Schweiz",
             "united_kingdom": "Storbritannien",
             "united_states": "USA",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Spårvagnshållplats",
             "bus-stop": "Busshållplats",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "En interaktiv höjdprofil med detaljerad statistik för att analysera sparade aktiviter och framtida mål.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Fil-URL:er (separerade med kommatecken)",
         "drive_ids": "Google Drive file IDs (separerade med kommatecken)",
         "basemap": "Baskarta",
diff --git a/website/src/locales/th.json b/website/src/locales/th.json
index ff1210312..fe80fe4e8 100644
--- a/website/src/locales/th.json
+++ b/website/src/locales/th.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Click",
         "drag": "Drag",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Name",
@@ -190,6 +191,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Layer type",
             "basemap": "Basemap",
@@ -300,8 +303,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",
diff --git a/website/src/locales/tr.json b/website/src/locales/tr.json
index 1f27c242e..2d877a9ea 100644
--- a/website/src/locales/tr.json
+++ b/website/src/locales/tr.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Tıkla",
         "drag": "Sürükle",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Bilgi...",
             "name": "Ad",
@@ -190,6 +191,8 @@
                 "from": "Başlangıç noktası en yakın yoldan çok uzak",
                 "via": "Geçiş noktası en yakın yoldan çok uzak",
                 "to": "Bitiş noktası en yakın yoldan çok uzak",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Rota hesaplaması uzun sürdü, daha yakın noktalar eklemeyi deneyin"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Yükselti verisi talep et",
-            "help": "Yükselti verisi talep etmek, varsa mevcut yükselti verilerini silecek ve Mapbox verisi ile değiştirecektir.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Yükselti verisi talep etmek için bir dosya öğesi seçin."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Yeni özel katman",
             "edit": "Özel katmanı düzenle",
             "urls": "URL(ler)",
-            "url_placeholder": "WMTS, WMS veya Mapbox JSON stili",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Maksimum yakınlık",
             "layer_type": "Katman Tipi",
             "basemap": "Temel Harita",
@@ -300,8 +303,10 @@
             "switzerland": "İsviçre",
             "united_kingdom": "Birleşik Krallık",
             "united_states": "Birlişik Devletler",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Uydu",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tramvay Durağı",
             "bus-stop": "Otobüs Durağı",
             "ferry": "Feribot",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "E-Posta",
         "contribute": "Bağış Yap",
         "supported_by": "sponsor",
-        "support_button": "gpx.studio'yu Ko-fi'de destekle",
+        "features": "Features",
         "route_planning": "Rota Planlama",
         "route_planning_description": "OpenStreetMap verilerini kullanarak, her spora özel rotalar oluşturabileceğiniz, kullanımı kolay bir arayüz.",
         "file_processing": "Gelişmiş dosya işleme",
@@ -497,8 +502,15 @@
         "maps_description": "Geniş bir temel harita koleksiyonu, bir sonraki açık hava maceranızı ustalıkla yapmanıza yardımcı olacak katmanlar ve ilgi alana noktaları, veya en son başarı hikayenizi görselleştirin.",
         "data_visualization": "Veri görselleştirme",
         "data_visualization_description": "Kayıtlı aktiviteleri ve gelecek hedeflerinizi detaylı istatistiklerle analiz edebileceğiniz bir interaktif yükselti profili.",
-        "identity": "Ücretsiz, reklamsız ve açık kaynak",
-        "identity_description": "Website kullunımı ücretsizdir, reklam olmadan, ve kaynak kodu GitHub'da erişime açaktır. Bu sadece inanılmaz topluluk desteğiyle mümkün."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Çevirimleri Crowdin ile iyileştir",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Kendi haritanı oluştur!",
-        "mapbox_token": "Mapbox erişim token'ı",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "Dosya URLleri (virgülle ayrımış)",
         "drive_ids": "Google Drive dosya ID'si (virgülle ayrılmış)",
         "basemap": "Temel Harita",
diff --git a/website/src/locales/uk.json b/website/src/locales/uk.json
index 2a8725e92..d9be0d741 100644
--- a/website/src/locales/uk.json
+++ b/website/src/locales/uk.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Клац",
         "drag": "Перетягти",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Інформація...",
             "name": "Назва",
@@ -190,6 +191,8 @@
                 "from": "Початкова точка знаходиться занадто далеко від найближчої дороги",
                 "via": "Проміжна точка знаходиться занадто далеко від найближчої дороги",
                 "to": "Кінцева точка знаходиться занадто далеко від найближчої дороги",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Розрахунок маршруту є занадто довгий, спробуйте додати ближчі точки"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Запит даних висот",
-            "help": "Запит даних висот призведе до видалення наявних даних висот, якщо вони є, і замінить їх даними з Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Виберіть елемент файлу, щоб запросити дані про висоту."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "Новий користувацький шар",
             "edit": "Редагувати користувацький шар",
             "urls": "URL-адреса(и)",
-            "url_placeholder": "WMTS, WMS або Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Максимальний зум",
             "layer_type": "Тип шару",
             "basemap": "Базова карта",
@@ -300,8 +303,10 @@
             "switzerland": "Швейцарія",
             "united_kingdom": "Велика Британія\nВеликобританія",
             "united_states": "Сполучені Штати",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Супутник Mapbox",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Трамвайна Зупинка",
             "bus-stop": "Автобусна Зупинка",
             "ferry": "Пором",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Електронна пошта",
         "contribute": "Зробити внесок",
         "supported_by": "за підтримки",
-        "support_button": "Підтримати gpx.studio на Ko-fi",
+        "features": "Features",
         "route_planning": "Планування маршруту",
         "route_planning_description": "Інтуїтивно зрозумілий інтерфейс для створення маршрутів, адаптованих під кожен вид спорту, на основі даних OpenStreetMap.",
         "file_processing": "Розширена обробка файлу",
@@ -497,8 +502,15 @@
         "maps_description": "Велика колекція базових карт, шарів та точок інтересу, щоб допомогти вам спланувати наступну outdoor-пригоду або візуалізувати своє останнє досягнення.",
         "data_visualization": "Візуалізація даних",
         "data_visualization_description": "Інтерактивний профіль висот з детальною статистикою для аналізу записаних активностей та майбутніх цілей.",
-        "identity": "Безоплатно, без реклами та відкритим вихідним кодом",
-        "identity_description": "Сайт безоплатний для використання, без реклами, а вихідний код відкрито доступний на GitHub. Це можливо лише завдяки неймовірній підтримці спільноти."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Покращити переклад на Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Створити власну карту",
-        "mapbox_token": "Токен доступу Mapbox",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "URL-адреси файлів (розділені комами)",
         "drive_ids": "Ідентифікатори файлів Google Drive (розділені комами)",
         "basemap": "Базова карта",
diff --git a/website/src/locales/vi.json b/website/src/locales/vi.json
index 297b1bbb1..b0adda6b7 100644
--- a/website/src/locales/vi.json
+++ b/website/src/locales/vi.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Nhấp chuột",
         "drag": "Kéo",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Thông tin...",
             "name": "Tên",
@@ -190,6 +191,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Layer type",
             "basemap": "Bản đồ cơ sở",
@@ -300,8 +303,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Bản đồ cơ sở",
diff --git a/website/src/locales/zh-HK.json b/website/src/locales/zh-HK.json
index 13590168d..e28ae3c54 100644
--- a/website/src/locales/zh-HK.json
+++ b/website/src/locales/zh-HK.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "Click",
         "drag": "Drag",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "Info...",
             "name": "Name",
@@ -190,6 +191,8 @@
                 "from": "The start point is too far from the nearest road",
                 "via": "The via point is too far from the nearest road",
                 "to": "The end point is too far from the nearest road",
+                "distance": "The end point is too far from the start point",
+                "connection": "No connection found between the points",
                 "timeout": "Route calculation took too long, try adding points closer together"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "Request elevation data",
-            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapbox.",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "Select a file item to request elevation data."
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "New custom layer",
             "edit": "Edit custom layer",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS, WMS or Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "Max zoom",
             "layer_type": "Layer type",
             "basemap": "Basemap",
@@ -300,8 +303,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "Tram Stop",
             "bus-stop": "Bus Stop",
             "ferry": "Ferry",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "Email",
         "contribute": "Contribute",
         "supported_by": "supported by",
-        "support_button": "Support gpx.studio on Ko-fi",
+        "features": "Features",
         "route_planning": "Route planning",
         "route_planning_description": "An intuitive interface to create itineraries tailored to each sport, based on OpenStreetMap data.",
         "file_processing": "Advanced file processing",
@@ -497,8 +502,15 @@
         "maps_description": "A large collection of basemaps, overlays and points of interest to help you craft your next outdoor adventure, or visualize your latest achievement.",
         "data_visualization": "Data visualization",
         "data_visualization_description": "An interactive elevation profile with detailed statistics to analyze recorded activities and future objectives.",
-        "identity": "Free, ad-free and open source",
-        "identity_description": "The website is free to use, without ads, and the source code is publicly available on GitHub. This is only possible thanks to the incredible support of the community."
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "Support gpx.studio on Open Collective",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "Improve the translation on Crowdin",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "Create your own map",
-        "mapbox_token": "Mapbox access token",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "File URLs (separated by commas)",
         "drive_ids": "Google Drive file IDs (separated by commas)",
         "basemap": "Basemap",
diff --git a/website/src/locales/zh.json b/website/src/locales/zh.json
index 8e30ab65d..5543d5858 100644
--- a/website/src/locales/zh.json
+++ b/website/src/locales/zh.json
@@ -63,6 +63,7 @@
         "ctrl": "Ctrl",
         "click": "单击",
         "drag": "拖拽",
+        "right_click_drag": "Right-click drag",
         "metadata": {
             "button": "信息...",
             "name": "名称",
@@ -190,6 +191,8 @@
                 "from": "起点离最近的道路太远",
                 "via": "途径点离最近的道路太远",
                 "to": "终点离最近的道路太远",
+                "distance": "起点到终点的距离太远",
+                "connection": "找不到经过途径点的路线",
                 "timeout": "轨迹计算耗时太长，请尝试添加更靠近路网的点"
             }
         },
@@ -231,7 +234,7 @@
         },
         "elevation": {
             "button": "请求海拔数据",
-            "help": "请求成功后将移除原有的海拔数据，并使用 Mapbox 的海拔数据替换原有数据。",
+            "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.",
             "help_no_selection": "选择要请求海拔数据的文件。"
         },
         "waypoint": {
@@ -273,7 +276,7 @@
             "new": "新建自定义图层",
             "edit": "编辑自定义图层",
             "urls": "URL(s)",
-            "url_placeholder": "WMTS，WMS 或 Mapbox style JSON",
+            "url_placeholder": "WMTS, WMS or MapLibre style JSON",
             "max_zoom": "最大缩放等级",
             "layer_type": "图层类型",
             "basemap": "底图",
@@ -300,8 +303,10 @@
             "switzerland": "瑞士",
             "united_kingdom": "英国",
             "united_states": "美国",
-            "mapboxOutdoors": "Mapbox Outdoors",
-            "mapboxSatellite": "Mapbox Satellite",
+            "maptilerStreets": "MapTiler Streets",
+            "maptilerTopo": "MapTiler Topo",
+            "maptilerOutdoors": "MapTiler Outdoors",
+            "maptilerSatellite": "MapTiler Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
             "openHikingMap": "OpenHikingMap",
@@ -381,7 +386,7 @@
             "tram-stop": "有轨电车站",
             "bus-stop": "小型公交站台",
             "ferry": "渡口",
-            "mapbox-dem": "Mapbox DEM",
+            "maptiler-dem": "MapTiler DEM",
             "mapterhorn": "Mapterhorn"
         }
     },
@@ -488,7 +493,7 @@
         "email": "电子邮箱",
         "contribute": "参与贡献",
         "supported_by": "技术支持",
-        "support_button": "在 Ko-fi 上支持 gpx.studio",
+        "features": "Features",
         "route_planning": "路线规划",
         "route_planning_description": "基于 OpenStreetMap 数据，在直观的界面中为每项运动创建量身定制的行程。",
         "file_processing": "高级文件处理",
@@ -497,8 +502,15 @@
         "maps_description": "内置大量地图底图、叠加图层和兴趣点，用于帮助规划户外冒险或可视化成果。",
         "data_visualization": "数据可视化",
         "data_visualization_description": "可交互的海拔剖面图，带有详细的统计数据，用于分析已记录的活动和规划中的目标。",
-        "identity": "免费、 无广告且开源",
-        "identity_description": "免费使用，无广告，源代码已在 GitHub 上开源。感谢社区的鼎力支持。"
+        "philosophy": "Philosophy",
+        "foss": "Free, ad-free and open source",
+        "foss_description": "The website is free to use, without ads, and the source code is publicly available on GitHub.",
+        "privacy": "Privacy-friendly",
+        "privacy_description": "Your GPX files never leave your browser. No tracking, no data collection.",
+        "community": "Made possible by the community",
+        "community_description": "gpx.studio has an amazing community that has covered its costs through donations for years, while shaping the project through feature suggestions, bug reports, and translations into many languages.",
+        "support_button": "在 Open Collective 上支持 gpx.studio",
+        "translate_button": "Help translate the website on Crowdin"
     },
     "docs": {
         "translate": "在 Crowdin 上改进此翻译",
@@ -523,7 +535,7 @@
     },
     "embedding": {
         "title": "创建您自己的地图",
-        "mapbox_token": "Mapbox 密钥",
+        "maptiler_key": "MapTiler key (optional, only required for MapTiler maps)",
         "file_urls": "文件链接（英文逗号分隔）",
         "drive_ids": "谷歌云盘文件 IDs（英文逗号分隔）",
         "basemap": "底图",