From ac5dc8958a51712557ba57206b2bc83c52f0a40b Mon Sep 17 00:00:00 2001
From: Laurent Carcone <laurent@w3.org>
Date: Tue, 22 Oct 2024 14:01:38 +0200
Subject: [PATCH] remove some classes "clean-list"

---
 html/s24-home.html           |   2 +-
 html/s24-list-surveys.html   | 587 +++++++++--------------------------
 html/s24-qtypes-results.html | 241 ++++++++++----
 html/s24-qtypes.html         | 432 +++++---------------------
 html/s24-question-add.html   |   8 +-
 html/s24-survey-edit.html    |  10 +-
 6 files changed, 425 insertions(+), 855 deletions(-)

diff --git a/html/s24-home.html b/html/s24-home.html
index 4220d65..60289ee 100644
--- a/html/s24-home.html
+++ b/html/s24-home.html
@@ -347,7 +347,7 @@ <h2 class="nav__submenu__intro__heading">About</h2>
 <nav id="breadcrumb" aria-label="Breadcrumb">
     <div class="l-center">
         <div class="l-cluster">
-            <ol class="breadcrumbs clean-list" role="list">
+            <ol class="breadcrumbs" role="list">
                                                         <li><a href="https://www.w3.org/">Home</a></li>
 
         <li><a href="https://www.w3.org/wbs/" aria-current="page">WBS Home</a></li>
diff --git a/html/s24-list-surveys.html b/html/s24-list-surveys.html
index 37a83f5..c322b61 100644
--- a/html/s24-list-surveys.html
+++ b/html/s24-list-surveys.html
@@ -113,9 +113,9 @@
 <div class="grid-wrap">
     <div class="wrap">
         <header class="global-header">
-            <span role="status" aria-live="polite"></span>
-                                        
-                                        <nav id="global-nav" aria-label="Main">
+        <span role="status" aria-live="polite"></span>
+      
+<nav id="global-nav" aria-label="Main">
     <div class="global-nav__inner l-center">
         <a class="logo-link" href="https://www.w3.org/" hreflang="en">
             <span class="logo">
@@ -125,9 +125,9 @@
         </a>
         <button type="button" class="button button--ghost with-icon--after with-icon--larger" data-trigger="mobile-nav"
                 style="display: none;"></button>
-        <ul class="clean-list" data-component="nav-double-intro">
+        <ul data-component="nav-double-intro">
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/standards/" class="nav-link">Standards <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/standards/" class="nav-link">Standards</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -137,76 +137,34 @@ <h2 class="nav__submenu__intro__heading">Standards</h2>
                                                                                                                 <a href="https://www.w3.org/standards/">Explore web standards</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/standards/about/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                About W3C web standards
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/TR/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                W3C standards and drafts
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/standards/types/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Types of documents W3C publishes
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/translations/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Translations of W3C standards and drafts
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/standards/review/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Reviews and public feedback
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/liaisons/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Liaisons
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/get-involved/promote/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Promote web standards
-                                            </a>
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/standards/about/">About W3C web standards</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/TR/">W3C standards &amp; drafts</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/standards/types/">Types of documents W3C publishes</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/translations/">Translations of W3C standards &amp; drafts</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/standards/review/">Reviews &amp; public feedback</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/liaisons/">Liaisons</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/get-involved/promote/">Promote web standards</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/groups/" class="nav-link">Groups <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/groups/" class="nav-link">Groups</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -216,85 +174,37 @@ <h2 class="nav__submenu__intro__heading">Groups</h2>
                                                                                                                 <a href="https://www.w3.org/groups/">About W3C groups</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/wg/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Working Groups
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/ig/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Interest Groups
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/cg/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Community Groups
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/bg/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Business Groups
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/other/tag/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Technical Architecture Group
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/invited-experts/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Invited Experts
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/guide/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Participant guidebook
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/positive-work-environment/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Positive work environment
-                                            </a>
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/wg/">Working Groups</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/ig/">Interest Groups</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/cg/">Community Groups</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/bg/">Business Groups</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/other/tag/">Technical Architecture Group</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/invited-experts/">Invited Experts</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/guide/">Participant guidebook</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/positive-work-environment/">Positive work environment</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/get-involved/" class="nav-link">Get involved <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/get-involved/" class="nav-link">Get involved</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -304,67 +214,31 @@ <h2 class="nav__submenu__intro__heading">Get involved</h2>
                                                                                                                 <a href="https://www.w3.org/get-involved/">Find ways to get involved</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/ecosystems/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Browse our work by industry
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/membership/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Become a Member
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/Member/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Member Home (restricted)
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/email/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Follow mailing lists
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/donate/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Make a donation
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/sponsor/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Sponsor an event
-                                            </a>
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/ecosystems/">Browse our work by industry</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/membership/">Become a Member</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/Member/">Member Home (restricted)</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/email/">Mailing lists</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/donate/">Make a donation</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/sponsor/">Sponsor an event</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/resources/" class="nav-link">Resources <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/resources/" class="nav-link">Resources</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -374,155 +248,71 @@ <h2 class="nav__submenu__intro__heading">Resources</h2>
                                                                                                                 <a href="https://www.w3.org/resources/">Learn from W3C resources</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/developers/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Developers
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/developers/tools/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Validators and tools
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/WAI/fundamentals/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Accessibility fundamentals
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/International/i18n-drafts/nav/about">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Internationalization
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/translations/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Translations of W3C standards and drafts
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/policies/code-of-conduct/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Code of conduct
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/reports/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Reports
-                                            </a>
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/developers/">Developers</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/developers/tools/">Validators &amp; tools</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/WAI/fundamentals/">Accessibility fundamentals</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/International/i18n-drafts/nav/about">Internationalization</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/translations/">Translations of W3C standards and drafts</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/policies/code-of-conduct/">Code of conduct</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/reports/">Reports</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/news-events/" class="nav-link">News and events <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/news-events/" class="nav-link">News &amp; events</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
-                                <h2 class="nav__submenu__intro__heading">News and events</h2>
+                                <h2 class="nav__submenu__intro__heading">News &amp; events</h2>
                                 <div class="nav__submenu__intro__text">
                                                                             <p>Recent content across news, blogs, press releases, media; upcoming events.</p>
