diff --git a/SCRATCHPAD-WISHLIST.md b/SCRATCHPAD-WISHLIST.md
index 2198814..8e08b1f 100644
--- a/SCRATCHPAD-WISHLIST.md
+++ b/SCRATCHPAD-WISHLIST.md
@@ -37,7 +37,12 @@ without needing to replace all CSS).
 * Valid HTML5 / CSS3 (updated as browsers gain support for features)
 * Canonical or not appropriately
 * Index / follow or not appropriately
-* Robots.txt with pointer to sitemap.xml
+* TODO: Robots.txt with pointer to sitemap.xml
+
+## 404
+
+Basic 404 page (just the error message "404 Not Found" in the style of the
+site).
 
 ## Mobile
 
diff --git a/layouts/404.html b/layouts/404.html
index f8689c0..376cf2d 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,6 +1,6 @@
 {{ define "main-content" }}
-{{- if templates.Exists "partials/output-wtg-awt/layout-404.html" }}
-{{ partial "output-wtg-awt/layout-404.html" . -}}
+{{- if templates.Exists "partials/wtg-theme/output/layout-404.html" }}
+{{ partial "wtg-theme/output/layout-404.html" . -}}
 {{- else }}
 <p>404 Page not found</p>
 {{- end -}}
diff --git a/layouts/partials/wtg-shell/output/head-canonical.html b/layouts/partials/wtg-shell/output/head-canonical.html
index b37fa21..7dde986 100644
--- a/layouts/partials/wtg-shell/output/head-canonical.html
+++ b/layouts/partials/wtg-shell/output/head-canonical.html
@@ -32,13 +32,4 @@
 {{ (printf "<!-- link rel=\"alternate\" data=\"will-not-be-canonical\" href=\"%s\" -->" .Permalink) | safeHTML -}}
 	{{- end -}}
 {{- end -}}
-{{- if .IsTranslated -}}
-	{{- range .Translations }}
-<link rel="alternate" hreflang="{{ .Language.Lang }}" href="{{ .Permalink }}">
-	{{- end }}
-<link rel="alternate" hreflang="{{ .Language.Lang }}" href="{{ .Permalink }}">
-	{{- with .Sites.First.GetPage (.TranslationKey | strings.TrimPrefix (.Page.Kind | lower) | strings.TrimPrefix "/") }}
-<link rel="alternate" hreflang="x-default" href="{{ .Permalink }}">
-	{{- end -}}
-{{- end -}}
 {{- /* Remove trailing newlines */ -}}
diff --git a/layouts/partials/wtg-shell/output/page-header-nav.html b/layouts/partials/wtg-shell/output/page-header-nav.html
index fed86c8..3fdce17 100644
--- a/layouts/partials/wtg-shell/output/page-header-nav.html
+++ b/layouts/partials/wtg-shell/output/page-header-nav.html
@@ -2,19 +2,8 @@
 	<menu>
 		<li><a href="{{ relref .Page "/" }}">{{ site.Title }}</a></li>
 	</menu>
-{{- /* Next header piece is/are links to translations of this page */ -}}
-{{- if .IsTranslated }}
-	<details>
-		<summary>A↔B</summary>
-		<div>
-{{- range .Translations }}
-			<span><a href="{{ .RelPermalink }}">{{ with .Language.LanguageName }}{{ . }}{{ else }}{{ .Lang }}{{ end }}</a></span>
-{{- end }}
-		</div>
-	</details>
-{{- else -}}
+{{- /* Next header piece placeholder for language selector */ -}}
 	<div></div>
-{{- end }}
 {{- /* Next header piece is/are menu items, if a 'main' menu is defined */}}
 	<menu>
 {{- with site.Menus.main -}}
diff --git a/layouts/partials/wtg-shell/output/sitemap-urls.xml b/layouts/partials/wtg-shell/output/sitemap-urls.xml
index b227e10..eb98d19 100644
--- a/layouts/partials/wtg-shell/output/sitemap-urls.xml
+++ b/layouts/partials/wtg-shell/output/sitemap-urls.xml
@@ -1,4 +1,4 @@
-{{- /* cspell:ignore pagecanonical taxcanonical changefreq hreflang */ -}}
+{{- /* cspell:ignore pagecanonical taxcanonical changefreq */ -}}
 {{ range .Data.Pages }}
 	{{- $pageCanonical := true -}}
 	{{- if isset .Page.Params "pagecanonical" -}}
@@ -24,20 +24,6 @@
 	{{- if ge .Sitemap.Priority 0.0 }}
 		<priority>{{ .Sitemap.Priority }}</priority>
 	{{- end -}}
-	{{- if .IsTranslated }}
-		{{- range .Translations }}
-		<xhtml:link
-			rel="alternate"
-			hreflang="{{ .Language.Lang }}"
-			href="{{ .Permalink }}"
-		/>
-		{{- end }}
-		<xhtml:link
-			rel="alternate"
-			hreflang="{{ .Language.Lang }}"
-			href="{{ .Permalink }}"
-		/>
-	{{- end }}
 	</url>
 	{{- end -}}
 {{- end -}}