diff --git a/index.html b/index.html
index 67e8be28..64a69242 100644
--- a/index.html
+++ b/index.html
@@ -291,10 +291,10 @@ <h2>
         Navigation scope
       </h2>
       <p>
-        A <dfn>navigation scope</dfn> is a [[!URL]] that represents the set of
-        URLs to which an <a>application context</a> can be navigated while the
-        manifest is <a>applied</a>. To determine if a URL is within the
-        <a>navigation scope</a>, the user agent MUST run the <a>within
+        A <dfn>navigation scope</dfn> is a [[!WHATWG-URL]] that represents the
+        set of URLs to which an <a>application context</a> can be navigated
+        while the manifest is <a>applied</a>. To determine if a URL is within
+        the <a>navigation scope</a>, the user agent MUST run the <a>within
         scope</a> algorithm.
       </p>
       <p>
@@ -842,11 +842,11 @@ <h4>
               from which a <a>user agent</a> can fetch a manifest. As with
               other directives, by default the <a><code>manifest-src</code></a>
               directive is <code>*</code>, meaning that a user agent can,
-              [[!CORS]] permitting, fetch the manifest cross-domain. Remote
-              origins (e.g., a <abbr title=
+              [[!FETCH]]'s <abbr>CORS</abbr> permitting, fetch the manifest
+              cross-domain. Remote origins (e.g., a <abbr title=
               "content delivery network">CDN</abbr>) wanting to host manifests
               for various web applications will need to include the appropriate
-              [[!CORS]] response header in their HTTP response (e.g.,
+              <abbr>CORS</abbr> response header in their HTTP response (e.g.,
               <code>Access-Control-Allow-Origin: https://example.com</code>).
             </p>
             <figure class="example">
@@ -1082,7 +1082,7 @@ <h2>
       </p>
       <p>
         Every manifest has an associated <dfn>manifest URL</dfn>, which the
-        [[!URL]] from which the <a>manifest</a> was fetched.
+        [[!WHATWG-URL]] from which the <a>manifest</a> was fetched.
       </p>
       <section>
         <h3>
@@ -1624,19 +1624,16 @@ <h3>
           The <dfn id="member-theme_color"><code>theme_color</code>
           member</dfn> serves as the <dfn>default theme color</dfn> for an
           application context. What constitutes a <dfn>theme color</dfn> is
-          defined in [[!META-THEME-COLOR]].
+          defined in [[!HTML]].
         </p>
         <p>
           If the user agent honors the value of the <code>theme_color</code>
           member as the <a>default theme color</a>, then that color serves as
           the <a>theme color</a> for all browsing contexts to which the
           manifest is <a>applied</a>. However, a document may override the
-          <a>default theme color</a> through the inclusion of a [[!HTML]]
-          <code>meta</code> element that conforms to [[!META-THEME-COLOR]]. A
-          user agent MUST return the theme color to the <a>default theme
-          color</a> when there are no <code>meta</code> elements that conform
-          to [[!META-THEME-COLOR]] in a document, or the <a>top-level browsing
-          context</a> is <a>navigated</a> to a URL that is <a>within scope</a>.
+          <a>default theme color</a> through the inclusion of a valid [[!HTML]]
+          <code>meta</code> element whose <code>name</code> attribute is
+          "theme-color".
         </p>
         <p>
           The <dfn>steps for processing the <code>theme_color</code>