-                                                                                                                <a href="https://www.w3.org/news-events/">Follow news and events</a>
+                                                                                                                <a href="https://www.w3.org/news-events/">Follow news &amp; events</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
+                                                            <ul>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/news/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                News
-                                            </a>
+                                            <a href="https://www.w3.org/news/">News</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/blog/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Blog
-                                            </a>
+                                            <a href="https://www.w3.org/blog/">Blog</a>
                                         </li>
                                                                             <li class="break-after">
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/press-releases/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Press releases
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/press-media/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Press and media
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/events/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Events
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/news-events/w3c-tpac/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Annual W3C Conference (TPAC)
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/policies/code-of-conduct/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Code of conduct
-                                            </a>
+                                            <a href="https://www.w3.org/press-releases/">Press releases</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/press-media/">Press &amp; media</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/events/">Events</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/news-events/w3c-tpac/">Annual W3C Conference (TPAC)</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/policies/code-of-conduct/">Code of conduct</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/about/" class="nav-link">About <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/about/" class="nav-link">About</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -532,126 +322,54 @@ <h2 class="nav__submenu__intro__heading">About</h2>
                                                                                                                 <a href="https://www.w3.org/about/">Find out more about us</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/mission/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Our mission
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/leadership/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Leadership
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/staff/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Staff
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/evangelists/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Evangelists
-                                            </a>
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/mission/">Our mission</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/leadership/">Leadership</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/staff/">Staff</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/evangelists/">Evangelists</a>
                                         </li>
                                                                             <li class="break-after">
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/careers/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Careers
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/diversity/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Diversity
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/corporation/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Corporation
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/sponsor/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Sponsoring W3C
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/press-media/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Media kit
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/contact/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Contact
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/policies/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Policies and legal information
-                                            </a>
-                                        </li>
-                                                                            <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/help/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Help
-                                            </a>
+                                            <a href="https://www.w3.org/careers/">Careers</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/diversity/">Diversity</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/corporation/">Corporation</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/sponsor/">Sponsoring W3C</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/press-media/">Media kit</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/contact/">Contact</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/policies/">Policies &amp; legal information</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/help/">Help</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                         <li class="top-nav-item">
-                <a hreflang="en" href="/help/search/" class="nav-link icon-link">
+                <a hreflang="en" href="https://www.w3.org/help/search/" class="nav-link icon-link">
                     <img class="icon" src="https://www.w3.org/assets/website-2021/svg/search.svg" width="24" height="24" alt aria-hidden="true"><span class="hide-at-max-width">Search</span>
                 </a>
             </li>
             <li class="top-nav-item">
-                <a hreflang="en" href="/users/myprofile/" id="account-login-link" class="account-login icon-link with-icon--after">
+                <a hreflang="en" href="https://www.w3.org/users/myprofile/" id="account-login-link" class="account-login icon-link with-icon--after">
                     My account <span class="avatar avatar--small icon">
                         <img src="https://www.w3.org/assets/website-2021/svg/avatar.svg" width="24" height="24" alt aria-hidden="true"/>
                     </span>
@@ -660,12 +378,13 @@ <h2 class="nav__submenu__intro__heading">About</h2>
         </ul>
     </div>
 </nav>
-                    </header>
+
+        </header>
                         
 <nav id="breadcrumb" aria-label="Breadcrumb">
     <div class="l-center">
         <div class="l-cluster">
