diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index e495cc4..5509362 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -30,7 +30,7 @@
           }).addTo(map);
 
           var latLons = [];
-          {{ $locations := partialCached "util/get_location_leaf_nodes.html.tmpl" $.Site.Data.locations -}}
+          {{ $locations := partialCached "util/get_location_leaf_nodes.html" $.Site.Data.locations -}}
           {{- range . -}}
               {{- with ( index $locations ( replaceRE `, [A-Z]+` "" . ) ) -}}
                   L.marker([{{ .lat }}, {{ .lon }}]).addTo(map);
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 62016f4..b95a9c4 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -30,7 +30,7 @@
             }).addTo(map);
 
             var latLons = [];
-            {{ $locations := partialCached "util/get_location_leaf_nodes.html.tmpl" $.Site.Data.locations -}}
+            {{ $locations := partialCached "util/get_location_leaf_nodes.html" $.Site.Data.locations -}}
             {{- range . -}}
                 {{- with ( index $locations ( replaceRE `, [A-Z]+` "" . ) ) -}}
                     L.marker([{{ .lat }}, {{ .lon }}]).addTo(map);
diff --git a/layouts/cv/organisations/section.html b/layouts/cv/organisations/section.html
index d9f2cb1..6222d9d 100644
--- a/layouts/cv/organisations/section.html
+++ b/layouts/cv/organisations/section.html
@@ -28,7 +28,7 @@
 
 {{ define "main-body" }}
     {{ with .GetPage "cv/organisations" }}
-        {{ partial "cv/organisations/organisations-table.html.tmpl" . }}
+        {{ partial "cv/organisations/organisations-table.html" . }}
     {{ end }}
 {{ end }}
 
diff --git a/layouts/cv/section.html b/layouts/cv/section.html
index 7788832..e863e8e 100644
--- a/layouts/cv/section.html
+++ b/layouts/cv/section.html
@@ -152,7 +152,7 @@
             {{ end }}
           </ul>
         </nav>
-        {{- partialCached "cv/timeline-legend.html.tmpl" . -}}
+        {{- partialCached "cv/timeline-legend.html" . -}}
       {{- else -}}
         <nav class="page-header__minor-links">
           {{- partial "years-list.html" . -}}
@@ -172,11 +172,11 @@
 
       <main class="site-content__body organisation">
 
-        {{- partial "cv/organisation/description.html.tmpl" ( dict "content" .Content ) -}}
+        {{- partial "cv/organisation/description.html" ( dict "content" .Content ) -}}
 
-        {{- partial "cv/organisation/roles-timeline.html.tmpl" -}}
+        {{- partial "cv/organisation/roles-timeline.html" -}}
 
-        {{- partial "cv/organisation/related-items.html.tmpl" ( dict "sc" $ "organisation_titles" ( .Scratch.Get "titles" ) "organisation_title" .Title ) -}}
+        {{- partial "cv/organisation/related-items.html" ( dict "sc" $ "organisation_titles" ( .Scratch.Get "titles" ) "organisation_title" .Title ) -}}
 
       </main>
 
diff --git a/layouts/locations/list.html b/layouts/locations/list.html
index 272eb73..e395b4f 100644
--- a/layouts/locations/list.html
+++ b/layouts/locations/list.html
@@ -30,7 +30,7 @@
             attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'
         }).addTo(map);
 
