diff --git a/convert_policy.py b/convert_policy.py
index 6328ad5ef..b52a67f54 100755
--- a/convert_policy.py
+++ b/convert_policy.py
@@ -34,11 +34,11 @@ def header_text_to_id(header_text):
 
 
 def adjust_header(line):
-    search = re.search(r'<h([2-5])>(.+)</h([2-5])>', line)
+    search = re.search(r'<h([2-6])>(.+)</h([2-6])>', line)
     if not search:
         return line
 
-    header_level = str(int(search.group(1)) + 1)
+    header_level = search.group(1)
     header_text = search.group(2)
     header_id = header_text_to_id(header_text)
 
diff --git a/convert_sg_db.py b/convert_sg_db.py
index f7ef140f4..27ec09968 100755
--- a/convert_sg_db.py
+++ b/convert_sg_db.py
@@ -85,7 +85,7 @@ def create_workstreams(db, template):
     introduction = introduction.replace("<!-- This ends up being included at https://whatwg.org/workstreams -->\n", "")
     content = markdown(introduction, obtain_link_mapping())
     for workstream in db["workstreams"]:
-        content += "\n<h3>{}</h3>".format(workstream["name"])
+        content += "\n<h2>{}</h2>".format(workstream["name"])
         content += """\n<dl class="compact">"""
         content += "\n <div>"
         content += "\n  <dt>Scope</dt>"
diff --git a/resources.whatwg.org/standard-service-worker.js b/resources.whatwg.org/standard-service-worker.js
index 6549018eb..0e414cac7 100644
--- a/resources.whatwg.org/standard-service-worker.js
+++ b/resources.whatwg.org/standard-service-worker.js
@@ -8,7 +8,7 @@
 
 const standardShortname = location.host.split(".")[0];
 