-            <ol class="breadcrumbs clean-list" role="list">
+            <ol class="breadcrumbs" role="list">
               <li><a href="/">Home</a></li>
               <li><a href="https://www.w3.org/2002/09/wbs/" aria-current="page">WBS Home</a></li>
             </ol>
@@ -749,12 +468,12 @@ <h2 class="txt-saturn"><a href="wbs-types-test">WBS question types - new design<
  <div class="related">
    <nav class="related__inner" aria-labelledby="related-label">
    <h2 class="txt-jupiter">This Group</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/109/" title="Current questionnaires for this group">Open questionnaires for this group</a></li>
           <li><a href="/2002/09/wbs/109/factory" title="Create a questionnaire for this group">Create a new questionnaire for this group</a></li>
      </ul>
      <h2 class="txt-jupiter">WBS Home</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/" title="WBS Home">WBS Home</a></li>
           <li><a href="/2002/09/wbs/showq" title="Current questionnaires for all the groups">All open questionnaires</a></li>
           <li><a href="href='/2002/09/wbs/myQuestionnaires" title="List of questionnaires you are supposed to answer">My questionnaires</a></li>
diff --git a/html/s24-qtypes-results.html b/html/s24-qtypes-results.html
index 6358135..44589d5 100644
--- a/html/s24-qtypes-results.html
+++ b/html/s24-qtypes-results.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html dir="ltr" lang="en" class="no-js">
+<html dir="ltr" lang="en" class="js fonts-loaded">
 <head>
     <title>WBS question types results</title>
 
@@ -62,9 +62,6 @@
             })();
         </script>
     
