diff --git a/layouts/shortcodes/leaflet-elevation-profile.html b/layouts/shortcodes/leaflet-elevation-profile.html
new file mode 100644
index 0000000..72a984f
--- /dev/null
+++ b/layouts/shortcodes/leaflet-elevation-profile.html
@@ -0,0 +1,14 @@
+{{ if or (not .Parent) (not (eq .Parent.Name "leaflet-map")) }}
+{{ errorf "%s: cannot be used outside leaflet-map: %s" .Name .Position }}
+{{ end }}
+
+{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+
+<script>
+	map_options_{{ $uniqueMapId }}.heightgraph = {
+		enabled: true,
+		{{ with .Get "resizable" }}
+		resizable: {{ . }},
+		{{ end }}
+	};
+</script>
diff --git a/layouts/shortcodes/leaflet-layer.html b/layouts/shortcodes/leaflet-layer.html
new file mode 100644
index 0000000..82991fa
--- /dev/null
+++ b/layouts/shortcodes/leaflet-layer.html
@@ -0,0 +1,19 @@
+{{ if or (not .Parent) (not (eq .Parent.Name "leaflet-map")) }}
+{{ errorf "%s: cannot be used outside leaflet-map: %s" .Name .Position }}
+{{ end }}
+
+{{ if not (isset .Params "id") }}
+{{ errorf "%s: missing 'id' parameter: %s" .Name .Position }}
+{{ end }}
+
+{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+
+{{ $id := .Get "id" }}
+<script>
+	map_options_{{ $uniqueMapId }}.layers.enabled.push({{ $id }});
+	map_options_{{ $uniqueMapId }}.layers["{{ $id }}"] = {
+		{{ with .Get "apiKey" }}
+		apiKey: '{{ . }}',
+		{{ end }}
+	};
+</script>
diff --git a/layouts/shortcodes/leaflet-map.html b/layouts/shortcodes/leaflet-map.html
new file mode 100644
index 0000000..339dbb7
--- /dev/null
+++ b/layouts/shortcodes/leaflet-map.html
@@ -0,0 +1,132 @@
+{{/*
+
+Syntax summary:
+
+	{{< leaflet-map centerLat=FLOAT centerLon=FLOAT zoom=INT >}}
+
+		{{< leaflet-layer id="STRING" apiKey="STRING" >}}
+
+		{{< leaflet-marker lat=FLOAT lon=FLOAT >}}
+
+		{{< leaflet-track path="URL" >}}
+
+		{{< leaflet-scale >}}
+
+		{{< leaflet-elevation-profile resizable=BOOL >}}
+
+	{{< /leaflet-map >}}
+
+Map options:
+
+	centerLat/centerLon:
+		Center point coordinates of the map as decimal values. Optional iif tracks or markers are given.
+	zoom:
+		Zoom level of the map. Optional iif tracks or markers are given.
+
+Layer options:
+
+	id:
+		Name of the layer. Supported:
+		- openStreetMap: https://www.openstreetmap.org/
+		- openCycleMap: https://www.thunderforest.com/maps/opencyclemap/ (*)
+		- outdoors: https://www.thunderforest.com/maps/outdoors/ (*)
+		- landscape: https://www.thunderforest.com/maps/landscape/ (*)
+		(*) API key required
+	apiKey:
+		API key for tile access.
+
+Marker options:
+
+	lat/lon:
+		Coordinates of the marker as decimal values.
+
+Track options:
+
+	path:
+		Absolute or relative path of the .gpx file to render as a track.
+
+Scale options:
+
+	(none)
+
+Elevation profile options:
+
+	resizable:
+		Boolean value indicating whether the elevation profile box should be drag & drop resizable.
+		Optional, defaults to false.
+
+	Note: Elevation profiles are only supported if exactly one track is present.
+
+*/}}
+
+{{ $uniqueId := .Ordinal | safeJS }}
+
+<div id="map_container_{{ $uniqueId }}" class="map-container">
+	<div id="map_{{ $uniqueId }}" class="map"></div>
+	<div id="map_backdrop_{{ $uniqueId }}" class="map-backdrop"></div>
+	<div id="map_attribution_{{ $uniqueId }}" class="map-attribution"></div>
+</div>
+
+<script>
+	var map_options_{{ $uniqueId }} = {
+		element: 'map_{{ $uniqueId }}',
+		center: null,
+		zoom: null,
+		layers: {
+			enabled: [],
+		},
+		scale: false,
+		markers: [],
+		tracks: [],
+		heightgraph: null,
+	};
+</script>
+
+{{ .Inner }}
+
+<script>
+	$(document).ready(function() {
+		{
+			var lat  = {{ .Get "centerLat" | default "null" | safeJS }};
+			var lon  = {{ .Get "centerLon" | default "null" | safeJS }};
+			var zoom = {{ .Get "zoom"      | default "null" | safeJS }};
+			const needCenterAndZoom = map_options_{{ $uniqueId }}.markers.length == 0 && map_options_{{ $uniqueId }}.tracks.length == 0;
+			if (needCenterAndZoom && (lat === null || lon === null || zoom === null))
+			{
+				$('#map_{{ $uniqueId }}').text("ERROR: Map without markers or tracks requires 'centerLat', 'centerLon', and 'zoom' parameters.");
+				return;
+			}
+			if (lat !== null && lon !== null)
+			{
+				map_options_{{ $uniqueId }}.center = {
+					lat: lat,
+					lon: lon,
+				};
+			}
+			if (zoom !== null)
+			{
+				map_options_{{ $uniqueId }}.zoom = zoom;
+			}
+		}
+
+		// Create the map
+		var map = Quip.createTrackMap(map_options_{{ $uniqueId }});
+
+		// Make the map resizable
+		$('#map_container_{{ $uniqueId }}').resizable({
+			handles: 'e, s, se',
+			resize: () => map.invalidateSize(),
+		});
+
+		// Move the Leaflet attribution out of the map container
+		$('#map_attribution_{{ $uniqueId }}').append(
+			$('.leaflet-control-attribution')
+		);
+
+		// Restore the map when clicking outside the maximized map
+		{
+			const backdrop = L.DomUtil.get('map_backdrop_{{ $uniqueId }}');
+			backdrop.addEventListener('click', ev => { map.restore(); });
+		}
+	});
+</script>
diff --git a/layouts/shortcodes/leaflet-marker.html b/layouts/shortcodes/leaflet-marker.html
new file mode 100644
index 0000000..b47a7e4
--- /dev/null
+++ b/layouts/shortcodes/leaflet-marker.html
@@ -0,0 +1,16 @@
+{{ if or (not .Parent) (not (eq .Parent.Name "leaflet-map")) }}
+{{ errorf "%s: cannot be used outside leaflet-map: %s" .Name .Position }}
+{{ end }}
+
+{{ if not (isset .Params "lat") }}
+{{ errorf "%s: missing 'lat' parameter: %s" .Name .Position }}
+{{ end }}
+{{ if not (isset .Params "lon") }}
+{{ errorf "%s: missing 'lon' parameter: %s" .Name .Position }}
+{{ end }}
+
+{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+
+<script>
+	map_options_{{ $uniqueMapId }}.markers.push({ lat: {{ .Get "lat" }}, lon: {{ .Get "lon" }} })
+</script>
diff --git a/layouts/shortcodes/leaflet-scale.html b/layouts/shortcodes/leaflet-scale.html
new file mode 100644
index 0000000..c421b8f
--- /dev/null
+++ b/layouts/shortcodes/leaflet-scale.html
@@ -0,0 +1,9 @@
+{{ if or (not .Parent) (not (eq .Parent.Name "leaflet-map")) }}
+{{ errorf "%s: cannot be used outside leaflet-map: %s" .Name .Position }}
+{{ end }}
+
+{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+
+<script>
+	map_options_{{ $uniqueMapId }}.scale = { enabled: true };
+</script>
diff --git a/layouts/shortcodes/leaflet-track.html b/layouts/shortcodes/leaflet-track.html
new file mode 100644
index 0000000..09f37b4
--- /dev/null
+++ b/layouts/shortcodes/leaflet-track.html
@@ -0,0 +1,13 @@
+{{ if or (not .Parent) (not (eq .Parent.Name "leaflet-map")) }}
+{{ errorf "%s: cannot be used outside leaflet-map: %s" .Name .Position }}
+{{ end }}
+
+{{ if not (isset .Params "path") }}
+{{ errorf "%s: missing 'path' parameter: %s" .Name .Position }}
+{{ end }}
+
+{{ $uniqueMapId := .Parent.Ordinal | safeJS }}
+
+<script>
+	map_options_{{ $uniqueMapId }}.tracks.push({{ .Get "path" }})
+</script>