-const cacheKey = "v8";
+const cacheKey = "v9";
 const toCache = [
   location.origin + "/",
   "https://resources.whatwg.org/spec.css",
diff --git a/resources.whatwg.org/standard.css b/resources.whatwg.org/standard.css
index 7fb9d98af..17f83bc28 100644
--- a/resources.whatwg.org/standard.css
+++ b/resources.whatwg.org/standard.css
@@ -54,11 +54,11 @@ code :link, :link code, code :visited, :visited code { color: #CE3C05; }
 pre :link, pre :visited { color: inherit; }
 
 html, ::before { font: 1em/1.45 Helvetica Neue, sans-serif, Droid Sans Fallback; }
-h1, h2, h3, h4, h5, h6 { text-align: left; text-rendering: optimizeLegibility; }
-h1, h2, h3 { color: #3c790a; background: transparent; }
+h1, h2, h3, h4, h5, h6, hgroup p { text-align: left; text-rendering: optimizeLegibility; }
+h1, h2, h3, hgroup p { color: #3c790a; background: transparent; }
 h1 { font: 900 200% Helvetica Neue, sans-serif, Droid Sans Fallback; }
 h1.allcaps { font: 900 350% Helvetica Neue, sans-serif, Droid Sans Fallback; letter-spacing: 2px; }
-h2 { font: 800 140% Helvetica Neue, sans-serif, Droid Sans Fallback; }
+h2, hgroup p { font: 800 140% Helvetica Neue, sans-serif, Droid Sans Fallback; }
 h3 { font: 800 125% Helvetica Neue, sans-serif, Droid Sans Fallback; }
 h4 { font: 800 110% Helvetica Neue, sans-serif, Droid Sans Fallback; }
 h5 { font: 800 100% Helvetica Neue, sans-serif, Droid Sans Fallback; }
@@ -329,7 +329,7 @@ figure.diagrams img { display: block; margin: 1em auto; }
 h2:not(.short) { page-break-before: always; }
 h2#contents { page-break-before: avoid; }
 h1, h2, h3, h4, h5, h6, dt { page-break-after: avoid; }
-hgroup h2, h1 + h2, hr + h2.no-toc { page-break-before: auto ! important; }
+hgroup p, h1 + h2, hr + h2.no-toc { page-break-before: auto ! important; }
 
 .brief { margin-top: 1em; margin-bottom: 1em; line-height: 1.1; }
 .brief > li { margin: 0; padding: 0; }
@@ -368,12 +368,12 @@ td.non-rectangular-cell-indentation { border-top-style: hidden; min-width: 2em;
 .hide { display: none }
 
 .head { margin: 0 0 1em; padding: 1em 0 0 0; display: block; }
-.head p { margin: 0; }
+.head p:not(hgroup p) { margin: 0; }
 .head h1 { margin: 0 100px 0 0; }
-.head h2 { margin-top: 0; margin-right: 100px; }
+hgroup p, .head h2 { margin: 0 100px 1em 0; }
 @media (max-width: 767px) {
   .head .logo img { width: 4em; height: 4em; }
-  .head h1, .head h2 { margin-right:5rem; }
+  .head h1, .head h2, hgroup p { margin-right: 5rem; }
 }
 .head dl { margin: 1em 0; }
 p.copyright { font-size: 0.6em; font-style: oblique; margin: 0; }
diff --git a/resources.whatwg.org/website-service-worker.js b/resources.whatwg.org/website-service-worker.js
index 27321b14e..ff9e62fcd 100644
--- a/resources.whatwg.org/website-service-worker.js
+++ b/resources.whatwg.org/website-service-worker.js
@@ -10,7 +10,7 @@
 
 */
 
-const cacheKeyToUse = "v3_" + (self.cacheKey || "v0");
+const cacheKeyToUse = "v4_" + (self.cacheKey || "v0");
 const everythingToCache = [
   "/",
   "https://whatwg.org/style/shared.css",
diff --git a/site-template.html b/site-template.html
index c4f054f7e..08e2edd45 100644
--- a/site-template.html
+++ b/site-template.html
@@ -16,7 +16,7 @@ <h1>
     WHATWG
    </a>
   </h1>
-  <h2>@TITLE_GOES_HERE@</h2>
+  <p>@TITLE_GOES_HERE@</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/404 b/whatwg.org/404
index 4a3db0cf4..aec70c009 100644
--- a/whatwg.org/404
+++ b/whatwg.org/404
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>File Not Found</h2>
+  <p>File Not Found</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/410 b/whatwg.org/410
index ce0c369a1..9e2362f8d 100644
--- a/whatwg.org/410
+++ b/whatwg.org/410
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>Gone</h2>
+  <p>Gone</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/charter b/whatwg.org/charter
index 80738b4ee..c675ae75b 100644
--- a/whatwg.org/charter
+++ b/whatwg.org/charter
@@ -23,7 +23,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>Charter (Historical)</h2>
+  <p>Charter (Historical)</p>
  </hgroup>
 </header>
 
@@ -33,7 +33,7 @@ the WHATWG operates. For a more up to date description read
 <a href="/policies">Policies</a>. The text below remains solely for the historical record.</p>
 
 <div id="obsolete-container">
- <h3 id="intro">Introduction</h3>
+ <h2 id="intro">Introduction</h2>
 
  <p id="the-good">Software developers are increasingly using the Web
  to deploy their applications. User Agents serve as front ends for
@@ -52,7 +52,7 @@ the WHATWG operates. For a more up to date description read
  Web applications, but these are often designed to address other
  needs and only consider Web Applications in a peripheral way.</p>
 
- <h3 id="deliverables">Deliverables</h3>
+ <h2 id="deliverables">Deliverables</h2>
 
  <p id="address">The goal of the Web Hypertext Applications
  Technology Working Group is to address the need for one coherent
@@ -114,7 +114,7 @@ the WHATWG operates. For a more up to date description read
 
 -->
 
- <h3 id="process">Process</h3>
+ <h2 id="process">Process</h2>
 
  <p id="list">Working group contributors will contribute to this
  activity through a publicly-archived and open-subscription mailing
@@ -182,7 +182,7 @@ the WHATWG operates. For a more up to date description read
  returned to the draft stage to address the issues raised and reasons
  for implementation differences.</p>
 
- <h3 id="member">Membership</h3>
+ <h2 id="member">Membership</h2>
 
  <p id="contributors">Anyone can contribute by subscribing to the <a
  href="mailing-list">mailing list</a>. The list of subscribers to the
diff --git a/whatwg.org/chat b/whatwg.org/chat
index 83c7fff4b..1f40e0095 100644
--- a/whatwg.org/chat
+++ b/whatwg.org/chat
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>Chat</h2>
+  <p>Chat</p>
  </hgroup>
 </header>
 
@@ -27,7 +27,7 @@
  <a href="https://participate.whatwg.org/">Participate</a>
 </nav>
 
-<h3 id="chat">Chat<a class="self-link" href="#irc"></a></h3>
+<h2 id="chat">Chat<a class="self-link" href="#irc"></a></h2>
 
 <p>We have a <a href="https://app.element.io/#/room/#whatwg:matrix.org">WHATWG</a> room in the <a href="https://en.wikipedia.org/wiki/Matrix_(protocol)">Matrix</a> network. Join us!</p>
 
@@ -35,11 +35,11 @@
 
 <p>We are committed to providing a friendly, safe, and welcoming environment for all. So please read the <a href="/code-of-conduct">WHATWG Code of Conduct</a> and respect it when participating in discussions.</p>
 
-<h3 id="getting-started-with-matrix">Getting Started With Matrix<a class="self-link" href="#getting-started-with-matrix"></a></h3>
+<h2 id="getting-started-with-matrix">Getting Started With Matrix<a class="self-link" href="#getting-started-with-matrix"></a></h2>
 
 <p>A quick way to get started is by opening the <a href="https://matrix.to/#/#whatwg:matrix.org">WHATWG room launch page</a>, which will prompt you to choose a Matrix client to connect from. Choosing the <a href="https://app.element.io/#/room/#whatwg:matrix.org">Element web app</a> will let you connect to the room right away, directly from your browser. Or you can choose from any of the available <a href="https://matrix.org/clients/">Matrix desktop clients and native mobile apps</a>.</p>
 
-<h3 id="logs">Logs<a class="self-link" href="#logs"></a></h3>
+<h2 id="logs">Logs<a class="self-link" href="#logs"></a></h2>
 
 <p>Chat logs can be found in the following places:</p>
 
@@ -51,7 +51,7 @@
 </ul>
 
 
-<h3 id="bots">Bots<a class="self-link" href="#bots"></a></h3>
+<h2 id="bots">Bots<a class="self-link" href="#bots"></a></h2>
 
 <p>If you want to run a bot, let us know. If they are useful, e.g., providing logging facilities, then they are more than welcome.</p>
 
diff --git a/whatwg.org/faq b/whatwg.org/faq
index 91ca09e63..e3c939be3 100644
--- a/whatwg.org/faq
+++ b/whatwg.org/faq
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>FAQ</h2>
+  <p>FAQ</p>
  </hgroup>
 </header>
 
@@ -30,9 +30,9 @@
 <p><i>See also the
 <a href="https://github.com/whatwg/html/blob/main/FAQ.md">HTML Standard FAQ</a>.</i>
 
-<h3 id="the-whatwg">The WHATWG<a class="self-link" href="#the-whatwg"></a></h3>
+<h2 id="the-whatwg">The WHATWG<a class="self-link" href="#the-whatwg"></a></h2>
 
-<h4 id="what-is-the-whatwg">What is the WHATWG?<a class="self-link" href="#what-is-the-whatwg"></a></h4>
+<h3 id="what-is-the-whatwg">What is the WHATWG?<a class="self-link" href="#what-is-the-whatwg"></a></h3>
 
 <p>The Web Hypertext Application Technology Working Group (WHATWG) is a community of people
 interested in evolving the web through standards and tests.
@@ -48,17 +48,17 @@ these concerns and the Web Hypertext Application Technology Working Group was bo
 governance structure for the WHATWG, together forming a
 <a href="https://github.com/whatwg/sg">Steering Group</a> to oversee relevant policies.
 
-<h4 id="spell-and-pronounce">How do you spell and pronounce WHATWG?<a class="self-link" href="#spell-and-pronounce"></a></h4>
+<h3 id="spell-and-pronounce">How do you spell and pronounce WHATWG?<a class="self-link" href="#spell-and-pronounce"></a></h3>
 
 <p>It is spelled WHATWG, all uppercase, no spaces. It has various pronunciations: what-wee-gee,
 what-wig, what-double-you-gee.
 
-<h4 id="what-is-the-whatwg-working-on">What is the WHATWG working on?<a class="self-link" href="#what-is-the-whatwg-working-on"></a></h4>
+<h3 id="what-is-the-whatwg-working-on">What is the WHATWG working on?<a class="self-link" href="#what-is-the-whatwg-working-on"></a></h3>
 
 <p>The WHATWG’s focus is on standards implementable in web browsers, and their associated tests.
 Our existing work can be seen on the <a href="https://spec.whatwg.org/">standards</a> page.
 
-<h4 id="get-involved">How can I get involved?<a class="self-link" href="#get-involved"></a></h4>
+<h3 id="get-involved">How can I get involved?<a class="self-link" href="#get-involved"></a></h3>
 
 <p>There are lots of ways you can get involved! You might want to get started by reviewing
 <a href="https://spec.whatwg.org/">the standards</a> and filing issues. You can also browse our
@@ -72,7 +72,7 @@ Also, feel free to join <a href="/chat">Chat</a> and ask questions of other comm
 <a href="https://www.youtube.com/watch?v=hneN6aW-d9w">this video from Domenic Denicola</a> is a
 good introduction to working with standards bodies.
 
-<h4 id="is-participation-free">Is participation free?<a class="self-link" href="#is-participation-free"></a></h4>
+<h3 id="is-participation-free">Is participation free?<a class="self-link" href="#is-participation-free"></a></h3>
 
 <p>Yes, everyone can contribute. There are no memberships fees involved; it’s an open process. See
 our <a href="https://participate.whatwg.org/">participation page</a> for more information.
@@ -80,9 +80,9 @@ Participation can be done entirely over the internet; no binding decisions are m
 meetings. That is, decisions made during the odd meeting are tentative and subject to appeal from
 those not present.
 
-<h3 id="process">The WHATWG Process<a class="self-link" href="#process"></a></h3>
+<h2 id="process">The WHATWG Process<a class="self-link" href="#process"></a></h2>
 
-<h4 id="how-does-the-whatwg-work">How does the WHATWG work?<a class="self-link" href="#how-does-the-whatwg-work"></a></h4>
+<h3 id="how-does-the-whatwg-work">How does the WHATWG work?<a class="self-link" href="#how-does-the-whatwg-work"></a></h3>
 
 <p><a href="/working-mode">Working Mode</a> describes the day-to-day process in detail. Most of
 the activity consists of <a href="https://github.com/whatwg">collaboration on GitHub</a>.
@@ -94,7 +94,7 @@ software project, a WHATWG standard undergoes
 <a href="https://whatwg.org/working-mode#additions">new features</a>. This work is driven by the
 community in collaboration with implementers.
 
-<h4 id="what-happens-with-discussions">What happens in WHATWG GitHub issue discussions?<a class="self-link" href="#what-happens-with-discussions"></a></h4>
+<h3 id="what-happens-with-discussions">What happens in WHATWG GitHub issue discussions?<a class="self-link" href="#what-happens-with-discussions"></a></h3>
 
 <p>Much of the time, discussions in the WHATWG are straightforward, with everyone collaborating
 on an effort to change the standard <a href="https://whatwg.org/working-mode#changes">according to
@@ -116,7 +116,7 @@ when they look at the thread. Similarly, as soon as threads start being meta-thr
 people’s argumentation behaviour, we stop making any kind of useful progress, since that isn’t
 input that can help the decision-making process later.
 
-<h4 id="consensus">Does the WHATWG operate by consensus?<a class="self-link" href="#consensus"></a></h4>
+<h3 id="consensus">Does the WHATWG operate by consensus?<a class="self-link" href="#consensus"></a></h3>
 
 <p>The WHATWG strives for rough, informal consensus among contributors when drafting Living
 Standards. After considering input from all parties, the editor of a Living Standard makes the
@@ -127,7 +127,7 @@ Steering Group, which does have a formal consensus policy.
 <p>For more information on how decisions are made, see the
 <a href="/working-mode">Working Mode</a>.
 
-<h4 id="control">Who controls the WHATWG?<a class="self-link" href="#control"></a></h4>
+<h3 id="control">Who controls the WHATWG?<a class="self-link" href="#control"></a></h3>
 
 <p>The community working there. Living Standards are informed by input from contributors, driven
 by workstream participants, articulated by editors, and coordinated by the Steering Group. If
@@ -136,7 +136,7 @@ organizations that develop browser engines, as a backstop to ensure the editor's
 with what they will implement. Substantive technical objections are considered and resolved by the
 Steering Group, consistent with the <a href="/principles">principles of the WHATWG</a>.
 
-<h4 id="how-to-interact">How should tool developers, screen reader developers, browser vendors, search engine vendors, and other implementers interact with the WHATWG?<a class="self-link" href="#how-to-interact"></a></h4>
+<h3 id="how-to-interact">How should tool developers, screen reader developers, browser vendors, search engine vendors, and other implementers interact with the WHATWG?<a class="self-link" href="#how-to-interact"></a></h3>
 
 <p>File an issue on the <a href="https://spec.whatwg.org/">relevant standard</a> as indicated at
 the top of that standard. All feedback is supposed to be addressed in due course. You are also
@@ -148,7 +148,7 @@ feedback, let the editors know by either emailing them, or contacting them on
 <a href="/irc">IRC</a>. Requests for priority feedback handling are handled confidentially if
 desired so other implementers won’t know that you are working on that feature.
 
-<h4 id="removing-bad-ideas">Is there a process for removing bad ideas from a standard?<a class="self-link" href="#removing-bad-ideas"></a></h4>
+<h3 id="removing-bad-ideas">Is there a process for removing bad ideas from a standard?<a class="self-link" href="#removing-bad-ideas"></a></h3>
 
 <p>In general, it is very hard to remove features from the web platform, as implementers are
 hesitant to break web pages. Remember that WHATWG standards are intended to align with the reality
@@ -169,7 +169,7 @@ are the <a href="https://github.com/whatwg/html/pull/1399"><code>applet</code></
 removal, which may or may not be successful, is
 <a href="https://xhr.spec.whatwg.org/#sync-warning">synchronous <code>XMLHttpRequest</code></a>.
 
-<h4 id="adding-new-features">How should I go about proposing new features to WHATWG standards?<a class="self-link" href="#adding-new-features"></a></h4>
+<h3 id="adding-new-features">How should I go about proposing new features to WHATWG standards?<a class="self-link" href="#adding-new-features"></a></h3>
 
 <p>The process is rather informal, but basically boils down to this:
 
@@ -242,7 +242,7 @@ removal, which may or may not be successful, is
 <p>For more information on the formalized requirements for adding new features, see
 <a href="https://whatwg.org/working-mode#additions">our working mode</a>.
 
-<h4 id="should-i-send-new-proposed-text">Should I send new proposed text when I have a suggestion?<a class="self-link" href="#should-i-send-new-proposed-text"></a></h4>
+<h3 id="should-i-send-new-proposed-text">Should I send new proposed text when I have a suggestion?<a class="self-link" href="#should-i-send-new-proposed-text"></a></h3>
 
 <p>This is a great idea for grammatical or typographical errors! However, usually, you want to
 open an issue first. Although sending a pull request is eventually part of the process, doing so
@@ -250,7 +250,7 @@ before discussion with the community and editor(s) can result in wasted work on
 suggestions that are actually new features, this is especially important; see the answer above for
 how things usually work.
 
-<h4 id="living-standard">What does “Living Standard” mean?<a class="self-link" href="#living-standard"></a></h4>
+<h3 id="living-standard">What does “Living Standard” mean?<a class="self-link" href="#living-standard"></a></h3>
 
 <p>The WHATWG standards are described as Living Standards. This means that they are standards
 that are continuously updated as they receive feedback, either from web developers, browser
@@ -269,7 +269,7 @@ implementations (not just browsers, of course) can do the same thing. Instead of
 browsers do, we fix the standard to match what the browsers do. Instead of leaving the standard
 ambiguous, we fix the the standard to define how things work.
 
-<h4 id="change-at-any-time">Does that mean the standards can change at any time?<a class="self-link" href="#change-at-any-time"></a></h4>
+<h3 id="change-at-any-time">Does that mean the standards can change at any time?<a class="self-link" href="#change-at-any-time"></a></h3>
 
 <p>The standards do not change arbitrarily: we are extremely careful! As parts of a standard
 mature, and implementations ship, the standard can generally not be changed in
@@ -287,7 +287,7 @@ process by which each change to the standard (embodied in a commit) triggers the
 frozen snapshot of the said standard. These snapshots are published as historical references. The
 WHATWG intends to keep these frozen snapshots available at their published URL permanently.
 
-<h4 id="stable">Doesn't this mean your standards are not stable?<a class="self-link" href="#stable"></a></h4>
+<h3 id="stable">Doesn't this mean your standards are not stable?<a class="self-link" href="#stable"></a></h3>
 
 <p>We think of stability for standards in the same way as we do for software. When one says that
 software is stable, one doesn't mean that it never changes: one instead means that it evolves
@@ -298,7 +298,7 @@ Software that is never patched has a low chance of being stable, as bugs sit una
 Living Standards are quite stable: they endeavor to eliminate all of their bugs, instead of
 leaving them unaddressed.
 
-<h4 id="patent-policy">What’s the patent story for WHATWG standards?<a class="self-link" href="#patent-policy"></a></h4>
+<h3 id="patent-policy">What’s the patent story for WHATWG standards?<a class="self-link" href="#patent-policy"></a></h3>
 
 <p>In non-normative layperson's terms: roughly every six months, a Living Standard is
 “snapshotted” to create a Review Draft suitable for patent review. All workstream participants, by
@@ -306,7 +306,7 @@ virtue of signing the <a href="/ipr-policy">IPR Policy</a>, commit to licensing
 claims they may have, unless they exclude those claims within 45 days of the publication of that
 snapshot.
 
-<h4 id="translating">What is the process for translating WHATWG standards?<a class="self-link" href="#translating"></a></h4>
+<h3 id="translating">What is the process for translating WHATWG standards?<a class="self-link" href="#translating"></a></h3>
 
 <p>Many WHATWG standards have been translated into other languages by the WHATWG community. This
 is great, and highly encouraged!
diff --git a/whatwg.org/index.html b/whatwg.org/index.html
index bf82494ef..b12190d11 100644
--- a/whatwg.org/index.html
+++ b/whatwg.org/index.html
@@ -23,12 +23,12 @@
  align-items: center;
 }
 
-header > hgroup > h1, header > hgroup > h2 {
+header > hgroup > h1, header > hgroup > p {
  margin: 0;
  font-weight: normal;
 }
 
-header > hgroup > h2 {
+header > hgroup > p {
  font-size: 16px;
 }
 
@@ -146,7 +146,7 @@
  <img id="main-logo" crossorigin src="https://resources.whatwg.org/logo.svg" alt>
  <hgroup>
   <h1>Welcome to the WHATWG community</h1>
-  <h2>Maintaining and evolving HTML since 2004</h2>
+  <p>Maintaining and evolving HTML since 2004</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/news/future-of-html b/whatwg.org/news/future-of-html
index 18153c6cd..d622781b7 100644
--- a/whatwg.org/news/future-of-html
+++ b/whatwg.org/news/future-of-html
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>Looking for feedback on HTML5</h2>
+  <p>Looking for feedback on HTML5</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/news/index.html b/whatwg.org/news/index.html
index 4dbbf7abd..4c4f223e8 100644
--- a/whatwg.org/news/index.html
+++ b/whatwg.org/news/index.html
@@ -16,7 +16,7 @@ <h1>
     WHATWG
    </a>
   </h1>
-  <h2>News</h2>
+  <p>News</p>
  </hgroup>
 </header>
 
@@ -29,7 +29,7 @@ <h2>News</h2>
 
 <p>For the most up to date news, read the <a href="https://blog.whatwg.org/">WHATWG Blog</a>.</p>
 
-<h3>History</h3>
+<h2>History</h2>
 
 <p>The following historical news items were posted before the blog was created:</p>
 
diff --git a/whatwg.org/news/start b/whatwg.org/news/start
index 8ca02a0d9..6b6a22b08 100644
--- a/whatwg.org/news/start
+++ b/whatwg.org/news/start
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>News</h2>
+  <p>News</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/news/web-forms-call-for-comments-1 b/whatwg.org/news/web-forms-call-for-comments-1
index 8cc1fa249..27c387d89 100644
--- a/whatwg.org/news/web-forms-call-for-comments-1
+++ b/whatwg.org/news/web-forms-call-for-comments-1
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>News</h2>
+  <p>News</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/news/web-forms-call-for-comments-2 b/whatwg.org/news/web-forms-call-for-comments-2
index cc3c95c37..38083bafe 100644
--- a/whatwg.org/news/web-forms-call-for-comments-2
+++ b/whatwg.org/news/web-forms-call-for-comments-2
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>News</h2>
+  <p>News</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/news/web-forms-call-for-comments-3 b/whatwg.org/news/web-forms-call-for-comments-3
index 9e517a39b..60da56b48 100644
--- a/whatwg.org/news/web-forms-call-for-comments-3
+++ b/whatwg.org/news/web-forms-call-for-comments-3
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>News</h2>
+  <p>News</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/news/web-forms-call-for-comments-4 b/whatwg.org/news/web-forms-call-for-comments-4
index 848783f8f..cc0c07a10 100644
--- a/whatwg.org/news/web-forms-call-for-comments-4
+++ b/whatwg.org/news/web-forms-call-for-comments-4
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>News</h2>
+  <p>News</p>
  </hgroup>
 </header>
 
diff --git a/whatwg.org/service-worker.js b/whatwg.org/service-worker.js
index f134b485e..ba4d369ae 100644
--- a/whatwg.org/service-worker.js
+++ b/whatwg.org/service-worker.js
@@ -1,6 +1,6 @@
 "use strict";
 
-self.cacheKey = "v3";
+self.cacheKey = "v4";
 self.toCache = [
   "/img/arrow.svg",
   "/img/bird-webpage.svg",
diff --git a/whatwg.org/style-guide b/whatwg.org/style-guide
index 0a971ba9b..feef6d466 100644
--- a/whatwg.org/style-guide
+++ b/whatwg.org/style-guide
@@ -16,7 +16,7 @@
     WHATWG
    </a>
   </h1>
-  <h2>Style Guide</h2>
+  <p>Style Guide</p>
  </hgroup>
 </header>
 
@@ -27,11 +27,11 @@
  <a href="https://participate.whatwg.org/">Participate</a>
 </nav>
 
-<h3 id="language">Language<a class="self-link" href="#language"></a></h3>
+<h2 id="language">Language<a class="self-link" href="#language"></a></h2>
 
 <p>American English.</p>
 
-<h3 id="dictionary">Dictionary<a class="self-link" href="#dictionary"></a></h3>
+<h2 id="dictionary">Dictionary<a class="self-link" href="#dictionary"></a></h2>
 
 <ul>
  <li>behavior</li>
@@ -57,7 +57,7 @@
  <li>whitespace (though CSS '<code>white-space</code>' [sic] property)</li>
 </ul>
 
-<h3 id="grammar">Grammar<a class="self-link" href="#grammar"></a></h3>
+<h2 id="grammar">Grammar<a class="self-link" href="#grammar"></a></h2>
 
 <ul>
  <li>Use "'s" for possessives, even when it looks unnatural.</li>
@@ -66,26 +66,26 @@
  <li>"A hierarchy" (not "an").</li>
 </ul>
 
-<h3 id="casing">Casing<a class="self-link" href="#casing"></a></h3>
+<h2 id="casing">Casing<a class="self-link" href="#casing"></a></h2>
 
 <ul>
  <li>"web", unless at the start of a sentence</li>
 </ul>
 
-<h3 id="punctuation">Punctuation<a class="self-link" href="#punctuation"></a></h3>
+<h2 id="punctuation">Punctuation<a class="self-link" href="#punctuation"></a></h2>
 
 <ul>
  <li>Spaces around "—" (em dash)</li>
  <li>Lowercase after colon ("The slot attribute is used to assign a slot to an element: an element with a slot attribute is assigned to the slot created by the slot element whose name attribute's value matches that slot attribute's value")</li>
 </ul>
 
-<h3 id="words-and-phrases-used-as-words">Words and phrases used as words<a class="self-link" href="#words-and-phrases-used-as-words"></a></h3>
+<h2 id="words-and-phrases-used-as-words">Words and phrases used as words<a class="self-link" href="#words-and-phrases-used-as-words"></a></h2>
 
 <ul>
  <li>When a word or term is not used functionally but is referred to as the word or term itself, enclose it in quotation marks. (See also: <a href="https://en.wikipedia.org/wiki/Use%E2%80%93mention_distinction">use/mention distinction</a>, and <a href="https://www.chicagomanualofstyle.org/qanda/data/faq/topics/NoneoftheAbove/faq0012.html">some examples that highlight why this is necessary</a>.)</li>
 </ul>
 
-<h3 id="tone">Tone<a class="self-link" href="#tone"></a></h3>
+<h2 id="tone">Tone<a class="self-link" href="#tone"></a></h2>
 
 <ul>
  <li>Avoid using "simply" or suggesting that something is simple</li>
diff --git a/whatwg.org/style/subpages.css b/whatwg.org/style/subpages.css
index c3c6dcdd3..5475f524f 100644
--- a/whatwg.org/style/subpages.css
+++ b/whatwg.org/style/subpages.css
@@ -36,13 +36,13 @@ header > hgroup > h1 > a:link, header > hgroup > h1 > a:visited {
   color: inherit;
 }
 
-header > hgroup > h2 {
+header > hgroup > p {
  font-size: var(--header-main-font-size);
  color: rgb(40, 40, 40);
  margin-left: 0.3em;
 }
 
-header > hgroup > h2::before {
+header > hgroup > p::before {
   content: ' – ';
 }
 
@@ -55,9 +55,9 @@ body > nav {
 }
 
 /* HEADINGS */
-h3 { border-bottom: 1px solid #aaa; font: 1.2em sans-serif; margin: 1.2em 0 1.2em; }
-h4 { font: bold 1.1em sans-serif; margin: 1.2em 0 1.2em; }
-h5, h6 { font: bold 1.0em sans-serif; margin: 1.2em 0 1.2em; }
+h2 { border-bottom: 1px solid #aaa; font: 1.2em sans-serif; margin: 1.2em 0 1.2em; }
+h3 { font: bold 1.1em sans-serif; margin: 1.2em 0 1.2em; }
+h4, h5, h6 { font: bold 1.0em sans-serif; margin: 1.2em 0 1.2em; }
 
 /* GLOBAL ELEMENT STYLES */
 ol, ul, dl, p, address { margin-top: 1.1em; margin-bottom: 1.1em; }
diff --git a/whatwg.org/validator/index.html b/whatwg.org/validator/index.html
index e096ef1c8..69d61fc15 100644
--- a/whatwg.org/validator/index.html
+++ b/whatwg.org/validator/index.html
@@ -16,7 +16,7 @@ <h1>
     WHATWG
    </a>
   </h1>
-  <h2>HTML Conformance Checkers</h2>
+  <p>HTML Conformance Checkers</p>
  </hgroup>
 </header>