-        {{- $locations := partialCached "util/get_location_leaf_nodes.html.tmpl" $.Site.Data.locations -}}
+        {{- $locations := partialCached "util/get_location_leaf_nodes.html" $.Site.Data.locations -}}
 
         {{/*
         {{- range .Site.AllPages -}}
@@ -76,7 +76,7 @@
     <div id="map" style="width: 100%; height: 500px; margin: 0; display: block;"></div>
 
     <section style="grid-area: section-content">
-    {{- partial "util/render_recursive_list.html.tmpl" ( dict "sc" $ "pc" . "items" $.Site.Data.locations "schemaType" "Place" ) -}}
+    {{- partial "util/render_recursive_list.html" ( dict "sc" $ "pc" . "items" $.Site.Data.locations "schemaType" "Place" ) -}}
     </section>
 </article>
 {{ end }}
diff --git a/layouts/partials/cite.html.tmpl b/layouts/partials/cite.html
similarity index 100%
rename from layouts/partials/cite.html.tmpl
rename to layouts/partials/cite.html
diff --git a/layouts/partials/cv/organisation/description.html.tmpl b/layouts/partials/cv/organisation/description.html
similarity index 100%
rename from layouts/partials/cv/organisation/description.html.tmpl
rename to layouts/partials/cv/organisation/description.html
diff --git a/layouts/partials/cv/organisation/get-num-of-items.html.tmpl b/layouts/partials/cv/organisation/get-num-of-items.html
similarity index 100%
rename from layouts/partials/cv/organisation/get-num-of-items.html.tmpl
rename to layouts/partials/cv/organisation/get-num-of-items.html
diff --git a/layouts/partials/cv/organisation/get_top_level_ancestor.html.tmpl b/layouts/partials/cv/organisation/get_top_level_ancestor.html
similarity index 100%
rename from layouts/partials/cv/organisation/get_top_level_ancestor.html.tmpl
rename to layouts/partials/cv/organisation/get_top_level_ancestor.html
diff --git a/layouts/partials/cv/organisation/organisation-items-list.html.tmpl b/layouts/partials/cv/organisation/organisation-items-list.html
similarity index 100%
rename from layouts/partials/cv/organisation/organisation-items-list.html.tmpl
rename to layouts/partials/cv/organisation/organisation-items-list.html
diff --git a/layouts/partials/cv/organisation/organisation-items-tiles.html.tmpl b/layouts/partials/cv/organisation/organisation-items-tiles.html
similarity index 100%
rename from layouts/partials/cv/organisation/organisation-items-tiles.html.tmpl
rename to layouts/partials/cv/organisation/organisation-items-tiles.html
diff --git a/layouts/partials/cv/organisation/related-items-section.html.tmpl b/layouts/partials/cv/organisation/related-items-section.html
similarity index 89%
rename from layouts/partials/cv/organisation/related-items-section.html.tmpl
rename to layouts/partials/cv/organisation/related-items-section.html
index 1c33429..4102d86 100644
--- a/layouts/partials/cv/organisation/related-items-section.html.tmpl
+++ b/layouts/partials/cv/organisation/related-items-section.html
@@ -19,11 +19,11 @@
     {{- with ( where $organisation_items ".Params.redact" "ne" true ) -}}
         {{- if in ( slice "Qualifications" "Awards" ) $section_title -}}
             <section id="related-{{ $section_title | anchorize }}" class="related-section related-section--list">
-            {{- partial "cv/organisation/organisation-items-list.html.tmpl" ( dict "organisation_title" $sc.Title "section_title" $section_title "content" . ) -}}
+            {{- partial "cv/organisation/organisation-items-list.html" ( dict "organisation_title" $sc.Title "section_title" $section_title "content" . ) -}}
             </section>
         {{- else -}}
 	    <section id="related-{{ $section_title | anchorize }}" class="related-section related-section--tiles">
-            {{- partial "cv/organisation/organisation-items-tiles.html.tmpl" ( dict "section_title" $section_title "content" . ) -}}
+            {{- partial "cv/organisation/organisation-items-tiles.html" ( dict "section_title" $section_title "content" . ) -}}
             </section>
         {{- end -}}
     {{- end -}}
diff --git a/layouts/partials/cv/organisation/related-items.html.tmpl b/layouts/partials/cv/organisation/related-items.html
similarity index 55%
rename from layouts/partials/cv/organisation/related-items.html.tmpl
rename to layouts/partials/cv/organisation/related-items.html
index cc8f7dd..c2d38cb 100644
--- a/layouts/partials/cv/organisation/related-items.html.tmpl
+++ b/layouts/partials/cv/organisation/related-items.html
@@ -11,16 +11,16 @@
 <section id="related" class="organisation__related">
 
     <!-- Blog posts -->
-    {{- partial "cv/organisation/related-items-section.html.tmpl" ( dict "sc" $sc "tls" "blog" "section_title" "Blog Posts" "organisation_titles" $organisation_titles ) -}}
+    {{- partial "cv/organisation/related-items-section.html" ( dict "sc" $sc "tls" "blog" "section_title" "Blog Posts" "organisation_titles" $organisation_titles ) -}}
 
     <!-- Portfolios -->
     {{- range ( ( $sc.GetPage "portfolio" ).Sections ).ByWeight -}}
-        {{- partial "cv/organisation/related-items-section.html.tmpl" ( dict "sc" $sc "tls" "portfolio" "section_title" .Title "organisation_titles" $organisation_titles ) -}}
+        {{- partial "cv/organisation/related-items-section.html" ( dict "sc" $sc "tls" "portfolio" "section_title" .Title "organisation_titles" $organisation_titles ) -}}
     {{- end -}}
 
     <!-- Qualifications, Awards and Appearances -->
     {{- range ( where ( ( $sc.GetPage "cv" ).Sections ) "Title" "not in" ( slice "Organisations" "Roles" ) ).ByWeight }}
-        {{- partial "cv/organisation/related-items-section.html.tmpl" ( dict "sc" $sc "tls" "cv" "section_title" .Title "organisation_titles" $organisation_titles ) -}}
+        {{- partial "cv/organisation/related-items-section.html" ( dict "sc" $sc "tls" "cv" "section_title" .Title "organisation_titles" $organisation_titles ) -}}
     {{- end -}}
 
 </section>
diff --git a/layouts/partials/cv/organisation/roles-timeline.html.tmpl b/layouts/partials/cv/organisation/roles-timeline.html
similarity index 100%
rename from layouts/partials/cv/organisation/roles-timeline.html.tmpl
rename to layouts/partials/cv/organisation/roles-timeline.html
diff --git a/layouts/partials/cv/organisations/organisations-table.html.tmpl b/layouts/partials/cv/organisations/organisations-table.html
similarity index 95%
rename from layouts/partials/cv/organisations/organisations-table.html.tmpl
rename to layouts/partials/cv/organisations/organisations-table.html
index 3bd8cc1..bb3d3b7 100644
--- a/layouts/partials/cv/organisations/organisations-table.html.tmpl
+++ b/layouts/partials/cv/organisations/organisations-table.html
@@ -74,7 +74,7 @@
             "Awards"
             "Appearances"
           -}}
-            {{- partialCached "cv/organisation/get-num-of-items.html.tmpl" ( dict "sc" $ "section_title" . "organisation_titles" $organisation_titles ) ( print $organisation_title "_" . ) -}}
+            {{- partialCached "cv/organisation/get-num-of-items.html" ( dict "sc" $ "section_title" . "organisation_titles" $organisation_titles ) ( print $organisation_title "_" . ) -}}
           {{- end -}}
         </td>
       </tr>
diff --git a/layouts/partials/cv/timeline-legend.html.tmpl b/layouts/partials/cv/timeline-legend.html
similarity index 100%
rename from layouts/partials/cv/timeline-legend.html.tmpl
rename to layouts/partials/cv/timeline-legend.html
diff --git a/layouts/partials/media/audio.html.tmpl b/layouts/partials/media/audio.html
similarity index 100%
rename from layouts/partials/media/audio.html.tmpl
rename to layouts/partials/media/audio.html
diff --git a/layouts/partials/media/picture.html.tmpl b/layouts/partials/media/picture.html
similarity index 100%
rename from layouts/partials/media/picture.html.tmpl
rename to layouts/partials/media/picture.html
diff --git a/layouts/partials/media/video.html.tmpl b/layouts/partials/media/video.html
similarity index 100%
rename from layouts/partials/media/video.html.tmpl
rename to layouts/partials/media/video.html
diff --git a/layouts/partials/util/get_location_leaf_nodes.html.tmpl b/layouts/partials/util/get_location_leaf_nodes.html
similarity index 91%
rename from layouts/partials/util/get_location_leaf_nodes.html.tmpl
rename to layouts/partials/util/get_location_leaf_nodes.html
index 4691a0c..52917cb 100644
--- a/layouts/partials/util/get_location_leaf_nodes.html.tmpl
+++ b/layouts/partials/util/get_location_leaf_nodes.html
@@ -11,7 +11,7 @@
     {{- if ( isset $v "lat" ) -}}
         {{- $locations = merge $locations ( dict $k $v ) -}}
     {{- else -}}
-        {{- $locations = merge $locations ( partial "util/get_location_leaf_nodes.html.tmpl" . ) -}}
+        {{- $locations = merge $locations ( partial "util/get_location_leaf_nodes.html" . ) -}}
     {{- end -}}
 {{- end -}}
 
diff --git a/layouts/partials/util/get_valid_rel_values.html.tmpl b/layouts/partials/util/get_valid_rel_values.html
similarity index 100%
rename from layouts/partials/util/get_valid_rel_values.html.tmpl
rename to layouts/partials/util/get_valid_rel_values.html
diff --git a/layouts/partials/util/render_recursive_list.html.tmpl b/layouts/partials/util/render_recursive_list.html
similarity index 90%
rename from layouts/partials/util/render_recursive_list.html.tmpl
rename to layouts/partials/util/render_recursive_list.html
index b2ebb02..c33e9d3 100644
--- a/layouts/partials/util/render_recursive_list.html.tmpl
+++ b/layouts/partials/util/render_recursive_list.html
@@ -44,7 +44,7 @@
     <li itemscope itemtype="https://schema.org/Place">
         {{- $k -}}
         {{- if ( not ( isset $v "lat" ) ) -}}
-            {{- partial "util/render_recursive_list.html.tmpl" ( dict "sc" $.sc "pc" $.pc "items" $v "schemaType" $schemaType "listType" $listType ) -}}
+            {{- partial "util/render_recursive_list.html" ( dict "sc" $.sc "pc" $.pc "items" $v "schemaType" $schemaType "listType" $listType ) -}}
         {{- end -}}
     </li>
 {{- end -}}
diff --git a/layouts/shortcodes/blockquote.html b/layouts/shortcodes/blockquote.html
index b08b64a..7b2e36f 100644
--- a/layouts/shortcodes/blockquote.html
+++ b/layouts/shortcodes/blockquote.html
@@ -7,7 +7,7 @@
 
     For works cited (optional):
       @params ibid  Whether to use ibidem as the source. Optional.
-      @see partials/cite.html.tmpl for full list of args.
+      @see partials/cite.html for full list of args.
 
     For works cited that form part of a series (optional):
       @params schemaTypeSeries The Schema.org `itemtype` value for the work series. Default 'CreativeWork'. Optional.
@@ -63,14 +63,14 @@
     <abbr lang="la" title="ibīdem [in the same place]">Ibid.</abbr>
   {{- else if $source -}}
     <span temprop="spokenByCharacter">{{- $source | safeHTML -}}</span>
-    {{- if $hasCitedWork -}}, <span itemprop="isBasedOn">{{- partial "cite.html.tmpl" . -}}
+    {{- if $hasCitedWork -}}, <span itemprop="isBasedOn">{{- partial "cite.html" . -}}
       {{- if $hasCitedSeries }} (
         {{- .Scratch.Set "cite" .Params.citeSeries -}}
         {{- .Scratch.Set "title" .Params.titleSeries -}}
         {{- .Scratch.Set "titleLang" .Params.titleSeriesLang -}}
         {{- .Scratch.Set "titleTr" .Params.titleSeriesTr -}}
         {{- .Scratch.Set "schemaType" .Params.schemaTypeSeries -}}
-        {{- partial "cite.html.tmpl" . -}}
+        {{- partial "cite.html" . -}}
         {{- with .Params.numberSeries }}, {{ . | safeHTML -}}{{- end -}}
       ){{- end -}}</span>
     {{- end -}}
diff --git a/layouts/shortcodes/cite.html b/layouts/shortcodes/cite.html
index fa27c26..b489344 100644
--- a/layouts/shortcodes/cite.html
+++ b/layouts/shortcodes/cite.html
@@ -25,4 +25,4 @@
 
 {{- $citationId := printf "%s%s" ( cond ( isset .Params "cite" ) .Params.cite .Params.title ) ( default "" .Params.shortTitle ) -}}
 
-{{- partialCached "cite.html.tmpl" . $citationId -}}
+{{- partialCached "cite.html" . $citationId -}}
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index 2f1fe92..66e9bd4 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -10,7 +10,7 @@
 
 {{- $src := $.Page.Resources.GetMatch ( .Get "src" ) -}}
 {{- $linkedResource := $.Page.Resources.GetMatch ( .Get "link" ) -}}
-{{- $valid_rel_values := partialCached "util/get_valid_rel_values.html.tmpl" . -}}
+{{- $valid_rel_values := partialCached "util/get_valid_rel_values.html" . -}}
 
 <!-- Validation -->
 
@@ -40,14 +40,14 @@
     {{- end -}}
 
     {{- if eq $src.ResourceType "image" -}}
-      {{- partial "media/picture.html.tmpl" $src -}}
+      {{- partial "media/picture.html" $src -}}
 
     {{- else if eq $src.ResourceType "video" -}}
       {{- if eq $src.MediaType "video/ogg" -}}
-        {{- partial "media/audio.html.tmpl" $src -}}
+        {{- partial "media/audio.html" $src -}}
 
       {{- else -}}
-        {{- partial "media/video.html.tmpl" ( dict "src" $src "page_file_path" .Page.File.Path ) -}}
+        {{- partial "media/video.html" ( dict "src" $src "page_file_path" .Page.File.Path ) -}}
 
       {{- end -}}
 
diff --git a/layouts/shortcodes/picture.html b/layouts/shortcodes/picture.html
index 68bb6d3..f45dab3 100644
--- a/layouts/shortcodes/picture.html
+++ b/layouts/shortcodes/picture.html
@@ -10,7 +10,7 @@
 
 {{- $src := $.Page.Resources.GetMatch ( .Get "src" ) -}}
 {{- $linkedResource := $.Page.Resources.GetMatch ( .Get "link" ) -}}
-{{- $valid_rel_values := partialCached "util/get_valid_rel_values.html.tmpl" . -}}
+{{- $valid_rel_values := partialCached "util/get_valid_rel_values.html" . -}}
 
 <!-- Validation -->
 
@@ -38,7 +38,7 @@
     {{- end -}}
 {{- end -}}
 
-{{- partial "media/picture.html.tmpl" $src -}}
+{{- partial "media/picture.html" $src -}}
 
 {{- if .Get "link" -}}
     </a>
diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html
index fe00a3b..4f398d2 100644
--- a/layouts/shortcodes/video.html
+++ b/layouts/shortcodes/video.html
@@ -10,7 +10,7 @@
 
 {{- $src := $.Page.Resources.GetMatch ( .Get "src" ) -}}
 {{- $linkedResource := $.Page.Resources.GetMatch ( .Get "link" ) -}}
-{{- $valid_rel_values := partialCached "util/get_valid_rel_values.html.tmpl" . -}}
+{{- $valid_rel_values := partialCached "util/get_valid_rel_values.html" . -}}
 
 <!-- Validation -->
 
@@ -40,7 +40,7 @@
     {{- end -}}
 {{- end -}}
 
-{{- partial "media/video.html.tmpl" ( dict "src" $src "page_file_path" .Page.File.Path ) -}}
+{{- partial "media/video.html" ( dict "src" $src "page_file_path" .Page.File.Path ) -}}
 
 {{- if .Get "link" -}}
     </a>