-<!-- custom css for wbs
-  <link rel="stylesheet" type="text/css" href="css/design-style.css" title="default" />
--->
 <style>
 td {
   border-right: solid 1px #bdbdbd !important;
@@ -76,11 +73,11 @@
 <body class="landing">
 <a class="skip-link" href="#main">Skip to content</a>
 <div class="grid-wrap">
-    <div class="wrap">
-        <header class="global-header">
+ <div class="wrap">
+ <header class="global-header">
             <span role="status" aria-live="polite"></span>
-                                        
-                                        <nav id="global-nav" aria-label="Main">
+
+<nav id="global-nav" aria-label="Main">
     <div class="global-nav__inner l-center">
         <a class="logo-link" href="https://www.w3.org/" hreflang="en">
             <span class="logo">
@@ -90,9 +87,9 @@
         </a>
         <button type="button" class="button button--ghost with-icon--after with-icon--larger" data-trigger="mobile-nav"
                 style="display: none;"></button>
-        <ul class="clean-list" data-component="nav-double-intro">
+        <ul data-component="nav-double-intro">
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/standards/" class="nav-link">Standards <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/standards/" class="nav-link">Standards</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -102,14 +99,34 @@ <h2 class="nav__submenu__intro__heading">Standards</h2>
                                                                                                                 <a href="https://www.w3.org/standards/">Explore web standards</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                 
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/standards/about/">About W3C web standards</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/TR/">W3C standards &amp; drafts</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/standards/types/">Types of documents W3C publishes</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/translations/">Translations of W3C standards &amp; drafts</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/standards/review/">Reviews &amp; public feedback</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/liaisons/">Liaisons</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/get-involved/promote/">Promote web standards</a>
+                                        </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/groups/" class="nav-link">Groups <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/groups/" class="nav-link">Groups</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -119,14 +136,37 @@ <h2 class="nav__submenu__intro__heading">Groups</h2>
                                                                                                                 <a href="https://www.w3.org/groups/">About W3C groups</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                          
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/wg/">Working Groups</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/ig/">Interest Groups</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/cg/">Community Groups</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/bg/">Business Groups</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/groups/other/tag/">Technical Architecture Group</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/invited-experts/">Invited Experts</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/guide/">Participant guidebook</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/positive-work-environment/">Positive work environment</a>
+                                        </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/get-involved/" class="nav-link">Get involved <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/get-involved/" class="nav-link">Get involved</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -136,14 +176,31 @@ <h2 class="nav__submenu__intro__heading">Get involved</h2>
                                                                                                                 <a href="https://www.w3.org/get-involved/">Find ways to get involved</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                       
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/ecosystems/">Browse our work by industry</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/membership/">Become a Member</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/Member/">Member Home (restricted)</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/email/">Mailing lists</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/donate/">Make a donation</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/sponsor/">Sponsor an event</a>
+                                        </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/resources/" class="nav-link">Resources <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/resources/" class="nav-link">Resources</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -153,31 +210,71 @@ <h2 class="nav__submenu__intro__heading">Resources</h2>
                                                                                                                 <a href="https://www.w3.org/resources/">Learn from W3C resources</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                      
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/developers/">Developers</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/developers/tools/">Validators &amp; tools</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/WAI/fundamentals/">Accessibility fundamentals</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/International/i18n-drafts/nav/about">Internationalization</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/translations/">Translations of W3C standards and drafts</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/policies/code-of-conduct/">Code of conduct</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/reports/">Reports</a>
+                                        </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/news-events/" class="nav-link">News and events <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/news-events/" class="nav-link">News &amp; events</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
-                                <h2 class="nav__submenu__intro__heading">News and events</h2>
+                                <h2 class="nav__submenu__intro__heading">News &amp; events</h2>
                                 <div class="nav__submenu__intro__text">
                                                                             <p>Recent content across news, blogs, press releases, media; upcoming events.</p>
-                                                                                                                <a href="https://www.w3.org/news-events/">Follow news and events</a>
+                                                                                                                <a href="https://www.w3.org/news-events/">Follow news &amp; events</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                   
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/news/">News</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/blog/">Blog</a>
+                                        </li>
+                                                                            <li class="break-after">
+                                            <a href="https://www.w3.org/press-releases/">Press releases</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/press-media/">Press &amp; media</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/events/">Events</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/news-events/w3c-tpac/">Annual W3C Conference (TPAC)</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/policies/code-of-conduct/">Code of conduct</a>
+                                        </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/about/" class="nav-link">About <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/about/" class="nav-link">About</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -187,19 +284,54 @@ <h2 class="nav__submenu__intro__heading">About</h2>
                                                                                                                 <a href="https://www.w3.org/about/">Find out more about us</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
-                                                                       
+                                                            <ul>
+                                                                            <li >
+                                            <a href="https://www.w3.org/mission/">Our mission</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/leadership/">Leadership</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/staff/">Staff</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/evangelists/">Evangelists</a>
+                                        </li>
+                                                                            <li class="break-after">
+                                            <a href="https://www.w3.org/careers/">Careers</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/diversity/">Diversity</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/corporation/">Corporation</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/sponsor/">Sponsoring W3C</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/about/press-media/">Media kit</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/contact/">Contact</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/policies/">Policies &amp; legal information</a>
+                                        </li>
+                                                                            <li >
+                                            <a href="https://www.w3.org/help/">Help</a>
+                                        </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                         <li class="top-nav-item">
-                <a hreflang="en" href="/help/search/" class="nav-link icon-link">
+                <a hreflang="en" href="https://www.w3.org/help/search/" class="nav-link icon-link">
                     <img class="icon" src="https://www.w3.org/assets/website-2021/svg/search.svg" width="24" height="24" alt aria-hidden="true"><span class="hide-at-max-width">Search</span>
                 </a>
             </li>
             <li class="top-nav-item">
-                <a hreflang="en" href="/users/myprofile/" id="account-login-link" class="account-login icon-link with-icon--after">
+                <a hreflang="en" href="https://www.w3.org/users/myprofile/" id="account-login-link" class="account-login icon-link with-icon--after">
                     My account <span class="avatar avatar--small icon">
                         <img src="https://www.w3.org/assets/website-2021/svg/avatar.svg" width="24" height="24" alt aria-hidden="true"/>
                     </span>
@@ -208,7 +340,9 @@ <h2 class="nav__submenu__intro__heading">About</h2>
         </ul>
     </div>
 </nav>
-</header>
+   
+
+ </header>
                         
 <nav id="breadcrumb" aria-label="Breadcrumb">
     <div class="l-center">
@@ -229,31 +363,30 @@ <h2 class="nav__submenu__intro__heading">About</h2>
 
     <h1>Results of Questionnaire WBS question types</h1>
     <div>
-
+<div class='field-group'>
 <p>The <a href='results'>results of this questionnaire</a> are available only to the participants of the group (and the W3C Team)</p><p>This questionnaire is open from 2014-11-21 to 2016-12-31.</p>
 <p><strong>2</strong> answers have been received.</p>
 
-<div class='field-group'>
-<div class='question l-box'>
-<p>Jump to results for question:</p><ol>
-<li><a href='#xq1'>Simple text question</a></li>
-<li><a href='#xq2'>Single selection required Yes/No</a></li>
-<li><a href='#xq3'>Single selection required Yes/No/Concur/Abstain</a></li>
-<li><a href='#xq4'>Select one among many (drop-down list)</a></li>
-<li><a href='#xq5'>Select one among many (radio buttons)</a></li>
-<li><a href='#xq6'>Open comments</a></li>
-<li><a href='#xq7'>Text entries</a></li>
-<li><a href='#xq8'>Select multiple items (checkboxes)</a></li>
-<li><a href='#xq9'>Survey type</a></li>
-<li><a href='#xq10'>Straw-poll</a></li>
-<li><a href='#xq11'>Rank-ordering</a></li>
-<li><a href='#xq12'> Pick a time for a teleconf</a></li>
-<li><a href='#xq13'>Cumulative vote</a></li>
-<li><a href='#xq14'> Importance survey</a></li>
-<li><a href='#xq15'> Importance and Satisfaction survey</a></li>
-<li><a href='#xtpac'>Monday, 27 October All Group Meetings Attendance </a></li>
-</ol>
-</div>
+<nav class="toc" aria-labelledby="toc-label">
+	<ul>
+<li><a href='#xq1'>1. Simple text question</a></li>
+<li><a href='#xq2'>2. Single selection required Yes/No</a></li>
+<li><a href='#xq3'>3. Single selection required Yes/No/Concur/Abstain</a></li>
+<li><a href='#xq4'>4. Select one among many (drop-down list)</a></li>
+<li><a href='#xq5'>5. Select one among many (radio buttons)</a></li>
+<li><a href='#xq6'>6. Open comments</a></li>
+<li><a href='#xq7'>7. Text entries</a></li>
+<li><a href='#xq8'>8. Select multiple items (checkboxes)</a></li>
+<li><a href='#xq9'>9. Survey type</a></li>
+<li><a href='#xq10'>10. Straw-poll</a></li>
+<li><a href='#xq11'>11. Rank-ordering</a></li>
+<li><a href='#xq12'>12. Pick a time for a teleconf</a></li>
+<li><a href='#xq13'>13. Cumulative vote</a></li>
+<li><a href='#xq14'>14. Importance survey</a></li>
+<li><a href='#xq15'>15. Importance and Satisfaction survey</a></li>
+<li><a href='#xtpac'>16. Monday, 27 October All Group Meetings Attendance</a></li>
+</ul>
+</nav>
 </div>
 
 <div class='field-group'>
diff --git a/html/s24-qtypes.html b/html/s24-qtypes.html
index 99785d5..f5a99fa 100644
--- a/html/s24-qtypes.html
+++ b/html/s24-qtypes.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html dir="ltr" lang="en" class="no-js">
+<html dir="ltr" lang="en" class="js">
 <head>
     <title>WBS question types</title>
 
@@ -81,11 +81,10 @@
 <body class="default">
 <a class="skip-link" href="#main">Skip to content</a>
 <div class="grid-wrap">
-    <div class="wrap">
-        <header class="global-header">
+ <div class="wrap">
+ <header class="global-header">
             <span role="status" aria-live="polite"></span>
-                                        
-                                        <nav id="global-nav" aria-label="Main">
+<nav id="global-nav" aria-label="Main">
     <div class="global-nav__inner l-center">
         <a class="logo-link" href="https://www.w3.org/" hreflang="en">
             <span class="logo">
@@ -95,9 +94,9 @@
         </a>
         <button type="button" class="button button--ghost with-icon--after with-icon--larger" data-trigger="mobile-nav"
                 style="display: none;"></button>
-        <ul class="clean-list" data-component="nav-double-intro">
+        <ul data-component="nav-double-intro">
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/standards/" class="nav-link">Standards <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/standards/" class="nav-link">Standards</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -107,76 +106,34 @@ <h2 class="nav__submenu__intro__heading">Standards</h2>
                                                                                                                 <a href="https://www.w3.org/standards/">Explore web standards</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
+                                                            <ul>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/standards/about/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                About W3C web standards
-                                            </a>
+                                            <a href="https://www.w3.org/standards/about/">About W3C web standards</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/TR/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                W3C standards and drafts
-                                            </a>
+                                            <a href="https://www.w3.org/TR/">W3C standards &amp; drafts</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/standards/types/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Types of documents W3C publishes
-                                            </a>
+                                            <a href="https://www.w3.org/standards/types/">Types of documents W3C publishes</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/translations/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Translations of W3C standards and drafts
-                                            </a>
+                                            <a href="https://www.w3.org/translations/">Translations of W3C standards &amp; drafts</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/standards/review/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Reviews and public feedback
-                                            </a>
+                                            <a href="https://www.w3.org/standards/review/">Reviews &amp; public feedback</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/liaisons/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Liaisons
-                                            </a>
+                                            <a href="https://www.w3.org/liaisons/">Liaisons</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/get-involved/promote/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Promote web standards
-                                            </a>
+                                            <a href="https://www.w3.org/get-involved/promote/">Promote web standards</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/groups/" class="nav-link">Groups <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/groups/" class="nav-link">Groups</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -186,85 +143,37 @@ <h2 class="nav__submenu__intro__heading">Groups</h2>
                                                                                                                 <a href="https://www.w3.org/groups/">About W3C groups</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
+                                                            <ul>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/wg/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Working Groups
-                                            </a>
+                                            <a href="https://www.w3.org/groups/wg/">Working Groups</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/ig/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Interest Groups
-                                            </a>
+                                            <a href="https://www.w3.org/groups/ig/">Interest Groups</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/cg/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Community Groups
-                                            </a>
+                                            <a href="https://www.w3.org/groups/cg/">Community Groups</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/bg/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Business Groups
-                                            </a>
+                                            <a href="https://www.w3.org/groups/bg/">Business Groups</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/groups/other/tag/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Technical Architecture Group
-                                            </a>
+                                            <a href="https://www.w3.org/groups/other/tag/">Technical Architecture Group</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/invited-experts/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Invited Experts
-                                            </a>
+                                            <a href="https://www.w3.org/invited-experts/">Invited Experts</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/guide/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Participant guidebook
-                                            </a>
+                                            <a href="https://www.w3.org/guide/">Participant guidebook</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/positive-work-environment/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Positive work environment
-                                            </a>
+                                            <a href="https://www.w3.org/about/positive-work-environment/">Positive work environment</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/get-involved/" class="nav-link">Get involved <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/get-involved/" class="nav-link">Get involved</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -274,67 +183,31 @@ <h2 class="nav__submenu__intro__heading">Get involved</h2>
                                                                                                                 <a href="https://www.w3.org/get-involved/">Find ways to get involved</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
+                                                            <ul>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/ecosystems/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Browse our work by industry
-                                            </a>
+                                            <a href="https://www.w3.org/ecosystems/">Browse our work by industry</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/membership/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Become a Member
-                                            </a>
+                                            <a href="https://www.w3.org/membership/">Become a Member</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/Member/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Member Home (restricted)
-                                            </a>
+                                            <a href="https://www.w3.org/Member/">Member Home (restricted)</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/email/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Follow mailing lists
-                                            </a>
+                                            <a href="https://www.w3.org/email/">Mailing lists</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/donate/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Make a donation
-                                            </a>
+                                            <a href="https://www.w3.org/donate/">Make a donation</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/sponsor/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Sponsor an event
-                                            </a>
+                                            <a href="https://www.w3.org/sponsor/">Sponsor an event</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/resources/" class="nav-link">Resources <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/resources/" class="nav-link">Resources</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -344,155 +217,71 @@ <h2 class="nav__submenu__intro__heading">Resources</h2>
                                                                                                                 <a href="https://www.w3.org/resources/">Learn from W3C resources</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
+                                                            <ul>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/developers/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Developers
-                                            </a>
+                                            <a href="https://www.w3.org/developers/">Developers</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/developers/tools/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Validators and tools
-                                            </a>
+                                            <a href="https://www.w3.org/developers/tools/">Validators &amp; tools</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/WAI/fundamentals/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Accessibility fundamentals
-                                            </a>
+                                            <a href="https://www.w3.org/WAI/fundamentals/">Accessibility fundamentals</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/International/i18n-drafts/nav/about">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Internationalization
-                                            </a>
+                                            <a href="https://www.w3.org/International/i18n-drafts/nav/about">Internationalization</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/translations/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Translations of W3C standards and drafts
-                                            </a>
+                                            <a href="https://www.w3.org/translations/">Translations of W3C standards and drafts</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/policies/code-of-conduct/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Code of conduct
-                                            </a>
+                                            <a href="https://www.w3.org/policies/code-of-conduct/">Code of conduct</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/reports/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Reports
-                                            </a>
+                                            <a href="https://www.w3.org/reports/">Reports</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/news-events/" class="nav-link">News and events <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/news-events/" class="nav-link">News &amp; events</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
-                                <h2 class="nav__submenu__intro__heading">News and events</h2>
+                                <h2 class="nav__submenu__intro__heading">News &amp; events</h2>
                                 <div class="nav__submenu__intro__text">
                                                                             <p>Recent content across news, blogs, press releases, media; upcoming events.</p>
-                                                                                                                <a href="https://www.w3.org/news-events/">Follow news and events</a>
+                                                                                                                <a href="https://www.w3.org/news-events/">Follow news &amp; events</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
+                                                            <ul>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/news/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                News
-                                            </a>
+                                            <a href="https://www.w3.org/news/">News</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/blog/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Blog
-                                            </a>
+                                            <a href="https://www.w3.org/blog/">Blog</a>
                                         </li>
                                                                             <li class="break-after">
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/press-releases/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Press releases
-                                            </a>
+                                            <a href="https://www.w3.org/press-releases/">Press releases</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/press-media/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Press and media
-                                            </a>
+                                            <a href="https://www.w3.org/about/press-media/">Press &amp; media</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/events/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Events
-                                            </a>
+                                            <a href="https://www.w3.org/events/">Events</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/news-events/w3c-tpac/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Annual W3C Conference (TPAC)
-                                            </a>
+                                            <a href="https://www.w3.org/news-events/w3c-tpac/">Annual W3C Conference (TPAC)</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/policies/code-of-conduct/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Code of conduct
-                                            </a>
+                                            <a href="https://www.w3.org/policies/code-of-conduct/">Code of conduct</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                             <li class="top-nav-item has-children">
-                    <a href="https://www.w3.org/about/" class="nav-link">About <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" height="16" width="16" class="icon icon--submenu" focusable="false" aria-hidden="true" fill="currentColor" style="visibility: hidden"><path d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"/></svg></a>
+                    <a href="https://www.w3.org/about/" class="nav-link">About</a>
                     <div class="nav__submenu" data-nav="submenu" style="display: none;">
                         <div class="l-center">
                             <div class="nav__submenu__intro">
@@ -502,126 +291,54 @@ <h2 class="nav__submenu__intro__heading">About</h2>
                                                                                                                 <a href="https://www.w3.org/about/">Find out more about us</a>
                                                                     </div>
                             </div>
-                                                            <ul class="clean-list" role="list">
+                                                            <ul>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/mission/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Our mission
-                                            </a>
+                                            <a href="https://www.w3.org/mission/">Our mission</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/leadership/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Leadership
-                                            </a>
+                                            <a href="https://www.w3.org/about/leadership/">Leadership</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/staff/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Staff
-                                            </a>
+                                            <a href="https://www.w3.org/staff/">Staff</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/evangelists/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Evangelists
-                                            </a>
+                                            <a href="https://www.w3.org/evangelists/">Evangelists</a>
                                         </li>
                                                                             <li class="break-after">
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/careers/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Careers
-                                            </a>
+                                            <a href="https://www.w3.org/careers/">Careers</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/diversity/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Diversity
-                                            </a>
+                                            <a href="https://www.w3.org/about/diversity/">Diversity</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/corporation/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Corporation
-                                            </a>
+                                            <a href="https://www.w3.org/about/corporation/">Corporation</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/sponsor/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Sponsoring W3C
-                                            </a>
+                                            <a href="https://www.w3.org/sponsor/">Sponsoring W3C</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/about/press-media/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Media kit
-                                            </a>
+                                            <a href="https://www.w3.org/about/press-media/">Media kit</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/contact/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Contact
-                                            </a>
+                                            <a href="https://www.w3.org/contact/">Contact</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/policies/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Policies and legal information
-                                            </a>
+                                            <a href="https://www.w3.org/policies/">Policies &amp; legal information</a>
                                         </li>
                                                                             <li >
-                                            <a class="with-icon--before with-icon--larger" href="https://www.w3.org/help/">
-                                                <svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em">
-                                                    <path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
-                                                    <path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/>
-                                                </svg>
-                                                Help
-                                            </a>
+                                            <a href="https://www.w3.org/help/">Help</a>
                                         </li>
                                                                     </ul>
                                                     </div>
                     </div>
                 </li>
                         <li class="top-nav-item">
-                <a hreflang="en" href="/help/search/" class="nav-link icon-link">
+                <a hreflang="en" href="https://www.w3.org/help/search/" class="nav-link icon-link">
                     <img class="icon" src="https://www.w3.org/assets/website-2021/svg/search.svg" width="24" height="24" alt aria-hidden="true"><span class="hide-at-max-width">Search</span>
                 </a>
             </li>
             <li class="top-nav-item">
-                <a hreflang="en" href="/users/myprofile/" id="account-login-link" class="account-login icon-link with-icon--after">
+                <a hreflang="en" href="https://www.w3.org/users/myprofile/" id="account-login-link" class="account-login icon-link with-icon--after">
                     My account <span class="avatar avatar--small icon">
                         <img src="https://www.w3.org/assets/website-2021/svg/avatar.svg" width="24" height="24" alt aria-hidden="true"/>
                     </span>
@@ -629,13 +346,14 @@ <h2 class="nav__submenu__intro__heading">About</h2>
             </li>
         </ul>
     </div>
-</nav>
-                    </header>
+</nav>                                        
+ 
+ </header>
                         
 <nav id="breadcrumb" aria-label="Breadcrumb">
     <div class="l-center">
         <div class="l-cluster">
-            <ol class="breadcrumbs clean-list" role="list">
+            <ol class="breadcrumbs" role="list">
               <li><a href="/">Home</a></li>
               <li><a href="https://www.w3.org/2002/09/wbs/" aria-current="page">WBS Home</a></li>
             </ol>
@@ -1612,7 +1330,7 @@ <h1 class="title">WBS question types</h1>
  <div class="related">
    <nav class="related__inner" aria-labelledby="related-label">
      <h2 class="txt-jupiter">This Questionnaire</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/">Answer</a></li>
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/results">Results</a></li>
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/handler" title="Edit this questionnaire">Edit</a></li>
@@ -1621,12 +1339,12 @@ <h2 class="txt-jupiter">This Questionnaire</h2>
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/impersonate" title="Impersonate a user for this questionnaires">Impersonate</a></li>
      </ul>
      <h2 class="txt-jupiter">This Group</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/109/" title="Current questionnaires for this group">Open questionnaires for this group</a></li>
           <li><a href="/2002/09/wbs/109/factory" title="Create a questionnaire for this group">Create a new questionnaire for this group</a></li>
      </ul>
      <h2 class="txt-jupiter">WBS Home</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/" title="WBS Home">WBS Home</a></li>
           <li><a href="/2002/09/wbs/showq" title="Current questionnaires for all the groups">All open questionnaires</a></li>
           <li><a href="href='/2002/09/wbs/myQuestionnaires" title="List of questionnaires you are supposed to answer">My questionnaires</a></li>
diff --git a/html/s24-question-add.html b/html/s24-question-add.html
index 3b2e02b..462bcc5 100644
--- a/html/s24-question-add.html
+++ b/html/s24-question-add.html
@@ -351,7 +351,7 @@ <h2 class="nav__submenu__intro__heading">About</h2>
 <nav id="breadcrumb" aria-label="Breadcrumb">
     <div class="l-center">
         <div class="l-cluster">
-            <ol class="breadcrumbs clean-list" role="list">
+            <ol class="breadcrumbs" role="list">
               <li><a href="/">Home</a></li>
               <li><a href="https://www.w3.org/2002/09/wbs/" aria-current="page">WBS Home</a></li>
             </ol>
@@ -561,7 +561,7 @@ <h2 name="copy" id="copy">Copy an existing question</h2>
  <div class="related">
    <nav class="related__inner" aria-labelledby="related-label">
      <h2 class="txt-jupiter">This Questionnaire</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/">Answer</a></li>
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/results">Results</a></li>
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/handler" title="Edit this questionnaire">Edit</a></li>
@@ -570,12 +570,12 @@ <h2 class="txt-jupiter">This Questionnaire</h2>
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/impersonate" title="Impersonate a user for this questionnaires">Impersonate</a></li>
      </ul>
      <h2 class="txt-jupiter">This Group</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/109/" title="Current questionnaires for this group">Open questionnaires for this group</a></li>
           <li><a href="/2002/09/wbs/109/factory" title="Create a questionnaire for this group">Create a new questionnaire for this group</a></li>
      </ul>
      <h2 class="txt-jupiter">WBS Home</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/" title="WBS Home">WBS Home</a></li>
           <li><a href="/2002/09/wbs/showq" title="Current questionnaires for all the groups">All open questionnaires</a></li>
           <li><a href="href='/2002/09/wbs/myQuestionnaires" title="List of questionnaires you are supposed to answer">My questionnaires</a></li>
diff --git a/html/s24-survey-edit.html b/html/s24-survey-edit.html
index 4d8515e..86320b9 100644
--- a/html/s24-survey-edit.html
+++ b/html/s24-survey-edit.html
@@ -350,7 +350,7 @@ <h2 class="nav__submenu__intro__heading">About</h2>
 <nav id="breadcrumb" aria-label="Breadcrumb">
     <div class="l-center">
         <div class="l-cluster">
-            <ol class="breadcrumbs clean-list" role="list">
+            <ol class="breadcrumbs" role="list">
               <li><a href="/">Home</a></li>
               <li><a href="https://www.w3.org/2002/09/wbs/" aria-current="page">WBS Home</a></li>
             </ol>
@@ -507,7 +507,7 @@ <h2 class="txt-mars">Order of the existing questions. Use input area to change o
 <div class='l-box l-box--no-padding' id='order'>
 
   <fieldset>
-  <ol clean-list>
+  <ol>
     <li>
 <div class="component--fifty-fifty">
   <div class="component--fifty-fifty__text">
@@ -689,7 +689,7 @@ <h2 class="txt-mars">Add/Edit questions</h2>
  <div class="related">
    <nav class="related__inner" aria-labelledby="related-label">
      <h2 class="txt-jupiter">This Questionnaire</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/">Answer</a></li>
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/results">Results</a></li>
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/handler" title="Edit this questionnaire">Edit</a></li>
@@ -698,12 +698,12 @@ <h2 class="txt-jupiter">This Questionnaire</h2>
           <li><a href="/2002/09/wbs/109/Test-wbs-rfe/impersonate" title="Impersonate a user for this questionnaires">Impersonate</a></li>
      </ul>
      <h2 class="txt-jupiter">This Group</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/109/" title="Current questionnaires for this group">Open questionnaires for this group</a></li>
           <li><a href="/2002/09/wbs/109/factory" title="Create a questionnaire for this group">Create a new questionnaire for this group</a></li>
      </ul>
      <h2 class="txt-jupiter">WBS Home</h2>
-     <ul class="clean-list" role="list">
+     <ul role="list">
           <li><a href="/2002/09/wbs/" title="WBS Home">WBS Home</a></li>
           <li><a href="/2002/09/wbs/showq" title="Current questionnaires for all the groups">All open questionnaires</a></li>
           <li><a href="href='/2002/09/wbs/myQuestionnaires" title="List of questionnaires you are supposed to answer">My questionnaires</a></li>