diff --git a/content/posts/website-best-practices.md b/content/posts/website-best-practices.md
index c5abb75..02e82b8 100644
--- a/content/posts/website-best-practices.md
+++ b/content/posts/website-best-practices.md
@@ -1445,7 +1445,7 @@ The [250kb club](https://250kb.club/) gathers websites at or under 250kb, and al
 
 The [10KB Club](https://10kbclub.com/) does the same with a 10kb homepage budget (excluding favicons and webmanifest icons). It also has guidelines for note­worthiness, to avoid low-hanging fruit like mostly-blank pages.
 
-My favorite website club has to be the [<abbr title="eXtreme HyperText Movement for Luddites">XHTML</abbr> Club](https://xhtml.club/) by {{<indieweb-person first-name="Bradley" last-name="Taunt" url="https://tdarb.org">}}, the creator of the original [1mb.club](https://1mb.club).
+My favorite website club has to be the <span itemprop="mentions" itemscope itemtype="https://schema.org/WebSite">{{< cited-work name="XHTML Club" url="https://xhtml.club/" >}} by {{<indieweb-person first-name="Bradley" last-name="Taunt" url="https://tdarb.org" itemprop="author">}}</span>, the creator of the original [1mb.club](https://1mb.club).
 
 Also see [Motherfucking Website](https://motherfuckingwebsite.com/). Motherfucking Website inspired several unofficial sequels that tried to gently improve upon it. My favorite is [Best Motherfucking Website](https://bestmotherfucking.website/).
 
@@ -1510,9 +1510,9 @@ A special thanks goes out to GothAlice for the questions she answered in <samp>#
 
 [^19]: Consider disabling the JIT for your normal browsing too; doing so removes whole classes of vulnera&shy;bilities. In Firefox, navigate to <samp>about:<wbr>config</samp> and toggle some flags under <code>javascript<wbr>.options</code>.
 
-    <figure itemscope itemtype="https://schema.org/SoftwareSourceCode">
+    <figure itemprop="hasPart" itemscope itemtype="https://schema.org/SoftwareSourceCode">
     <figcaption>
-    <strong itemprop="name"> <span itemprop="codeSampleType">Code snippet</span> 11</strong>:
+    <strong id="code-snippet=11" itemprop="name"> <span itemprop="codeSampleType">Code snippet</span> 11</strong>:
         Firefox prefs to turn off JIT compilation
         </figcaption>
 
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 00b2d63..c6d3986 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -7,8 +7,8 @@
 			<li itemprop="license" itemscope itemtype="https://schema.org/CreativeWork">
 				<a rel="license" itemprop="url" href="https://creativecommons.org/licenses/by-sa/4.0/"><span itemprop="name">CC BY-SA 4.0</span></a>
 			</li>
-			<li itemscope itemtype="https://schema.org/SoftwareSourceCode">
-				<a itemprop="codeRepository" rel="source" href="{{ .Site.Params.src }}">Source code</a>
+			<li>
+				<a rel="source" href="{{ .Site.Params.src }}">Source code</a>
 			</li>
 			<li>
 				<a rel="alternate" href="http://wgq3bd2kqoybhstp77i3wrzbfnsyd27wt34psaja4grqiezqircorkyd.onion{{ .RelPermalink }}">Tor mirror</a>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index e871395..35a208c 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,4 +1,4 @@
-<header id="banner" itemscope itemtype="https://schema.org/WPHeader">
+<header id="banner" itemprop="hasPart" itemscope itemtype="https://schema.org/WPHeader">
 	<nav aria-label="Global">
 		<ul class="unstyled-list">
 			{{- $currentPage := . -}}
@@ -6,7 +6,7 @@
 			{{- if eq $currentPage.Permalink .Site.BaseURL -}}
 				{{- $isHome = true -}}
 			{{- end }}
-			<li itemscope itemtype="https://schema.org/SiteNavigationElement">
+			<li itemprop="hasPart" itemscope itemtype="https://schema.org/SiteNavigationElement">
 				<a rel="home" itemprop="url" href="{{ .Site.BaseURL }}"{{- if $isHome }} aria-current="page"{{- end -}}>
 					{{- if $isHome -}}
 						<strong itemprop="name">{{ .Site.Title }}</strong>
@@ -17,7 +17,7 @@
 			</li>
 			{{ range .Site.Menus.main -}}
 			{{ $isCurrent := false }}
-			<li itemscope itemtype="https://schema.org/SiteNavigationElement">
+			<li itemProp="hasPart" itemscope itemtype="https://schema.org/SiteNavigationElement">
 				<a href="{{ .URL }}" itemprop="url" {{- if or (eq $currentPage.RelPermalink .URL) ($currentPage.HasMenuCurrent "main" .) -}}{{- $isCurrent = true }} aria-current="page"{{- end -}}>
 					{{- if or $isCurrent (eq $currentPage.Section .Title) -}}
 						<strong itemprop="name">{{- .Name -}}</strong>
diff --git a/layouts/partials/posts.html b/layouts/partials/posts.html
index 00d199b..5340468 100644
--- a/layouts/partials/posts.html
+++ b/layouts/partials/posts.html
@@ -7,7 +7,7 @@
 	<h1 class="p-name" itemprop="name headline" id="posts">Posts</h1>
 	<p>These are all of my posts, sorted by date (newest first).</p>
 {{- else  }}
-<section class="h-feed hfeed" itemscope itemtype="https://schema.org/DataFeed">
+<section class="h-feed hfeed" itemprop="hasPart" itemscope itemtype="https://schema.org/DataFeed">
 	<h2 class="p-name" itemprop="name" id="posts">Posts</h2>
 	<p>Here&rsquo;s a selection of my best posts, in featured order. To see the rest, visit <a href="/posts.html">my Posts page</a>.</p>
 {{- end }}
diff --git a/layouts/shortcodes/codefigure.html b/layouts/shortcodes/codefigure.html
index 7e4cb5c..fa70c41 100644
--- a/layouts/shortcodes/codefigure.html
+++ b/layouts/shortcodes/codefigure.html
@@ -7,6 +7,6 @@
 	The full caption is too long for an aria-label;
 	just use the beginning for the label and the full thing for the aria description.
 -->
-<figure aria-labelledby="{{ $id }}" itemscope itemtype="https://schema.org/SoftwareSourceCode">
+<figure aria-labelledby="{{ $id }}" itemprop="hasPart" itemscope itemtype="https://schema.org/SoftwareSourceCode">
 {{ .Inner | markdownify -}}
 </figure>
diff --git a/layouts/shortcodes/transcribed-image.html b/layouts/shortcodes/transcribed-image.html
index a248c64..354d5de 100644
--- a/layouts/shortcodes/transcribed-image.html
+++ b/layouts/shortcodes/transcribed-image.html
@@ -3,6 +3,6 @@
 {{- $type = . -}}
 {{- end -}}
 
-<article aria-label="{{ $type }}, caption, and transcript" itemscope itemtype="https://schema.org/ImageObject" id="{{ .Get "id" }}">
+<article aria-label="{{ $type }}, caption, and transcript" itemprop="mentions" itemscope itemtype="https://schema.org/ImageObject" id="{{ .Get "id" }}">
 {{ .Inner | markdownify | safeHTML }}
 </article>