update changelog

2026-01-13 12:39:14 +00:00 · 2025-10-13 10:47:02 -04:00
291 changed files with 6930 additions and 10000 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 contact_links:
  - name: Feature Requests
-    url: https://github.com/shoelace-style/webawesome/discussions/categories/ideas-suggestions
+    url: https://github.com/shoelace-style/shoelace/discussions/categories/ideas
    about: All requests for new features should go here.
  - name: Help & Support
-    url: https://github.com/shoelace-style/webawesome/discussions/categories/ask-for-help
+    url: https://github.com/shoelace-style/shoelace/discussions/categories/help
    about: Please don't create issues for personal help requests. Instead, ask your question on the discussion forum.
--- a/.prettierignore
+++ b/.prettierignore
@@ -20,5 +20,4 @@ packages/**/*/src/react/index.ts
 node_modules

 packages/**/*/_site
-packages/**/*/_bundle_
 packages/webawesome/docs/assets/scripts/prism-downloaded.js
--- a/VERSIONS.txt
+++ b/VERSIONS.txt
@@ -1,2 +1,6 @@
-3.0.0
-3.1.0
+3.0.0-beta.1
+3.0.0-beta.2
+3.0.0-beta.3
+3.0.0-beta.4
+3.0.0-beta.5
+3.0.0-beta.6
--- a/cspell.json
+++ b/cspell.json
@@ -105,7 +105,6 @@
    "keydown",
    "keyframes",
    "keymaker",
-    "Kickstarter",
    "Konnor",
    "Kool",
    "labelledby",
@@ -118,7 +117,6 @@
    "lowercasing",
    "Lucide",
    "maxlength",
-    "mdash",
    "Menlo",
    "menuitemcheckbox",
    "menuitemradio",
@@ -132,7 +130,6 @@
    "mouseout",
    "mouseup",
    "multiselectable",
-    "nbsp",
    "nextjs",
    "nocheck",
    "noindex",
@@ -182,7 +179,6 @@
    "shadowrootmode",
    "Shortcode",
    "Shortcodes",
-    "signup",
    "sitedir",
    "slotchange",
    "smartquotes",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "@webawesome/monorepo",
  "private": true,
  "description": "A forward-thinking library of web components.",
-  "version": "3.1.0",
+  "version": "3.0.0-alpha.13",
  "homepage": "https://webawesome.com/",
  "author": "Web Awesome",
  "license": "MIT",
@@ -85,4 +85,4 @@
      "prettier --write"
    ]
  }
-}
+}
--- a/packages/webawesome/LICENSE.md
+++ b/packages/webawesome/LICENSE.md
@@ -1,7 +0,0 @@
-Copyright (c) 2025 Fonticons, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/packages/webawesome/docs/.eleventy.js
+++ b/packages/webawesome/docs/.eleventy.js
@@ -1,5 +1,6 @@
 import { nanoid } from 'nanoid';
 import { parse as HTMLParse } from 'node-html-parser';
+import { execFileSync } from 'node:child_process';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { anchorHeadingsTransformer } from './_transformers/anchor-headings.js';
@@ -20,6 +21,7 @@ import { replaceTextPlugin } from './_plugins/replace-text.js';
 import { searchPlugin } from './_plugins/search.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const isDev = process.argv.includes('--develop');
+const ignoreGit = process.env.ELEVENTY_IGNORE_GIT === 'true';
 const passThroughExtensions = ['js', 'css', 'png', 'svg', 'jpg', 'mp4'];

 async function getPackageData() {
@@ -58,6 +60,15 @@ export default async function (eleventyConfig) {
    if (updateComponentData) {
      allComponents = getComponents();
    }
+
+    // Invalidate last-modified cache for changed content files during watch
+    if (Array.isArray(changedFiles)) {
+      for (const file of changedFiles) {
+        if (/\.(md|njk|html)$/i.test(file)) {
+          lastModCache.delete(file);
+        }
+      }
+    }
  });

  /**
@@ -83,63 +94,85 @@ export default async function (eleventyConfig) {
    flashes: '',
  });

-  // Site metadata for social sharing (Open Graph, canonical URLs, etc.)
-  const siteMetadata = {
-    url: 'https://webawesome.com',
-    name: 'Web Awesome',
-    description: 'Build better with Web Awesome, the open source library of web components from Font Awesome.',
-    image: 'https://webawesome.com/assets/images/open-graph/default.png',
-  };
-
-  // Title composition/stripping config - single source of truth
-  const SITE_NAME = siteMetadata.name;
-  const SITE_TITLE_SEPARATORS = ['|'];
-
-  // Helper to escape user-provided strings for safe use inside RegExp sources
-  const escapeRegExp = string => (string + '').replace(/[.*+?^${}()|[\\]\\]/g, '\\$&');
-
-  // Precompute a reusable regex to strip a trailing site name suffix from titles, e.g. " | Web Awesome"
-  // Supports configured separators and flexible whitespace. This keeps search titles clean and improves Lunr scoring
-  const siteNameEscapedForRegex = escapeRegExp(SITE_NAME);
-  const separatorsEscaped = SITE_TITLE_SEPARATORS.map(s => escapeRegExp(s)).join('');
-  const siteTitleSuffixPattern = new RegExp(`\\s*[${separatorsEscaped}]\\s*${siteNameEscapedForRegex}$`);
-
-  // Helper to remove the site suffix from a page title. Keep this in sync with how page titles
-  // are composed (see eleventyComputed.pageTitle) so search indexing stays consistent
-  const stripSiteTitleSuffix = title => (title || '').replace(siteTitleSuffixPattern, '');
-
-  // Helper to compose a full page title with site suffix when appropriate
-  // Uses the same separator set as the stripping logic for consistency
-  const composePageTitle = baseTitle => {
-    const title = baseTitle || SITE_NAME;
-    const preferredSeparator = SITE_TITLE_SEPARATORS[0] || '|';
-    return title !== SITE_NAME ? `${title} ${preferredSeparator} ${SITE_NAME}` : title;
-  };
-
-  eleventyConfig.addGlobalData('siteMetadata', siteMetadata);
-
  // Template filters - {{ content | filter }}
  eleventyConfig.addFilter('inlineMarkdown', content => markdown.renderInline(content || ''));
  eleventyConfig.addFilter('markdown', content => markdown.render(content || ''));
  eleventyConfig.addFilter('stripExtension', string => path.parse(string + '').name);
  eleventyConfig.addFilter('stripPrefix', content => content.replace(/^wa-/, ''));
  eleventyConfig.addFilter('uniqueId', (_value, length = 8) => nanoid(length));
+  // Returns last modified date as ISO 8601 (UTC, Z-suffixed)
+  // Fallback order: front matter override -> Git last commit date -> filesystem mtime -> now
+  // Caching: in-memory per inputPath during one build/dev session
+  // Override: pass a Date or string: {{ page.inputPath | gitLastModifiedISO(lastUpdated) }}
+  const lastModCache = new Map();
+  let repoRoot = null; // lazily resolved; null => not resolved, undefined => failed

-  eleventyConfig.addGlobalData('eleventyComputed', {
-    // Page title with smart + default site name formatting
-    pageTitle: data => composePageTitle(data.title),
-    // Open Graph title with smart + default site name formatting
-    ogTitle: data => composePageTitle(data.ogTitle || data.title),
-    ogDescription: data => data.ogDescription || data.description,
-    ogImage: data => data.ogImage || siteMetadata.image,
-    ogUrl: data => {
-      if (data.ogUrl) return data.ogUrl;
-      const url = data.page?.url || '';
-      return url ? `${siteMetadata.url}${url}` : siteMetadata.url;
-    },
-    ogType: data => data.ogType || 'website',
+  function getLastModifiedISO(inputPath, overrideDate) {
+    if (overrideDate instanceof Date) {
+      return overrideDate.toISOString();
+    }
+    if (typeof overrideDate === 'string' && overrideDate) {
+      const parsed = new Date(overrideDate);
+      if (!isNaN(parsed.getTime())) return parsed.toISOString();
+    }
+    if (!inputPath) return new Date().toISOString();
+    if (lastModCache.has(inputPath)) return lastModCache.get(inputPath);
+
+    // Try Git (ISO via %cI). Use a repo-root-relative path for portability.
+    if (!ignoreGit) {
+      try {
+        if (repoRoot === null) {
+          try {
+            repoRoot = execFileSync('git', ['rev-parse', '--show-toplevel'], {
+              stdio: ['ignore', 'pipe', 'ignore'],
+              cwd: __dirname,
+            })
+              .toString()
+              .trim();
+          } catch (_) {
+            repoRoot = undefined;
+          }
+        }
+
+        const gitPath = repoRoot ? path.relative(repoRoot, inputPath) : inputPath;
+        const args = ['log', '-1', '--format=%cI', '--follow', '--', gitPath];
+        const result = execFileSync('git', args, {
+          stdio: ['ignore', 'pipe', 'ignore'],
+          cwd: repoRoot || path.dirname(inputPath),
+        })
+          .toString()
+          .trim();
+        if (result) {
+          const iso = new Date(result).toISOString();
+          lastModCache.set(inputPath, iso);
+          return iso;
+        }
+      } catch (_) {
+        // continue to fs fallback
+      }
+    }
+
+    // Fallback to filesystem mtime
+    try {
+      const stats = fs.statSync(inputPath);
+      const iso = new Date(stats.mtime).toISOString();
+      lastModCache.set(inputPath, iso);
+      return iso;
+    } catch (_) {
+      const now = new Date().toISOString();
+      lastModCache.set(inputPath, now);
+      return now;
+    }
+  }
+
+  eleventyConfig.addFilter('gitLastModifiedISO', function (inputPath, overrideDate) {
+    return getLastModifiedISO(inputPath, overrideDate);
  });

+  // Attach lastUpdatedISO to page data so templates can use {{ lastUpdatedISO }} directly
+  eleventyConfig.addGlobalData('eleventyComputed', {
+    lastUpdatedISO: data => getLastModifiedISO(data.page?.inputPath, data.lastUpdated),
+  });
  // Trims whitespace and pipes from the start and end of a string. Useful for CEM types, which can be pipe-delimited.
  // With Prettier 3, this means a leading pipe will exist be present when the line wraps.
  eleventyConfig.addFilter('trimPipes', content => {
@@ -194,11 +227,7 @@ export default async function (eleventyConfig) {

  // Shortcodes - {% shortCode arg1, arg2 %}
  eleventyConfig.addShortcode('cdnUrl', location => {
-    // We use WA (free) via the public CDN for CodePen examples
-    return (
-      `https://cdn.jsdelivr.net/npm/@awesome.me/webawesome@${packageData.version}/dist-cdn/` +
-      (location || '').replace(/^\//, '')
-    );
+    return `https://early.webawesome.com/webawesome@${packageData.version}/dist/` + (location || '').replace(/^\//, '');
  });

  // Turns `{% server "foo" %} into `{{ server.foo | safe }}` when the WEBAWESOME_SERVER variable is set to "true"
@@ -293,11 +322,6 @@ export default async function (eleventyConfig) {
    searchPlugin({
      filename: '',
      selectorsToIgnore: ['code.example'],
-      // Use <title> but strip a trailing site name suffix for cleaner search results
-      getTitle: doc => {
-        const raw = doc.querySelector('title')?.textContent ?? '';
-        return stripSiteTitleSuffix(raw);
-      },
      getContent: doc => doc.querySelector('#content')?.textContent ?? '',
    }),
  );
@@ -313,13 +337,9 @@ export default async function (eleventyConfig) {

  // This needs to happen in "eleventy.after" otherwise incremental builds never update.
  eleventyConfig.on('eleventy.after', function () {
-    const baseDir = process.env.BASE_DIR || 'docs';
-    let assetsDir = path.join(baseDir, 'assets');
+    let assetsDir = path.join(process.env.BASE_DIR || 'docs', 'assets');
    const siteAssetsDir = path.join(eleventyConfig.directories.output, 'assets');
    fs.cpSync(assetsDir, siteAssetsDir, { recursive: true });
-
-    // Passthrough copy for manifest.json (PWA manifest file)
-    fs.cpSync(path.join(baseDir, 'manifest.json'), path.join(eleventyConfig.directories.output, 'manifest.json'));
  });

  for (let glob of passThrough) {
--- a/packages/webawesome/docs/503.md
+++ b/packages/webawesome/docs/503.md
@@ -1,312 +0,0 @@
---
-title: Web Awesome is Undergoing Maintenance
-description: We're performing routine maintenance to keep things running smoothly. Check back soon!
-layout: blank
-permalink: 503.html
-noindex: true
-unlisted: true
---
-
-{% block head %}
-
-  <link id="site-stylesheet" rel="stylesheet" href="/assets/styles/theme-site.css" />
-  <link id="site-stylesheet" rel="stylesheet" href="/assets/styles/site.css" />
-{% endblock %}
-
-<style>
-  :root {
-    --scene-vertical-offset: calc(var(--wa-space-2xs) * -1);
-    --wa-font-family-heading: cera-round-pro;
-    --vehicle-offset: 25ch;
-    --vehicle-duration: 20s;
-    --vehicle-start: calc(-1 * var(--vehicle-offset));
-    --vehicle-end: calc(100% + var(--vehicle-offset));
-  }
-
-  html, wa-page {
-    background-color: var(--wa-color-surface-lowered);
-  }
-
-  wa-icon[name='traffic-cone'] {
-    --primary-color: var(--wa-color-brand-70);
-    --secondary-color: var(--wa-color-text-normal);
-    --secondary-opacity: 1.0;
-  }
-
-  wa-page.background-grid {
-    --grid-line-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 96%);
-    --subgrid-line-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 98%);
-  }
-
-  wa-page > [slot='main-footer'] {
-    border-block-end: var(--wa-border-style) calc(var(--wa-border-width-l) * 10) var(--wa-color-text-normal);
-    padding: 0;
-    background-color: transparent;
-  }
-
-  .header-content {
-    margin-inline: auto;
-    max-width: var(--content-width-l);
-    padding-inline: var(--content-padding-inline);
-  }
-
-  .icon-brand-logo {
-    font-size: var(--wa-font-size-xl);
-    color: var(--wa-brand-orange);
-  }
-
-  /* centering main-content */
-  wa-page::part(main-content) {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-  }
-
-  #content {
-    max-width: var(--content-width-m);
-    padding-inline: var(--content-padding-inline);
-    margin-inline: auto;
-  }
-
-  .heading-stacked-subtitle {
-    text-transform: uppercase;
-    letter-spacing: 0.1em;
-  }
-
-  .heading-stacked-subtitle wa-icon {
-    position: relative;
-    inset-block-start: calc(var(--wa-space-3xs) * -0.75);
-    font-size: 0.75em;
-  }
-
-  .heading-stacked-subtitle wa-icon[name="traffic-cone"] {
-    --secondary-color: var(--wa-color-text-normal);
-    --primary-color: var(--wa-color-brand-70);
-    margin-inline: calc(var(--wa-space-xs) * -1.15) calc(var(--wa-space-xs) * -0.75);
-  }
-
-  .copy {
-    code {
-      font-size: 0.75em;
-    }
-
-    strong {
-      text-decoration: underline;
-      text-decoration-color: var(--wa-color-brand-70);
-      text-decoration-thickness: var(--wa-border-width-m);
-      text-underline-offset: var(--wa-space-2xs);
-    }
-  }
-
-  .status {
-    width: 100%;
-    --min-column-size: 30ch;
-
-    wa-callout {
-      background-color: var(--wa-color-surface-default);
-    }
-  }
-
-  .linkies {
-    /* nudge those linkies left */
-    margin-inline-start: calc(var(--wa-space-xs) * -1);
-
-    a {
-      padding-inline: var(--wa-space-xs);
-    }
-  }
-
-  .scene {
-    width: 100%;
-    position: relative;
-    overflow-x: clip;
-    inset-block-end: var(--scene-vertical-offset);
-
-    .vehicle {
-      position: absolute;
-      inset-inline-start: var(--vehicle-start);
-      inset-block-end: 0; /* align all vehicles to bottom */
-      animation: driveAcross var(--vehicle-duration) linear infinite;
-      transform-origin: center;
-      z-index: 1;
-    }
-
-    .vehicle-with-object {
-      white-space: nowrap;
-      display: flex;
-      align-items: baseline;
-      gap: var(--wa-space-3xs);
-    }
-
-    .scene-left {
-      position: absolute;
-      inset-block-end: 0;
-      inset-inline-start: var(--wa-space-l);
-    }
-
-    .scene-left wa-icon[name='toilet-portable'] {
-      position: relative;
-      inset-block-start: var(--scene-vertical-offset);
-      margin-inline: calc(var(--wa-space-xs) * -1);
-    }
-
-    .scene-left wa-icon[name='traffic-cone'] {
-      position: relative;
-      inset-block-start: var(--scene-vertical-offset);
-    }
-
-    .blocks {
-      position: absolute;
-      inset-inline-end: calc(var(--wa-space-l) * -1);
-      inset-block-end: 0;
-      z-index: 2;
-    }
-
-    .blocks wa-icon[name='block-brick'] {
-      margin-inline: calc(var(--wa-space-xs) * -1);
-    }
-
-    .blocks-bottom {
-      margin-block-start: calc(var(--wa-space-2xs) * -1);
-    }
-
-    wa-icon[family='duotone'] {
-      --secondary-opacity: 1.0;
-    }
-
-    wa-icon[name='bulldozer'],
-    wa-icon[name='excavator'] {
-      --secondary-color: var(--wa-color-brand-70);
-    }
-
-    wa-icon[name='block-brick'],
-    wa-icon[name='toilet-portable'] {
-      --secondary-color: var(--wa-color-neutral-70);
-    }
-  }
-
-  @keyframes driveAcross {
-    0% {
-      left: var(--vehicle-start);
-    }
-    100% {
-      left: var(--vehicle-end);
-    }
-  }
-
-  /* Unique rumble animations for each vehicle type */
-  @keyframes rumble-bulldozer {
-    0%, 100% { transform: translateY(0px) rotate(0deg); }
-    25% { transform: translateY(-1px) rotate(0.5deg); }
-    50% { transform: translateY(1px) rotate(-0.3deg); }
-    75% { transform: translateY(-0.5px) rotate(0.2deg); }
-  }
-
-
-  /* Apply rumble animation to the single vehicle */
-  .vehicle-driving { animation: driveAcross var(--vehicle-duration) linear infinite; }
-  .vehicle wa-icon[name="bulldozer"] { animation: rumble-bulldozer 0.1s ease-in-out infinite; }
-</style>
-
-<wa-page disable-sticky="header" class="background-grid">
-  <header slot="header">
-    <div class="header-content wa-split" style="flex-wrap: nowrap;">
-      <wa-icon variant="brands" name="web-awesome" class="icon-brand-logo"></wa-icon>
-      <div>
-        <wa-button id="contact-us-button" appearance="plain" href="mailto:hello@webawesome.com?subject=Help%2C%20Web%20Awesome">
-          <wa-icon variant="regular" name="headset" label="Need help? Contact Us" class="icon-embiggen"></wa-icon>
-        </wa-button>
-        <wa-tooltip for="contact-us-button" aria-hidden="true">Contact Us</wa-tooltip>
-      </div>
-    </div>
-  </header>
-  <main id="content">
-    <div class="content-container wa-stack wa-gap-xl wa-align-items-center">
-      <h1 class="brand-font wa-stack wa-gap-s heading heading-stacked"  style="text-align: center;">
-        <span class="wa-heading-l heading-stacked-subtitle">
-          under 
-          <span class="wa-visually-hidden">maintenance</span>
-          <span aria-hidden="true">
-            m
-            <wa-icon family="duotone" variant="solid" name="traffic-cone"></wa-icon>
-            inten
-            <wa-icon family="duotone" variant="solid" name="traffic-cone"></wa-icon>
-            nce
-          </span>
-        </span>
-        <span class="wa-heading-4xl heading-stacked-title">Hey! We're Workin&apos; Here</span>
-      </h1>
-      <p class="copy wa-body-l line-length line-length-m" style="text-align: center;">Mind the <code>wa-gap</code>! webawesome.com is undergoing maintenance and will be back shortly.</p>
-      <div class="wa-grid wa-gap-xl status">
-        <wa-callout appearance="plain" variant="neutral">
-          <wa-icon slot="icon" family="duotone" variant="regular" name="diamond-exclamation" class="icon-embiggen" style="--secondary-opacity: 1; --secondary-color: var(--wa-color-warning-fill-normal);"></wa-icon>
-          <strong>Temporarily Unavailable</strong><br />
-          Access to Docs, Accounts, and Teams
-        </wa-callout>
-        <wa-callout appearance="plain" variant="neutral">
-          <wa-icon slot="icon" family="duotone" variant="regular" name="bolt" class="icon-embiggen" style="--secondary-opacity: 1; --secondary-color: var(--wa-color-success-fill-normal);"></wa-icon>
-          <strong>Fully Operational</strong><br />
-          Services (such as CDNs) and Support
-        </wa-callout>
-      </div>
-      <div class="wa-cluster wa-gap-xs linkies">
-        <h2 class="wa-visually-hidden">Web Awesome Elsewhere</h2>
-        <a href="https://github.com/shoelace-style/webawesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-          <wa-icon family="brands" name="github" label="GitHub"></wa-icon>
-        </a>
-        <a href="https://bsky.app/profile/webawesome.com" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-          <wa-icon family="brands" name="bluesky" label="Bluesky"></wa-icon>
-        </a>
-        <a href="https://mastodon.social/@webawesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-          <wa-icon family="brands" name="mastodon" label="Mastodon"></wa-icon>
-        </a>
-        <a href="https://x.com/webawesomer" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-          <wa-icon family="brands" name="x-twitter" label="Twitter (X)"></wa-icon>
-        </a>
-        <a href="https://www.threads.com/@web.awesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-          <wa-icon family="brands" name="threads" label="Threads"></wa-icon>
-        </a>
-        <a href="mailto:hello@webawesome.com?subject=Help%2C%20Web%20Awesome" class="appearance-plain">
-          <wa-icon variant="regular" name="envelope" label="Email Web Awesome"></wa-icon>
-        </a>
-      </div>
-    </div>
-  </main>
-  <div slot="main-footer" class="footer">
-    <div class="scene">
-      <div class="scene-left wa-cluster wa-align-items-end">
-        <wa-icon family="duotone" variant="solid" name="traffic-cone"></wa-icon>
-        <div class="wa-cluster wa-gap-0">
-          <wa-icon family="duotone" variant="regular" name="toilet-portable" class="wa-font-size-2xl"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="toilet-portable" class="wa-font-size-2xl"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="toilet-portable" class="wa-font-size-2xl"></wa-icon>
-        </div>
-        <wa-icon family="duotone" variant="regular" name="excavator" class="wa-font-size-3xl"></wa-icon>
-        <wa-icon family="duotone" variant="solid" name="traffic-cone"></wa-icon>
-      </div>
-      <div class="blocks wa-stack wa-align-items-center wa-gap-0">
-        <div class="blocks-top wa-cluster wa-gap-0">
-          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
-        </div>
-        <div class="blocks-bottom wa-cluster wa-gap-0">
-          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
-        </div>
-      </div>
-      <div class="track">
-        <wa-icon family="duotone" variant="regular" name="bulldozer" class="spacer-dot-gif wa-font-size-3xl" style="opacity: 0;"></wa-icon>
-        <span class="vehicle vehicle-driving vehicle-with-object">
-          <wa-icon family="duotone" variant="regular" name="bulldozer" class="wa-font-size-3xl"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl" style="position: relative; inset-inline-start: calc(var(--wa-space-2xs) * -1);"></wa-icon>
-        </span>
-      </div>
-    </div>
-
-  </div>
-</wa-page>
--- a/packages/webawesome/docs/_data/themer.js
+++ b/packages/webawesome/docs/_data/themer.js
@@ -12,22 +12,22 @@ export const themes = [
    isPro: false,
    fonts: {
      body: {
-        name: 'OS Default (sans-serif)',
+        name: 'OS Default',
        css: 'ui-sans-serif, system-ui, sans-serif',
        href: null,
      },
      heading: {
-        name: 'OS Default (sans-serif)',
+        name: 'OS Default',
        css: 'ui-sans-serif, system-ui, sans-serif',
        href: null,
      },
      code: {
-        name: 'OS Default (monospace)',
+        name: 'OS Default',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
-        name: 'OS Default (serif)',
+        name: 'OS Default',
        css: 'ui-serif, serif',
        href: null,
      },
@@ -74,22 +74,22 @@ export const themes = [
      body: {
        name: 'Quicksand',
        css: 'Quicksand, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Quicksand:wght@300..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Crimson+Pro:ital,wght@0,200..900;1,200..900&family=Quicksand:wght@300..700&display=swap',
      },
      heading: {
        name: 'Quicksand',
        css: 'Quicksand, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Quicksand:wght@300..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Crimson+Pro:ital,wght@0,200..900;1,200..900&family=Quicksand:wght@300..700&display=swap',
      },
      code: {
-        name: 'OS Default (monospace)',
+        name: 'OS Default',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
        name: 'Crimson Pro',
        css: '"Crimson Pro", serif',
-        href: 'https://fonts.bunny.net/css2?family=Crimson+Pro:ital,wght@0,200..900;1,200..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Crimson+Pro:ital,wght@0,200..900;1,200..900&family=Quicksand:wght@300..700&display=swap',
      },
    },
    icons: {
@@ -132,22 +132,22 @@ export const themes = [
    isPro: false,
    fonts: {
      body: {
-        name: 'OS Default (sans-serif)',
+        name: 'OS Default',
        css: 'ui-sans-serif, system-ui, sans-serif',
        href: null,
      },
      heading: {
-        name: 'OS Default (sans-serif)',
+        name: 'OS Default',
        css: 'ui-sans-serif, system-ui, sans-serif',
        href: null,
      },
      code: {
-        name: 'OS Default (monospace)',
+        name: 'OS Default',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
-        name: 'OS Default (serif)',
+        name: 'OS Default',
        css: 'ui-serif, serif',
        href: null,
      },
@@ -194,22 +194,22 @@ export const themes = [
      body: {
        name: 'Inter',
        css: 'Inter, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Inter:ital,wght@0,100..900;1,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Aleo:ital,wght@0,100..900;1,100..900&family=Geist+Mono:wght@100..900&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
      },
      heading: {
        name: 'Inter',
        css: 'Inter, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Inter:ital,wght@0,100..900;1,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Aleo:ital,wght@0,100..900;1,100..900&family=Geist+Mono:wght@100..900&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
      },
      code: {
        name: 'Geist Mono',
        css: '"Geist Mono", monospace',
-        href: 'https://fonts.bunny.net/css2?family=Geist+Mono:wght@100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Aleo:ital,wght@0,100..900;1,100..900&family=Geist+Mono:wght@100..900&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
      },
      longform: {
        name: 'Aleo',
        css: 'Aleo, serif',
-        href: 'https://fonts.bunny.net/css2?family=Aleo:ital,wght@0,100..900;1,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Aleo:ital,wght@0,100..900;1,100..900&family=Geist+Mono:wght@100..900&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
      },
    },
    icons: {
@@ -254,22 +254,22 @@ export const themes = [
      body: {
        name: 'Space Grotesk',
        css: '"Space Grotesk", sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Space+Grotesk:wght@300..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Podkova:wght@400..800&family=Space+Grotesk:wght@300..700&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
      },
      heading: {
        name: 'IBM Plex Sans Condensed',
        css: '"IBM Plex Sans Condensed", sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Podkova:wght@400..800&family=Space+Grotesk:wght@300..700&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
      },
      code: {
        name: 'Space Mono',
        css: '"Space Mono", monospace',
-        href: 'https://fonts.bunny.net/css2?family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Podkova:wght@400..800&family=Space+Grotesk:wght@300..700&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
      },
      longform: {
        name: 'Podkova',
        css: 'Podkova, serif',
-        href: 'https://fonts.bunny.net/css2?family=Podkova:wght@400..800&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Podkova:wght@400..800&family=Space+Grotesk:wght@300..700&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
      },
    },
    icons: {
@@ -314,22 +314,22 @@ export const themes = [
      body: {
        name: 'Figtree',
        css: 'Figtree, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Figtree:ital,wght@0,300..900;1,300..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&family=Figtree:ital,wght@0,300..900;1,300..900&family=Fraunces:ital,opsz,wght@0,9..144,100..900;1,9..144,100..900&display=swap',
      },
      heading: {
        name: 'Figtree',
        css: 'Figtree, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Figtree:ital,wght@0,300..900;1,300..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&family=Figtree:ital,wght@0,300..900;1,300..900&family=Fraunces:ital,opsz,wght@0,9..144,100..900;1,9..144,100..900&display=swap',
      },
      code: {
        name: 'Chivo Mono',
        css: '"Chivo Mono", monospace',
-        href: 'https://fonts.bunny.net/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&family=Figtree:ital,wght@0,300..900;1,300..900&family=Fraunces:ital,opsz,wght@0,9..144,100..900;1,9..144,100..900&display=swap',
      },
      longform: {
        name: 'Fraunces',
        css: 'Fraunces, serif',
-        href: 'https://fonts.bunny.net/css2?family=Fraunces:ital,wght@0,100..900;1,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&family=Figtree:ital,wght@0,300..900;1,300..900&family=Fraunces:ital,opsz,wght@0,9..144,100..900;1,9..144,100..900&display=swap',
      },
    },
    icons: {
@@ -374,22 +374,22 @@ export const themes = [
      body: {
        name: 'Wix Madefor Text',
        css: '"Wix Madefor Text", sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto+Serif:ital,opsz,wght@0,8..144,100..900;1,8..144,100..900&family=Roboto:ital,wght@0,100..900;1,100..900&family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
      },
      heading: {
        name: 'Wix Madefor Text',
        css: '"Wix Madefor Text", sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto+Serif:ital,opsz,wght@0,8..144,100..900;1,8..144,100..900&family=Roboto:ital,wght@0,100..900;1,100..900&family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
      },
      code: {
        name: 'Roboto Mono',
        css: '"Roboto Mono", monospace',
-        href: 'https://fonts.bunny.net/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto+Serif:ital,opsz,wght@0,8..144,100..900;1,8..144,100..900&family=Roboto:ital,wght@0,100..900;1,100..900&family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
      },
      longform: {
        name: 'Roboto Serif',
        css: '"Roboto Serif", serif',
-        href: 'https://fonts.bunny.net/css2?family=Roboto+Serif:ital,wght@0,100..900;1,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto+Serif:ital,opsz,wght@0,8..144,100..900;1,8..144,100..900&family=Roboto:ital,wght@0,100..900;1,100..900&family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
      },
    },
    icons: {
@@ -434,22 +434,22 @@ export const themes = [
      body: {
        name: 'Mulish',
        css: 'Mulish, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Mulish:ital,wght@0,200..1000;1,200..1000&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Lora:ital,wght@0,400..700;1,400..700&family=Mulish:ital,wght@0,200..1000;1,200..1000&display=swap',
      },
      heading: {
        name: 'Lora',
        css: 'Lora, serif',
-        href: 'https://fonts.bunny.net/css2?family=Lora:ital,wght@0,400..700;1,400..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Lora:ital,wght@0,400..700;1,400..700&family=Mulish:ital,wght@0,200..1000;1,200..1000&display=swap',
      },
      code: {
-        name: 'OS Default (monospace)',
+        name: 'OS Default',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
        name: 'Lora',
        css: 'Lora, serif',
-        href: 'https://fonts.bunny.net/css2?family=Lora:ital,wght@0,400..700;1,400..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Lora:ital,wght@0,400..700;1,400..700&family=Mulish:ital,wght@0,200..1000;1,200..1000&display=swap',
      },
    },
    icons: {
@@ -494,22 +494,22 @@ export const themes = [
      body: {
        name: 'Nunito',
        css: 'Nunito, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&family=BioRhyme:wght@200..800&family=Fredoka:wght@300..700&family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
      },
      heading: {
        name: 'Fredoka',
        css: 'Fredoka, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Fredoka:wght@300..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&family=BioRhyme:wght@200..800&family=Fredoka:wght@300..700&family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
      },
      code: {
        name: 'Azeret Mono',
        css: '"Azeret Mono", monospace',
-        href: 'https://fonts.bunny.net/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&family=BioRhyme:wght@200..800&family=Fredoka:wght@300..700&family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
      },
      longform: {
        name: 'BioRhyme',
        css: 'BioRhyme, serif',
-        href: 'https://fonts.bunny.net/css2?family=BioRhyme:wght@200..800&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&family=BioRhyme:wght@200..800&family=Fredoka:wght@300..700&family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
      },
    },
    icons: {
@@ -554,22 +554,22 @@ export const themes = [
      body: {
        name: 'DM Sans',
        css: '"DM Sans", sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=DM+Sans:ital,wght@0,100..1000;1,100..1000&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&family=Playfair+Display:ital,wght@0,400..900;1,400..900&family=Playfair:ital,opsz,wght@0,5..1200,300..900;1,5..1200,300..900&display=swap',
      },
      heading: {
        name: 'Playfair Display',
        css: '"Playfair Display", serif',
-        href: 'https://fonts.bunny.net/css2?family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&family=Playfair+Display:ital,wght@0,400..900;1,400..900&family=Playfair:ital,opsz,wght@0,5..1200,300..900;1,5..1200,300..900&display=swap',
      },
      code: {
-        name: 'OS Default (monospace)',
+        name: 'OS Default',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
        name: 'Playfair',
        css: 'Playfair, serif',
-        href: 'https://fonts.bunny.net/css2?family=Playfair:ital,wght@0,300..900;1,300..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&family=Playfair+Display:ital,wght@0,400..900;1,400..900&family=Playfair:ital,opsz,wght@0,5..1200,300..900;1,5..1200,300..900&display=swap',
      },
    },
    icons: {
@@ -614,20 +614,20 @@ export const themes = [
      body: {
        name: 'Inter',
        css: 'Inter, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Inter:ital,wght@0,100..900;1,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
      },
      heading: {
        name: 'Inter',
        css: 'Inter, sans-serif',
-        href: 'https://fonts.bunny.net/css2?family=Inter:ital,wght@0,100..900;1,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
      },
      code: {
-        name: 'OS Default (monospace)',
+        name: 'OS Default',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
-        name: 'OS Default (serif)',
+        name: 'OS Default',
        css: 'ui-serif, serif',
        href: null,
      },
--- a/packages/webawesome/docs/_includes/_banner-wa-launch.njk
+++ b/packages/webawesome/docs/_includes/_banner-wa-launch.njk
@@ -1,19 +0,0 @@
-{% raw %}
-  {%- if req.stripe.discount.active and not currentUser.hasPro -%}
-  <div slot="banner" class="banner-wa-launch wa-dark">
-    <div class="banner-content wa-split">
-      <div class="wa-cluster wa-gap-s">
-        <wa-icon name="badge-percent" class="banner-icon"></wa-icon>
-        <p class="wa-body-s">
-          <strong style="margin-inline-end: var(--wa-space-2xs)">Web Awesome is here!</strong>
-          Celebrate with <span class="appearance-underlined variant-drawn">20% off</span> on a Web Awesome Pro plan&hellip; <span class="appearance-underlined variant-drawn">for life</span>!
-        </p>
-      </div>
-      <wa-button appearance="outlined" variant="brand" size="small" href="/purchase" class="brand-font">
-        <wa-icon slot="start" variant="regular" name="rocket-launch"></wa-icon>
-        Get Pro + Save 20%
-      </wa-button>
-    </div>
-  </div>
-  {%- endif -%}
-{% endraw %}
--- a/packages/webawesome/docs/_includes/_dialog-wa-launch.njk
+++ b/packages/webawesome/docs/_includes/_dialog-wa-launch.njk
@@ -1,77 +0,0 @@
-{% raw %}
-  {%- if req.stripe.discount.active and not currentUser.hasPro -%}
-    <wa-dialog id="dialog-site" light-dismiss without-header>
-
-      <div class="background-wa-pattern" style="justify-content: center; margin-inline: calc(var(--spacing) * -1); margin-block-start: calc(var(--spacing) * -1); margin-block-end: var(--spacing); background: linear-gradient(to bottom, var(--wa-color-brand), var(--wa-color-brand-50)); color: var(--wa-color-brand-on-loud); padding: var(--wa-space-3xl) var(--spacing); --background-pattern-opacity: 0.2; --background-pattern-image: url('/assets/images/bg-wa-pattern.svg');">
-
-        <div class="wa-stack wa-align-items-center" style="text-align: center;">
-          <wa-icon name="party-horn" family="duotone" variant="solid" style="font-size: var(--wa-font-size-3xl); --secondary-color: var(--wa-color-brand-40); --secondary-opacity: 1.0;"></wa-icon>
-          <h2 class="wa-heading-2xl brand-font">Get a lifetime discount on Web Awesome Pro!</h2>
-        </div>
-      </div>
-
-      <div class="wa-stack wa-gap-l">
-        <p>Celebrate our official launch with a 20% discount on a Web Awesome Pro plan&hellip;<span class="appearance-underlined variant-drawn" style="--underline-color: var(--wa-color-brand);">for life</span>! But hurry, this lifetime discount is only available for a limited time.</p>
-
-        <div class="wa-split">
-          <wa-button type="button" appearance="plain" data-dialog="close">Maybe Later</wa-button>
-          <wa-button variant="neutral" appearance="accent" href="/purchase" class="brand-font">
-            <wa-icon slot="start" variant="regular" name="rocket-launch"></wa-icon>
-            Get Pro + Save 20%
-          </wa-button>
-        </div>
-      </div>
-    </wa-dialog>
-
-    <script type="module">
-      (function() {
-        const SITE_DIALOG_DISMISSED_KEY = 'dialog-wa-launch-sale-dismissed';
-
-        // Early exit if user has dismissed the dialog
-        try {
-          if (localStorage.getItem(SITE_DIALOG_DISMISSED_KEY) === 'true') {
-            return;
-          }
-        } catch (e) {
-          // localStorage may be disabled or unavailable
-          return;
-        }
-
-        // Wait for DOM and dialog element
-        const dialog = document.getElementById('dialog-site');
-        if (!dialog) {
-          return;
-        }
-
-        // Initialize dialog functionality
-        let initCalled = false;
-        const initDialog = () => {
-          // Prevent double initialization
-          if (initCalled) {
-            return;
-          }
-          initCalled = true;
-
-          // Save dismissal state when dialog is hidden
-          dialog.addEventListener('wa-hide', (event) => {
-            // Save dismissal state to localStorage
-            try {
-              localStorage.setItem(SITE_DIALOG_DISMISSED_KEY, 'true');
-            } catch (e) {
-              // localStorage may be disabled or unavailable
-            }
-          }, { once: true });
-
-          // Show dialog after a short delay to ensure page is loaded
-          setTimeout(() => {
-            dialog.open = true;
-          }, 500);
-        };
-
-      customElements.whenDefined("wa-dialog").then(() => {
-        initDialog()
-      })
-      })();
-    </script>
-  {%- endif -%}
-{% endraw %}
--- a/packages/webawesome/docs/_includes/base.njk
+++ b/packages/webawesome/docs/_includes/base.njk
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
-{% if hasAnchors == undefined %}{% set hasAnchors = true %}{% endif %}
-{% if hasBanner == undefined %}{% set hasBanner = true %}{% endif %}
-{% if hasSiteDialog == undefined %}{% set hasSiteDialog = true %}{% endif %}
-{% if hasGeneratedTitle == undefined %}{% set hasGeneratedTitle = true %}{% endif %}
-<html lang="en" data-fa-kit-code="38c11e3f20" data-version="{{ package.version }}" class="wa-cloak"{% if hasAnchors == false %} data-no-anchor{% endif %}>
+<html lang="en" data-fa-kit-code="38c11e3f20" data-cdn-url="{% cdnUrl %}" class="wa-cloak">
  <head>
    {% include 'head.njk' %}
    <meta name="theme-color" content="#f36944">
@@ -17,6 +13,7 @@
    <script type="module" src="/assets/scripts/color-scheme.js"></script>
    <script type="module" src="/assets/scripts/theme.js"></script>
    {% if hasSidebar %}<script type="module" src="/assets/scripts/sidebar.js"></script>{% endif %}
+    <script defer data-domain="webawesome.com" src="https://plausible.io/js/script.js"></script>

    {% block head %}
      <link rel="stylesheet" href="/assets/styles/docs.css" />
@@ -30,8 +27,7 @@
    </script>
  </head>
  <body class="layout-{{ layout | stripExtension }} page-{{ pageClass or page.fileSlug or 'home' }}{{ ' page-wide' if wide }}">
-
-    {% set defaultWaPageAttributes = defaultWaPageAttributes or { view: 'desktop', 'disable-navigation-toggle': true, 'mobile-breakpoint': 1180, 'disable-sticky': 'banner' } %}
+    {% set defaultWaPageAttributes = defaultWaPageAttributes or { view: 'desktop', 'disable-navigation-toggle': true, 'mobile-breakpoint': 1180 } %}
    {% set waPageAttributes = waPageAttributes or {} %}
    {% set mergedWaPageAttributes = defaultWaPageAttributes | merge(waPageAttributes) %}
    <wa-page
@@ -41,13 +37,6 @@
        {% endif %}
      {% endfor %}
    >
-        {% block pageBanner %}
-          {% if hasBanner %}
-            {#- WA Launch Banner -#}
-            {% include "_banner-wa-launch.njk" ignore missing %}
-          {% endif %}
-        {% endblock %}
-
        {% block pageHeader %}
          <header slot="header" class="wa-split">
            {# Nav toggle #}
@@ -120,9 +109,7 @@
        <div id="flashes">{% server "flashes" %}</div>

        {% block header %}
-          {% if hasGeneratedTitle %}
-            <h1 class="title">{{ title }}</h1>
-          {% endif %}
+          <h1 class="title">{{ title }}</h1>
        {% endblock %}

        {% block beforeContent %}{% endblock %}
@@ -136,14 +123,6 @@

      {% include 'search.njk' %}

-      {#- Site-Wide Dialog -#}
-      {% if hasSiteDialog %}
-        {% include "_dialog-wa-launch.njk" ignore missing %}
-      {% endif %}
-
-      {#- Cookie Consent Dialog -#}
-      {% include "cookie-consent.njk" ignore missing %}
-
      {# Footer #}
      {% block pageFooter %}{% endblock %}
    </wa-page>
--- a/packages/webawesome/docs/_includes/free-badge.njk
+++ b/packages/webawesome/docs/_includes/free-badge.njk
@@ -1,7 +0,0 @@
-{% macro freeBadge(params) %}
-  {% set description = params.description or "This feature is available in the free version of Web Awesome" %}
-  {% set badgeId = params.id or ("free-badge-" + ("" | uniqueId(8))) %}
-  <wa-badge appearance="filled" variant="neutral" pill class="free" id="{{ badgeId }}" data-free-badge>Free</wa-badge>
-  <wa-tooltip for="{{ badgeId }}">{{ description }}</wa-tooltip>
-{% endmacro %}
-
--- a/packages/webawesome/docs/_includes/head.njk
+++ b/packages/webawesome/docs/_includes/head.njk
@@ -3,17 +3,7 @@
 <meta name="description" content="{{ description }}">
 {% if noindex or unlisted %}<meta name="robots" content="noindex">{% endif %}

-<title>{{ pageTitle }}</title>
-
-{# Skip OG tags for unlisted/noindex pages to prevent social sharing #}
-{% if not (noindex or unlisted) %}
-  <meta property="og:type" content="{{ ogType }}" />
-  <meta property="og:url" content="{{ ogUrl }}" />
-  <meta property="og:title" content="{{ ogTitle }}" />
-  <meta property="og:description" content="{{ ogDescription }}" />
-  <meta property="og:image" content="{{ ogImage }}" />
-  <meta property="og:site_name" content="{{ siteMetadata.name }}" />
-{% endif %}
+<title>{{ title }}</title>

 {# Dark mode #}
 <script>
@@ -25,11 +15,8 @@
 	document.documentElement.classList.toggle('wa-dark', isDark);
 </script>

-<link rel="manifest" href="/manifest.json" />
-<link rel="icon" href="/assets/images/app-icons/favicon.ico" sizes="any">
-<link rel="icon" href="/assets/images/app-icons/icon.svg" type="image/svg+xml">
-<link rel="apple-touch-icon" href="/assets/images/app-icons/apple-touch-icon.png">
-
+<link rel="icon" href="/assets/images/webawesome-logo.svg" />
+<link rel="apple-touch-icon" href="/assets/images/app-icon.png">
 <link rel="preconnect" href="https://cdn.jsdelivr.net">
 <script type="module" src="/dist/webawesome.loader.js"></script>

@@ -38,12 +25,12 @@
 <link rel="stylesheet" href="/dist/styles/webawesome.css" />

 <script type="module">
-  document.addEventListener('wa-discovery-complete', loadLayout)
+  document.addEventListener("wa-discovery-complete", loadLayout)
  function loadLayout () {
-    if (!customElements.get('wa-page')) {
-      import('https://early.webawesome.com/webawesome@3.0.0-beta.6/dist/components/page/page.js')
+    if (!customElements.get("wa-layout")) {
+      import("{% cdnUrl 'components/page/page.js' %}")
        .catch((e) => {
-          // known errors with dual registration. This is only a thing in the free repo.
+        // known errors with dual registration. This is only a thing in the free repo.
        })
    }
  }
--- a/packages/webawesome/docs/_includes/logo-simple.njk
+++ b/packages/webawesome/docs/_includes/logo-simple.njk
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="15" fill="none" viewBox="0 0 20 15"><path fill="var(--wa-brand-orange, #f36944)" d="M11.63 1.625c0 .654-.387 1.218-.944 1.476L14 6l3.262-.652A1.5 1.5 0 1 1 18.55 6l-3.52 7.82A2 2 0 0 1 13.208 15H6.793a2 2 0 0 1-1.824-1.18L1.45 6a1.5 1.5 0 1 1 1.289-.652L6 6l3.317-2.902a1.625 1.625 0 1 1 2.313-1.473"/></svg>
+<svg width="20" height="15" viewBox="0 0 20 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.63 1.625C11.63 2.27911 11.2435 2.84296 10.6865 3.10064L14 6L17.2622 5.34755C17.0968 5.10642 17 4.81452 17 4.5C17 3.67157 17.6716 3 18.5 3C19.3284 3 20 3.67157 20 4.5C20 5.31157 19.3555 5.9726 18.5504 5.99917L15.0307 13.8207C14.7077 14.5384 13.9939 15 13.2068 15H6.79317C6.00615 15 5.29229 14.5384 4.96933 13.8207L1.44963 5.99917C0.64452 5.9726 0 5.31157 0 4.5C0 3.67157 0.671573 3 1.5 3C2.32843 3 3 3.67157 3 4.5C3 4.81452 2.9032 5.10642 2.73777 5.34755L6 6L9.31702 3.09761C8.76346 2.83855 8.38 2.27656 8.38 1.625C8.38 0.727537 9.10754 0 10.005 0C10.9025 0 11.63 0.727537 11.63 1.625Z" fill="var(--wa-brand-orange, #f36944)"/>
+</svg>
--- a/packages/webawesome/docs/_includes/logo.njk
+++ b/packages/webawesome/docs/_includes/logo.njk
@@ -1 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="105" height="16" fill="none" viewBox="0 0 105 16"><path fill="currentColor" d="M78.052 11.86c.412.386 1.175.64 1.816.64 1.193 0 2.122-.667 2.122-1.807 0-.85-.517-1.342-1.482-1.746l-.667-.28c-.36-.15-.5-.255-.5-.474 0-.263.22-.368.518-.368.31 0 .479.13.633.25q.057.044.112.083a.64.64 0 0 0 .386.132c.334 0 .676-.29.676-.676a.66.66 0 0 0-.176-.447C81.35 7 80.86 6.49 79.841 6.5c-1.149 0-2.026.676-2.026 1.71 0 .816.544 1.343 1.465 1.746l.596.263c.404.176.588.264.588.535 0 .281-.193.422-.596.422-.504 0-.843-.28-1.02-.424q-.053-.045-.086-.068a.63.63 0 0 0-.342-.105.673.673 0 0 0-.675.667c0 .228.114.43.307.614M97.912 7.28c0-.447-.316-.78-.755-.78-.307 0-.517.15-.763.553l-1.43 2.298-1.43-2.298c-.245-.404-.456-.553-.763-.553-.438 0-.754.333-.754.78v4.457a.74.74 0 0 0 .754.763.74.74 0 0 0 .755-.763V9.71l.754 1.201c.21.334.403.465.684.465.28 0 .474-.131.684-.465l.755-1.201v2.026a.74.74 0 0 0 .754.763.74.74 0 0 0 .755-.763zM100.516 11.632c0 .438.324.763.763.763h2.754a.67.67 0 0 0 .693-.684c0-.386-.289-.676-.693-.676h-2.009v-1.009h1.211a.62.62 0 0 0 .64-.631.62.62 0 0 0-.64-.632h-1.211v-.798h1.904a.67.67 0 0 0 .693-.684c0-.386-.29-.676-.693-.676h-2.649a.74.74 0 0 0-.763.764z"/><path fill="currentColor" fill-rule="evenodd" d="M86.878 6.5c1.754 0 3.131 1.325 3.131 3 0 1.684-1.377 3-3.131 3s-3.114-1.316-3.114-3 1.368-3 3.114-3m.009 1.386c-.939 0-1.58.658-1.58 1.614 0 .965.632 1.614 1.58 1.614.93 0 1.579-.667 1.579-1.614 0-.939-.658-1.614-1.58-1.614" clip-rule="evenodd"/><path fill="currentColor" d="M72.172 12.395a.74.74 0 0 1-.763-.763V7.369c0-.44.325-.764.763-.764h2.65c.403 0 .692.29.692.676a.67.67 0 0 1-.693.684h-1.903v.798h1.21a.62.62 0 0 1 .64.632.62.62 0 0 1-.64.631h-1.21v1.01h2.008c.404 0 .693.289.693.675a.67.67 0 0 1-.693.684zM69.443 7.237a.75.75 0 0 0-.754-.737.72.72 0 0 0-.702.5l-1.044 2.86-.965-2.79c-.131-.368-.395-.57-.745-.57-.351 0-.615.202-.746.57l-.965 2.79-1.053-2.886c-.105-.298-.368-.474-.693-.474a.75.75 0 0 0-.754.737c0 .105.018.202.079.342l1.71 4.412c.123.334.369.509.702.509.325 0 .57-.175.693-.509l1.026-2.78 1.027 2.78c.123.334.368.509.693.509.333 0 .579-.175.701-.509l1.711-4.412a.9.9 0 0 0 .079-.342"/><path fill="currentColor" fill-rule="evenodd" d="M60.027 11.412c.053.132.079.263.079.369 0 .412-.316.719-.746.719-.324 0-.57-.184-.71-.544l-.123-.307h-2.07l-.123.307c-.14.36-.386.544-.71.544-.43 0-.746-.307-.746-.72 0-.104.026-.236.079-.368L56.773 7c.131-.324.377-.5.719-.5s.588.176.72.5zm-2.535-2.666-.588 1.693h1.176z" clip-rule="evenodd"/><path fill="currentColor" d="M35.667 6.5a.75.75 0 0 1 .754.737c0 .114-.026.21-.08.342l-1.71 4.412c-.122.334-.368.509-.701.509-.325 0-.57-.175-.693-.509l-1.027-2.78-1.026 2.78c-.123.334-.368.509-.693.509-.333 0-.579-.175-.702-.509L28.08 7.58A.8.8 0 0 1 28 7.237a.75.75 0 0 1 .754-.737c.325 0 .588.176.693.474L30.5 9.86l.965-2.79c.131-.368.395-.57.745-.57.351 0 .614.202.746.57l.965 2.79L34.965 7a.72.72 0 0 1 .701-.5M38.387 11.632c0 .438.324.763.763.763h2.754c.395 0 .693-.29.693-.684 0-.386-.29-.676-.693-.676h-2.008v-1.009h1.21a.62.62 0 0 0 .64-.631.62.62 0 0 0-.64-.632h-1.21v-.798h1.903a.67.67 0 0 0 .693-.684c0-.386-.29-.676-.693-.676H39.15a.74.74 0 0 0-.763.764z"/><path fill="currentColor" fill-rule="evenodd" d="M49.502 10.675c0-.657-.36-1.14-.965-1.385.228-.255.351-.588.351-.974 0-1-.816-1.71-1.956-1.71h-1.325a.74.74 0 0 0-.763.763v4.263c0 .438.325.763.764.763h1.938c1.132 0 1.956-.72 1.956-1.72m-3.21-2.798h.544c.35 0 .578.193.578.509s-.228.509-.578.509h-.544zm1.736 2.737c0 .325-.21.509-.578.509h-1.158v-1.018h1.158c.368 0 .578.184.578.509" clip-rule="evenodd"/><path fill="var(--wa-brand-orange, #f36944)" d="M11.63 1.625c0 .654-.387 1.218-.944 1.476L14 6l3.262-.652A1.5 1.5 0 1 1 18.55 6l-3.52 7.82A2 2 0 0 1 13.208 15H6.793a2 2 0 0 1-1.824-1.18L1.45 6a1.5 1.5 0 1 1 1.289-.652L6 6l3.317-2.902a1.625 1.625 0 1 1 2.313-1.473"/></svg>
+<svg width="105" height="16" viewBox="0 0 105 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M78.0517 11.8597C78.464 12.2456 79.2272 12.5 79.8675 12.5C81.0605 12.5 81.9903 11.8333 81.9903 10.693C81.9903 9.84215 81.4727 9.35093 80.5078 8.94743L79.8412 8.66674C79.4815 8.51762 79.3412 8.41235 79.3412 8.19306C79.3412 7.92991 79.5605 7.82465 79.8587 7.82465C80.169 7.82465 80.3376 7.95507 80.4921 8.07458C80.5297 8.1037 80.5665 8.1322 80.6043 8.15797C80.7359 8.25446 80.8675 8.28955 80.9903 8.28955C81.3236 8.28955 81.6657 8.00008 81.6657 7.61413C81.6657 7.47378 81.6219 7.31589 81.4903 7.16677C81.3499 7.0001 80.8587 6.49134 79.8412 6.50011C78.6921 6.50011 77.8149 7.17554 77.8149 8.2106C77.8149 9.02638 78.3588 9.55268 79.2798 9.95618L79.8763 10.2193C80.2798 10.3948 80.464 10.4825 80.464 10.7544C80.464 11.0351 80.271 11.1755 79.8675 11.1755C79.3642 11.1755 79.0247 10.8964 78.8489 10.752C78.8133 10.7228 78.7844 10.699 78.7623 10.6842C78.657 10.6141 78.5342 10.579 78.4202 10.579C78.0781 10.579 77.7535 10.8421 77.7447 11.2456C77.7447 11.4737 77.8588 11.6754 78.0517 11.8597Z" fill="currentColor"/>
+<path d="M97.9115 7.2808C97.9115 6.83344 97.5957 6.50012 97.1572 6.50011C96.8502 6.50011 96.6396 6.64923 96.394 7.05274L94.9642 9.35094L93.5344 7.05274C93.2888 6.64923 93.0783 6.50011 92.7713 6.50011C92.3327 6.50011 92.0169 6.83344 92.0169 7.2808V11.7369C92.0169 12.1754 92.3415 12.5 92.7713 12.5C93.2011 12.5 93.5257 12.1754 93.5257 11.7369V9.71058L94.28 10.9123C94.4906 11.2456 94.6835 11.3772 94.9642 11.3772C95.2449 11.3772 95.4379 11.2456 95.6484 10.9123L96.4028 9.71058V11.7369C96.4028 12.1754 96.7273 12.5 97.1572 12.5C97.587 12.5 97.9115 12.1754 97.9115 11.7369L97.9115 7.2808Z" fill="currentColor"/>
+<path d="M100.516 11.6316C100.516 12.0702 100.84 12.3947 101.279 12.3947L104.033 12.3947C104.428 12.3947 104.726 12.1053 104.726 11.7105C104.726 11.3246 104.437 11.0351 104.033 11.0351L102.024 11.0351V10.0264L103.235 10.0264C103.603 10.0264 103.875 9.75445 103.875 9.3948C103.875 9.03516 103.603 8.76324 103.235 8.76324L102.024 8.76324V7.96501L103.928 7.96501C104.323 7.96501 104.621 7.67554 104.621 7.28081C104.621 6.89485 104.331 6.60539 103.928 6.60539L101.279 6.60538C100.84 6.60538 100.516 6.92994 100.516 7.36853V11.6316Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M86.8778 6.50011C88.6322 6.50011 90.0094 7.82465 90.0094 9.50006C90.0094 11.1842 88.6322 12.5 86.8778 12.5C85.1235 12.5 83.7639 11.1842 83.7639 9.50006C83.7639 7.81588 85.1323 6.50011 86.8778 6.50011ZM86.8866 7.88605C85.948 7.88605 85.3077 8.54393 85.3077 9.50006C85.3077 10.4649 85.9393 11.1141 86.8866 11.1141C87.8164 11.1141 88.4655 10.4474 88.4655 9.50006C88.4655 8.56148 87.8076 7.88605 86.8866 7.88605Z" fill="currentColor"/>
+<path d="M72.1721 12.3947C71.7335 12.3947 71.4089 12.0702 71.4089 11.6316V7.36852C71.4089 6.92993 71.7335 6.60538 72.1721 6.60538L74.8211 6.60538C75.2246 6.60538 75.5141 6.89485 75.5141 7.2808C75.5141 7.67553 75.2159 7.965 74.8211 7.965L72.9177 7.965V8.76323L74.1282 8.76323C74.4966 8.76323 74.7685 9.03515 74.7685 9.3948C74.7685 9.75444 74.4966 10.0264 74.1282 10.0264L72.9177 10.0264V11.0351L74.9264 11.0351C75.3299 11.0351 75.6194 11.3246 75.6194 11.7105C75.6194 12.1053 75.3211 12.3947 74.9264 12.3947L72.1721 12.3947Z" fill="currentColor"/>
+<path d="M69.4429 7.23694C69.443 6.83344 69.1009 6.50012 68.6886 6.50012C68.364 6.50012 68.1009 6.68432 67.9868 7.00011L66.943 9.8597L65.9781 7.07028C65.8465 6.70187 65.5834 6.50011 65.2325 6.50011C64.8816 6.50011 64.6185 6.70187 64.4869 7.07028L63.522 9.8597L62.4694 6.97379C62.3641 6.67555 62.101 6.50011 61.7764 6.50011C61.3642 6.50011 61.0221 6.83344 61.0221 7.23694C61.0221 7.3422 61.0396 7.43869 61.101 7.57904L62.8115 11.9912C62.9343 12.3246 63.1799 12.5 63.5132 12.5C63.8378 12.5 64.0834 12.3246 64.2062 11.9912L65.2325 9.21059L66.2588 11.9912C66.3816 12.3246 66.6272 12.5 66.9518 12.5C67.2851 12.5 67.5307 12.3246 67.6535 11.9912L69.364 7.57904C69.4166 7.44747 69.4429 7.35098 69.4429 7.23694Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60.0269 11.4123C60.0795 11.5439 60.1058 11.6755 60.1058 11.7807C60.1058 12.193 59.7901 12.5 59.3602 12.5C59.0357 12.5 58.7901 12.3158 58.6497 11.9561L58.5269 11.6491L56.4568 11.6491L56.334 11.9561C56.1936 12.3158 55.948 12.5 55.6235 12.5C55.1936 12.5 54.8779 12.193 54.8779 11.7807C54.8779 11.6755 54.9042 11.5439 54.9568 11.4123L56.7726 7.0001C56.9041 6.67555 57.1498 6.50011 57.4919 6.50011C57.834 6.50011 58.0796 6.67555 58.2111 7.00011L60.0269 11.4123ZM57.4919 8.74568L56.9041 10.4386L58.0796 10.4386L57.4919 8.74568Z" fill="currentColor"/>
+<path d="M35.6665 6.50013C36.0788 6.50013 36.4209 6.83346 36.4209 7.23696C36.4209 7.35099 36.3946 7.44748 36.3419 7.57906L34.6314 11.9912C34.5086 12.3246 34.263 12.5 33.9297 12.5C33.6051 12.5 33.3595 12.3246 33.2367 11.9912L32.2104 9.2106L31.1841 11.9912C31.0613 12.3246 30.8157 12.5 30.4912 12.5C30.1578 12.5 29.9122 12.3246 29.7894 11.9912L28.0789 7.57906C28.0175 7.43871 28 7.34222 28 7.23696C28 6.83346 28.3421 6.50013 28.7544 6.50013C29.0789 6.50013 29.3421 6.67557 29.4473 6.97381L30.4999 9.85971L31.4648 7.07029C31.5964 6.70188 31.8596 6.50013 32.2104 6.50013C32.5613 6.50013 32.8245 6.70188 32.956 7.07029L33.9209 9.85971L34.9648 7.00012C35.0788 6.68434 35.3419 6.50013 35.6665 6.50013Z" fill="currentColor"/>
+<path d="M38.3868 11.6316C38.3868 12.0702 38.7114 12.3947 39.15 12.3947H41.9043C42.299 12.3947 42.5973 12.1052 42.5973 11.7105C42.5973 11.3246 42.3078 11.0351 41.9043 11.0351H39.8956V10.0263H41.1061C41.4745 10.0263 41.7464 9.75442 41.7464 9.39478C41.7464 9.03514 41.4745 8.76321 41.1061 8.76321H39.8956V7.96498H41.799C42.1938 7.96498 42.492 7.67552 42.492 7.28079C42.492 6.89483 42.2025 6.60536 41.799 6.60536H39.15C38.7114 6.60536 38.3868 6.92992 38.3868 7.36851V11.6316Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.5021 10.6754C49.5021 10.0176 49.1425 9.53512 48.5372 9.28952C48.7653 9.03514 48.8881 8.70181 48.8881 8.31585C48.8881 7.31587 48.0723 6.60536 46.932 6.60536H45.6075C45.1689 6.60536 44.8443 6.92992 44.8443 7.36851V11.6316C44.8443 12.0702 45.1689 12.3947 45.6075 12.3947H47.546C48.6776 12.3947 49.5021 11.6754 49.5021 10.6754ZM46.2917 7.87727H46.8355C47.1864 7.87727 47.4145 8.07024 47.4145 8.38603C47.4145 8.70181 47.1864 8.89479 46.8355 8.89479H46.2917V7.87727ZM48.0285 10.614C48.0285 10.9386 47.818 11.1228 47.4496 11.1228H46.2917V10.1053H47.4496C47.818 10.1053 48.0285 10.2895 48.0285 10.614Z" fill="currentColor"/>
+<path d="M11.63 1.625C11.63 2.27911 11.2435 2.84296 10.6865 3.10064L14 6L17.2622 5.34755C17.0968 5.10642 17 4.81452 17 4.5C17 3.67157 17.6716 3 18.5 3C19.3284 3 20 3.67157 20 4.5C20 5.31157 19.3555 5.9726 18.5504 5.99917L15.0307 13.8207C14.7077 14.5384 13.9939 15 13.2068 15H6.79317C6.00615 15 5.29229 14.5384 4.96933 13.8207L1.44963 5.99917C0.64452 5.9726 0 5.31157 0 4.5C0 3.67157 0.671573 3 1.5 3C2.32843 3 3 3.67157 3 4.5C3 4.81452 2.9032 5.10642 2.73777 5.34755L6 6L9.31702 3.09761C8.76346 2.83855 8.38 2.27656 8.38 1.625C8.38 0.727537 9.10754 0 10.005 0C10.9025 0 11.63 0.727537 11.63 1.625Z" fill="var(--wa-brand-orange, #F36944)"/>
+</svg>
--- a/packages/webawesome/docs/_includes/pro-badge.njk
+++ b/packages/webawesome/docs/_includes/pro-badge.njk
@@ -1,6 +1,6 @@
 {% macro proBadge(params) %}
  {% set description = params.description or "This requires access to Web Awesome Pro" %}
  {% set badgeId = params.id or ("pro-badge-" + ("" | uniqueId(8))) %}
-  <wa-badge appearance="accent" pill class="pro" id="{{ badgeId }}" data-pro-badge>Pro</wa-badge>
+  <wa-badge appearance="accent" pill class="pro" id="{{ badgeId }}">Pro</wa-badge>
  <wa-tooltip for="{{ badgeId }}">{{ description }}</wa-tooltip>
 {% endmacro %}
--- a/packages/webawesome/docs/_includes/sidebar.njk
+++ b/packages/webawesome/docs/_includes/sidebar.njk
@@ -16,21 +16,17 @@
 {# Resources #}
 <h2>Resources</h2>
 <ul>
-  <li><a href="/docs/resources/support">Help & Support</a></li>
+  <li><a href="https://github.com/shoelace-style/webawesome/discussions" target="_blank">Help &amp; Support</a></li>
  <li><a href="https://github.com/shoelace-style/webawesome/">Source Code</a></li>
-  <li>
-    <span class="wa-split">
-      <a href="/docs/resources/figma">Figma Design Kit</a></li>
-      {{ proBadge() }}
-    </span>
-  </li>
+  <li><a href="/docs/resources/community">Community</a></li>
  <li><a href="/docs/resources/accessibility">Accessibility</a></li>
  <li><a href="/docs/resources/browser-support">Browser Support</a></li>
  <li><a href="/docs/resources/contributing">Contributing</a></li>
  <li><a href="/docs/resources/changelog">Changelog</a></li>
+  <li><a href="/license"><span class="wa-visually-hidden">Web Awesome </span>Free License</a></li>
+  <li><a href="/license/pro"><span class="wa-visually-hidden">Web Awesome </span>Pro License</a></li>
+  <li><a href="/tos">Terms of Service</a></li>
  <li><a href="/docs/resources/visual-tests">Visual Tests</a></li>
-
-
 </ul>

 <!-- Components -->
@@ -78,18 +74,10 @@
        </li>
      </ul>
    </li>
-    <li><span class="is-planned wa-split">Charts <span><a href="https://github.com/shoelace-style/webawesome/issues/1073" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a>{{ proBadge({ description: "This will require access to Web Awesome Pro" }) }}</span></span></li>
+    <li><span class="is-planned wa-split">Charts <a href="https://github.com/shoelace-style/webawesome/issues/1073" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a></span></li>
    <li><a href="/docs/components/checkbox/">Checkbox</a></li>
    <li><a href="/docs/components/color-picker/">Color Picker</a></li>
-    <li>
-      <span class="wa-split">
-        <span>
-          <a href="/docs/components/combobox">Combobox</a>
-          <wa-icon name="flask" aria-hidden="true" class="icon-shrink"></wa-icon>
-        </span>
-        {{ proBadge() }}
-      </span>
-    </li>
+    <li><span class="is-planned wa-split">Combobox <a href="https://github.com/shoelace-style/webawesome/issues/1074" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a></span></li>
    <li><a href="/docs/components/comparison/">Comparison</a></li>
    <li>
      <a class="wa-cluster wa-gap-xs" href="/docs/components/copy-button/">
@@ -97,8 +85,8 @@
        <wa-icon name="flask" aria-hidden="true" class="icon-shrink"></wa-icon>
      </a>
    </li>
-    <li><span class="is-planned wa-split">Data Grid <span><a href="https://github.com/shoelace-style/webawesome/issues/1072" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a>{{ proBadge({ description: "This will require access to Web Awesome Pro" }) }}</span></span></li>
-    <li><span class="is-planned wa-split">Date Picker <span><a href="https://github.com/shoelace-style/webawesome/issues/1075" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a>{{ proBadge({ description: "This will require access to Web Awesome Pro" }) }}</span></span></li>
+    <li><span class="is-planned wa-split">Data Grid <a href="https://github.com/shoelace-style/webawesome/issues/1072" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a></span></li>
+    <li><span class="is-planned wa-split">Datepicker <a href="https://github.com/shoelace-style/webawesome/issues/1075" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a></span></li>
    <li><a href="/docs/components/details/">Details</a></li>
    <li><a href="/docs/components/dialog/">Dialog</a></li>
    <li><a href="/docs/components/divider/">Divider</a></li>
@@ -109,7 +97,6 @@
        <li><a href="/docs/components/dropdown-item">Dropdown Item</a></li>
      </ul>
    </li>
-    <li><span class="is-planned wa-split">File Input <span><a href="https://github.com/shoelace-style/webawesome/issues/1240" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a>{{ proBadge({ description: "This will require access to Web Awesome Pro" }) }}</span></span></li>
    <li><a href="/docs/components/format-bytes/">Format Bytes</a></li>
    <li><a href="/docs/components/format-date/">Format Date</a></li>
    <li><a href="/docs/components/format-number/">Format Number</a></li>
@@ -118,7 +105,6 @@
    <li><a href="/docs/components/input/">Input</a></li>
    <li><a href="/docs/components/intersection-observer">Intersection Observer</a></li>
    <li><a href="/docs/components/mutation-observer/">Mutation Observer</a></li>
-    <li><span class="is-planned wa-split">Number Input <a href="https://github.com/shoelace-style/webawesome/issues/1688" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a></span></li>
    <li><a href="/docs/components/popover/">Popover</a></li>
    <li><a href="/docs/components/popup/">Popup</a></li>
    <li><a href="/docs/components/progress-bar/">Progress Bar</a></li>
@@ -154,15 +140,9 @@
    </li>
    <li><a href="/docs/components/tag/">Tag</a></li>
    <li><a href="/docs/components/textarea/">Textarea</a></li>
-    <li><span class="is-planned wa-split">Toast <span><a href="https://github.com/shoelace-style/webawesome/issues/105" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a>{{ proBadge( { description: "This will require access to Web Awesome Pro" }) }}</span></span></li>
    <li><a href="/docs/components/tooltip/">Tooltip</a></li>
-    <li>
-      <a href="/docs/components/tree/">Tree</a>
-      <ul>
-        <li><a href="/docs/components/tree-item/">Tree Item</a></li>
-      </ul>
-    </li>
-    <li><span class="is-planned wa-split">Video <span><a href="https://github.com/shoelace-style/webawesome/issues/985" target="_blank">{{ plannedBadge("A Web Awesome Kickstarter stretch goal!") }}</a>{{ proBadge( { description: "This will require access to Web Awesome Pro" }) }}</span></span></li>
+    <li><a href="/docs/components/tree/">Tree</a></li>
+    <li><a href="/docs/components/tree-item/">Tree Item</a></li>
    <li><a href="/docs/components/zoomable-frame">Zoomable Frame</a></li>
    {# PLOP_NEW_COMPONENT_PLACEHOLDER #}
  </ul>
@@ -196,7 +176,6 @@
  </h2>
  <ul>
    <li><a href="/docs/utilities/align-items/">Align Items</a></li>
-    <li><a href="/docs/utilities/justify-content/">Justify Content</a></li>
    <li><a href="/docs/utilities/gap/">Gap</a></li>
    <li><a href="/docs/utilities/cluster/">Cluster</a></li>
    <li><a href="/docs/utilities/flank/">Flank</a></li>
@@ -382,6 +361,9 @@
        <li>
          <a href="/docs/patterns/layouts/ecommerce/">Ecommerce</a>
        </li>
+        <li>
+          <a href="/docs/patterns/layouts/app/">App</a>
+        </li>
        <li>
          <a href="/docs/patterns/layouts/blog/">Blog</a>
        </li>
@@ -395,6 +377,12 @@
 <ul>
  <li><a href="/docs/color-palettes">Color Palettes</a></li>
  <li><a href="/docs/themes">Themes</a></li>
+  <li>
+    <span class="wa-split">
+      <a href="/themer" data-turbo="false">Theme Builder</a>
+      {{ proBadge({ description: "This requires an active Web Awesome Pro subscription", shrink: true }) }}
+    </span>
+  </li>
 </ul>

 <!-- Design tokens -->
@@ -417,31 +405,21 @@
  </ul>
 </wa-details>

-{# Policies #}
-<h2>Terms &amp; Policies</h2>
-<ul>
-  <li><a href="/license"><span class="wa-visually-hidden">Web Awesome </span>Free License</a></li>
-  <li><a href="/license/pro"><span class="wa-visually-hidden">Web Awesome </span>Pro License</a></li>
-  <li><a href="/tos">Terms of Service</a></li>
-  <li><a href="/privacy">Privacy Policy</a></li>
-  <li><a href="/refunds">Refund Policy</a></li>
-</ul>
-
 <wa-divider style="--spacing: var(--wa-space-xl);"></wa-divider>

 <div class="wa-stack wa-gap-xl" id="colophon">
  <div class="wa-stack wa-gap-xs">
    {% include "logo-simple.njk" %}
-    <h2 class="wa-heading-s">Web Awesome</h2>
-    <p class="wa-caption-xs wa-cluster wa-gap-xs">
-      Version {{ package.version }}
-      <wa-icon id="version-icon-info" family="duotone" variant="regular" name="party-horn"></wa-icon>
-      <wa-tooltip for="version-icon-info" distance="2" class="wa-font-size-xs">Here be freshly launched Awesome and no wa-dragons</wa-tooltip>
-    </p>
-    <p class="wa-caption-xs">&copy; Fonticons, Inc.</p>
+    <div class="wa-cluster wa-gap-xs">
+      <h2 class="wa-heading-xs">Web Awesome</h2>
+      <wa-badge id="version-beta-badge" variant="orange" appearance="filled" style="font-size: var(--wa-font-size-2xs);">Beta</wa-badge>
+      <wa-tooltip for="version-beta-badge" distance="2" style="font-size: var(--wa-font-size-xs);">Here be freshly made Awesome&hellip; and possible dragons</wa-tooltip>
+    </div>
+    <p class="wa-caption-s">Version {{ package.version }}</p>
+    <p class="wa-caption-s">&copy; Fonticons, Inc.</p>
  </div>

-  <div class="wa-cluster wa-gap-0 wa-caption-xs the-socials">
+  <div class="wa-cluster wa-gap-0 wa-caption-s the-socials">
    <h2 class="wa-visually-hidden">Web Awesome Elsewhere</h2>
    <a href="https://github.com/shoelace-style/webawesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
      <wa-icon family="brands" name="github" label="GitHub"></wa-icon>
--- a/packages/webawesome/docs/_includes/visual-tests/appearance.njk
+++ b/packages/webawesome/docs/_includes/visual-tests/appearance.njk
@@ -33,11 +33,11 @@
      <th><code>filled</code> + <code>outlined</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge variant="brand" appearance="filled-outlined">Brand</wa-badge>
-          <wa-badge variant="neutral" appearance="filled-outlined">Neutral</wa-badge>
-          <wa-badge variant="success" appearance="filled-outlined">Success</wa-badge>
-          <wa-badge variant="warning" appearance="filled-outlined">Warning</wa-badge>
-          <wa-badge variant="danger" appearance="filled-outlined">Danger</wa-badge>
+          <wa-badge variant="brand" appearance="filled outlined">Brand</wa-badge>
+          <wa-badge variant="neutral" appearance="filled outlined">Neutral</wa-badge>
+          <wa-badge variant="success" appearance="filled outlined">Success</wa-badge>
+          <wa-badge variant="warning" appearance="filled outlined">Warning</wa-badge>
+          <wa-badge variant="danger" appearance="filled outlined">Danger</wa-badge>
        </div>
      </td>
      <td>
@@ -174,11 +174,11 @@
      <th><code>filled</code> + <code>outlined</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button variant="brand" appearance="filled-outlined">Brand</wa-button>
-          <wa-button variant="neutral" appearance="filled-outlined">Neutral</wa-button>
-          <wa-button variant="success" appearance="filled-outlined">Success</wa-button>
-          <wa-button variant="warning" appearance="filled-outlined">Warning</wa-button>
-          <wa-button variant="danger" appearance="filled-outlined">Danger</wa-button>
+          <wa-button variant="brand" appearance="filled outlined">Brand</wa-button>
+          <wa-button variant="neutral" appearance="filled outlined">Neutral</wa-button>
+          <wa-button variant="success" appearance="filled outlined">Success</wa-button>
+          <wa-button variant="warning" appearance="filled outlined">Warning</wa-button>
+          <wa-button variant="danger" appearance="filled outlined">Danger</wa-button>
        </div>
      </td>
      <td>
@@ -375,23 +375,23 @@
      <th><code>filled</code> + <code>outlined</code></th>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout variant="brand" appearance="filled-outlined">
+          <wa-callout variant="brand" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
            Brand
          </wa-callout>
-          <wa-callout variant="neutral" appearance="filled-outlined">
+          <wa-callout variant="neutral" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
            Neutral
          </wa-callout>
-          <wa-callout variant="success" appearance="filled-outlined">
+          <wa-callout variant="success" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
            Success
          </wa-callout>
-          <wa-callout variant="warning" appearance="filled-outlined">
+          <wa-callout variant="warning" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
            Warning
          </wa-callout>
-          <wa-callout variant="danger" appearance="filled-outlined">
+          <wa-callout variant="danger" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
            Danger
          </wa-callout>
@@ -636,11 +636,11 @@
      <th><code>filled</code> + <code>outlined</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag variant="brand" appearance="filled-outlined">Brand</wa-tag>
-          <wa-tag variant="neutral" appearance="filled-outlined">Neutral</wa-tag>
-          <wa-tag variant="success" appearance="filled-outlined">Success</wa-tag>
-          <wa-tag variant="warning" appearance="filled-outlined">Warning</wa-tag>
-          <wa-tag variant="danger" appearance="filled-outlined">Danger</wa-tag>
+          <wa-tag variant="brand" appearance="filled outlined">Brand</wa-tag>
+          <wa-tag variant="neutral" appearance="filled outlined">Neutral</wa-tag>
+          <wa-tag variant="success" appearance="filled outlined">Success</wa-tag>
+          <wa-tag variant="warning" appearance="filled outlined">Warning</wa-tag>
+          <wa-tag variant="danger" appearance="filled outlined">Danger</wa-tag>
        </div>
      </td>
      <td>
@@ -775,4 +775,4 @@
    </tr>
  </tbody>
 </table>
-</div>
+</div>
--- a/packages/webawesome/docs/_includes/visual-tests/color.njk
+++ b/packages/webawesome/docs/_includes/visual-tests/color.njk
@@ -13,7 +13,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge variant="brand" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="brand" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge variant="brand" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge variant="brand" appearance="filled">Filled</wa-badge>
          <wa-badge variant="brand" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -21,7 +21,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge class="wa-brand" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-brand" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge class="wa-brand" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge class="wa-brand" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-brand" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -32,7 +32,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge variant="neutral" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="neutral" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge variant="neutral" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge variant="neutral" appearance="filled">Filled</wa-badge>
          <wa-badge variant="neutral" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -40,7 +40,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge class="wa-neutral" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-neutral" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge class="wa-neutral" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge class="wa-neutral" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-neutral" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -51,7 +51,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge variant="success" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="success" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge variant="success" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge variant="success" appearance="filled">Filled</wa-badge>
          <wa-badge variant="success" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -59,7 +59,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge class="wa-success" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-success" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge class="wa-success" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge class="wa-success" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-success" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -70,7 +70,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge variant="warning" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="warning" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge variant="warning" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge variant="warning" appearance="filled">Filled</wa-badge>
          <wa-badge variant="warning" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -78,7 +78,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge class="wa-warning" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-warning" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge class="wa-warning" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge class="wa-warning" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-warning" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -89,7 +89,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge variant="danger" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="danger" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge variant="danger" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge variant="danger" appearance="filled">Filled</wa-badge>
          <wa-badge variant="danger" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -97,7 +97,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-badge class="wa-danger" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-danger" appearance="filled-outlined">Filled-Outlined</wa-badge>
+          <wa-badge class="wa-danger" appearance="filled outlined">Filled + Outlined</wa-badge>
          <wa-badge class="wa-danger" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-danger" appearance="outlined">Outlined</wa-badge>
        </div>
@@ -123,7 +123,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button variant="brand" appearance="accent">Accent</wa-button>
-          <wa-button variant="brand" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button variant="brand" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button variant="brand" appearance="filled">Filled</wa-button>
          <wa-button variant="brand" appearance="outlined">Outlined</wa-button>
          <wa-button variant="brand" appearance="plain">Plain</wa-button>
@@ -132,7 +132,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button class="wa-brand" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-brand" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button class="wa-brand" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button class="wa-brand" appearance="filled">Filled</wa-button>
          <wa-button class="wa-brand" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-brand" appearance="plain">Plain</wa-button>
@@ -144,7 +144,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button variant="neutral" appearance="accent">Accent</wa-button>
-          <wa-button variant="neutral" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button variant="neutral" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button variant="neutral" appearance="filled">Filled</wa-button>
          <wa-button variant="neutral" appearance="outlined">Outlined</wa-button>
          <wa-button variant="neutral" appearance="plain">Plain</wa-button>
@@ -153,7 +153,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button class="wa-neutral" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-neutral" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button class="wa-neutral" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button class="wa-neutral" appearance="filled">Filled</wa-button>
          <wa-button class="wa-neutral" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-neutral" appearance="plain">Plain</wa-button>
@@ -165,7 +165,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button variant="success" appearance="accent">Accent</wa-button>
-          <wa-button variant="success" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button variant="success" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button variant="success" appearance="filled">Filled</wa-button>
          <wa-button variant="success" appearance="outlined">Outlined</wa-button>
          <wa-button variant="success" appearance="plain">Plain</wa-button>
@@ -174,7 +174,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button class="wa-success" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-success" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button class="wa-success" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button class="wa-success" appearance="filled">Filled</wa-button>
          <wa-button class="wa-success" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-success" appearance="plain">Plain</wa-button>
@@ -186,7 +186,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button variant="warning" appearance="accent">Accent</wa-button>
-          <wa-button variant="warning" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button variant="warning" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button variant="warning" appearance="filled">Filled</wa-button>
          <wa-button variant="warning" appearance="outlined">Outlined</wa-button>
          <wa-button variant="warning" appearance="plain">Plain</wa-button>
@@ -195,7 +195,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button class="wa-warning" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-warning" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button class="wa-warning" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button class="wa-warning" appearance="filled">Filled</wa-button>
          <wa-button class="wa-warning" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-warning" appearance="plain">Plain</wa-button>
@@ -207,7 +207,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button variant="danger" appearance="accent">Accent</wa-button>
-          <wa-button variant="danger" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button variant="danger" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button variant="danger" appearance="filled">Filled</wa-button>
          <wa-button variant="danger" appearance="outlined">Outlined</wa-button>
          <wa-button variant="danger" appearance="plain">Plain</wa-button>
@@ -216,7 +216,7 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-button class="wa-danger" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-danger" appearance="filled-outlined">Filled-Outlined</wa-button>
+          <wa-button class="wa-danger" appearance="filled outlined">Filled + Outlined</wa-button>
          <wa-button class="wa-danger" appearance="filled">Filled</wa-button>
          <wa-button class="wa-danger" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-danger" appearance="plain">Plain</wa-button>
@@ -246,9 +246,9 @@
            <wa-icon slot="icon" name="circle-star"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="brand" appearance="filled-outlined">
+          <wa-callout variant="brand" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout variant="brand" appearance="filled">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
@@ -270,9 +270,9 @@
            <wa-icon slot="icon" name="circle-star"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-brand" appearance="filled-outlined">
+          <wa-callout class="wa-brand" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout class="wa-brand" appearance="filled">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
@@ -297,9 +297,9 @@
            <wa-icon slot="icon" name="circle-info"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="neutral" appearance="filled-outlined">
+          <wa-callout variant="neutral" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout variant="neutral" appearance="filled">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
@@ -321,9 +321,9 @@
            <wa-icon slot="icon" name="circle-info"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-neutral" appearance="filled-outlined">
+          <wa-callout class="wa-neutral" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout class="wa-neutral" appearance="filled">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
@@ -348,9 +348,9 @@
            <wa-icon slot="icon" name="circle-check"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="success" appearance="filled-outlined">
+          <wa-callout variant="success" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout variant="success" appearance="filled">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
@@ -372,9 +372,9 @@
            <wa-icon slot="icon" name="circle-check"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-success" appearance="filled-outlined">
+          <wa-callout class="wa-success" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout class="wa-success" appearance="filled">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
@@ -399,9 +399,9 @@
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="warning" appearance="filled-outlined">
+          <wa-callout variant="warning" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout variant="warning" appearance="filled">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
@@ -423,9 +423,9 @@
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-warning" appearance="filled-outlined">
+          <wa-callout class="wa-warning" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout class="wa-warning" appearance="filled">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
@@ -450,9 +450,9 @@
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="danger" appearance="filled-outlined">
+          <wa-callout variant="danger" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout variant="danger" appearance="filled">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
@@ -474,9 +474,9 @@
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-danger" appearance="filled-outlined">
+          <wa-callout class="wa-danger" appearance="filled outlined">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
-            Filled-Outlined
+            Filled + Outlined
          </wa-callout>
          <wa-callout class="wa-danger" appearance="filled">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
@@ -513,17 +513,19 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag variant="brand" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="brand" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag variant="brand" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag variant="brand" appearance="filled">Filled</wa-tag>
          <wa-tag variant="brand" appearance="outlined">Outlined</wa-tag>
+          <wa-tag variant="brand" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag class="wa-brand" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-brand" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag class="wa-brand" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag class="wa-brand" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-brand" appearance="outlined">Outlined</wa-tag>
+          <wa-tag class="wa-brand" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
@@ -532,17 +534,19 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag variant="neutral" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="neutral" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag variant="neutral" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag variant="neutral" appearance="filled">Filled</wa-tag>
          <wa-tag variant="neutral" appearance="outlined">Outlined</wa-tag>
+          <wa-tag variant="neutral" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag class="wa-neutral" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-neutral" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag class="wa-neutral" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag class="wa-neutral" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-neutral" appearance="outlined">Outlined</wa-tag>
+          <wa-tag class="wa-neutral" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
@@ -551,17 +555,19 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag variant="success" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="success" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag variant="success" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag variant="success" appearance="filled">Filled</wa-tag>
          <wa-tag variant="success" appearance="outlined">Outlined</wa-tag>
+          <wa-tag variant="success" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag class="wa-success" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-success" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag class="wa-success" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag class="wa-success" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-success" appearance="outlined">Outlined</wa-tag>
+          <wa-tag class="wa-success" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
@@ -570,17 +576,19 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag variant="warning" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="warning" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag variant="warning" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag variant="warning" appearance="filled">Filled</wa-tag>
          <wa-tag variant="warning" appearance="outlined">Outlined</wa-tag>
+          <wa-tag variant="warning" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag class="wa-warning" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-warning" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag class="wa-warning" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag class="wa-warning" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-warning" appearance="outlined">Outlined</wa-tag>
+          <wa-tag class="wa-warning" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
@@ -589,17 +597,19 @@
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag variant="danger" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="danger" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag variant="danger" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag variant="danger" appearance="filled">Filled</wa-tag>
          <wa-tag variant="danger" appearance="outlined">Outlined</wa-tag>
+          <wa-tag variant="danger" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
          <wa-tag class="wa-danger" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-danger" appearance="filled-outlined">Filled-Outlined</wa-tag>
+          <wa-tag class="wa-danger" appearance="filled outlined">Filled + Outlined</wa-tag>
          <wa-tag class="wa-danger" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-danger" appearance="outlined">Outlined</wa-tag>
+          <wa-tag class="wa-danger" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
--- a/packages/webawesome/docs/_includes/visual-tests/native.njk
+++ b/packages/webawesome/docs/_includes/visual-tests/native.njk
@@ -39,14 +39,14 @@
      </td>
    </tr>
    <tr>
-      <th><code>filled-outlined</code></th>
+      <th><code>filled</code> + <code>outlined</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button variant="brand" appearance="filled-outlined">Brand</wa-button>
-          <wa-button variant="neutral" appearance="filled-outlined">Neutral</wa-button>
-          <wa-button variant="success" appearance="filled-outlined">Success</wa-button>
-          <wa-button variant="warning" appearance="filled-outlined">Warning</wa-button>
-          <wa-button variant="danger" appearance="filled-outlined">Danger</wa-button>
+          <wa-button variant="brand" appearance="filled outlined">Brand</wa-button>
+          <wa-button variant="neutral" appearance="filled outlined">Neutral</wa-button>
+          <wa-button variant="success" appearance="filled outlined">Success</wa-button>
+          <wa-button variant="warning" appearance="filled outlined">Warning</wa-button>
+          <wa-button variant="danger" appearance="filled outlined">Danger</wa-button>
        </div>
      </td>
      <td>
@@ -429,7 +429,7 @@
        </wa-select>
      </td>
      <td>
-        <label>Select
+        <label>Select 
          <select value="1">
            <option value="1">Option</option>
          </select>
@@ -444,7 +444,7 @@
        </wa-select>
      </td>
      <td>
-        <label>Select (filled)
+        <label>Select (filled) 
          <select class="wa-filled" value="1">
            <option value="1">Option</option>
          </select>
@@ -459,7 +459,7 @@
        </wa-select>
      </td>
      <td>
-        <label class="wa-size-s">Select (small)
+        <label class="wa-size-s">Select (small) 
          <select value="1">
            <option value="1">Option</option>
          </select>
@@ -474,7 +474,7 @@
        </wa-select>
      </td>
      <td>
-        <label class="wa-size-m">Select (medium)
+        <label class="wa-size-m">Select (medium) 
          <select value="1">
            <option value="1">Option</option>
          </select>
@@ -489,7 +489,7 @@
        </wa-select>
      </td>
      <td>
-        <label class="wa-size-l">Select (large)
+        <label class="wa-size-l">Select (large) 
          <select value="1">
            <option value="1">Option</option>
          </select>
@@ -582,4 +582,4 @@
    </tr>
  </tbody>
 </table>
-</div>
+</div>
--- a/packages/webawesome/docs/_layouts/blank.njk
+++ b/packages/webawesome/docs/_layouts/blank.njk
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" data-fa-kit-code="38c11e3f20" data-version="{{ package.version }}">
+<html lang="en" data-fa-kit-code="38c11e3f20" data-cdn-url="{% cdnUrl %}">
  <head>
    {% include 'head.njk' %}
    {% block head %}{% endblock %}
--- a/packages/webawesome/docs/_layouts/component.njk
+++ b/packages/webawesome/docs/_layouts/component.njk
@@ -8,13 +8,10 @@
    <wa-badge variant="neutral">Since {{ component.since }}</wa-badge>
    <wa-badge
      {% if component.status == 'stable' %}variant="brand"{% endif %}
-      {% if component.status == 'experimental' %}variant="warning" appearance="filled"{% endif %}
+      {% if component.status == 'experimental' %}variant="warning"{% endif %}
    >
      {{ component.status }}
    </wa-badge>
-    {% if isProComponent %}
-      <wa-badge class="pro">Pro</wa-badge>
-    {% endif %}
  </div>
  <p class="component-summary">
    {{ component.summary | inlineMarkdown | safe }}
@@ -23,37 +20,6 @@

 {# Component API #}
 {% block afterContent %}
-  {# Importing #}
-  <h2>Importing</h2>
-  <p>
-    Autoloading components via <a href="/docs/#using-a-project">projects</a> is the recommended way to import components. If you prefer to do it manually, use one of the following code snippets.
-  </p>
-
-  {% set componentName = component.tagName | stripPrefix %}
-  {% set componentPath = ["components/", componentName, "/", componentName, ".js"] | join("") %}
-  <wa-tab-group label="How would you like to import this component?">
-    <wa-tab panel="cdn">CDN</wa-tab>
-    <wa-tab panel="npm">npm</wa-tab>
-    <wa-tab panel="react">React</wa-tab>
-    <wa-tab-panel name="cdn">
-      <p>
-        Let your project code do the work! <a href="/signup">Sign up for free</a> to use a project with your very own CDN &mdash; it's the fastest and easiest way to use Web Awesome.
-      </p>
-    </wa-tab-panel>
-    <wa-tab-panel name="npm">
-      <p>
-        To manually import this component from NPM, use the following code.
-      </p>
-      <pre><code class="language-js">import '@awesome.me/webawesome/dist/{{ componentPath }}';</code></pre>
-    </wa-tab-panel>
-    <wa-tab-panel name="react">
-      <p>
-        To manually import this component from React, use the following code.
-      </p>
-      <pre><code class="language-js">import {{ component.name }} from '@awesome.me/webawesome/dist/react/{{ componentName }}';</code></pre>
-    </wa-tab-panel>
-  </wa-tab-group>
-
  {# Slots #}
  {% if component.slots.length %}
    <h2>Slots</h2>
@@ -245,12 +211,7 @@
            <tr>
              <td class="table-name"><code>{{ state.name }}</code></td>
              <td class="table-description">{{ state.description | inlineMarkdown | safe }}</td>
-              <td class="table-selector">
-                <span class="wa-cluster wa-gap-3xs">
-                  <code>:state({{ state.name }})</code>
-                  <wa-copy-button value=":state({{ state.name }})"></wa-copy-button>
-                </span>
-              </td>
+              <td class="table-selector"><code>:state({{ state.name }})</code></td>
            </tr>
          {% endfor %}
        </tbody>
@@ -269,7 +230,6 @@
          <tr>
            <th class="table-name">Name</th>
            <th class="table-description">Description</th>
-            <th class="table-selector">CSS selector</th>
          </tr>
        </thead>
        <tbody>
@@ -277,12 +237,6 @@
            <tr>
              <td class="table-name"><code>{{ cssPart.name }}</code></td>
              <td class="table-description">{{ cssPart.description | inlineMarkdown | safe }}</td>
-              <td class="table-selector">
-                <span class="wa-cluster wa-gap-3xs">
-                  <code>::part({{ cssPart.name }})</code>
-                  <wa-copy-button value="::part({{ cssPart.name }})"></wa-copy-button>
-                </span>
-              </td>
            </tr>
          {% endfor %}
        </tbody>
@@ -304,16 +258,50 @@
    </ul>
  {% endif %}

+  {# Importing #}
+  <h2>Importing</h2>
+  <p>
+    The <a href="/docs/#quick-start-autoloading-via-cdn">autoloader</a> is the recommended way to import components. If you prefer to do it manually, use one of the following code snippets.
+  </p>
+
+
+  {% set componentName = component.tagName | stripPrefix %}
+  {% set componentPath = ["components/", componentName, "/", componentName, ".js"] | join("") %}
+  <wa-tab-group label="How would you like to import this component?">
+    <wa-tab panel="cdn">CDN</wa-tab>
+    <wa-tab panel="npm">npm</wa-tab>
+    <wa-tab panel="react">React</wa-tab>
+    <wa-tab-panel name="cdn">
+      <p>
+        To manually import this component from the CDN, use the following code.
+      </p>
+
+      <pre><code class="language-js">import '{% cdnUrl componentPath %}';</code></pre>
+    </wa-tab-panel>
+    <wa-tab-panel name="npm">
+      <p>
+        To manually import this component from NPM, use the following code.
+      </p>
+      <pre><code class="language-js">import '@awesome.me/webawesome/dist/{{ componentPath }}';</code></pre>
+    </wa-tab-panel>
+    <wa-tab-panel name="react">
+      <p>
+        To manually import this component from React, use the following code.
+      </p>
+      <pre><code class="language-js">import {{ component.name }} from '@awesome.me/webawesome/dist/react/{{ componentName }}';</code></pre>
+    </wa-tab-panel>
+  </wa-tab-group>
+
  <wa-divider></wa-divider>

  <div class="component-help">
    <strong>Need a hand?</strong>
    <wa-button size="small" appearance="filled" variant="neutral" href="https://github.com/shoelace-style/webawesome/issues" target="_blank">
-      <wa-icon slot="start" variant="regular" name="bug"></wa-icon>
+      <wa-icon slot="prefix" name="bug"></wa-icon>
      Report a bug
    </wa-button>
    <wa-button size="small" appearance="filled" variant="neutral" href="https://github.com/shoelace-style/webawesome/discussions" target="_blank">
-      <wa-icon slot="start" variant="regular" name="message-question"></wa-icon>
+      <wa-icon slot="prefix" name="message-question"></wa-icon>
      Ask for help
    </wa-button>
  </div>
--- a/packages/webawesome/docs/_transformers/anchor-headings.js
+++ b/packages/webawesome/docs/_transformers/anchor-headings.js
@@ -35,23 +35,9 @@ export function anchorHeadingsTransformer(options = {}) {
      return doc;
    }

-    // Check if the document or container has data-no-anchor (view-level)
-    const hasNoAnchorOnDocument = doc.querySelector('html')?.hasAttribute('data-no-anchor') || false;
-    const hasNoAnchorOnContainer = container.closest('[data-no-anchor]') !== null;
-
-    // If view-level data-no-anchor is set, skip processing all headings
-    if (hasNoAnchorOnDocument || hasNoAnchorOnContainer) {
-      return doc;
-    }
-
-    // Look for headings (selector excludes headings with data-no-anchor attribute)
-    let selector = `:is(${options.headingSelector}):not([data-no-anchor])`;
+    // Look for headings
+    let selector = `:is(${options.headingSelector}):not([data-no-anchor], [data-no-anchor] *)`;
    container.querySelectorAll(selector).forEach(heading => {
-      // Skip if heading is a descendant of an element with data-no-anchor
-      // (selector already excludes headings with the attribute directly)
-      if (heading.closest('[data-no-anchor]') !== null) {
-        return;
-      }
      const hasAnchor = heading.querySelector('a');
      const existingId = heading.getAttribute('id');
      const clone = parse(heading.outerHTML);
@@ -79,7 +65,7 @@ export function anchorHeadingsTransformer(options = {}) {
      const anchor = parse(`
        <a href="#${encodeURIComponent(id)}">
          <span class="wa-visually-hidden"></span>
-          <wa-icon variant="regular" name="hashtag" class="icon-shrink"></wa-icon>
+          <span aria-hidden="true">#</span>
        </a>
      `);
      anchor.querySelector('.wa-visually-hidden').textContent = options.anchorLabel;
--- a/packages/webawesome/docs/_utils/simulate-webawesome-app.js
+++ b/packages/webawesome/docs/_utils/simulate-webawesome-app.js
@@ -1,20 +1,10 @@
-import * as path from 'node:path';
 import nunjucks from 'nunjucks';

-const baseDir = process.env.BASE_DIR || 'docs';
-
-const views = [path.join(baseDir), path.join(baseDir, '_layouts'), path.join(baseDir, '_includes')];
-
-const nunjucksEnv = new nunjucks.Environment(new nunjucks.FileSystemLoader(views), {
-  autoescape: true,
-  noCache: process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test',
-});
-
 /**
 * This function simulates what a server would do running "on top" of eleventy.
 */
 export function SimulateWebAwesomeApp(str) {
-  return nunjucksEnv.renderString(str, {
+  return nunjucks.renderString(str, {
    // Stub the server EJS shortcodes.
    currentUser: {
      hasPro: false,
--- a/packages/webawesome/docs/assets/images/app-icons/app-icon-192x192.png
+++ b/packages/webawesome/docs/assets/images/app-icons/app-icon-192x192.png
--- a/packages/webawesome/docs/assets/images/app-icons/app-icon-512x512.png
+++ b/packages/webawesome/docs/assets/images/app-icons/app-icon-512x512.png
--- a/packages/webawesome/docs/assets/images/app-icons/app-icon.svg
+++ b/packages/webawesome/docs/assets/images/app-icons/app-icon.svg
@@ -1 +0,0 @@
-<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m18.608 5.8c0 1.04658-.6184 1.94874-1.5097 2.36103l5.3017 4.63897 5.2196-1.0439c-.2647-.3858-.4196-.8529-.4196-1.3561 0-1.32548 1.0745-2.4 2.4-2.4s2.4 1.07452 2.4 2.4c0 1.3085-1.0471 2.3724-2.3491 2.3995l-5.7878 12.3578c-.5267 1.1245-1.6562 1.8427-2.8979 1.8427h-9.9303c-1.2417 0-2.37129-.7182-2.89794-1.8427l-5.78784-12.3578c-1.30199-.0271-2.34912-1.091-2.34912-2.3995 0-1.32548 1.07452-2.4 2.4-2.4s2.4 1.07452 2.4 2.4c0 .5032-.15488.9703-.41957 1.3561l5.21957 1.0439 5.3072-4.64383c-.8857-.4145-1.4992-1.31368-1.4992-2.35617 0-1.43594 1.1641-2.6 2.6-2.6s2.6 1.16406 2.6 2.6z" fill="#f36944" fill-rule="evenodd"/></svg>
--- a/packages/webawesome/docs/assets/images/app-icons/apple-touch-icon.png
+++ b/packages/webawesome/docs/assets/images/app-icons/apple-touch-icon.png
--- a/packages/webawesome/docs/assets/images/app-icons/favicon.ico
+++ b/packages/webawesome/docs/assets/images/app-icons/favicon.ico
--- a/packages/webawesome/docs/assets/images/app-icons/icon.svg
+++ b/packages/webawesome/docs/assets/images/app-icons/icon.svg
@@ -1 +0,0 @@
-<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m18.608 5.8c0 1.04658-.6184 1.94874-1.5097 2.36103l5.3017 4.63897 5.2196-1.0439c-.2647-.3858-.4196-.8529-.4196-1.3561 0-1.32548 1.0745-2.4 2.4-2.4s2.4 1.07452 2.4 2.4c0 1.3085-1.0471 2.3724-2.3491 2.3995l-5.7878 12.3578c-.5267 1.1245-1.6562 1.8427-2.8979 1.8427h-9.9303c-1.2417 0-2.37129-.7182-2.89794-1.8427l-5.78784-12.3578c-1.30199-.0271-2.34912-1.091-2.34912-2.3995 0-1.32548 1.07452-2.4 2.4-2.4s2.4 1.07452 2.4 2.4c0 .5032-.15488.9703-.41957 1.3561l5.21957 1.0439 5.3072-4.64383c-.8857-.4145-1.4992-1.31368-1.4992-2.35617 0-1.43594 1.1641-2.6 2.6-2.6s2.6 1.16406 2.6 2.6z" fill="#f36944" fill-rule="evenodd"/></svg>
--- a/packages/webawesome/docs/assets/images/bg-wa-pattern.svg
+++ b/packages/webawesome/docs/assets/images/bg-wa-pattern.svg
--- a/packages/webawesome/docs/assets/images/open-graph/default.png
+++ b/packages/webawesome/docs/assets/images/open-graph/default.png
--- a/packages/webawesome/docs/assets/images/web-awesome-mark-black.svg
+++ b/packages/webawesome/docs/assets/images/web-awesome-mark-black.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.63 3.625C11.63 4.27911 11.2435 4.84296 10.6865 5.10064L14 8L17.2622 7.34755C17.0968 7.10642 17 6.81452 17 6.5C17 5.67157 17.6716 5 18.5 5C19.3284 5 20 5.67157 20 6.5C20 7.31157 19.3555 7.9726 18.5504 7.99917L15.0307 15.8207C14.7077 16.5384 13.9939 17 13.2068 17H6.79317C6.00615 17 5.29229 16.5384 4.96933 15.8207L1.44963 7.99917C0.64452 7.9726 0 7.31157 0 6.5C0 5.67157 0.671573 5 1.5 5C2.32843 5 3 5.67157 3 6.5C3 6.81452 2.9032 7.10642 2.73777 7.34755L6 8L9.31702 5.09761C8.76346 4.83855 8.38 4.27656 8.38 3.625C8.38 2.72754 9.10754 2 10.005 2C10.9025 2 11.63 2.72754 11.63 3.625Z" fill="currentColor"/>
+</svg>
--- a/packages/webawesome/docs/assets/images/webawesome-logo.svg
+++ b/packages/webawesome/docs/assets/images/webawesome-logo.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="15" viewBox="0 0 20 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.63 1.625C11.63 2.27911 11.2435 2.84296 10.6865 3.10064L14 6L17.2622 5.34755C17.0968 5.10642 17 4.81452 17 4.5C17 3.67157 17.6716 3 18.5 3C19.3284 3 20 3.67157 20 4.5C20 5.31157 19.3555 5.9726 18.5504 5.99917L15.0307 13.8207C14.7077 14.5384 13.9939 15 13.2068 15H6.79317C6.00615 15 5.29229 14.5384 4.96933 13.8207L1.44963 5.99917C0.64452 5.9726 0 5.31157 0 4.5C0 3.67157 0.671573 3 1.5 3C2.32843 3 3 3.67157 3 4.5C3 4.81452 2.9032 5.10642 2.73777 5.34755L6 6L9.31702 3.09761C8.76346 2.83855 8.38 2.27656 8.38 1.625C8.38 0.727537 9.10754 0 10.005 0C10.9025 0 11.63 0.727537 11.63 1.625Z" fill="var(--wa-brand-orange, #f36944)"/>
+</svg>
--- a/packages/webawesome/docs/assets/images/webawesome-wordmark.svg
+++ b/packages/webawesome/docs/assets/images/webawesome-wordmark.svg
--- a/packages/webawesome/docs/assets/scripts/code-examples.js
+++ b/packages/webawesome/docs/assets/scripts/code-examples.js
@@ -1,6 +1,3 @@
-const version = document.documentElement.getAttribute('data-version') || '';
-const CDN_URL = `https://cdn.jsdelivr.net/npm/@awesome.me/webawesome@${version}/dist-cdn/`;
-
 //
 // Resizing previews
 //
@@ -57,9 +54,10 @@ document.addEventListener('click', event => {
  if (pen) {
    const codeExample = pen.closest('.code-example');
    const code = codeExample.querySelector('code');
+    const cdnUrl = document.documentElement.dataset.cdnUrl;
    const html =
-      `<script data-fa-kit-code="38c11e3f20" type="module" src="${CDN_URL}webawesome.loader.js"></script>\n` +
-      `<link rel="stylesheet" href="${CDN_URL}styles/webawesome.css">\n\n` +
+      `<script data-fa-kit-code="38c11e3f20" type="module" src="${cdnUrl}webawesome.loader.js"></script>\n` +
+      `<link rel="stylesheet" href="${cdnUrl}styles/webawesome.css">\n\n` +
      `${code.textContent}`;
    const css = 'html > body {\n  padding: 2rem !important;\n}';
    const js = '';
--- a/packages/webawesome/docs/assets/scripts/permalink.js
+++ b/packages/webawesome/docs/assets/scripts/permalink.js
@@ -0,0 +1,178 @@
+import { deepEach, deepGet, deepSet } from './util/deep.js';
+import { camelCase, kebabCase } from './util/string.js';
+
+export default class Permalink extends URLSearchParams {
+  /** Params changed since last URL I/O */
+  changed = false;
+
+  constructor(params) {
+    super(location.search);
+    this.params = params;
+  }
+
+  toJSON() {
+    return Object.fromEntries(this.entries());
+  }
+
+  /**
+   * Set multiple values from an object. Nested values will be joined with a hyphen.
+   * @param {object} values - The object containing the values to set.
+   * @param {object} defaults - The object containing the default values.
+   *
+   */
+  setAll(values, defaults) {
+    deepEach(values, (value, key, parent, path) => {
+      let fullPath = [...path, key];
+      let param = fullPath.map(kebabCase).join('-');
+
+      if (typeof value === 'object') {
+        // We'll handle this when we descend into it
+        return;
+      }
+
+      let defaultValue = deepGet(defaults, fullPath);
+
+      if (equals(value, defaultValue)) {
+        // Remove the param from the URL
+        this.delete(param);
+        return;
+      }
+
+      this.set(param, value);
+    });
+  }
+
+  /**
+   * Convert the URL params to a (potentially nested) object.
+   * @param {object} options - Options object.
+   * @param {(key: string, value: string) => string[]} options.getPath - Function to get the path of a param.
+   * @returns {object} The nested object.
+   */
+  toObject(options = {}) {
+    // Default getPath() assumes hyphens always mean nesting
+    let { ignoreKeys = [], getPath = param => param.split('-') } = options;
+
+    // Get all values as a nested object
+
+    let obj = {};
+
+    for (let [key, value] of this.entries()) {
+      let path = getPath(key, value);
+
+      if (path === null || ignoreKeys.includes(key)) {
+        // Skip this param
+        continue;
+      }
+
+      // Default to key if `getPath()` returns undefined
+      path ??= key;
+
+      path = Array.isArray(path) ? path : [path];
+
+      // Camel case any remaining hyphens
+      path = path.map(camelCase);
+
+      deepSet(obj, path, value);
+    }
+
+    return obj;
+  }
+
+  delete(key, value) {
+    let hadValue = this.has(key);
+    super.delete(key, value);
+
+    if (hadValue) {
+      this.changed = true;
+    }
+  }
+
+  set(key, value, defaultValue) {
+    if (equals(value, defaultValue) || equals(value, '')) {
+      value = null;
+    }
+
+    value ??= null; // undefined -> null
+
+    let oldValue = Array.isArray(value) ? this.getAll(key) : this.get(key);
+    let changed = !equals(value, oldValue);
+
+    if (!changed) {
+      // Nothing to do here
+      return;
+    }
+
+    if (Array.isArray(value)) {
+      super.delete(key);
+      value = value.slice();
+
+      for (let v of value) {
+        if (v || v === 0) {
+          if (typeof v === 'object') {
+            super.append(key, JSON.stringify(v));
+          } else {
+            super.append(key, v);
+          }
+        }
+      }
+    } else if (value === null) {
+      super.delete(key);
+    } else {
+      super.set(key, value);
+    }
+
+    this.sort();
+    this.changed ||= changed;
+  }
+
+  /**
+   * Update page URL if it has changed since last time
+   */
+  updateLocation() {
+    if (this.changed) {
+      // If there’s already a search, replace it.
+      // We don’t want to clog the user’s history while they iterate
+      let search = this.toString();
+      let historyAction = location.search && search ? 'replaceState' : 'pushState';
+      history[historyAction](null, '', `?${search}`);
+      this.changed = false;
+    }
+  }
+}
+
+function equals(value, oldValue) {
+  if (Array.isArray(value) || Array.isArray(oldValue)) {
+    value = toArray(value);
+    oldValue = toArray(oldValue);
+
+    if (value.length !== oldValue.length) {
+      return false;
+    }
+
+    return value.every((v, i) => equals(v, oldValue[i]));
+  }
+
+  // (value ?? oldValue ?? true) returns true if they're both empty (null or undefined)
+  [value, oldValue] = [value, oldValue].map(v => (!v && v !== false && v !== 0 ? null : v));
+  return value === oldValue || String(value) === String(oldValue);
+}
+
+/**
+ * Convert a value to an array. `undefined` and `null` values are converted to an empty array.
+ * @param {*} value - The value to convert.
+ * @returns {any[]} The converted array.
+ */
+function toArray(value) {
+  value ??= [];
+
+  if (Array.isArray(value)) {
+    return value;
+  }
+
+  // Don't convert "foo" into ["f", "o", "o"]
+  if (typeof value !== 'string' && typeof value[Symbol.iterator] === 'function') {
+    return Array.from(value);
+  }
+
+  return [value];
+}
--- a/packages/webawesome/docs/assets/scripts/scroll.js
+++ b/packages/webawesome/docs/assets/scripts/scroll.js
@@ -34,8 +34,7 @@ document.addEventListener('click', event => {
        top: target.offsetTop - headerHeight,
        behavior: 'smooth',
      });
-
-      history.replaceState(history.state, '', `#${id}`);
+      history.pushState(undefined, undefined, `#${id}`);
    }
  }
 });
--- a/packages/webawesome/docs/assets/scripts/search.js
+++ b/packages/webawesome/docs/assets/scripts/search.js
@@ -1,24 +1,11 @@
 // Search data
-const version = document.documentElement.getAttribute('data-version') || '';
-const res = await Promise.all([
-  import('https://cdn.jsdelivr.net/npm/lunr/+esm'),
-  fetch(`/search.json?v=${version}`),
-  import('/assets/scripts/track.js').catch(() => null),
-]);
+const res = await Promise.all([import('https://cdn.jsdelivr.net/npm/lunr/+esm'), fetch('/search.json')]);
 const lunr = res[0].default;
 const searchData = await res[1].json();
 const searchIndex = lunr.Index.load(searchData.searchIndex);
 const map = searchData.map;
 const searchDebounce = 200;
-const queryTrackDelay = 1000;
 let searchTimeout;
-let queryTrackTimeout;
-let lastTrackedQuery = '';
-let resultSelected = false;
-
-// Optional event tracking - works standalone if track.js isn't available
-const trackModule = res[2];
-const trackEvent = trackModule?.trackEvent || window.trackEvent || (() => {});

 // We're using Turbo, so references to these elements aren't guaranteed to remain intact
 function getElements() {
@@ -29,24 +16,6 @@ function getElements() {
  };
 }

-function trackQuerySubmit(query, resultSelectedValue) {
-  if (!query || query.length === 0) return;
-
-  const { results } = getElements();
-  if (!results) return;
-
-  const matches = results.querySelectorAll('li').length;
-  const truncatedQuery = query.length > 500 ? query.substring(0, 500) : query;
-
-  trackEvent('navigation:search_query_submit', {
-    query: truncatedQuery,
-    query_length: query.length,
-    result_count: matches,
-    has_results: matches > 0,
-    result_selected: resultSelectedValue,
-  });
-}
-
 // Show the search dialog when slash (or CMD+K) is pressed and focus is not inside a form element
 document.addEventListener('keydown', event => {
  if (
@@ -72,98 +41,40 @@ document.addEventListener('click', event => {

 function show() {
  const { dialog, input, results } = getElements();
-  if (!dialog || !input || !results) return;

-  const wasAlreadyOpen = dialog.open;
-
-  // Remove existing listeners before adding to prevent duplicates
-  input.removeEventListener('input', handleInput);
-  results.removeEventListener('click', handleSelection);
-  dialog.removeEventListener('keydown', handleKeyDown);
-  dialog.removeEventListener('wa-hide', handleClose);
-  resultSelected = false;
-  lastTrackedQuery = '';
  input.addEventListener('input', handleInput);
  results.addEventListener('click', handleSelection);
  dialog.addEventListener('keydown', handleKeyDown);
  dialog.addEventListener('wa-hide', handleClose);
  dialog.open = true;
-  if (!wasAlreadyOpen) {
-    trackEvent('navigation:search_dialog_open');
-  }
 }

-function cleanup() {
+function hide() {
  const { dialog, input, results } = getElements();
-  if (!dialog || !input || !results) return;
-  clearTimeout(searchTimeout);
-  clearTimeout(queryTrackTimeout);
+
  input.removeEventListener('input', handleInput);
  results.removeEventListener('click', handleSelection);
  dialog.removeEventListener('keydown', handleKeyDown);
  dialog.removeEventListener('wa-hide', handleClose);
-
-  // Reset state to prevent leakage between dialog sessions
-  resultSelected = false;
-  lastTrackedQuery = '';
+  dialog.open = false;
 }

-async function handleClose() {
-  const { dialog, input } = getElements();
-  if (!dialog || !input) return;
-  clearTimeout(queryTrackTimeout);
-  queryTrackTimeout = null;
-  dialog.removeEventListener('wa-hide', handleClose);
-  if (!resultSelected) {
-    const query = input.value.trim();
-    if (query.length > 0 && query !== lastTrackedQuery) {
-      trackQuerySubmit(query, false);
-      lastTrackedQuery = query;
-    }
-  }
+function handleClose() {
+  const { input } = getElements();

  input.value = '';
-  try {
-    await updateResults();
-  } catch (error) {
-    // Silently handle errors - UI cleanup should continue
-  }
-  cleanup();
-  trackEvent('navigation:search_dialog_close');
+  updateResults();
 }

 function handleInput() {
  const { input } = getElements();
-  if (!input) return;
+
  clearTimeout(searchTimeout);
-  clearTimeout(queryTrackTimeout);
-
-  const query = input.value.trim();
-
-  if (query.length === 0) {
-    lastTrackedQuery = '';
-  }
-
-  searchTimeout = setTimeout(async () => {
-    await updateResults(query);
-    if (query.length > 0 && query !== lastTrackedQuery) {
-      queryTrackTimeout = setTimeout(() => {
-        const { input: currentInput, results } = getElements();
-        if (!currentInput || resultSelected) return;
-
-        const currentQuery = currentInput.value.trim();
-        if (currentQuery === query && currentQuery !== lastTrackedQuery) {
-          trackQuerySubmit(currentQuery, false);
-          lastTrackedQuery = currentQuery;
-        }
-      }, queryTrackDelay);
-    }
-  }, searchDebounce);
+  searchTimeout = setTimeout(() => updateResults(input.value), searchDebounce);
 }

 function handleKeyDown(event) {
  const { input, results } = getElements();
-  if (!input || !results) return;

  // Handle keyboard selections
  if (['ArrowDown', 'ArrowUp', 'Home', 'End', 'Enter'].includes(event.key)) {
@@ -192,12 +103,7 @@ function handleKeyDown(event) {
        nextEl = items[items.length - 1];
        break;
      case 'Enter':
-        if (currentEl) {
-          const link = currentEl.querySelector('a');
-          if (link) {
-            selectResult(link, 'keyboard_enter');
-          }
-        }
+        currentEl?.querySelector('a')?.click();
        break;
    }

@@ -214,62 +120,27 @@ function handleKeyDown(event) {
  }
 }

-function selectResult(link, selectionMethod) {
-  const { input, results } = getElements();
-  if (!input || !link) return;
-
-  // Clear pending query tracking timeout to prevent duplicate events
-  clearTimeout(queryTrackTimeout);
-  queryTrackTimeout = null;
-  resultSelected = true; // Set immediately so timeout callback (if executing) sees it
-
-  const query = input.value.trim();
-  if (!link.dataset.searchResultIndex) return;
-  const resultIndex = parseInt(link.dataset.searchResultIndex, 10);
-  if (isNaN(resultIndex) || resultIndex < 1) return;
-
-  const resultUrl = link.dataset.searchResultUrl || link.getAttribute('href');
-  if (!resultUrl) return;
-  lastTrackedQuery = query;
-  trackQuerySubmit(query, true);
-  trackEvent('navigation:search_result_click', {
-    query,
-    result_index: resultIndex,
-    result_url: resultUrl,
-    selection_method: selectionMethod,
-  });
-
-  const { dialog } = getElements();
-  if (dialog) {
-    dialog.removeEventListener('wa-hide', handleClose);
-    cleanup();
-    trackEvent('navigation:search_dialog_close');
-    dialog.open = false;
-  }
-
-  if (window.Turbo) {
-    Turbo.visit(resultUrl);
-  } else {
-    location.href = resultUrl;
-  }
-}
-
 function handleSelection(event) {
  const link = event.target.closest('a');

  if (link) {
    event.preventDefault();
-    selectResult(link, 'mouse_click');
+    hide();
+
+    if (window.Turbo) {
+      Turbo.visit(link.href);
+    } else {
+      location.href = link.href;
+    }
  }
 }

 // Queries the search index and updates the results
 async function updateResults(query = '') {
  const { dialog, input, results } = getElements();
-  if (!dialog || !input || !results) return;
+
  try {
-    const trimmedQuery = query.trim();
-    const hasQuery = trimmedQuery.length > 0;
+    const hasQuery = query.length > 0;
    let matches = [];

    if (hasQuery) {
@@ -277,13 +148,13 @@ async function updateResults(query = '') {
      const seenRefs = new Set();

      // Start with a standard search to get the best "exact match" result
-      searchIndex.search(`${trimmedQuery}`).forEach(match => {
+      searchIndex.search(`${query}`).forEach(match => {
        matches.push(match);
        seenRefs.add(match.ref);
      });

      // Add wildcard matches if not already included
-      searchIndex.search(`${trimmedQuery}*`).forEach(match => {
+      searchIndex.search(`${query}*`).forEach(match => {
        if (!seenRefs.has(match.ref)) {
          matches.push(match);
          seenRefs.add(match.ref);
@@ -291,10 +162,11 @@ async function updateResults(query = '') {
      });

      // Add fuzzy search matches last
-      const fuzzyTokens = trimmedQuery
+      const fuzzyTokens = query
        .split(' ')
        .map(term => `${term}~1`)
        .join(' ');
+
      searchIndex.search(fuzzyTokens).forEach(match => {
        if (!seenRefs.has(match.ref)) {
          matches.push(match);
@@ -307,12 +179,12 @@ async function updateResults(query = '') {

    dialog.classList.toggle('has-results', hasQuery && hasResults);
    dialog.classList.toggle('no-results', hasQuery && !hasResults);
+
    input.setAttribute('aria-activedescendant', '');
    results.innerHTML = '';
+
    matches.forEach((match, index) => {
      const page = map[match.ref];
-      if (!page || !page.url) return;
-
      const li = document.createElement('li');
      const a = document.createElement('a');
      const displayTitle = page.title ?? '';
@@ -324,10 +196,12 @@ async function updateResults(query = '') {
      li.setAttribute('role', 'option');
      li.setAttribute('id', `search-result-item-${match.ref}`);
      li.setAttribute('data-selected', index === 0 ? 'true' : 'false');
+
      if (page.url === '/') icon = 'home';
      if (page.url.startsWith('/docs/utilities/native')) icon = 'code';
      if (page.url.startsWith('/docs/components')) icon = 'puzzle-piece';
      if (page.url.startsWith('/docs/theme') || page.url.startsWith('/docs/restyle')) icon = 'palette';
+
      a.href = page.url;
      a.innerHTML = `
        <div class="site-search-result-icon" aria-hidden="true">
@@ -343,9 +217,6 @@ async function updateResults(query = '') {
      a.querySelector('.site-search-result-description').textContent = displayDescription;
      a.querySelector('.site-search-result-url').textContent = displayUrl;

-      // Use 1-based indexing for analytics
-      a.dataset.searchResultIndex = (index + 1).toString();
-      a.dataset.searchResultUrl = page.url;
      li.appendChild(a);
      results.appendChild(li);
    });
--- a/packages/webawesome/docs/assets/scripts/theme.js
+++ b/packages/webawesome/docs/assets/scripts/theme.js
@@ -38,7 +38,7 @@ async function updateTheme(value, isInitialLoad = false) {
  // Handle site theme vs regular theme
  let href = `/dist/styles/themes/${value}.css`;

-  if (document.querySelector('wa-page')?.dataset.pageType === 'site') {
+  if (document.querySelector('wa-page').dataset.pageType === 'site') {
    brand = 'orange';
    href = `/assets/styles/theme-site.css`;
    palette = 'default';
--- a/packages/webawesome/docs/assets/styles/code-highlighter.css
+++ b/packages/webawesome/docs/assets/styles/code-highlighter.css
@@ -2,25 +2,22 @@
 pre[id*='code-block-'] {
  color-scheme: dark;
  color: white;
-  background-color: var(--code-background, var(--wa-color-neutral-20));
+  background-color: var(--wa-color-neutral-20);

  /* Ensures a discernible background color in dark mode
   * Useful for themes that use gray-20 as --wa-color-surface-default  */
  .wa-dark & {
-    background-color: var(--code-background-dark, var(--wa-color-surface-lowered));
+    background-color: var(--wa-color-surface-lowered);
  }
 }

 .code-comment,
 .code-prolog,
 .code-doctype,
-.code-cdata {
-  color: var(--code-comment, var(--wa-color-gray-70));
-}
-
+.code-cdata,
 .code-operator,
 .code-punctuation {
-  color: var(--code-operator, var(--wa-color-gray-70));
+  color: var(--wa-color-gray-70);
 }

 .code-namespace {
@@ -31,27 +28,24 @@ pre[id*='code-block-'] {
 .code-keyword,
 .code-tag,
 .code-url {
-  color: var(--code-keyword, var(--wa-color-indigo-70));
+  color: var(--wa-color-indigo-70);
 }

 .code-symbol,
 .code-deleted,
 .code-important {
-  color: var(--code-error, var(--wa-color-red-70));
-}
-
-.code-string,
-.code-char,
-.code-constant {
-  color: var(--code-string, var(--wa-color-green-70));
+  color: var(--wa-color-red-70);
 }

 .code-boolean,
+.code-constant,
 .code-selector,
 .code-attr-name,
+.code-string,
+.code-char,
 .code-builtin,
 .code-inserted {
-  color: var(--code-literal, var(--wa-color-green-70));
+  color: var(--wa-color-green-70);
 }

 .code-atrule,
@@ -61,7 +55,7 @@ pre[id*='code-block-'] {
 .code-function,
 .code-class-name,
 .code-regex {
-  color: var(--code-value, var(--wa-color-blue-70));
+  color: var(--wa-color-blue-70);
 }

 .code-important,
--- a/packages/webawesome/docs/assets/styles/copy-code.css
+++ b/packages/webawesome/docs/assets/styles/copy-code.css
@@ -15,25 +15,24 @@ pre[id*='code-block-']:has(code) {
 }

 wa-copy-button.copy-button {
+  --background-color: var(--wa-color-gray-20);
+  --background-color-hover: color-mix(in oklab, var(--background-color), white 5%);
  position: absolute;
-  top: 0.5rem;
-  right: 0.5rem;
+  top: 0.25rem;
+  right: 0.25rem;
  font-family: var(--wa-font-family-body);
-  font-size: var(--wa-font-size-m);
-  color: white;
+  color: var(--wa-color-gray-80);
  border-radius: var(--wa-border-radius-m);
+  padding: 0.25rem;

  &::part(button) {
-    aspect-ratio: 1;
-    background-color: var(--wa-color-neutral-20);
+    background: transparent;
    cursor: copy;
  }

  @media (hover: hover) {
    &:hover {
-      &::part(button) {
-        background-color: var(--wa-color-neutral-30);
-      }
+      color: white;
    }
  }

--- a/packages/webawesome/docs/assets/styles/docs.css
+++ b/packages/webawesome/docs/assets/styles/docs.css
@@ -27,61 +27,6 @@ body.theme-transitioning {
  transition: opacity 200ms ease-out;
 }

-/* banner */
-wa-page > [slot='banner'] {
-  padding: var(--wa-space-0);
-
-  .banner-content {
-    /* match docs header padding-inline by default */
-    padding-inline: var(--wa-space-xl);
-    padding-block: var(--wa-space-m);
-  }
-
-  &.banner-wa-launch {
-    /* custom brand colors carried over from theme-site for the banner */
-    --wa-color-brand-95: #fef0ec;
-    --wa-color-brand-90: #fce0d8;
-    --wa-color-brand-80: #f8bcac;
-    --wa-color-brand-70: #fa9378;
-    --wa-color-brand-60: #f46a45;
-    --wa-color-brand-50: #cb4b27;
-    --wa-color-brand-40: #9d371a;
-    --wa-color-brand-30: #7c2a13;
-    --wa-color-brand-20: #5d1d0b;
-    --wa-color-brand-10: #3b0f05;
-    --wa-color-brand-05: #270802;
-    --wa-color-brand: var(--wa-color-brand-60);
-    --wa-color-brand-on: var(--wa-color-brand-10);
-
-    .banner-icon {
-      color: var(--wa-color-brand-fill-loud);
-      font-size: var(--wa-font-size-xl);
-    }
-
-    .appearance-underlined.variant-drawn {
-      --underline-color: var(--wa-color-brand);
-    }
-  }
-}
-
-/* Site-Wide Dialog */
-#dialog-site {
-  /* custom brand colors carrried over from theme-site for the banner */
-  --wa-color-brand-95: #fef0ec;
-  --wa-color-brand-90: #fce0d8;
-  --wa-color-brand-80: #f8bcac;
-  --wa-color-brand-70: #fa9378;
-  --wa-color-brand-60: #f46a45;
-  --wa-color-brand-50: #cb4b27;
-  --wa-color-brand-40: #9d371a;
-  --wa-color-brand-30: #7c2a13;
-  --wa-color-brand-20: #5d1d0b;
-  --wa-color-brand-10: #3b0f05;
-  --wa-color-brand-05: #270802;
-  --wa-color-brand: var(--wa-color-brand-60);
-  --wa-color-brand-on: var(--wa-color-brand-10);
-}
-
 /* Header */
 wa-page::part(header) {
  background-color: var(--wa-color-surface-default);
@@ -260,12 +205,6 @@ wa-page > header {
      }
    }
  }
-
-  #version-icon-info {
-    --secondary-opacity: 1;
-    --secondary-color: var(--wa-brand-orange);
-    padding-inline: var(--wa-space-xs);
-  }
 }

 wa-button.delete {
@@ -307,9 +246,8 @@ wa-button.delete {
  padding-bottom: 1rem;
 }

-wa-page::part(drawer__dialog),
 wa-page::part(menu) {
-  overflow: clip;
+  scrollbar-width: thin;
 }

 /* smaller viewports-based navigation */
@@ -369,6 +307,26 @@ h1.title {
  }
 }

+/* Anchor headings */
+.anchor-heading a {
+  visibility: hidden;
+  text-decoration: none;
+}
+
+@media (hover: hover) {
+  .anchor-heading:hover a {
+    visibility: visible;
+    padding: 0 0.125em;
+  }
+}
+
+@media print {
+  /* Show URLs for printed links */
+  a:not(.anchor-heading)[href]::after {
+    content: ' (' attr(href) ')';
+  }
+}
+
 /* Callouts */
 .callout {
  display: flex;
@@ -422,27 +380,6 @@ h1.title {
  }
 }

-/* Images & Figures */
-
-figure.signpost {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: flex-start;
-  gap: var(--wa-space-s);
-
-  img {
-    border: var(--wa-border-style) var(--wa-border-width-m) var(--wa-color-surface-border);
-  }
-
-  figcaption {
-    color: var(--wa-color-text-quiet);
-    font-size: var(--wa-font-size-xs);
-    line-height: var(--wa-line-height-condensed);
-    text-align: center;
-  }
-}
-
 /* Search list pages */
 wa-page > main:has(> .search-list) {
  max-width: var(--content-width-l);
@@ -663,10 +600,6 @@ wa-scroller:has(.component-table) {
    min-width: var(--line-length-xs);
  }

-  .table-selector .wa-cluster {
-    flex-wrap: nowrap;
-  }
-
  .table-reflect {
    text-align: center;
  }
--- a/packages/webawesome/docs/assets/styles/search.css
+++ b/packages/webawesome/docs/assets/styles/search.css
@@ -5,6 +5,7 @@
  border-radius: var(--wa-border-radius-l);
  padding: 0;
  margin: 0 auto;
+  overflow: hidden;

  &::part(dialog) {
    margin-block-start: 10vh;
--- a/packages/webawesome/docs/assets/styles/utils.css
+++ b/packages/webawesome/docs/assets/styles/utils.css
@@ -70,8 +70,9 @@
  /* #region shared UI */
  /* pro badge */
  wa-badge.pro {
-    color: var(--wa-color-brand-on-loud);
+    color: white;
    background-color: var(--wa-brand-orange);
+    border-color: var(--wa-brand-orange);

    + wa-tooltip {
      font-size: var(--wa-font-size-xs);
@@ -79,14 +80,6 @@
    }
  }

-  /* free badge */
-  wa-badge.free {
-    + wa-tooltip {
-      font-size: var(--wa-font-size-xs);
-      --max-width: unset;
-    }
-  }
-
  /* planned badge */
  wa-badge.planned {
    background-color: var(--wa-color-neutral-fill-quiet);
@@ -116,148 +109,9 @@
    line-height: var(--wa-form-control-value-line-height);
    padding-inline: 0.33em;
  }
-
-  /* step icons for ordered instructions */
-  .step-icon {
-    --primary-color: var(--wa-color-neutral-20);
-    --secondary-color: var(--wa-color-neutral-80);
-    --secondary-opacity: 1;
-    font-size: 2em;
-
-    .wa-dark & {
-      --primary-color: var(--wa-color-neutral-90);
-      --secondary-color: var(--wa-color-neutral-30);
-    }
-  }
-
-  /* dialogs */
-  wa-dialog:has([slot='footer']) [slot='footer'] {
-    border-block-start: var(--wa-border-width-s) solid var(--wa-color-surface-border);
-    flex-grow: 1; /* make footer contents span entire width of dialog */
-    padding-block-start: var(--wa-space-l);
-  }
-
-  /* anchor headings  */
-  .anchor-heading a {
-    opacity: 0;
-    visibility: hidden;
-    text-decoration: none;
-    transition: opacity var(--wa-transition-normal) var(--wa-transition-easing);
-  }
-
-  @media (hover: hover) {
-    .anchor-heading:hover a {
-      opacity: 1;
-      visibility: visible;
-      padding: var(--wa-space-3xs);
-    }
-  }
-
-  @media print {
-    /* show URLs for printed links */
-    a:not(.anchor-heading)[href]::after {
-      content: ' (' attr(href) ')';
-    }
-  }
  /* #endregion */

-  /* #region funsies + cosmetics */
-
-  /* decorative underline emphasis */
-  .appearance-underlined.variant-drawn {
-    --underline-color: currentColor;
-    position: relative;
-    text-decoration: none;
-    padding-bottom: 0.4em;
-
-    &::after {
-      content: '';
-      position: absolute;
-      left: 0;
-      bottom: 0;
-      width: 100%;
-      height: 0.4em;
-      mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 20'%3E%3Cpath d='M0,12 Q50,8 100,12' stroke='black' stroke-width='4' fill='none'/%3E%3C/svg%3E");
-      mask-repeat: no-repeat;
-      mask-size: 100% auto;
-      mask-position: 0 100%;
-      background-color: var(--underline-color);
-    }
-  }
-
-  /* grid background */
-  .background-grid {
-    --grid-spacing: var(--wa-space-2xl);
-    --grid-line-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 90%);
-    --grid-line-width: var(--wa-border-width-s);
-    --subgrid-spacing: calc(var(--grid-spacing) / 2);
-    --subgrid-line-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 95%);
-    --subgrid-line-width: var(--wa-border-width-s);
-
-    background-image:
-      /* main grid - vertical lines */
-      linear-gradient(to right, var(--grid-line-color) var(--grid-line-width), transparent var(--grid-line-width)),
-      /* main grid - horizontal lines */
-        linear-gradient(to bottom, var(--grid-line-color) var(--grid-line-width), transparent var(--grid-line-width)),
-      /* sub-grid - vertical lines (offset by half the main grid spacing) */
-        linear-gradient(
-          to right,
-          var(--subgrid-line-color) var(--subgrid-line-width),
-          transparent var(--subgrid-line-width)
-        ),
-      /* sub-grid - horizontal lines (offset by half the main grid spacing) */
-        linear-gradient(
-          to bottom,
-          var(--subgrid-line-color) var(--subgrid-line-width),
-          transparent var(--subgrid-line-width)
-        );
-
-    background-size:
-      var(--grid-spacing) var(--grid-spacing),
-      var(--grid-spacing) var(--grid-spacing),
-      var(--subgrid-spacing) var(--subgrid-spacing),
-      var(--subgrid-spacing) var(--subgrid-spacing);
-
-    background-position:
-      0 0,
-      0 0,
-      calc(var(--grid-spacing) / 2) calc(var(--grid-spacing) / 2),
-      calc(var(--grid-spacing) / 2) calc(var(--grid-spacing) / 2);
-  }
-
-  /* dot grid background */
-  .background-dot-grid {
-    --dot-spacing: 1.5rem;
-    --dot-radius: 1.5px;
-    --dot-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 85%);
-
-    background-image: radial-gradient(circle, var(--dot-color) var(--dot-radius), transparent var(--dot-radius));
-    background-size: var(--dot-spacing) var(--dot-spacing);
-  }
-
-  /* wa illustration background pattern */
-  .background-wa-pattern {
-    position: relative;
-
-    & > * {
-      position: relative;
-      z-index: 1;
-    }
-
-    &::after {
-      --background-pattern-image: url('/assets/images/bg-wa-pattern.svg');
-
-      position: absolute;
-      inset: 0;
-      background-color: var(--background-pattern-color, transparent);
-      background-image: var(--background-pattern-image);
-      background-repeat: repeat;
-      content: '';
-      opacity: var(--background-pattern-opacity, 0.3);
-      z-index: 0;
-    }
-  }
-
+  /* #region funsies */
  /* buttons with icon toggle on hover */
  wa-button .icon-hover {
    display: none;
@@ -268,13 +122,6 @@
  wa-button:hover .icon-hover {
    display: inline-flex;
  }
-
-  /* buttons that are "shushed" (visually muted) by default, but have their full presentation otherwise  */
-  wa-button.shush {
-    &:not(:hover):not(active)::part(base) {
-      color: var(--wa-color-text-quiet);
-    }
-  }
  /* #endregion */

  /* #region resets */
--- a/packages/webawesome/docs/docs/color-palettes.njk
+++ b/packages/webawesome/docs/docs/color-palettes.njk
@@ -66,71 +66,14 @@ layout: page
 </div>

 <h2>Using This Palette</h2>
-
 <div id="import-code">
  {% for palette in themer.palettes %}
-    <div class="palette-instructions" data-palette="{{ palette.name | lower }}" {% if not loop.first %}hidden{% endif %}>
-      <wa-tab-group>
-        <wa-tab panel="cdn"><wa-icon name="rocket-launch" variant="regular"></wa-icon> CDN</wa-tab>
-        <wa-tab panel="npm"><wa-icon name="box-open" variant="regular"></wa-icon> npm</wa-tab>
-        <wa-tab panel="self-hosted"><wa-icon name="arrow-down-to-line" variant="regular"></wa-icon> Self-Hosted</wa-tab>
-
-        <wa-tab-panel name="cdn">
-{% markdown %}
-{% if palette.isPro %}
-<wa-callout variant="neutral" size="small">
-  <wa-icon name="info-circle" variant="regular"></wa-icon>
-  This palette can only be used on teams with a Pro subscription.
-</wa-callout>
-<br />
-{% else %}
-**For projects on Free teams:**
-1. Head over to your project's <wa-icon name="gear" variant="regular"></wa-icon> **Settings**.
-2. Find **Color Palette**. Select <wa-icon name="swatchbook" variant="regular"></wa-icon> **{{ palette.name | capitalize }}**.
-3. Save your theme to immediately update anywhere you're using your project.
-{% endif %}
-
-**For projects on Pro teams:**
-1. Head over to your project's <wa-icon name="gear" variant="regular"></wa-icon> **Settings**.
-2. Press <wa-icon name="paintbrush" variant="regular"></wa-icon> **Edit Your Theme** to open the Theme Builder.
-3. Open **Colors** and select **{{ palette.name | capitalize }}**.
-4. Save your theme to immediately update anywhere you're using your project.
-{% endmarkdown %}
-        </wa-tab-panel>
-
-        <wa-tab-panel name="npm">
-{% markdown %}
-To use this theme, import the theme's stylesheet:
-
-```js
-import '@awesome.me/webawesome/dist/styles/themes/{{ palette.filename }}';
-```
-
-Then apply the following class to the `<html>` element:
-
-```html
-<html class="wa-palette-{{ palette.name | lower }}">
-```
-{% endmarkdown %}
-        </wa-tab-panel>
-
-        <wa-tab-panel name="self-hosted">
-{% markdown %}
-To use this theme, include the theme's stylesheet:
-
-```html
-<link rel="stylesheet" href="/dist/styles/themes/{{ palette.filename }}" />
-```
-
-Then apply the following class to the `<html>` element:
-
-```html
-<html class="wa-palette-{{ palette.name | lower }}">
-```
-{% endmarkdown %}
-        </wa-tab-panel>
-      </wa-tab-group>
-    </div>
+  <div class="palette-instructions" data-palette="{{ palette.name | lower }}" {% if not loop.first %}hidden{% endif %}>
+    <p>
+      To import this palette, set <code>&lt;html class=&quot;wa-palette-{{ palette.name | lower }}&quot;&gt;</code> and import the following stylesheet:
+    </p>
+    <pre><code class="language-html">&lt;link rel=&quot;stylesheet&quot; href=&quot;{% cdnUrl %}styles/color/palettes/{{ palette.filename }}&quot; /&gt;</code></pre>
+  </div>
  {% endfor %}
 </div>

@@ -178,7 +121,7 @@ Then apply the following class to the `<html>` element:
      display: flex;
      flex-direction: row;
      flex-wrap: wrap;
-      gap: var(--wa-space-m);
+      gap: var(--wa-space-s);
    }

    &::part(form-control-label) {
@@ -191,11 +134,7 @@ Then apply the following class to the `<html>` element:
      overflow: hidden;
      white-space: nowrap;
      padding: 0;
-    }
-
-    wa-radio {
-      margin-inline: 0;
-    }
+   }
  }

  .palette-card {
--- a/packages/webawesome/docs/docs/components/badge.md
+++ b/packages/webawesome/docs/docs/components/badge.md
@@ -30,31 +30,31 @@ Use the `appearance` attribute to change the badge's visual appearance.
 ```html {.example}
 <div style="margin-block-end: 1rem;">
  <wa-badge appearance="accent" variant="neutral">Accent</wa-badge>
-  <wa-badge appearance="filled-outlined" variant="neutral">Filled-Outlined</wa-badge>
+  <wa-badge appearance="filled outlined" variant="neutral">Filled + Outlined</wa-badge>
  <wa-badge appearance="filled" variant="neutral">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="neutral">Outlined</wa-badge>
 </div>
 <div style="margin-block-end: 1rem;">
  <wa-badge appearance="accent" variant="brand">Accent</wa-badge>
-  <wa-badge appearance="filled-outlined" variant="brand">Filled-Outlined</wa-badge>
+  <wa-badge appearance="filled outlined" variant="brand">Filled + Outlined</wa-badge>
  <wa-badge appearance="filled" variant="brand">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="brand">Outlined</wa-badge>
 </div>
 <div style="margin-block-end: 1rem;">
  <wa-badge appearance="accent" variant="success">Accent</wa-badge>
-  <wa-badge appearance="filled-outlined" variant="success">Filled-Outlined</wa-badge>
+  <wa-badge appearance="filled outlined" variant="success">Filled + Outlined</wa-badge>
  <wa-badge appearance="filled" variant="success">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="success">Outlined</wa-badge>
 </div>
 <div style="margin-block-end: 1rem;">
  <wa-badge appearance="accent" variant="warning">Accent</wa-badge>
-  <wa-badge appearance="filled-outlined" variant="warning">Filled-Outlined</wa-badge>
+  <wa-badge appearance="filled outlined" variant="warning">Filled + Outlined</wa-badge>
  <wa-badge appearance="filled" variant="warning">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="warning">Outlined</wa-badge>
 </div>
 <div>
  <wa-badge appearance="accent" variant="danger">Accent</wa-badge>
-  <wa-badge appearance="filled-outlined" variant="danger">Filled-Outlined</wa-badge>
+  <wa-badge appearance="filled outlined" variant="danger">Filled + Outlined</wa-badge>
  <wa-badge appearance="filled" variant="danger">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="danger">Outlined</wa-badge>
 </div>
--- a/packages/webawesome/docs/docs/components/button-group.md
+++ b/packages/webawesome/docs/docs/components/button-group.md
@@ -40,6 +40,60 @@ Set the `orientation` attribute to `vertical` to make a vertical button group.
 </wa-button-group>
 ```

+### Theme Buttons
+
+Theme buttons are supported through the button group's `variant` attribute.
+
+```html {.example}
+<wa-button-group label="Alignment" variant="brand">
+  <wa-button>Left</wa-button>
+  <wa-button>Center</wa-button>
+  <wa-button>Right</wa-button>
+</wa-button-group>
+
+<br /><br />
+
+<wa-button-group label="Alignment" variant="success">
+  <wa-button>Left</wa-button>
+  <wa-button>Center</wa-button>
+  <wa-button>Right</wa-button>
+</wa-button-group>
+
+<br /><br />
+
+<wa-button-group label="Alignment">
+  <wa-button>Left</wa-button>
+  <wa-button>Center</wa-button>
+  <wa-button>Right</wa-button>
+</wa-button-group>
+
+<br /><br />
+
+<wa-button-group label="Alignment" variant="warning">
+  <wa-button>Left</wa-button>
+  <wa-button>Center</wa-button>
+  <wa-button>Right</wa-button>
+</wa-button-group>
+
+<br /><br />
+
+<wa-button-group label="Alignment" variant="danger">
+  <wa-button>Left</wa-button>
+  <wa-button>Center</wa-button>
+  <wa-button>Right</wa-button>
+</wa-button-group>
+```
+
+You can still use the buttons’ own `variant` attribute to override the inherited variant.
+
+```html {.example}
+<wa-button-group label="Alignment" variant="brand">
+  <wa-button>Left</wa-button>
+  <wa-button>Center</wa-button>
+  <wa-button variant="neutral">Right</wa-button>
+</wa-button-group>
+```
+
 ### Pill Buttons

 Pill buttons are supported through the button's `pill` attribute.
@@ -87,7 +141,7 @@ Dropdowns can be placed into button groups.

 ### Split Buttons

-Create a split button using a button and a dropdown. Use a [visually hidden](/docs/utilities/visually-hidden) label to ensure the dropdown is accessible to users with assistive devices.
+Create a split button using a button and a dropdown. Use a [visually hidden](/docs/components/visually-hidden) label to ensure the dropdown is accessible to users with assistive devices.

 ```html {.example}
 <wa-button-group label="Example Button Group">
--- a/packages/webawesome/docs/docs/components/button.md
+++ b/packages/webawesome/docs/docs/components/button.md
@@ -31,35 +31,35 @@ Use the `appearance` attribute to change the button's visual appearance.
 <div class="wa-stack">
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="neutral">Accent</wa-button>
-    <wa-button appearance="filled-outlined" variant="neutral">Filled-Outlined</wa-button>
+    <wa-button appearance="filled outlined" variant="neutral">Filled + Outlined</wa-button>
    <wa-button appearance="filled" variant="neutral">Filled</wa-button>
    <wa-button appearance="outlined" variant="neutral">Outlined</wa-button>
    <wa-button appearance="plain" variant="neutral">Plain</wa-button>
  </div>
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="brand">Accent</wa-button>
-    <wa-button appearance="filled-outlined" variant="brand">Filled-Outlined</wa-button>
+    <wa-button appearance="filled outlined" variant="brand">Filled + Outlined</wa-button>
    <wa-button appearance="filled" variant="brand">Filled</wa-button>
    <wa-button appearance="outlined" variant="brand">Outlined</wa-button>
    <wa-button appearance="plain" variant="brand">Plain</wa-button>
  </div>
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="success">Accent</wa-button>
-    <wa-button appearance="filled-outlined" variant="success">Filled-Outlined</wa-button>
+    <wa-button appearance="filled outlined" variant="success">Filled + Outlined</wa-button>
    <wa-button appearance="filled" variant="success">Filled</wa-button>
    <wa-button appearance="outlined" variant="success">Outlined</wa-button>
    <wa-button appearance="plain" variant="success">Plain</wa-button>
  </div>
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="warning">Accent</wa-button>
-    <wa-button appearance="filled-outlined" variant="warning">Filled-Outlined</wa-button>
+    <wa-button appearance="filled outlined" variant="warning">Filled + Outlined</wa-button>
    <wa-button appearance="filled" variant="warning">Filled</wa-button>
    <wa-button appearance="outlined" variant="warning">Outlined</wa-button>
    <wa-button appearance="plain" variant="warning">Plain</wa-button>
  </div>
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="danger">Accent</wa-button>
-    <wa-button appearance="filled-outlined" variant="danger">Filled-Outlined</wa-button>
+    <wa-button appearance="filled outlined" variant="danger">Filled + Outlined</wa-button>
    <wa-button appearance="filled" variant="danger">Filled</wa-button>
    <wa-button appearance="outlined" variant="danger">Outlined</wa-button>
    <wa-button appearance="plain" variant="danger">Plain</wa-button>
--- a/packages/webawesome/docs/docs/components/callout.md
+++ b/packages/webawesome/docs/docs/components/callout.md
@@ -60,7 +60,7 @@ Set the `variant` attribute to change the callout's variant.

 ### Appearance

-Use the `appearance` attribute to change the callout's visual appearance (the default is `filled-outlined`).
+Use the `appearance` attribute to change the callout's visual appearance (the default is `outlined filled`).

 ```html {.example}
 <wa-callout variant="brand" appearance="accent">
@@ -70,7 +70,7 @@ Use the `appearance` attribute to change the callout's visual appearance (the de

 <br />

-<wa-callout variant="brand" appearance="filled-outlined">
+<wa-callout variant="brand" appearance="outlined filled">
  <wa-icon slot="icon" name="fill-drip" variant="regular"></wa-icon>
  This callout is both <strong>filled</strong> and <strong>outlined</strong>
 </wa-callout>
--- a/packages/webawesome/docs/docs/components/card.md
+++ b/packages/webawesome/docs/docs/components/card.md
@@ -15,7 +15,7 @@ category: Organization

  <strong>Mittens</strong><br />
  This kitten is as cute as he is playful. Bring him home today!<br />
-  <small class="wa-caption-s">6 weeks old</small>
+  <small class="wa-caption-m">6 weeks old</small>

  <wa-button slot="footer" variant="brand" pill>More Info</wa-button>
  <wa-rating slot="footer-actions" label="Rating"></wa-rating>
@@ -100,20 +100,19 @@ If using SSR, you need to also use the `with-media` attribute to add a media sec
 ```html {.example}
 <div class="wa-grid">
  <wa-card class="card-media">
-    <div slot="media" class="wa-frame:landscape">
-      <img
-        src="https://images.unsplash.com/photo-1547191783-94d5f8f6d8b1?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=400&q=80"
-        alt="A kitten walks towards camera on top of pallet."
-      />
-    </div>
-    This card has an image of a kitten walking along a pallet. 
+    <img
+      slot="media"
+      src="https://images.unsplash.com/photo-1547191783-94d5f8f6d8b1?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=400&q=80"
+      alt="A kitten walks towards camera on top of pallet."
+    />
+    This is a kitten, but not just any kitten. This kitten likes walking along pallets.
  </wa-card>
  <wa-card class="card-media">
    <video slot="media" controls>
      <source src="https://uploads.webawesome.com/dog-with-glasses.mp4" />
      <p>Your browser doesn't support HTML video</p>
    </video>
-    This card has a video of a dog wearing shades.
+    This is a kitten, but not just any kitten. This kitten likes walking along pallets.
  </wa-card>
 </div>

@@ -138,7 +137,7 @@ Use the `appearance` attribute to change the card's visual appearance.
    />
    Outlined (default)
  </wa-card>
-  {% for appearance in ['filled-outlined', 'plain', 'filled', 'accent'] -%}
+  {% for appearance in ['outlined filled', 'plain', 'filled', 'accent'] -%}
  <wa-card appearance="{{ appearance }}">
    <img
      slot="media"
@@ -154,10 +153,10 @@ Use the `appearance` attribute to change the card's visual appearance.
 ### Orientation

 Set the `orientation` attribute to `horizontal` to create a card with a horizontal, side-by-side layout. Make sure to set a width or maximum width for the media slot. Horizontal cards do not currently contain the header and footer slots.
-
-:::info
+<wa-callout>
+<wa-icon slot="icon" name="circle-info" variant="regular"></wa-icon>
 The `actions` slot is only available for the horizontal orientation
-:::
+</wa-callout>

 ```html {.example}
 <div class="wa-grid">
@@ -167,7 +166,7 @@ The `actions` slot is only available for the horizontal orientation
      src="https://images.unsplash.com/photo-1559209172-0ff8f6d49ff7?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=500&q=80"
      alt="A kitten sits patiently between a terracotta pot and decorative grasses."
    />
-    This card has a horizontal orientation with media, body, and actions arranged side-by-side.
+    This is a kitten, but not just any kitten. This kitten likes walking along pallets.
    <wa-button slot="actions" variant="neutral" appearance="plain"
      ><wa-icon name="ellipsis" label="actions"></wa-icon
    ></wa-button>
--- a/packages/webawesome/docs/docs/components/comparison.md
+++ b/packages/webawesome/docs/docs/components/comparison.md
@@ -5,7 +5,7 @@ layout: component
 category: Imagery
 ---

-This is especially useful for comparing images, but can be used for comparing any type of content (for an example of using it to compare entire UIs, check out our [theme page](/docs/themes)).
+This is especially useful for comparing images, but can be used for comparing any type of content (for an example of using it to compare entire UIs, check out our [theme pages](/docs/themes/default/)).
 For best results, use content that shares the same dimensions.
 The slider can be controlled by dragging or pressing the left and right arrow keys. (Tip: press shift + arrows to move the slider in larger intervals, or home + end to jump to the beginning or end.)

--- a/packages/webawesome/docs/docs/components/details.md
+++ b/packages/webawesome/docs/docs/components/details.md
@@ -108,7 +108,7 @@ Use the `appearance` attribute to change the element’s visual appearance.
    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
    aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
  </wa-details>
-  <wa-details summary="Filled-outlined" appearance="filled-outlined">
+  <wa-details summary="Filled + Outlined" appearance="filled outlined">
    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
    aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
  </wa-details>
--- a/packages/webawesome/docs/docs/components/divider.md
+++ b/packages/webawesome/docs/docs/components/divider.md
@@ -53,9 +53,9 @@ The default orientation for dividers is `horizontal`. Set `orientation` attribut
 </div>
 ```

-### Dropdown Dividers
+### Menu Dividers

-Use dividers in [dropdowns](/docs/components/dropdown) to visually group dropdown items.
+Use dividers in [menus](/docs/components/menu) to visually group menu items.

 ```html {.example}
 <wa-dropdown style="max-width: 200px;">
--- a/packages/webawesome/docs/docs/components/include.md
+++ b/packages/webawesome/docs/docs/components/include.md
@@ -19,7 +19,7 @@ The included content will be inserted into the `<wa-include>` element's default

 When an include file loads successfully, the `wa-load` event will be emitted. You can listen for this event to add custom loading logic to your includes.

-If the request fails, the `wa-include-error` event will be emitted. In this case, `event.detail.status` will contain the resulting HTTP status code of the request, e.g. 404 (not found).
+If the request fails, the `wa-error` event will be emitted. In this case, `event.detail.status` will contain the resulting HTTP status code of the request, e.g. 404 (not found).

 ```html
 <wa-include src="https://shoelace.style/assets/examples/include.html"></wa-include>
@@ -33,7 +33,7 @@ If the request fails, the `wa-include-error` event will be emitted. In this case
    }
  });

-  include.addEventListener('wa-include-error', event => {
+  include.addEventListener('wa-error', event => {
    if (event.eventPhase === Event.AT_TARGET) {
      console.log('Error', event.detail.status);
    }
--- a/packages/webawesome/docs/docs/components/input.md
+++ b/packages/webawesome/docs/docs/components/input.md
@@ -60,9 +60,7 @@ Add the `password-toggle` attribute to add a toggle button that will show the pa
 Use the `appearance` attribute to change the input's visual appearance.

 ```html {.example}
-<wa-input placeholder="Type something" appearance="filled"></wa-input><br />
-<wa-input placeholder="Type something" appearance="filled-outlined"></wa-input><br />
-<wa-input placeholder="Type something" appearance="outlined"></wa-input>
+<wa-input placeholder="Type something" appearance="filled"></wa-input>
 ```

 ### Disabled
--- a/packages/webawesome/docs/docs/components/intersection-observer.md
+++ b/packages/webawesome/docs/docs/components/intersection-observer.md
@@ -2,7 +2,6 @@
 title: Intersection Observer
 description: Tracks immediate child elements and fires events as they move in and out of view.
 layout: component
-category: Utilities
 ---

 This component leverages the [IntersectionObserver API](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver) to track when its direct children enter or leave a designated root element. The `wa-intersect` event fires whenever elements cross the visibility threshold.
--- a/packages/webawesome/docs/docs/components/radio-group.md
+++ b/packages/webawesome/docs/docs/components/radio-group.md
@@ -102,7 +102,7 @@ The default orientation for radio items is `vertical`. Set the `orientation` to

 ### Sizing Options

-The size of radios will be determined by the Radio Group's `size` attribute.
+The size of [Radios](/docs/components/radio) will be determined by the Radio Group's `size` attribute.

 ```html {.example}
 <wa-radio-group label="Select an option" size="medium" value="medium" onchange="this.size = this.value">
@@ -113,7 +113,7 @@ The size of radios will be determined by the Radio Group's `size` attribute.
 ```

 :::info
-[Radios](/docs/components/radio) also have a `size` attribute,
+[Radios](/docs/components/radio) and [Radio Buttons](/docs/components/radio-button) also have a `size` attribute,
 which will override the inherited size when used.
 :::

--- a/packages/webawesome/docs/docs/components/select.md
+++ b/packages/webawesome/docs/docs/components/select.md
@@ -80,18 +80,6 @@ Use the `appearance` attribute to change the select's visual appearance.
  <wa-option value="option-2">Option 2</wa-option>
  <wa-option value="option-3">Option 3</wa-option>
 </wa-select>
-<br />
-<wa-select appearance="filled-outlined">
-  <wa-option value="option-1">Option 1</wa-option>
-  <wa-option value="option-2">Option 2</wa-option>
-  <wa-option value="option-3">Option 3</wa-option>
-</wa-select>
-<br />
-<wa-select appearance="outlined">
-  <wa-option value="option-1">Option 1</wa-option>
-  <wa-option value="option-2">Option 2</wa-option>
-  <wa-option value="option-3">Option 3</wa-option>
-</wa-select>
 ```

 ### Pill
@@ -285,10 +273,9 @@ Remember that custom tags are rendered in a shadow root. To style them, you can
    const name = option.querySelector('wa-icon[slot="start"]').name;

    // You can return a string, a Lit Template, or an HTMLElement here
-    // Important: include data-value so the tag can be removed properly!
    return `
-      <wa-tag with-remove data-value="${option.value}">
-        <wa-icon name="${name}"></wa-icon>
+      <wa-tag with-remove>
+        <wa-icon name="${name}" style="padding-inline-end: .5rem;"></wa-icon>
        ${option.label}
      </wa-tag>
    `;
@@ -300,10 +287,6 @@ Remember that custom tags are rendered in a shadow root. To style them, you can
 Be sure you trust the content you are outputting! Passing unsanitized user input to `getTag()` can result in XSS vulnerabilities.
 :::

-:::info
-When using custom tags with `with-remove`, you must include the `data-value` attribute set to the option's value. This allows the select to identify which option to deselect when the tag's remove button is clicked.
-:::
-
 ### Lazy loading options

 Lazy loading options works similarly to native `<select>` elements. The select component handles various scenarios intelligently:
--- a/packages/webawesome/docs/docs/components/tag.md
+++ b/packages/webawesome/docs/docs/components/tag.md
@@ -18,40 +18,41 @@ category: Feedback & Status
 ### Appearance

 Use the `size` attribute to change a tag's visual appearance.
-The default appearance is `filled-outlined`.
+The default appearance is `outlined filled`.

 ```html {.example}
 <div class="wa-stack">
  <p>
    <wa-tag variant="brand" appearance="accent">Accent</wa-tag>
-    <wa-tag variant="brand" appearance="filled-outlined">Filled-Outlined</wa-tag>
+    <wa-tag variant="brand" appearance="filled outlined">Filled + Outlined</wa-tag>
    <wa-tag variant="brand" appearance="filled">Filled</wa-tag>
    <wa-tag variant="brand" appearance="outlined">Outlined</wa-tag>
+
  </p>
  <p>
    <wa-tag variant="success" appearance="accent">Accent</wa-tag>
-    <wa-tag variant="success" appearance="filled-outlined">Filled-Outlined</wa-tag>
+    <wa-tag variant="success" appearance="filled outlined">Filled + Outlined</wa-tag>
    <wa-tag variant="success" appearance="filled">Filled</wa-tag>
    <wa-tag variant="success" appearance="outlined">Outlined</wa-tag>
  </p>

  <p>
    <wa-tag variant="neutral" appearance="accent">Accent</wa-tag>
-    <wa-tag variant="neutral" appearance="filled-outlined">Filled-Outlined</wa-tag>
+    <wa-tag variant="neutral" appearance="filled outlined">Filled + Outlined</wa-tag>
    <wa-tag variant="neutral" appearance="filled">Filled</wa-tag>
    <wa-tag variant="neutral" appearance="outlined">Outlined</wa-tag>
  </p>

  <p>
    <wa-tag variant="warning" appearance="accent">Accent</wa-tag>
-    <wa-tag variant="warning" appearance="filled-outlined">Filled-Outlined</wa-tag>
+    <wa-tag variant="warning" appearance="filled outlined">Filled + Outlined</wa-tag>
    <wa-tag variant="warning" appearance="filled">Filled</wa-tag>
    <wa-tag variant="warning" appearance="outlined">Outlined</wa-tag>
  </p>

  <p>
    <wa-tag variant="danger" appearance="accent">Accent</wa-tag>
-    <wa-tag variant="danger" appearance="filled-outlined">Filled-Outlined</wa-tag>
+    <wa-tag variant="danger" appearance="filled outlined">Filled + Outlined</wa-tag>
    <wa-tag variant="danger" appearance="filled">Filled</wa-tag>
    <wa-tag variant="danger" appearance="outlined">Outlined</wa-tag>
  </p>
--- a/packages/webawesome/docs/docs/components/textarea.md
+++ b/packages/webawesome/docs/docs/components/textarea.md
@@ -52,9 +52,7 @@ Use the `placeholder` attribute to add a placeholder.
 Use the `appearance` attribute to change the textarea's visual appearance.

 ```html {.example}
-<wa-textarea placeholder="Type something" appearance="filled"></wa-textarea><br />
-<wa-textarea placeholder="Type something" appearance="filled-outlined"></wa-textarea><br />
-<wa-textarea placeholder="Type something" appearance="outlined"></wa-textarea>
+<wa-textarea placeholder="Type something" appearance="filled"></wa-textarea>
 ```

 ### Disabled
--- a/packages/webawesome/docs/docs/customizing.md
+++ b/packages/webawesome/docs/docs/customizing.md
@@ -10,32 +10,27 @@ You can customize the look and feel of Web Awesome at a high level with themes.

 Web Awesome uses [themes](/docs/themes) to apply a cohesive look and feel across the entire library. Themes are built with a collection of predefined CSS custom properties, which we call [design tokens](/docs/tokens), and there are many premade themes you can choose from.

-{% raw %}
-  <p>
-    To use a pre-built theme {%- if currentUser.hasPro -%}&nbsp;or build your own{%- endif -%},&nbsp;
-    {%- if not session.isLoggedIn -%}
-      <a href="/signup">sign up</a> or <a href="/login">log in</a> to create a project.&nbsp;
-    {%- else -%}
-      head over to <a href="/teams">your teams</a> and open up the project you'd like to use.&nbsp;
-    {%- endif -%}
-    In your project's <wa-icon name="gear" variant="regular"></wa-icon> <strong>Settings</strong>,&nbsp;
-    {%- if not currentUser.hasPro -%}
-      select a <wa-icon name="paintbrush" variant="regular"></wa-icon> <strong>Theme</strong> and a <wa-icon name="swatchbook" variant="regular"></wa-icon> <strong>Color Palette</strong> to use, save your changes, and bask in the glory of your new theme.
-    {%- else -%}
-      <wa-icon name="paintbrush" variant="regular"></wa-icon> <strong>Edit Your Theme</strong> to open the Theme Builder and select a pre-built theme or customize your colors, fonts, icons, and more.
-    {%- endif -%}
-  </p>
-{% endraw %}
+To use a theme, simply add a link to the theme's stylesheet to the `<head>` of your page. For example, you can add this snippet alongside th [installation code](/docs/#quick-start-autoloading-via-cdn) to use the *Awesome* theme:

-For even more customizations, you can off-road and override any theme just with CSS — no preprocessor required. All design tokens are prefixed with `--wa-` to avoid collisions with other libraries and your own custom properties. Simply style any design token in your own stylesheet by scoping your styles to `:root` and the class for the relevant color scheme (if needed). Here's an example that uses tinted surface colors in light mode:
+```html
+<link rel="stylesheet" href="{% cdnUrl 'styles/themes/awesome.css' %}" />
+```
+
+You can customize any theme just with CSS — no preprocessor required. All design tokens are prefixed with `--wa-` to avoid collisions with other libraries and your own custom properties. Simply override any design token in your own stylesheet by scoping your styles to `:root`, the class for the specific theme you want to override (if needed), and the class for the relevant color scheme (if needed). Here's an example that changes the default brand color to purple in light mode:

 ```css
 :root,
 .wa-light,
 .wa-dark .wa-invert {
-  --wa-color-surface-raised: var(--wa-color-neutral-95);
-  --wa-color-surface-default: var(--wa-color-neutral-90);
-  --wa-color-surface-lowered: var(--wa-color-neutral-80);
+  --wa-color-brand-fill-quiet: var(--wa-color-purple-95);
+  --wa-color-brand-fill-normal: var(--wa-color-purple-90);
+  --wa-color-brand-fill-loud: var(--wa-color-purple-50);
+  --wa-color-brand-border-quiet: var(--wa-color-purple-90);
+  --wa-color-brand-border-normal: var(--wa-color-purple-80);
+  --wa-color-brand-border-loud: var(--wa-color-purple-60);
+  --wa-color-brand-on-quiet: var(--wa-color-purple-40);
+  --wa-color-brand-on-normal: var(--wa-color-purple-30);
+  --wa-color-brand-on-loud: white;
 }
 ```

@@ -92,7 +87,7 @@ Custom states can be combined with CSS parts and custom properties to create sop

 CSS parts offer further flexibility to customize individual components. The "parts" exposed by each component can be targeted with the [CSS part selector](https://developer.mozilla.org/en-US/docs/Web/CSS/::part), or `::part()`.

-Parts allow you to style _any_ standard CSS property, not just those exposed through custom properties. Here's an example that modifies buttons with the `gradient-button` class.
+Parts allow you to style *any* standard CSS property, not just those exposed through custom properties. Here's an example that modifies buttons with the `gradient-button` class.

 ```html {.example}
 <wa-button class="gradient-button"> Gradient Button </wa-button>
@@ -101,9 +96,7 @@ Parts allow you to style _any_ standard CSS property, not just those exposed thr
  .gradient-button::part(base) {
    background: linear-gradient(217deg, var(--wa-color-indigo-50), var(--wa-color-purple-50), var(--wa-color-red-50));
    border: solid 1px var(--wa-color-purple-50);
-    transition:
-      transform 100ms,
-      box-shadow 100ms;
+    transition: transform 100ms, box-shadow 100ms;
  }

  .gradient-button::part(base):hover {
@@ -137,8 +130,7 @@ Most (but not all) components expose parts. You can find them in each component'

 If you're using [native styles](/docs/utilities/native), any custom styles added for a component should also target the corresponding native element. In general, the same styles you declare for components will work just the same to style their native counterparts.

-For example, we can give `<input type="checkbox">` the same custom styles as `<wa-checkbox>` by using standard CSS properties and CSS parts:
-
+For example, we can give `<input type="checkbox">` the same custom styles as `<wa-checkbox>` by using the custom properties required to style the component:
 ```html {.example}
 <wa-checkbox class="pinkify">Web Awesome checkbox</wa-checkbox>
 <br />
@@ -148,16 +140,59 @@ For example, we can give `<input type="checkbox">` the same custom styles as `<w
 </label>

 <style>
-  wa-checkbox.pinkify::part(control),
-  input[type='checkbox'].pinkify {
-    border-width: 3px;
-  }
-
-  wa-checkbox.pinkify:state(checked)::part(control),
-  input[type='checkbox'].pinkify:checked {
-    background-color: hotpink;
-    border-color: hotpink;
-    color: lavenderblush;
+  wa-checkbox.pinkify,
+  input[type="checkbox"].pinkify {
+    --background-color-checked: hotpink;
+    --border-color-checked: hotpink;
+    --border-width: 3px;
+    --checked-icon-color: lavenderblush;
  }
 </style>
 ```
+
+Or, if using CSS parts, we can give both checkboxes the same custom styles using standard CSS properties:
+```html {.example}
+<wa-checkbox class="purpleify">Web Awesome checkbox</wa-checkbox>
+<br />
+<label>
+  <input type="checkbox" class="purpleify" />
+  HTML checkbox
+</label>
+
+<style>
+  wa-checkbox.purpleify::part(control),
+  input[type="checkbox"].purpleify {
+    border-width: 3px;
+  }
+
+  wa-checkbox.purpleify:state(checked)::part(control),
+  input[type="checkbox"].purpleify:checked {
+    background-color: darkorchid;
+    border-color: darkorchid;
+    color: lavender;
+  }
+</style>
+```
+
+
+## Style Utilities
+
+Similarly, if you're using [style utilities](/docs/utilities), any custom styles added for a specific attribute variation of a component — such as `appearance`, `variant`, or `size` — should also target the corresponding style utility class. This ensures that the attribute and its utility class counterpart work interchangeably.
+
+For example, we can give all outlined callouts a thick left border, regardless of whether they are styled with `appearance="outlined"` or `class="wa-outlined"`:
+```html {.example}
+<wa-callout appearance="outlined filled">
+  <wa-icon slot="icon" name="circle-star"></wa-icon>
+  Here's a callout with <code>appearance="outlined"</code>
+</wa-callout>
+<wa-callout class="wa-outlined wa-filled">
+  <wa-icon slot="icon" name="circle-star"></wa-icon>
+  Here's a callout with <code>class="wa-outlined"</code>
+</wa-callout>
+
+<style>
+  wa-callout:is([appearance~="outlined"]) {
+    border-left-width: var(--wa-panel-border-radius);
+  }
+</style>
+```
--- a/packages/webawesome/docs/docs/experimental/ssr.md
+++ b/packages/webawesome/docs/docs/experimental/ssr.md
@@ -16,8 +16,8 @@ SSR in Web Awesome is experimental! There are some known bugs and timing issues.
 If you're using the `webawesome.loader.js` file which automatically loads, make sure to change it to `webawesome.ssr-loader.js`.

 ```diff
- <script type="module" src="/dist/webawesome.loader.js"></script>
-+ <script type="module" src="/dist/webawesome.ssr-loader.js"></script>
+- <script type="module" src="https://early.webawesome.com/webawesome@3.0.0-alpha.2/dist/webawesome.loader.js"></script>
+ <script type="module" src="https://early.webawesome.com/webawesome@3.0.0-alpha.2/dist/webawesome.ssr-loader.js"></script>
 ```

 If you're using a bundler, make sure it comes _before_ any components are imported.
@@ -43,10 +43,7 @@ import litPlugin from '@lit-labs/eleventy-plugin-lit';

 eleventyConfig.addPlugin(litPlugin, {
  mode: 'worker',
-  componentModules: [
-    '@awesome.me/webawesome/dist/components/button/button.js',
-    '@awesome.me/webawesome/dist/components/input/input.js',
-  ],
+  componentModules: ['@awesome.me/webawesome/dist/components/button/button.js', '@awesome.me/webawesome/dist/components/input/input.js'],
 });
 ```

@@ -117,4 +114,4 @@ Here are some known issues and things we're still working on.
 - `@shoelace-style/localize` (our localization library) has no way to set a language currently so it always falls back to `en`.
 - `<wa-icon>` has no fallback if there's no JS besides a blank `<svg>`. There's perhaps some backend mechanisms we can use to fetch. But requires altering APIs. Should also have a way to set height / widths, but we don't want to increase pain for SSR users.
 - `<wa-qr-code>` QR Code will not error on the backend and will render a blank canvas at the appropriate size, but will not render the canvas until the client component connects.
- `setBasePath` and `kit codes` may need reconfiguring to work with SSR.
+- `setBasePath` and `kit codes` may need reconfiguring to work with SSR.
--- a/packages/webawesome/docs/docs/form-controls.md
+++ b/packages/webawesome/docs/docs/form-controls.md
@@ -52,7 +52,7 @@ To make a field required, use the `required` attribute. Required fields will aut
    customElements.whenDefined('wa-input'),
    customElements.whenDefined('wa-option'),
    customElements.whenDefined('wa-select'),
-    customElements.whenDefined('wa-textarea'),
+    customElements.whenDefined('wa-textarea')
  ]).then(() => {
    form.addEventListener('submit', event => {
      event.preventDefault();
@@ -78,7 +78,10 @@ To restrict a value to a specific [pattern](https://developer.mozilla.org/en-US/
  const form = document.querySelector('.input-validation-pattern');

  // Wait for controls to be defined before attaching form listeners
-  await Promise.all([customElements.whenDefined('wa-button'), customElements.whenDefined('wa-input')]).then(() => {
+  await Promise.all([
+    customElements.whenDefined('wa-button'),
+    customElements.whenDefined('wa-input')
+  ]).then(() => {
    form.addEventListener('submit', event => {
      event.preventDefault();
      alert('All fields are valid!');
@@ -105,7 +108,10 @@ Some input types will automatically trigger constraints, such as `email` and `ur
  const form = document.querySelector('.input-validation-type');

  // Wait for controls to be defined before attaching form listeners
-  await Promise.all([customElements.whenDefined('wa-button'), customElements.whenDefined('wa-input')]).then(() => {
+  await Promise.all([
+    customElements.whenDefined('wa-button'),
+    customElements.whenDefined('wa-input')
+  ]).then(() => {
    form.addEventListener('submit', event => {
      event.preventDefault();
      alert('All fields are valid!');
@@ -131,7 +137,10 @@ To create a custom validation error, pass a non-empty string to the `setCustomVa
  const input = form.querySelector('wa-input');

  // Wait for controls to be defined before attaching form listeners
-  await Promise.all([customElements.whenDefined('wa-button'), customElements.whenDefined('wa-input')]).then(() => {
+  await Promise.all([
+    customElements.whenDefined('wa-button'),
+    customElements.whenDefined('wa-input')
+  ]).then(() => {
    form.addEventListener('submit', event => {
      event.preventDefault();
      alert('All fields are valid!');
@@ -154,15 +163,17 @@ Custom validation can be applied to any form control that supports the `setCusto

 ## Custom Validation Styles

-Due to the many ways form controls are used, Web Awesome doesn't provide out of the box validation styles for form controls as part of its default theme.
+Due to the many ways form controls are used, Web Awesome doesn't provide out of the box validation styles for form controls as part of its default theme. Instead, the following attributes will be applied to reflect a control's validity as users interact with it. You can use them to create custom styles for any of the validation states you're interested in.

-Instead, the following [custom states](https://developer.mozilla.org/en-US/docs/Web/API/ElementInternals/states) will be applied to reflect a control's validity as users interact with it. You can use them to create custom styles for any of the validation states you're interested in.
+- `required` - the form control is required
+- `optional` - the form control is optional
+- `invalid` - the form control is invalid
+- `valid` - the form control is valid
+- `user-invalid` - the form control is invalid and the user has interacted with it
+- `user-valid` - the form control is valid and the user has interacted with it

- `:state(required)` - the form control is required
- `:state(optional)` - the form control is optional
- `:state(invalid)` - the form control is invalid
- `:state(valid)` - the form control is valid
- `:state(user-invalid)` - the form control is invalid and the user has interacted with it
- `:state(user-valid)` - the form control is valid and the user has interacted with it
+These attributes map to the browser's built-in pseudo classes for validation: [`:required`](https://developer.mozilla.org/en-US/docs/Web/CSS/:required), [`:optional`](https://developer.mozilla.org/en-US/docs/Web/CSS/:optional), [`:invalid`](https://developer.mozilla.org/en-US/docs/Web/CSS/:invalid), [`:valid`](https://developer.mozilla.org/en-US/docs/Web/CSS/:valid), [`:user-invalid`](https://developer.mozilla.org/en-US/docs/Web/CSS/:user-invalid), and [`:user-valid`](https://developer.mozilla.org/en-US/docs/Web/CSS/:user-valid).

-These custom states work alongside the browser's built-in pseudo classes for validation: [`:required`](https://developer.mozilla.org/en-US/docs/Web/CSS/:required), [`:optional`](https://developer.mozilla.org/en-US/docs/Web/CSS/:optional), [`:invalid`](https://developer.mozilla.org/en-US/docs/Web/CSS/:invalid), [`:valid`](https://developer.mozilla.org/en-US/docs/Web/CSS/:valid), [`:user-invalid`](https://developer.mozilla.org/en-US/docs/Web/CSS/:user-invalid), and [`:user-valid`](https://developer.mozilla.org/en-US/docs/Web/CSS/:user-valid).
+:::info
+In the future, data attribute selectors will be replaced with custom states such as `:state(valid)` and `:state(invalid)`. Web Awesome is using data attributes as a workaround until browsers fully support [custom states](https://developer.mozilla.org/en-US/docs/Web/API/ElementInternals/states).
+:::
--- a/packages/webawesome/docs/docs/index.md
+++ b/packages/webawesome/docs/docs/index.md
@@ -4,7 +4,7 @@ description: Choose the installation method that works best for you.
 layout: page-outline
 ---

-Welcome to Web Awesome! [Learn more](https://webawesome.com/) about this project and [how to contribute to it](https://webawesome.com/docs/resources/contributing).
+Welcome to Web Awesome beta! [Learn more](https://webawesome.com/) about this project and [how to contribute to it](https://webawesome.com/docs/resources/contributing).

 - [Report a bug](https://github.com/shoelace-style/webawesome/issues)
 - [Get help / ask a question](https://github.com/shoelace-style/webawesome/discussions)
@@ -12,27 +12,42 @@ Welcome to Web Awesome! [Learn more](https://webawesome.com/) about this project

 ---

-## 🚀 Using a Project
+## Quick Start (Autoloading via CDN)

-A project gives you your own, personal CDN to use Web Awesome on your site. Each project uses a single line of code to install your preferred version, theme, Font Awesome kit...the works! And, when you update your project's settings, your project code pulls in all of the right stuff automatically — no need to update your own code or redeploy your site.
+To get everything included in Web Awesome, add the following code to the `<head>` of your site:

-One line of code from us. The entire Web Awesome library for you.
+```html
+<link rel="stylesheet" href="{% cdnUrl 'styles/webawesome.css' %}" />
+<script type="module" src="{% cdnUrl 'webawesome.loader.js' %}"></script>
+```

-To use a project:
+This snippet adds:

-{% raw %}
-<ol>
-  <li>
-    {% if not session.isLoggedIn %}
-      <a href="/signup">Sign up</a> or <a href="/login">log in</a> to create a project.
-    {% else %}
-      Head over to <a href="/teams">your favorite team</a> and open up the project you'd like to use.
-    {% endif %}
-  </li>
-  <li>Copy and paste your unique project code into the <code>&lt;head&gt;</code> of each page on your site.</li>
-  <li><a href="/docs/usage">Start using Web Awesome!</a></li>
-</ol>
-{% endraw %}
+- **Web Awesome styles**, a collection of stylesheets including essential default theme styles, optional [styles for native elements](/docs/utilities/native) and optional [utility classes](/docs/utilities)
+- **The autoloader**, a lightweight script watches the DOM for unregistered Web Awesome elements and lazy loads them for you — even if they're added dynamically
+
+Now you can [start using Web Awesome!](/docs/usage)
+
+---
+
+## Using Font Awesome Kit Codes
+
+Font Awesome users can provide their kit code to unlock premium icon packs. You can provide yours by adding the `data-fa-kit-code` attribute to any element on the page, or by calling the `setKitCode()` method.
+
+```html
+<!-- Option 1: the data-fa-kit-code attribute -->
+<script src="bundle.js" data-fa-kit-code="abc123"></script>
+
+<!-- Option 2: the setKitCode() method -->
+<script type="module">
+  import { setKitCode } from '{% cdnUrl 'webawesome.loader.js' %}';
+  setKitCode('YOUR_KIT_CODE_HERE');
+</script>
+```
+
+:::info
+Not a Font Awesome user yet? [Learn more about premium icon packs](https://fontawesome.com/) and sign up for an account to unlock them!
+:::

 ---

@@ -48,9 +63,31 @@ To use a project:
 {% endraw %}
 </div>

-## 🛠️ Advanced Setup
+## Advanced Setup

-Projects are our favorite way to use Web Awesome, but different environments (or your own preferences!) may require different installation methods. If you're self-hosting Web Awesome or using npm, refer to the instructions in this section.
+The autoloader is the easiest way to use Web Awesome, but different projects (or your own preferences!) may require different installation methods.
+
+### Cherry Picking from CDN
+
+Cherry picking will only load the components you need up front, while limiting the number of files the browser has to download. The disadvantage is that you need to import each individual component on each page it's used. Additionally, you must include the default theme (`styles/themes/default.css`) to style any imported components. To use a different theme, include your preferred theme _in addition to_ the default theme.
+
+Here's an example that loads only the button component.
+
+```html
+<link rel="stylesheet" href="{% cdnUrl 'styles/themes/default.css' %}" />
+
+<script type="module">
+  import '{% cdnUrl 'components/button/button.js' %}';
+
+  // <wa-button> is ready to use!
+</script>
+```
+
+You can copy and paste the code to import a component from the "Importing" section of the component's documentation. Note that some components have dependencies that are automatically imported when you cherry pick. If a component has dependencies, they will be listed in the "Dependencies" section of its docs.
+
+:::warning
+You will see files named `chunk.[hash].js` in the `chunks` directory. Never import these files directly, as they are generated and change from version to version.
+:::

 ### Installing via npm

@@ -79,48 +116,11 @@ import '@awesome.me/webawesome/dist/components/input/input.js';

 Once they've been imported, you can use them in your HTML normally. Component imports are located in the "Importing" section of each component's documentation.

-
-### The Difference Between `/dist` & `/dist-cdn`
-
-If you have Web Awesome installed locally via npm, you'll notice the following directories in the project's root:
-
-```
-dist/
-dist-cdn/
-```
-
-The `dist-cdn` files come with everything bundled together, so you can use them directly without a build tool. The dist files keep dependencies separate, which lets your bundler optimize and share code more efficiently.
-
-Use `dist-cdn` if you're loading directly in the browser or from a CDN. Use `dist` if you're using a bundler like Webpack or Vite.
-
-### Referencing Necessary Styles
-
-If you're self-hosting Web Awesome, you'll need to set up your pages to reference any necessary styles. You can do so by referencing `webawesome.css`, or you can pick and choose specific stylesheets you'd like to use.
-
-```html
-<!-- Option 1: use all Web Awesome styles -->
-<link rel="stylesheet" href="/dist/styles/webawesome.css" />
-
-
-<!-- Option 2: pick and choose styles -->
-
-<!-- theme (required) -->
-<link rel="stylesheet" href="/dist/styles/themes/default.css" />
-
-<!-- native styles (optional) -->
-<link rel="stylesheet" href="/dist/styles/native.css" />
-
-<!-- CSS utilities (optional) -->
-<link rel="stylesheet" href="/dist/styles/utilities.css" />
-```
-
-If you choose to use a theme other than the default theme, be sure to add the corresponding class (e.g. `.wa-theme-awesome`) to your `<html>` element so that the class is applied.
-
 ### Setting the Base Path

 Some components rely on assets (icons, images, etc.) and Web Awesome needs to know where they're located. For convenience, Web Awesome will try to auto-detect the correct location based on the script you've loaded it from. This assumes assets are colocated with `webawesome.loader.js` and will "just work" for most users.

-==If you're using a Web Awesome project, you can skip this section.== However, if you're [cherry picking](#cherry-picking-from-cdn) or bundling Web Awesome, you'll need to set the base path. You can do this one of two ways.
+==If you're using the CDN, you can skip this section.== However, if you're [cherry picking](#cherry-picking-from-cdn) or bundling Web Awesome, you'll need to set the base path. You can do this one of two ways.

 ```html
 <!-- Option 1: the data-webawesome attribute -->
@@ -153,26 +153,18 @@ Most of the magic behind assets is handled internally by Web Awesome, but if you
 </script>
 ```

-### Using Font Awesome Pro and Pro+
+### The Difference Between `/dist` & `/dist-cdn`

-Font Awesome users can provide their kit code to unlock Pro and Pro+ icon packs. If you're using a project, simply add your Font Awesome Kit Code in your project's settings, and boom! Done.
+If you have Web Awesome installed locally via npm, you'll notice the following directories in the project's root:

-If you're using Web Awesome through other methods like npm, you can provide yours by adding the `data-fa-kit-code` attribute to any element on the page, or by calling the `setKitCode()` method.
-
-```html
-<!-- Option 1: the data-fa-kit-code attribute -->
-<script src="bundle.js" data-fa-kit-code="abc123"></script>
-
-<!-- Option 2: the setKitCode() method -->
-<script type="module">
-  import { setKitCode } from '{% cdnUrl 'webawesome.loader.js' %}';
-  setKitCode('YOUR_KIT_CODE_HERE');
-</script>
+```
+dist/
+dist-cdn/
 ```

-:::info
-Not a Font Awesome user yet? [Learn more about Font Awesome icon packs](https://fontawesome.com/) and sign up for an account to unlock them!
-:::
+The `dist-cdn` files come with everything bundled together, so you can use them directly without a build tool. The dist files keep dependencies separate, which lets your bundler optimize and share code more efficiently.
+
+Use `dist-cdn` if you're loading directly in the browser or from a CDN. Use `dist` if you're using a bundler like Webpack or Vite.

 ## React Users

@@ -220,4 +212,4 @@ declare module 'react' {
 :::details React 18 and below
 React 18 and below have [poor support](https://custom-elements-everywhere.com/#react) for custom elements. For legacy versions of React, we provide React wrappers for every component. You can find the import instructions by selecting the _React_ tab from the _Importing_ section of each
 component's documentation.
-:::
+:::
--- a/packages/webawesome/docs/docs/layout.njk
+++ b/packages/webawesome/docs/docs/layout.njk
@@ -43,56 +43,22 @@ layout: docs

 <wa-divider style="--spacing: var(--wa-space-3xl);"></wa-divider>

+<div class="max-line-length">
 {% markdown %}
-## Using Layout Utilities
+## Installation

-Layout utility classes are bundled with Web Awesome's [style utilities](/docs/utilities). By including style utilities in your project, you'll have access to layout utilities like `.wa-grid` and `.wa-stack`. 
-{% endmarkdown %}
+Layout components are included in Web Awesome's [autoloader](/docs/#quick-start-autoloading-via-cdn). You can also import them individually via [cherry picking](/docs/#cherry-picking).

-<wa-tab-group>
-  <wa-tab panel="cdn"><wa-icon name="rocket-launch" variant="regular"></wa-icon> CDN</wa-tab>
-  <wa-tab panel="npm"><wa-icon name="box-open" variant="regular"></wa-icon> npm</wa-tab>
-  <wa-tab panel="self-hosted"><wa-icon name="arrow-down-to-line" variant="regular"></wa-icon> Self-Hosted</wa-tab>
-
-  <wa-tab-panel name="cdn">
-{% markdown %}
-1. Head over to your project's <wa-icon name="gear" variant="regular"></wa-icon> **Settings**.
-2. Next to **Features**, select the **CSS utilities** checkbox.
-3. **Save Changes** to immediately update anywhere you're using your project.
-{% endmarkdown %}
-  </wa-tab-panel>
-
-  <wa-tab-panel name="npm">
-{% markdown %}
-To use all Web Awesome styles (including [native styles](/docs/utilities/native/)), import the following stylesheet in your project:
-
-```js
-import '@awesome.me/webawesome/dist/styles/webawesome.css';
-```
-
-Or, if you only want CSS utility classes, import a theme and the utilities individually:
-
-```js
-import '@awesome.me/webawesome/dist/styles/themes/default.css';
-import '@awesome.me/webawesome/dist/styles/utilities.css';
-```
-{% endmarkdown %}
-  </wa-tab-panel>
-
-  <wa-tab-panel name="self-hosted">
-{% markdown %}
-To use all Web Awesome styles (including [native styles](/docs/utilities/native/)), include the following stylesheet in your project:
+Layout utilities are bundled with all [style utilities](/docs/utilities). You can import all Web Awesome page styles (including [native styles](/docs/utilities/native/)) by including the following stylesheet in your project:

 ```html
-<link rel="stylesheet" href="/dist/styles/webawesome.css" />
+<link rel="stylesheet" href="{% cdnUrl 'styles/webawesome.css' %}" />
 ```

-Or, if you only want CSS utility classes, include a theme and the utilities individually:
+Or, you can choose to import _only_ the utilities:

 ```html
-<link rel="stylesheet" href="/dist/styles/themes/default.css" />
-<link rel="stylesheet" href="/dist/styles/utilities.css" />
+<link rel="stylesheet" href="{% cdnUrl 'styles/utilities.css' %}" />
 ```
 {% endmarkdown %}
-  </wa-tab-panel>
-</wa-tab-group>
+</div>
--- a/packages/webawesome/docs/docs/localization.md
+++ b/packages/webawesome/docs/docs/localization.md
@@ -27,7 +27,7 @@ Web Awesome ships with [a number of translations](https://github.com/shoelace-st
 You can import translations using the following syntax, where `<code>` is replaced with any language code shown above.

 ```js
-import '/dist/translations/<code>.js';
+import '{% cdnUrl "translations/<code>.js" %}';
 ```

 You do not need to load translations up front. You can import them dynamically even after updating the `lang` attribute. Once a translation is registered, localized components will update automatically.
@@ -37,7 +37,7 @@ You do not need to load translations up front. You can import them dynamically e
 document.documentElement.lang = 'de';

 // Import the translation
-import('/translations/<code>.js');
+import('{% cdnUrl "translations/<code>.js" %}');
 ```

 ### Translation Resolution
--- a/packages/webawesome/docs/docs/resources/changelog.md
+++ b/packages/webawesome/docs/docs/resources/changelog.md
@@ -1,11 +1,10 @@
 ---
 title: Changelog
-dateLastUpdated: 2025-11-07
 description: Changes to each version of the project are documented here.
 layout: page-outline
 ---

-<p class="wa-caption-s">Last updated: <wa-format-date month="long" day="numeric" year="numeric" date="{{ dateLastUpdated }}"></wa-format-date></p>
+<p class="wa-caption-m">Last updated: <wa-format-date month="long" day="numeric" year="numeric" date="{{ lastUpdatedISO }}"></wa-format-date></p>

 Web Awesome follows [Semantic Versioning](https://semver.org/). Breaking changes in components with the <wa-badge variant="brand">Stable</wa-badge> badge will not be accepted until the next major version. As such, all contributions must consider the project's roadmap and take this into consideration. Features that are deemed no longer necessary will be deprecated but not removed.

@@ -13,72 +12,14 @@ Components with the <wa-badge variant="warning">Experimental</wa-badge> badge sh

 ## Next

- Fixed a bug in `<wa-combobox>` that prevented the listbox from opening when options were preselected [issue:1883]
- Added `justify-content` CSS utilities [pr:1930]
- Added missing `.wa-gap-4xl` utility class [pr:1931]
-
-## 3.1.0
-
- Added `<wa-combobox>` as an experimental pro component [issue:1074]
- Added version 2.0.0 of the [official Web Awesome Figma Design Kit](/docs/resources/figma)
- Added npm support for Web Awesome Pro
- Added `layers.css` to define cascade layer order and updated palettes, themes, native styles, and utilities to import the new rule for more fail-safe modularity [pr:1793]
- [PRO]: Fixed a few sizing bugs in `<wa-page>` and `slot="footer"` no longer will always "overflow" the container.
- Fixed a bug in `<wa-slider>` that caused some touch devices to end up with the incorrect value [issue:1703]
- Fixed a bug in `<wa-card>` that prevented some slots from being detected correctly [discuss:1450]
- Fixed a z-index bug in `<wa-scroller>` styles [issue:1724]
- Fixed a bug in `<wa-icon>` that caused some icon libraries to render with the incorrect SVG fill [issue:1733]
- Fixed a bug in `<wa-tree-item>` that caused the spinner to not show when lazy loading [issue:1678]
- Fixed a bug in `<wa-dropdown>` that caused the browser to hang when cancelling the `wa-hide` event [issue:1483]
- Fixed a bug in `<wa-dropdown-item>` that prevented the icon dependency from being imported [issue:1825]
- Fixed a bug in `<wa-select>` that prevented clicks on the tag's remove button from removing options in multiple mode
- Fixed a bug in `<wa-select>` that caused tags to appear in alphabetical order instead of selection order when using `multiple`
- Improved performance of `<wa-icon>` so initial rendering occurs faster, especially with multiple icons on the page [issue:1729]
- Improved `<wa-slider>` to not throw an error when string values are passed to the `min`, `max`, and `step` properties [issue:1823]
- Fixed a bug in Web Awesome form controls that caused `<wa-input form="foo">` to set the form property to equal `"foo"` instead of returning an `HTMLFormElement` breaking platform expectations. [pr:1815]
- Fixed a bug in `<wa-button>` causing it to not copy over attributes for form submissions. [pr:1815]
- Improved performance of all components by fixing how CSS is imported and reused [issue:1812]
- Modified the default `transition` styles of `<wa-dropdown-item>` to use design tokens [pr:1693]
-
-## 3.0.0
-
- 🚨 BREAKING: Changed `appearance="filled outlined"` to `appearance="filled-outlined"` in the following elements [issue:1127]
-  - `<wa-button>`
-  - `<wa-callout>`
-  - `<wa-card>`
-  - `<wa-details>`
-  - `<wa-input>`
-  - `<wa-select>`
-  - `<wa-tag>`
-  - `<wa-textarea>`
- 🚨 BREAKING: Fixed a bug where `base` and `input` parts were swapped in `<wa-input>` [issue:1646]
 - Added the Kazakh translation [pr:1496]
 - Added docs for code completion for VS Code and JetBrains [pr:1550]
 - Added back the missing `form-control-label` part to `<wa-textarea>` for consistency with other form controls [pr:1533]
- Added focus delegation to `<wa-button>` to ensure tabbing works properly when using `tabindex` [issue:1622]
- Added [text utilities](/docs/utilities/text/) for longform text, form control text, font sizes, font weights, text color, and truncation [pr:1602]
- Added version 1.0.0 of the [official Web Awesome Figma Design Kit](/docs/resources/figma)
 - Fixed a bug in `<wa-button>` where slotted badges weren't properly positioned in buttons with an `href` [issue:1377]
 - Fixed focus outline styles in `<wa-details>` and native `<details>` [issue:1456]
 - Fixed focus outline styles in `<wa-scroller>`, `<wa-dialog>`, and `<wa-drawer>` [issue:1484]
- Fixed a bug in `<wa-checkbox>` where its value would revert to `""` when checked / unchecked [pr:1547]
 - Fixed a bug that caused icon button labels to not render in frameworks [issue:1542]
 - Fixed a bug in `<wa-details>` that caused the `name` property not to reflect [pr:1538]
- Fixed a bug in `<wa-dialog>` and `<wa-drawer>` that prevented focus from being set on the dialog/drawer when opened [issue:1302]
- Fixed an overflow style that was causing tab group content to be unnecessarily truncated [issue:1401]
- Fixed a bug in `<wa-icon>` that caused icon buttons to render when non-text nodes were slotted in [issue:1475]
- Fixed a bug in `<wa-tooltip>` that prevented tooltips from showing when disconnecting and then reconnecting to the DOM [issue:1595]
- Fixed a bug that caused the required `*` in form labels to have incorrect spacing in `<wa-checkbox>` and `<wa-switch>` [issue:1472]
- Fixed a bug in `<wa-dialog>` and `<wa-drawer>` that caused the component to prematurely hide when certain child elements are used [pr:1636]
- Fixed a bug in `<wa-popover>` and `<wa-tooltip>` that prevented dots and other valid ID characters from being used [issue:1648]
- [Pro] Fixed a bug in `<wa-page>` that caused menu and aside content to reserve space for slots with `disable-sticky`
- Fixed incorrect docs for the `wa-include-error` event which is dispatched by `<wa-include>` [issue:1663]
- Fixed a bug in `<wa-card>` where slotted header and footer content wasn't properly aligned [pr:1435]
- Improved autofill styles in `<wa-input>` so they span the entire width of the visual input [issue:1439]
- Improved [text utilities](/docs/utilities/text/) so that each size modifier always exactly matches the applied font size [pr:1602]
- Improved Native Styles to use the `--wa-font-weight-code` design token
- Modified `<wa-slider>` to only show the tooltip on the handle being dragged when in range mode [issue:1320]
- Upgraded `<wa-page>` from _experimental_ to _stable_

 ## 3.0.0-beta.6

@@ -275,7 +216,7 @@ Many of these changes and improvements were the direct result of feedback from u
 - 🚨 BREAKING: Renamed `<image-comparer>` to `<wa-comparison>` and improved compatibility for non-image content
 - 🚨 BREAKING: Added slot detection to `<wa-dialog>` and `<wa-drawer>` so you don't need to specify `with-header` and `with-footer`; headers are on by default now, but you can use the `without-header` attribute to turn them off
 - 🚨 BREAKING: Renamed the `image` slot to `media` for a more appropriate naming convention
- Added Theme Builder to create your own themes
+- Added [a theme builder](/docs/themes/edit/) to create your own themes
 - Added a new Blog & News pattern category
 - Added a new free component: `<wa-scroller>` (#1 of 14 per stretch goals)
 - Added support for Duotone Thin, Light, and Regular styles and the Sharp Duotone family of styles to `<wa-icon>`
@@ -292,7 +233,7 @@ Many of these changes and improvements were the direct result of feedback from u

 ### Enhancements {data-no-outline}

- Added `appearance` to [`<wa-details>`](/docs/components/details) and [`<wa-card>`](/docs/components/card) and support for the appearance utilities in the [`<details>` native styles](/docs/utilities/native/#details).
+- Added `appearance` to [`<wa-details>`](/docs/components/details) and [`<wa-card>`](/docs/components/card) and support for the [appearance utilities](/docs/utilities/appearance/) in the [`<details>` native styles](/docs/utilities/native/details).
 - Added an `orange` scale to all color palettes
 - Added the [`.wa-cloak` utility](/docs/utilities/fouce) to prevent FOUCE
 - Added the [`allDefined()` utility](/docs/usage/#all-defined) for awaiting component registration
@@ -317,7 +258,7 @@ Many of these changes and improvements were the direct result of feedback from u
 - Revert `<wa-dialog>` structure and CSS to fix clipped content in dialogs (WA-A #123) and light dismiss in iOS Safari (WA-A #201)
 - Fixed a bug in `<wa-color-picker>` that prevented light dismiss from working when clicking immediately above the color picker dropdown
 - Fixed a bug in `<wa-progress>` that prevented Safari from animation progress changes
- Fixed the missing indeterminate icon in [native checkbox styles](/docs/utilities/native/#form-controls)
+- Fixed the missing indeterminate icon in [native checkbox styles](/docs/utilities/native/checkbox)
 - Fixed a bug in `<wa-radio>` where elements would stack instead of display inline
 - Docs fixes:
  - Fixed the search dialog's styles so it doesn't jump around as you search
@@ -464,13 +405,13 @@ Many of these changes and improvements were the direct result of feedback from u
 ### Native styles {data-no-outline}

 - Added native styles for
-  [buttons](/docs/utilities/native/#buttons),
-  [input fields](/docs/utilities/native/#form-controls),
-  [dialogs](/docs/utilities/native/#dialog),
-  [details](/docs/utilities/native/#details),
-  [tables](/docs/utilities/native/#tables),
-  [lists](/docs/utilities/native/#lists),
-  and most [content elements](/docs/utilities/native/#typography).
+  [buttons](/docs/utilities/native/button),
+  [input fields](/docs/utilities/native/input),
+  [dialogs](/docs/utilities/native/dialog),
+  [details](/docs/utilities/native/details),
+  [tables](/docs/utilities/native/table),
+  [lists](/docs/utilities/native/lists),
+  and most [content elements](/docs/utilities/native/content).

 ### Style utilities {data-no-outline}

@@ -478,7 +419,7 @@ Many of these changes and improvements were the direct result of feedback from u
 - Added [appearance utilities](/docs/utilities/appearance/)
 - Added [size utilities](/docs/utilities/size/)
 - Added [layout utilities](/docs/layout/#utilities)
- Added [`.wa-visually hidden`](/docs/utilities/visually-hidden) utility
+- Added [`.wa-visually hidden`](/docs/utilities/a11y/#visually-hidden) utility
 - Added [`<wa-page>`](/docs/components/page/#styles) native styles and utilities

 ### Components {data-no-outline}
--- a/packages/webawesome/docs/docs/resources/contributing.md
+++ b/packages/webawesome/docs/docs/resources/contributing.md
@@ -164,7 +164,7 @@ This section can be a lot to digest in one sitting, so don't feel like you need

 Web Awesome is built with accessibility in mind. Creating generic components that are fully accessible to users with varying capabilities across a multitude of circumstances is a daunting challenge. Oftentimes, the solution to an a11y problem is not written in black and white and, therefore, we may not get it right the first time around. There are, however, guidelines we can follow in our effort to make Web Awesome an accessible foundation from which applications and websites can be built.

-We take this commitment seriously, so please ensure your contributions have this goal in mind. If you need help with anything a11y-related, please reach out on the [community chat](https://discord.gg/mg8f26C) for assistance. If you discover an accessibility concern within the library, please file a bug on the [issue tracker](https://github.com/shoelace-style/webawesome/issues).
+We take this commitment seriously, so please ensure your contributions have this goal in mind. If you need help with anything a11y-related, please [reach out to the community](/resources/community) for assistance. If you discover an accessibility concern within the library, please file a bug on the [issue tracker](https://github.com/shoelace-style/webawesome/issues).

 It's important to remember that, although accessibility starts with foundational components, it doesn't end with them. It everyone's responsibility to encourage best practices and ensure we're providing an optimal experience for all of our users.

@@ -364,7 +364,7 @@ Form controls should support submission and validation through the following con

 ### System Icons

-Avoid inlining SVG icons inside of templates. If a component requires an icon, make sure `<wa-icon>` is a dependency of the component and use the [system library](/docs/components/icon#customizing-the-system-library):
+Avoid inlining SVG icons inside of templates. If a component requires an icon, make sure `<wa-icon>` is a dependency of the component and use the [system library](/components/icon#customizing-the-system-library):

 ```html
 <wa-icon library="system" name="..." variant="..."></wa-icon>
--- a/packages/webawesome/docs/docs/resources/support.md
+++ b/packages/webawesome/docs/docs/resources/support.md
@@ -1,91 +0,0 @@
---
-title: Community & Support
-description: Web Awesome has a growing community of designers and developers that are building amazing things with web components.
-layout: page
---
-
-  <p>We know people have their own way of reaching out, so our team makes sure you can find us wherever you need — whether it’s filing an issue on GitHub, chatting with the community on Discord, or getting private help via email. If you’re just getting started, don’t miss our <a href="/docs/">Instillation Guide</a>.</p>
-
-<wa-divider></wa-divider>
-
-<div class="wa-stack wa-gap-xl">
-<div class="wa-stack wa-align-items-start">
-  <div class="wa-stack wa-gap-s">
-    <h2 class="anchor-heading wa-cluster wa-gap-xs" data-no-anchor><wa-icon name="github" family="brands" style="font-size: 2ch;"></wa-icon>GitHub</h2>
-    <span class="wa-heading-m">Feature requests & bugs</span>
-    <p class="wa-caption-l">Notice a bug or have an idea? Open an issue on GitHub so we can triage, track, and ship fixes.</p>
-  </div>
-  <ul>
-    <li>Report reproducible bugs with clear steps.</li>
-    <li>Suggest features that improve developer workflow</li>
-    <li>Vote on issues others have filed to help us prioritize.</li>
-  </ul>
-  <div class="wa-cluster wa-gap-s">
-    <wa-button href="https://github.com/shoelace-style/webawesome/discussions/categories/ideas-suggestions" appearance="filled">
-      Request a Feature
-    </wa-button>
-    <wa-button href="https://github.com/shoelace-style/webawesome/issues" appearance="outlined">
-      Report a Bug
-    </wa-button>
-  </div>  
-</div>
-<wa-divider></wa-divider>
-<div class="wa-stack wa-align-items-start">
-  <div class="wa-stack wa-gap-s">
-    <h2 class="anchor-heading wa-cluster wa-gap-xs" data-no-anchor><wa-icon name="discord" family="brands" style="font-size: 2ch;"></wa-icon>Discord</h2>
-    <span class="wa-heading-m">Community & Discussion</span>
-    <p class="wa-caption-l">Ask questions, share tips, and connect with other developers in real time.</p>
-  </div>
-  <ul>
-    <li>Ask for help</li>
-    <li>Share ideas and get feedback</li>
-    <li>Show the community what you're working on</li>
-    <li>Chat live with other designers, developers, and Web Awesome supporters.</li>
-  </ul>
-  <wa-button href="https://discord.com/invite/mg8f26C" appearance="filled">
-    Join Discord
-  </wa-button>
-</div>
-<wa-divider></wa-divider>
-<div class="wa-stack wa-align-items-start">
-  <div class="wa-stack wa-gap-s">
-    <h2 class="anchor-heading wa-cluster wa-gap-xs" data-no-anchor><wa-icon name="envelope" style="font-size: 2ch;"></wa-icon>Email</h2>
-    <span class="wa-heading-m">Anything Else</span>
-    <p class="wa-caption-l">Billing questions, account access, or sensitive issues—reach our support team directly.</p>
-  </div>
-  <ul>
-    <li>Account access & login issues.</li>
-    <li>Billing or subscription questions.</li>
-    <li>Private matters you don’t want to post publicly.</li>
-  </ul>
-  <wa-button href="mailto:help@webawesome.com" appearance="filled">
-    Get Help via Email
-  </wa-button>
-</div>
-<wa-divider></wa-divider>
-</div>
-<div class="wa-stack" style="margin-block-start: var(--wa-space-xl);">
-  <div class="wa-stack wa-gap-s">
-    <h2 data-no-anchor>Socials</h2>
-    <p>We’re everywhere you are — follow us on your favorite social media platforms for the latest news and updates.</p>
-  </div>
-<div class="wa-cluster wa-caption-2xl">
-    <h2 class="wa-visually-hidden">Web Awesome Elsewhere</h2>
-    <a href="https://github.com/shoelace-style/webawesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-      <wa-icon family="brands" name="github" label="GitHub" role="img" aria-label="GitHub" library="default"></wa-icon>
-    </a>
-    <a href="https://bsky.app/profile/webawesome.com" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-      <wa-icon family="brands" name="bluesky" label="Bluesky" role="img" aria-label="Bluesky" library="default"></wa-icon>
-    </a>
-    <a href="https://mastodon.social/@webawesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-      <wa-icon family="brands" name="mastodon" label="Mastodon" role="img" aria-label="Mastodon" library="default"></wa-icon>
-    </a>
-    <a href="https://x.com/webawesomer" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-      <wa-icon family="brands" name="x-twitter" label="Twitter (X)" role="img" aria-label="Twitter (X)" library="default"></wa-icon>
-    </a>
-    <a href="https://www.threads.com/@web.awesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
-      <wa-icon family="brands" name="threads" label="Threads" role="img" aria-label="Threads" library="default"></wa-icon>
-    </a>
-  </div>
-
-</div>
--- a/packages/webawesome/docs/docs/themes.njk
+++ b/packages/webawesome/docs/docs/themes.njk
@@ -1,31 +1,26 @@
 ---
 title: Themes
-description: Style (and restyle) your website at will with any of Web Awesome's pre-built themes.
+description: Themes galore
 layout: page
 ---

-{% from "pro-badge.njk" import proBadge %}
-{% from "free-badge.njk" import freeBadge %}
-
-<h1>{{ title }}</h1>
-
-<p>Themes are collections of <a href="/docs/tokens">design tokens</a> that give a cohesive look and feel to the entire Web Awesome library. Style and restyle your website at will by loading any pre-built theme.</p>
-
-{% raw %}
-<p>See one you like?&nbsp;
-{%- if not session.isLoggedIn -%}
-  <a href="/login">Log in</a>&nbsp;
-{%- else -%}
-  Head over to <a href="/teams">your teams</a>&nbsp;
-{%- endif -%}
-to create a project with any one of these themes.
-{%- if not currentUser.hasPro -%}
-  &nbsp;(Plus, there are even more themes to love with Web Awesome Pro. <wa-icon name="heart" style="color: var(--wa-color-red-70);"></wa-icon>)
-{%- endif -%}
-</p>
-{% endraw %}
+<div class="wa-split">
+  <h1>{{ title }}</h1>
+  <wa-button variant="brand" href="/themer">
+    <wa-icon slot="start" name="plus" variant="regular"></wa-icon>
+    Create a Theme
+  </wa-button>
+</div>

 <div id="theme-viewer">
+  {% raw %}
+    {% if not currentUser.hasPro %}
+      <p>
+        Additional themes are available to pro users. Please <a href="/login">login to view pro themes</a>.
+      </p>
+    {% endif %}
+  {% endraw %}
+
  <wa-radio-group id="theme-picker" label="Theme Selector" value="default" orientation="horizontal">
    {% for theme in themer.themes %}
      {% if not theme.isPro %}
@@ -67,9 +62,8 @@ to create a project with any one of these themes.
  <header class="wa-stack">
    <div class="wa-cluster">
      <h2 data-theme-name="name">Theme</h2>
-      {{ freeBadge({ id: "free-badge", description: "This theme is available in the free version of Web Awesome." }) }}
-      {{ proBadge({ id: "pro-badge", description: "This theme requires access to Web Awesome Pro." }) }}
-
+      <wa-badge data-free-badge appearance="outlined" variant="neutral" hidden>FREE</wa-badge>
+      <wa-badge data-pro-badge appearance="accent" hidden>PRO</wa-badge>
    </div>
    <p data-theme-description>Description</p>
  </header>
@@ -90,70 +84,16 @@ to create a project with any one of these themes.
 </div>

 <h2>Using This Theme</h2>
-
 <div id="import-code">
  {% for theme in themer.themes %}
-    <div class="theme-instructions" data-theme="{{ theme.filename | stripExtension }}" {% if not loop.first %}hidden{% endif %}>
-      <wa-tab-group>
-        <wa-tab panel="cdn"><wa-icon name="rocket-launch" variant="regular"></wa-icon> CDN</wa-tab>
-        <wa-tab panel="npm"><wa-icon name="box-open" variant="regular"></wa-icon> npm</wa-tab>
-        <wa-tab panel="self-hosted"><wa-icon name="arrow-down-to-line" variant="regular"></wa-icon> Self-Hosted</wa-tab>
-
-        <wa-tab-panel name="cdn">
-{% markdown %}
-{% if theme.isPro %}
-<wa-callout variant="neutral" size="small">
-  <wa-icon name="info-circle" variant="regular"></wa-icon>
-  This theme can only be used on teams with a Pro subscription.
-</wa-callout>
-<br />
-{% else %}
-**For projects on Free teams:**
-1. Head over to your project's <wa-icon name="gear" variant="regular"></wa-icon> **Settings**.
-2. For your **Theme**, select <wa-icon name="paintbrush" variant="regular"></wa-icon> **{{ theme.filename | stripExtension | capitalize }}**.
-3. For your **Color Palette**, select <wa-icon name="swatchbook" variant="regular"></wa-icon> **{{ theme.palette.filename | stripExtension | capitalize }}**.
-4. Press **Save Changes** to immediately update anywhere you're using your project.
-{% endif %}
-
-**For projects on Pro teams:**
-1. Head over to your project's <wa-icon name="gear" variant="regular"></wa-icon> **Settings**.
-2. Press <wa-icon name="paintbrush" variant="regular"></wa-icon> **Edit Your Theme** to open the Theme Builder.
-3. Open **Theme** and select **{{ theme.filename | stripExtension | capitalize }}**.
-4. Press **Save Theme** to immediately update anywhere you're using your project.
-{% endmarkdown %}
-        </wa-tab-panel>
-
-        <wa-tab-panel name="npm">
-{% markdown %}
-To use this theme, import the theme's stylesheet:
-```js
-import '@awesome.me/webawesome/dist/styles/themes/{{ theme.filename }}';
-```
-
-Then apply the following classes to the `<html>` element:
-
-```html
-<html class="wa-theme-{{ theme.filename | stripExtension }} wa-palette-{{ theme.palette.filename | stripExtension }} wa-brand-{{ theme.colorBrand.color}}">
-```
-{% endmarkdown %}
-        </wa-tab-panel>
-
-        <wa-tab-panel name="self-hosted">
-{% markdown %}
-To use this theme, include the theme's stylesheet:
-```html
-<link rel="stylesheet" href="/dist/styles/themes/{{ theme.filename }}" />
-```
-
-Then apply the following classes to the `<html>` element:
-
-```html
-<html class="wa-theme-{{ theme.filename | stripExtension }} wa-palette-{{ theme.palette.filename | stripExtension }} wa-brand-{{ theme.colorBrand.color}}">
-```
-{% endmarkdown %}
-        </wa-tab-panel>
-      </wa-tab-group>
-    </div>
+  <div class="theme-instructions" data-theme="{{ theme.filename | stripExtension }}" {% if not loop.first %}hidden{% endif %}>
+    <p>
+      To import this theme, apply the following classes to the <code>&lt;html&gt;</code> element and import the theme's stylesheet.
+    </p>
+<pre><code class="language-html">&lt;html class=&quot;wa-theme-{{ theme.filename | stripExtension }} wa-palette-{{ theme.palette.filename | stripExtension }} wa-brand-{{ theme.colorBrand.color}}&quot;&gt;
+...
+&lt;link rel=&quot;stylesheet&quot; href=&quot;{% cdnUrl %}styles/themes/{{ theme.filename }}&quot; /&gt;</code></pre>
+  </div>
  {% endfor %}
 </div>

@@ -166,12 +106,8 @@ Then apply the following classes to the `<html>` element:
  const beforeFrame = document.querySelector('wa-zoomable-frame[slot="before"]');
  const nameElement = document.querySelector('[data-theme-name]');
  const descriptionElement = document.querySelector('[data-theme-description]');
-  const freeBadge = document.getElementById('free-badge');
-  const proBadge = document.getElementById('pro-badge');
-
-  // Hide both badges initially
-  if (freeBadge) freeBadge.hidden = true;
-  if (proBadge) proBadge.hidden = true;
+  const freeBadge = document.querySelector('[data-free-badge]');
+  const proBadge = document.querySelector('[data-pro-badge]');

  function updateFrames(selectedValue, title, description, isPro, palette, brand) {
    // Update theme classes on both frames
@@ -293,7 +229,7 @@ Then apply the following classes to the `<html>` element:
        display: flex;
        flex-direction: row;
        flex-wrap: wrap;
-        gap: var(--wa-space-m);
+        gap: var(--wa-space-s);
      }

      &::part(form-control-label) {
@@ -307,10 +243,6 @@ Then apply the following classes to the `<html>` element:
        white-space: nowrap;
        padding: 0;
      }
-
-      wa-radio {
-        margin-inline: 0;
-      }
    }

    .theme-card {
--- a/packages/webawesome/docs/docs/tokens/typography.md
+++ b/packages/webawesome/docs/docs/tokens/typography.md
@@ -59,13 +59,11 @@ Common weights let you easily adjust the full range of weights for your theme.

 Role-based weights allow you to uniformly adjust the weight of certain types of text to keep styles consistent.

-| Custom Property             | Default Value                    | Preview                                                            |
-| --------------------------- | -------------------------------- | ------------------------------------------------------------------ |
-| `--wa-font-weight-body`     | `var(--wa-font-weight-normal)`   | <div style="font-weight: var(--wa-font-weight-body)">AaBb</div>    |
-| `--wa-font-weight-heading`  | `var(--wa-font-weight-bold)`     | <div style="font-weight: var(--wa-font-weight-heading)">AaBb</div> |
-| `--wa-font-weight-code`     | `var(--wa-font-weight-normal)`   | <div style="font-weight: var(--wa-font-weight-code)">AaBb</div> |
-| `--wa-font-weight-longform` | `var(--wa-font-weight-normal)`   | <div style="font-weight: var(--wa-font-weight-longform)">AaBb</div> |
-| `--wa-font-weight-action`   | `var(--wa-font-weight-semibold)` | <div style="font-weight: var(--wa-font-weight-action)">AaBb</div>  |
+| Custom Property            | Default Value                    | Preview                                                            |
+| -------------------------- | -------------------------------- | ------------------------------------------------------------------ |
+| `--wa-font-weight-body`    | `var(--wa-font-weight-normal)`   | <div style="font-weight: var(--wa-font-weight-body)">AaBb</div>    |
+| `--wa-font-weight-heading` | `var(--wa-font-weight-bold)`     | <div style="font-weight: var(--wa-font-weight-heading)">AaBb</div> |
+| `--wa-font-weight-action`  | `var(--wa-font-weight-semibold)` | <div style="font-weight: var(--wa-font-weight-action)">AaBb</div>  |

 In Web Awesome, we use `--wa-font-weight-action` for interactive text, such as button labels and tab names. We also recommend using `--wa-font-weight-action` for text that uses color alone to signal interactivity, such as links without text decoration.

--- a/packages/webawesome/docs/docs/usage.md
+++ b/packages/webawesome/docs/docs/usage.md
@@ -40,7 +40,6 @@ await allDefined();

 By default, `allDefined()` will wait for all `wa-` prefixed custom elements within the current `document` to be registered.
 You can customize this behavior by passing in options:
-
 - `root` allows you to pass in a different element to search within, or a different document entirely (defaults to `document`).
 - `match` allows you to specify a custom function to determine which elements to wait for. This function should return `true` for elements you want to wait for and `false` for those you don't.
 - `additionalElements` allows you to wait for custom elements to be defined that may not be present in the DOM at the time `allDefined()` is called. This can be useful for elements that are loaded dynamically via JS.
@@ -53,7 +52,7 @@ import { allDefined } from '/dist/webawesome.js';
 await allDefined({
  match: tagName => tagName.startsWith('wa-') || tagName === 'my-component',
  root: document.getElementById('sidebar'),
-  additionalElements: ['wa-slider', 'other-slider'],
+  additionalElements: ['wa-slider', 'other-slider']
 });
 ```

@@ -175,53 +174,3 @@ This time we see an empty string, which means the boolean attribute is now prese
 :::info
 To wait for multiple components to update, you can use `requestAnimationFrame()` instead of awaiting each element.
 :::
-
-## Code Completion
-
-### VS Code
-
-Web Awesome ships with a file called `vscode.html-custom-data.json` that can be used to describe its custom elements to [Visual Studio Code](https://code.visualstudio.com/). This enables code completion for Web Awesome components (also known as “code hinting” or “IntelliSense”). To enable it, you need to tell VS Code where the file is.
-
-1. [Install Web Awesome locally](/docs/#installing-via-npm)
-2. If it doesn’t already exist, create a folder called `.vscode` at the root of your project
-3. If it doesn’t already exist, create a file inside that folder called `settings.json`
-4. Add the following to the file
-
-```json
-{
-  "html.customData": ["./node_modules/@awesome.me/webawesome/dist/vscode.html-custom-data.json"]
-}
-```
-
-If `settings.json` already exists, simply add the above line to the root of the object. Note that you may need to restart VS Code for the changes to take effect.
-
-### JetBrains IDEs
-
-If you are using a [JetBrains IDE](https://www.jetbrains.com/) and you are installing Web Awesome from NPM, the editor will automatically detect the `web-types.json` file from the package and you should immediately see component information in your editor.
-
-Be sure to add a reference to the `web-types.json` file in your `package.json` in order for your editor to properly detect it.
-
-```json
-{
-  ...
-  "web-types": "./web-types.json"
-  ...
-}
-```
-
-If you are using types from multiple projects, you can add an array of references.
-
-```json
-{
-  ...
-  "web-types": [
-    ...,
-    "./web-types.json"
-  ]
-  ...
-}
-```
-
-### Other Editors
-
-Most popular editors support custom code completion with a bit of configuration. Please [submit a feature request](https://github.com/shoelace-style/webawesome/issues/new/choose) for your editor of choice. PRs are also welcome!
--- a/packages/webawesome/docs/docs/utilities/align-items.md
+++ b/packages/webawesome/docs/docs/utilities/align-items.md
@@ -1,6 +1,6 @@
 ---
 title: Align Items
-description: Align items utilities align items within flex and grid containers on the cross axis.
+description: Align items utilities set the gap property of flex and grid containers, like other Web Awesome layout utilities.
 layout: docs
 tags: layoutUtilities
 ---
@@ -10,7 +10,6 @@ tags: layoutUtilities
    border: var(--wa-border-width-s) dashed var(--wa-color-neutral-border-normal);
    border-radius: var(--wa-border-radius-m);
    min-block-size: 3em;
-    min-inline-size: 5em;
    padding: var(--wa-space-2xs);
  }
  .preview-block {
@@ -21,16 +20,16 @@ tags: layoutUtilities
  }
 </style>

-Web Awesome includes classes to set the `align-items` property of flex and grid containers. Use them alongside other Web Awesome layout utilities, like [cluster](/docs/utilities/cluster) and [stack](/docs/utilities/stack), to align items in a container on the container's [cross axis](#whats-the-cross-axis).
+Web Awesome includes classes to set the `align-items` property of flex and grid containers. They can be used alongside other Web Awesome layout utilities, like [cluster](/docs/utilities/cluster) and [stack](/docs/utilities/stack), to align children in container on the container's cross axis.

-| Class Name                | `align-items` Value | Preview                                                                                                                                             |
-| ------------------------- | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `wa-align-items-baseline` | `baseline`          | <div class="wa-cluster wa-gap-2xs wa-align-items-baseline preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div> |
-| `wa-align-items-center`   | `center`            | <div class="wa-cluster wa-gap-2xs wa-align-items-center preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>   |
-| `wa-align-items-end`      | `flex-end`          | <div class="wa-cluster wa-gap-2xs wa-align-items-end preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>      |
-| `wa-align-items-start`    | `flex-start`        | <div class="wa-cluster wa-gap-2xs wa-align-items-start preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>    |
-| `wa-align-items-stretch`  | `stretch`           | <div class="wa-cluster wa-gap-2xs wa-align-items-stretch preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>  |
+| Class Name                | `align-items` Value | Preview                                                                                                                                  |
+| ------------------------- | ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| `wa-align-items-baseline` | `baseline`          | <div class="wa-cluster wa-align-items-baseline preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div> |
+| `wa-align-items-center`   | `center`            | <div class="wa-cluster wa-align-items-center preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>   |
+| `wa-align-items-end`      | `flex-end`          | <div class="wa-cluster wa-align-items-end preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>      |
+| `wa-align-items-start`    | `flex-start`        | <div class="wa-cluster wa-align-items-start preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>    |
+| `wa-align-items-stretch`  | `stretch`           | <div class="wa-cluster wa-align-items-stretch preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>  |

-## What's the Cross Axis?
+## What's a Cross Axis?

-The cross axis runs perpendicular to a container's content direction. For containers where `flex-direction` is `row` and content flows in the inline direction, the cross axis runs in the block direction. For containers where `flex-direction` is `column` and content flows in the block direction, the cross axis runs in the inline direction.
+The cross axis runs perpendicular to a flex container's content direction. For containers where `flex-direction` is `row` and content flows in the inline direction, the cross axis runs in the block direction. For containers where `flex-direction` is `column` and content flows in the block direction, the cross axis runs in the inline direction.
--- a/packages/webawesome/docs/docs/utilities/cluster.md
+++ b/packages/webawesome/docs/docs/utilities/cluster.md
@@ -60,7 +60,7 @@ Clusters are great for inline lists and aligning items of varying sizes.

 ```html {.example}
 <div class="wa-stack">
-  <h3 class="wa-heading-2xl">Withywindle Pub and Eatery</h3>
+  <h3 class="wa-heading-xl">Withywindle Pub and Eatery</h3>
  <div class="wa-cluster wa-gap-xs">
    <wa-rating value="4.6" read-only></wa-rating>
    <strong>4.6</strong>
@@ -72,7 +72,7 @@ Clusters are great for inline lists and aligning items of varying sizes.
      <wa-icon name="dollar" style="color: var(--wa-color-green-60);"></wa-icon>
      <wa-icon name="dollar" style="color: var(--wa-color-green-60);"></wa-icon>
    </div>
-    <span class="wa-caption-s">&bull;</span>
+    <span class="wa-caption-m">&bull;</span>
    <wa-tag size="small">Comfort Food</wa-tag>
    <wa-tag size="small">Gastropub</wa-tag>
    <wa-tag size="small">Cocktail Bar</wa-tag>
@@ -84,7 +84,7 @@ Clusters are great for inline lists and aligning items of varying sizes.

 ## Align Items

-By default, items are centered in the block direction of the `wa-cluster` container. You can add any of the following [`wa-align-items-*`](/docs/utilities/align-items) classes to an element with `wa-cluster` to specify how items are aligned in the block direction:
+By default, items are centered in the block direction of the `wa-cluster` container. You can add any of the following [`wa-align-items-*`](/docs/style-utilities/align-items) classes to an element with `wa-cluster` to specify how items are aligned in the block direction:

 - `wa-align-items-start`
 - `wa-align-items-end`
@@ -119,7 +119,7 @@ By default, items are centered in the block direction of the `wa-cluster` contai

 ## Gap

-By default, the gap between cluster items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/utilities/gap) classes to an element with `wa-cluster` to specify the gap between items:
+By default, the gap between cluster items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/style-utilities/gap) classes to an element with `wa-cluster` to specify the gap between items:

 - `wa-gap-0`
 - `wa-gap-3xs`
--- a/packages/webawesome/docs/docs/utilities/flank.md
+++ b/packages/webawesome/docs/docs/utilities/flank.md
@@ -137,7 +137,7 @@ The main content fills the remaining inline space of the container. By default,

 ## Align Items

-By default, items are centered in the block direction of the `wa-flank` container. You can add any of the following [`wa-align-items-*`](/docs/utilities/align-items) classes to an element with `wa-flank` to specify how items are aligned in the block direction:
+By default, items are centered in the block direction of the `wa-flank` container. You can add any of the following [`wa-align-items-*`](/docs/style-utilities/align-items) classes to an element with `wa-flank` to specify how items are aligned in the block direction:

 - `wa-align-items-start`
 - `wa-align-items-end`
@@ -168,7 +168,7 @@ By default, items are centered in the block direction of the `wa-flank` containe

 ## Gap

-By default, the gap between flank items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/utilities/gap) classes to an element with `wa-flank` to specify the gap between items:
+By default, the gap between flank items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/style-utilities/gap) classes to an element with `wa-flank` to specify the gap between items:

 - `wa-gap-0`
 - `wa-gap-3xs`
--- a/packages/webawesome/docs/docs/utilities/fouce.md
+++ b/packages/webawesome/docs/docs/utilities/fouce.md
@@ -22,7 +22,7 @@ As soon as all elements are registered _or_ after two seconds have elapsed, the

 :::details Are you using Turbo in your app?

-If you're using [Turbo](https://turbo.hotwired.dev/) to serve a multi-page application (MPA) as a single page application (SPA), you might notice FOUCE when navigating from page to page. This is because Turbo renders the new page's content before the autoloader has a chance to register new components.
+If you're using [Turbo](https://turbo.hotwired.dev/) to serve a multi-page application (MPA) as a single page application (SPA), you might notice FOUCE when navigating from page to page. This is because Turbo renders the new page's content before the autoloader has a change to register new components.

 The following function acts as a middleware to ensure components are registered _before_ the page shows, eliminating FOUCE for page-to-page navigation with Turbo.

--- a/packages/webawesome/docs/docs/utilities/frame.md
+++ b/packages/webawesome/docs/docs/utilities/frame.md
@@ -54,7 +54,7 @@ Frames are well-suited for images and image placeholders.
      <img src="https://images.unsplash.com/photo-1533743983669-94fa5c4338ec?q=20" alt="Grey and white tabby kitten" />
    </div>
    <div class="wa-stack wa-gap-xs">
-      <h3 class="wa-heading-m">White-socks</h3>
+      <h3 class="wa-heading-s">White-socks</h3>
      <span class="wa-body-s">Kitten &bull; Male</span>
      <div class="wa-flank:end wa-gap-xs">
        <wa-button size="small" appearance="filled" variant="brand">Adopt this pet</wa-button>
@@ -67,13 +67,13 @@ Frames are well-suited for images and image placeholders.
  </wa-card>
  <wa-card>
    <div class="wa-frame:landscape" slot="header">
-      <div class="wa-stack wa-align-items-center wa-gap-xs wa-caption-s">
+      <div class="wa-stack wa-align-items-center wa-gap-xs wa-caption-m">
        <wa-icon name="paw"></wa-icon>
        <span>Photo coming soon</span>
      </div>
    </div>
    <div class="wa-stack wa-gap-xs">
-      <h3 class="wa-heading-m">Bumpkin</h3>
+      <h3 class="wa-heading-s">Bumpkin</h3>
      <span class="wa-body-s">Adult &bull; Male</span>
      <div class="wa-flank:end wa-gap-xs">
        <wa-button size="small" appearance="filled" variant="brand">Adopt this pet</wa-button>
@@ -89,7 +89,7 @@ Frames are well-suited for images and image placeholders.
      <img src="https://images.unsplash.com/photo-1445499348736-29b6cdfc03b9?q=20" alt="Diluted calico kitten" />
    </div>
    <div class="wa-stack wa-gap-xs">
-      <h3 class="wa-heading-m">Swish-tail</h3>
+      <h3 class="wa-heading-s">Swish-tail</h3>
      <span class="wa-body-s">Kitten &bull; Female</span>
      <div class="wa-flank:end wa-gap-xs">
        <wa-button size="small" appearance="filled" variant="brand">Adopt this pet</wa-button>
@@ -105,7 +105,7 @@ Frames are well-suited for images and image placeholders.
      <img src="https://images.unsplash.com/photo-1517451330947-7809dead78d5?q=20" alt="Short-haired tabby cat" />
    </div>
    <div class="wa-stack wa-gap-xs">
-      <h3 class="wa-heading-m">Sharp-ears</h3>
+      <h3 class="wa-heading-s">Sharp-ears</h3>
      <span class="wa-body-s">Adult &bull; Female</span>
      <div class="wa-flank:end wa-gap-xs">
        <wa-button size="small" appearance="filled" variant="brand">Adopt this pet</wa-button>
@@ -139,7 +139,7 @@ Frames have a square aspect ratio by default. You can append `:square` (1 / 1),

 ## Border Radius

-Frames have a square border radius by default. You can add any of the following [`wa-border-radius-*`](/docs/utilities/rounding) classes to an element with `wa-frame` to specify the border radius:
+Frames have a square border radius by default. You can add any of the following [`wa-border-radius-*`](/docs/style-utilities/border-radius) classes to an element with `wa-frame` to specify the border radius:

 - `wa-border-radius-s`
 - `wa-border-radius-m`
--- a/packages/webawesome/docs/docs/utilities/gap.md
+++ b/packages/webawesome/docs/docs/utilities/gap.md
@@ -14,7 +14,8 @@ tags: layoutUtilities
  }
 </style>

-Web Awesome includes classes to set the `gap` property of flex and grid containers. Use them alone to create a flex container with a gap, or use them alongside other Web Awesome layout utilities, like [cluster](/docs/utilities/cluster) and [stack](/docs/utilities/stack), to change the space between items.
+Web Awesome includes classes to set the `gap` property of flex and grid containers. They can be used alongside other Web Awesome layout utilities, like [cluster](/docs/layout/cluster) and [stack](/docs/layout/stack), to change the space between items.
+Or even by themselves — all gap properties also set `display: flex` with a specificity of 0 so that it can be trivially overridden.

 Besides `wa-gap-0`, which sets `gap` to zero, each class corresponds to one of the [`--wa-space-*`](/docs/tokens/space) tokens in your theme.

@@ -30,4 +31,3 @@ Besides `wa-gap-0`, which sets `gap` to zero, each class corresponds to one of t
 | `wa-gap-xl`  | `--wa-space-xl`  | <div class="wa-cluster wa-gap-xl"><div class="preview-block"></div><div class="preview-block"></div></div>  |
 | `wa-gap-2xl` | `--wa-space-2xl` | <div class="wa-cluster wa-gap-2xl"><div class="preview-block"></div><div class="preview-block"></div></div> |
 | `wa-gap-3xl` | `--wa-space-3xl` | <div class="wa-cluster wa-gap-3xl"><div class="preview-block"></div><div class="preview-block"></div></div> |
-| `wa-gap-4xl` | `--wa-space-4xl` | <div class="wa-cluster wa-gap-4xl"><div class="preview-block"></div><div class="preview-block"></div></div> |
--- a/packages/webawesome/docs/docs/utilities/grid.md
+++ b/packages/webawesome/docs/docs/utilities/grid.md
@@ -41,35 +41,35 @@ Grids work especially well for card lists and content designed for browsing.
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1520763185298-1b434c919102?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-m">Tulip</h3>
+    <h3 class="wa-heading-s">Tulip</h3>
    <em>Tulipa gesneriana</em>
  </div>
  <div class="wa-stack wa-gap-s">
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1591767134492-338e62f7b5a2?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-m">Peony</h3>
+    <h3 class="wa-heading-s">Peony</h3>
    <em>Paeonia officinalis</em>
  </div>
  <div class="wa-stack wa-gap-s">
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1590872000386-4348c6393115?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-m">Poppy</h3>
+    <h3 class="wa-heading-s">Poppy</h3>
    <em>Papaver rhoeas</em>
  </div>
  <div class="wa-stack wa-gap-s">
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1516723338795-324c7c33f700?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-m">Sunflower</h3>
+    <h3 class="wa-heading-s">Sunflower</h3>
    <em>Helianthus annuus</em>
  </div>
  <div class="wa-stack wa-gap-s">
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1563601841845-74a0a8ab7c8a?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-m">Daisy</h3>
+    <h3 class="wa-heading-s">Daisy</h3>
    <em>Bellis perennis</em>
  </div>
 </div>
@@ -83,9 +83,9 @@ Grids work especially well for card lists and content designed for browsing.
        <wa-icon slot="icon" name="globe"></wa-icon>
      </wa-avatar>
      <div class="wa-stack wa-gap-3xs">
-        <span class="wa-caption-xs">Population (Zion)</span>
+        <span class="wa-caption-s">Population (Zion)</span>
        <span class="wa-cluster wa-gap-xs">
-          <span class="wa-heading-2xl">251,999</span>
+          <span class="wa-heading-xl">251,999</span>
          <wa-badge variant="danger">-3%&nbsp;<wa-icon name="arrow-trend-down"></wa-icon></wa-badge>
        </span>
      </div>
@@ -97,9 +97,9 @@ Grids work especially well for card lists and content designed for browsing.
        <wa-icon slot="icon" name="brain-circuit"></wa-icon>
      </wa-avatar>
      <div class="wa-stack wa-gap-3xs">
-        <span class="wa-caption-xs">Minds Freed</span>
+        <span class="wa-caption-s">Minds Freed</span>
        <span class="wa-cluster wa-gap-xs">
-          <span class="wa-heading-2xl">0.36%</span>
+          <span class="wa-heading-xl">0.36%</span>
          <wa-badge variant="success">+0.03%&nbsp;<wa-icon name="arrow-trend-up"></wa-icon></wa-badge>
        </span>
      </div>
@@ -111,9 +111,9 @@ Grids work especially well for card lists and content designed for browsing.
        <wa-icon slot="icon" name="robot"></wa-icon>
      </wa-avatar>
      <div class="wa-stack wa-gap-3xs">
-        <span class="wa-caption-xs">Agents Discovered</span>
+        <span class="wa-caption-s">Agents Discovered</span>
        <span class="wa-cluster wa-gap-xs">
-          <span class="wa-heading-2xl">3</span>
+          <span class="wa-heading-xl">3</span>
          <wa-badge variant="neutral">±0%&nbsp;<wa-icon name="wave-triangle"></wa-icon></wa-badge>
        </span>
      </div>
@@ -125,9 +125,9 @@ Grids work especially well for card lists and content designed for browsing.
        <wa-icon slot="icon" name="spaghetti-monster-flying"></wa-icon>
      </wa-avatar>
      <div class="wa-stack wa-gap-3xs">
-        <span class="wa-caption-xs">Sentinels Controlled</span>
+        <span class="wa-caption-s">Sentinels Controlled</span>
        <span class="wa-cluster wa-gap-xs">
-          <span class="wa-heading-2xl">208</span>
+          <span class="wa-heading-xl">208</span>
          <wa-badge variant="success">+1%&nbsp;<wa-icon name="arrow-trend-up"></wa-icon></wa-badge>
        </span>
      </div>
@@ -169,7 +169,7 @@ By default, grid items will wrap when the grid's column size is less than `20ch`

 ## Gap

-By default, the gap between grid items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/utilities/gap) classes to an element with `wa-grid` to specify the gap between items:
+By default, the gap between grid items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/style-utilities/gap) classes to an element with `wa-grid` to specify the gap between items:

 - `wa-gap-0`
 - `wa-gap-3xs`
--- a/packages/webawesome/docs/docs/utilities/index.njk
+++ b/packages/webawesome/docs/docs/utilities/index.njk
@@ -45,54 +45,22 @@ layout: docs

 <wa-divider style="--spacing: var(--wa-space-3xl);"></wa-divider>

+<div class="max-line-length">
 {% markdown %}
-## Using {{ title }}
-{% endmarkdown %}
+## Installation

-<wa-tab-group>
-  <wa-tab panel="cdn"><wa-icon name="rocket-launch" variant="regular"></wa-icon> CDN</wa-tab>
-  <wa-tab panel="npm"><wa-icon name="box-open" variant="regular"></wa-icon> npm</wa-tab>
-  <wa-tab panel="self-hosted"><wa-icon name="arrow-down-to-line" variant="regular"></wa-icon> Self-Hosted</wa-tab>
-
-  <wa-tab-panel name="cdn">
-{% markdown %}
-1. Head over to your project's <wa-icon name="gear" variant="regular"></wa-icon> **Settings**.
-2. Next to **Features**, select the **CSS utilities** checkbox.
-3. **Save Changes** to immediately update anywhere you're using your project.
-{% endmarkdown %}
-  </wa-tab-panel>
-
-  <wa-tab-panel name="npm">
-{% markdown %}
-To use all Web Awesome styles (including [native styles](/docs/utilities/native/)), import the following stylesheet in your project:
-
-```js
-import '@awesome.me/webawesome/dist/styles/webawesome.css';
-```
-
-Or, if you only want CSS utility classes, import a theme and the utilities individually:
-
-```js
-import '@awesome.me/webawesome/dist/styles/themes/default.css';
-import '@awesome.me/webawesome/dist/styles/utilities.css';
-```
-{% endmarkdown %}
-  </wa-tab-panel>
-
-  <wa-tab-panel name="self-hosted">
-{% markdown %}
-To use all Web Awesome styles (including [native styles](/docs/utilities/native/)), include the following stylesheet in your project:
+To use all Web Awesome page styles (including [native styles](/docs/utilities/native/)), include the following stylesheet in your project:

 ```html
-<link rel="stylesheet" href="/dist/styles/webawesome.css" />
+<link rel="stylesheet" href="{% cdnUrl 'styles/webawesome.css' %}" />
 ```

-Or, if you only want CSS utility classes, include a theme and the utilities individually:
+Or, to _only_ include utilities:

 ```html
-<link rel="stylesheet" href="/dist/styles/themes/default.css" />
-<link rel="stylesheet" href="/dist/styles/utilities.css" />
+<link rel="stylesheet" href="{% cdnUrl 'styles/utilities.css' %}" />
 ```
+
 {% endmarkdown %}
-  </wa-tab-panel>
-</wa-tab-group>
+
+</div>
--- a/packages/webawesome/docs/docs/utilities/justify-content.md
+++ b/packages/webawesome/docs/docs/utilities/justify-content.md
@@ -1,37 +0,0 @@
---
-title: Justify Content
-description: Justify content utilities determine how space is distributed between items in flex and grid containers.
-layout: docs
-tags: layoutUtilities
---
-
-<style>
-  .preview-wrapper {
-    border: var(--wa-border-width-s) dashed var(--wa-color-neutral-border-normal);
-    border-radius: var(--wa-border-radius-m);
-    min-block-size: 3em;
-    min-inline-size: 5em;
-    padding: var(--wa-space-2xs);
-  }
-  .preview-block {
-    aspect-ratio: 1 / 1;
-    background-color: var(--wa-color-neutral-fill-loud);
-    border-radius: var(--wa-border-radius-s);
-    min-block-size: 1em;
-  }
-</style>
-
-Web Awesome includes classes to set the `justify-content` property of flex and grid containers. Use them alongside other Web Awesome layout utilities, like [cluster](/docs/utilities/cluster) and [stack](/docs/utilities/stack), to distribute space between items along the container's [main axis](#whats-the-main-axis).
-
-| Class Name                         | `justify-content` Value | Preview                                                                                                                                                      |
-| ---------------------------------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `wa-justify-content-start`         | `flex-start`            | <div class="wa-cluster wa-gap-2xs wa-justify-content-start preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>         |
-| `wa-justify-content-end`           | `flex-end`              | <div class="wa-cluster wa-gap-2xs wa-justify-content-end preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>           |
-| `wa-justify-content-center`        | `center`                | <div class="wa-cluster wa-gap-2xs wa-justify-content-center preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>        |
-| `wa-justify-content-space-around`  | `space-around`          | <div class="wa-cluster wa-gap-2xs wa-justify-content-space-around preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>  |
-| `wa-justify-content-space-between` | `space-between`         | <div class="wa-cluster wa-gap-2xs wa-justify-content-space-between preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div> |
-| `wa-justify-content-space-evenly`  | `space-evenly`          | <div class="wa-cluster wa-gap-2xs wa-justify-content-space-evenly preview-wrapper"><div class="preview-block"></div><div class="preview-block"></div></div>  |
-
-## What's the Main Axis?
-
-The main axis runs parallel to a container's content direction. For grid containers and flex containers where `flex-direction` is `row`, the main axis runs in the inline direction. For containers where `flex-direction` is `column`, the main axis runs in the block direction.
--- a/packages/webawesome/docs/docs/utilities/native.md
+++ b/packages/webawesome/docs/docs/utilities/native.md
@@ -9,53 +9,18 @@ Native styles use design tokens to spruce up native HTML elements so that they m

 ## Using native styles

-<wa-tab-group>
-  <wa-tab panel="cdn"><wa-icon name="rocket-launch" variant="regular"></wa-icon> CDN</wa-tab>
-  <wa-tab panel="npm"><wa-icon name="box-open" variant="regular"></wa-icon> npm</wa-tab>
-  <wa-tab panel="self-hosted"><wa-icon name="arrow-down-to-line" variant="regular"></wa-icon> Self-Hosted</wa-tab>
-
-  <wa-tab-panel name="cdn">
-{% markdown %}
-1. Head over to your project's <wa-icon name="gear" variant="regular"></wa-icon> **Settings**.
-2. Next to **Features**, select the **Native styles** checkbox.
-3. **Save Changes** to immediately update anywhere you're using your project.
-{% endmarkdown %}
-  </wa-tab-panel>
-
-  <wa-tab-panel name="npm">
-{% markdown %}
-To use all Web Awesome styles (including [utilities](/docs/utilities/)), import the following stylesheet in your project:
-
-```js
-import '@awesome.me/webawesome/dist/styles/webawesome.css';
-```
-
-Or, if you only want styles for native elements, import a theme and native styles individually:
-
-```js
-import '@awesome.me/webawesome/dist/styles/themes/default.css';
-import '@awesome.me/webawesome/dist/styles/native.css';
-```
-{% endmarkdown %}
-  </wa-tab-panel>
-
-  <wa-tab-panel name="self-hosted">
-{% markdown %}
 To use all Web Awesome styles (including [utilities](/docs/utilities/)), include the following stylesheet in your project:

 ```html
-<link rel="stylesheet" href="/dist/styles/webawesome.css" />
+<link rel="stylesheet" href="{% cdnUrl 'styles/webawesome.css' %}" />
 ```

-Or, if you only want styles for native elements, include a theme and native styles individually:
+Or, if you only want styles for native elements, include the default theme and native styles individually:

 ```html
-<link rel="stylesheet" href="/dist/styles/themes/default.css" />
-<link rel="stylesheet" href="/dist/styles/native.css" />
+<link rel="stylesheet" href="{% cdnUrl 'styles/themes/default.css' %}" />
+<link rel="stylesheet" href="{% cdnUrl 'styles/native.css' %}" />
 ```
-{% endmarkdown %}
-  </wa-tab-panel>
-</wa-tab-group>

 You can additionally include any pre-made [theme](/docs/themes/) or [color palette](/docs/color-palettes/) to change the look of native elements.

@@ -65,18 +30,10 @@ Native styles set default space between many block-level HTML elements using the

 ```html {.example}
 <h3>Curabitur odio ligula</h3>
-<p>
-  Fusce mollis quam lorem, et gravida arcu laoreet ut. Pellentesque et malesuada mi. Morbi faucibus nisl nec nulla
-  porta, ac scelerisque elit finibus.
-</p>
-<blockquote>
-  The Road goes ever on and on<br />
-  Out from the door where it began.
-</blockquote>
-<p>
-  Donec varius, ipsum sit amet lobortis tristique, quam arcu pellentesque turpis, non porta lacus arcu non arcu. Morbi
-  luctus at nisl sit amet faucibus.
-</p>
+<p>Fusce mollis quam lorem, et gravida arcu laoreet ut. Pellentesque et malesuada mi. Morbi faucibus nisl nec nulla porta, ac scelerisque elit finibus.</p>
+<blockquote>The Road goes ever on and on<br />
+Out from the door where it began.</blockquote>
+<p>Donec varius, ipsum sit amet lobortis tristique, quam arcu pellentesque turpis, non porta lacus arcu non arcu. Morbi luctus at nisl sit amet faucibus.</p>
 <hr />
 <ul>
  <li>Aenean imperdiet</li>
@@ -234,8 +191,8 @@ Use any inline text element like `<strong>`, `<em>`, `<a>`, `<kbd>`, and others
 Add responsive media with `<img>`, `<svg>`, `<video>`, `<iframe>`, and others. Media takes up 100% width by default and scales according to its container's width.

 ```html {.example}
-<img
-  src="https://images.unsplash.com/photo-1620196244888-d31ff5bbf163?q=80&w=1000&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D"
+<img 
+  src="https://images.unsplash.com/photo-1620196244888-d31ff5bbf163?q=80&w=1000&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D" 
  alt="A gray kitten lays next to a toy"
 />
 ```
@@ -247,9 +204,7 @@ Structure tabular data with `<table>` and related elements like `<caption>`, `<t
 ```html {.example}
 <table>
  <caption>
-    This
-    <code>&lt;caption&gt;</code>
-    describes the table
+    This <code>&lt;caption&gt;</code> describes the table
  </caption>
  <thead>
    <tr>
@@ -392,6 +347,7 @@ Create buttons with `<button>` or `<input type="button | submit | reset">`. Butt

 Add the `wa-brand`, `wa-neutral`, `wa-success`, `wa-warning`, or `wa-danger` class to specify the button's [color variant](/docs/utilities/color/).

+
 ```html {.example}
 <button class="wa-neutral">Neutral</button>
 <button class="wa-brand">Brand</button>
@@ -450,8 +406,7 @@ Create a variety of form controls with `<input type="">`, `<select>`, and `<text
  <label>Color <input type="color" value="#f36944" /></label>
  <label>File <input type="file" multiple /></label>
  <label>Range <input type="range" /></label>
-  <label
-    >Select
+  <label>Select
    <select>
      <option value="option-1">Option 1</option>
      <option value="option-2">Option 2</option>
@@ -477,7 +432,6 @@ Create a variety of form controls with `<input type="">`, `<select>`, and `<text
 ```

 Add the `wa-size-s`, `wa-size-m`, or `wa-size-l` class to any form control or its parent `<label>` to specify its size.
-
 ```html {.example}
 <div class="wa-stack">
  <input type="text" placeholder="Small input" class="wa-size-s" />
@@ -556,8 +510,7 @@ Wrap form controls in a flex container to arrange them horizontally or verticall

 <form class="wa-stack">
  <label>Number of pancakes <input type="number" value="5" /></label>
-  <label
-    >Syrup flavor
+  <label>Syrup flavor
    <select>
      <option value="maple">Maple</option>
      <option value="strawberry">Strawberry</option>
--- a/packages/webawesome/docs/docs/utilities/rounding.md
+++ b/packages/webawesome/docs/docs/utilities/rounding.md
@@ -12,7 +12,7 @@ tags: styleUtilities
  }
 </style>

-Web Awesome includes classes to set an element's `border-radius` property. They can be used alongside Web Awesome layout utilities, like [frame](/docs/utilities/frame), to round all corners of an element.
+Web Awesome includes classes to set an element's `border-radius` property. They can be used alongside Web Awesome layout utilities, like [frame](/docs/layout/frame), to round all corners of an element.

 Each class corresponds to one of the [`--wa-border-radius-*`](/docs/tokens/borders/#radius) tokens in your theme.

--- a/packages/webawesome/docs/docs/utilities/split.md
+++ b/packages/webawesome/docs/docs/utilities/split.md
@@ -68,7 +68,7 @@ Splits are especially helpful for navigation, header, and footer layouts.
 ```html {.example}
 <div class="wa-stack">
  <div class="wa-split">
-    <wa-icon name="web-awesome" label="Web Awesome" class="wa-font-size-xl"></wa-icon>
+    <wa-icon name="web-awesome" label="Web Awesome" style="font-size: var(--wa-font-size-xl);"></wa-icon>
    <div class="wa-cluster">
      <wa-button>Sign Up</wa-button>
      <wa-button appearance="outlined">Log In</wa-button>
@@ -106,7 +106,7 @@ Items can be split across a row or a column by appending `:row` or `:column` to

 ## Align Items

-By default, items are centered on the cross axis of the `wa-split` container. You can add any of the following [`wa-align-items-*`](/docs/utilities/align-items) classes to an element with `wa-split` to specify how items are aligned:
+By default, items are centered on the cross axis of the `wa-split` container. You can add any of the following [`wa-align-items-*`](/docs/style-utilities/align-items) classes to an element with `wa-split` to specify how items are aligned:

 - `wa-align-items-start`
 - `wa-align-items-end`
@@ -139,7 +139,7 @@ These modifiers specify how items are aligned in the block direction for `wa-spl

 ## Gap

-A split's gap determines how close items can be before they wrap. By default, the gap between split items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/utilities/gap) classes to an element with `wa-split` to specify the gap between items:
+A split's gap determines how close items can be before they wrap. By default, the gap between split items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/style-utilities/gap) classes to an element with `wa-split` to specify the gap between items:

 - `wa-gap-0`
 - `wa-gap-3xs`
--- a/packages/webawesome/docs/docs/utilities/stack.md
+++ b/packages/webawesome/docs/docs/utilities/stack.md
@@ -62,7 +62,7 @@ Stacks are well suited for forms, text, and ensuring consistent spacing between

 ## Align Items

-By default, items stretch to fill the inline size of the `wa-stack` container. You can add any of the following [`wa-align-items-*`](/docs/utilities/align-items) classes to an element with `wa-stack` to specify how items are aligned in the inline direction:
+By default, items stretch to fill the inline size of the `wa-stack` container. You can add any of the following [`wa-align-items-*`](/docs/style-utilities/align-items) classes to an element with `wa-stack` to specify how items are aligned in the inline direction:

 - `wa-align-items-start`
 - `wa-align-items-end`
@@ -92,7 +92,7 @@ By default, items stretch to fill the inline size of the `wa-stack` container. Y

 ## Gap

-By default, the gap between stack items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/utilities/gap) classes to an element with `wa-stack` to specify the gap between items:
+By default, the gap between stack items uses `--wa-space-m` from your theme. You can add any of the following [`wa-gap-*`](/docs/style-utilities/gap) classes to an element with `wa-stack` to specify the gap between items:

 - `wa-gap-0`
 - `wa-gap-3xs`
--- a/packages/webawesome/docs/docs/utilities/text.md
+++ b/packages/webawesome/docs/docs/utilities/text.md
@@ -1,159 +1,66 @@
 ---
 title: Text
-description: Text utility classes use custom properties from your Web Awesome theme and other standard CSS properties to style text elements on the fly.
+description: Text utility classes combine custom properties from your Web Awesome theme to conveniently style text content.
 layout: docs
 tags: styleUtilities
 ---

-<style>
-  th {
-    min-inline-size: 15ch;
-  }
-</style>
-
-{{ description }} 
+Web Awesome includes classes to set multiple text properties at once to style body text, headings, and captions.

 ## Body

-Use `wa-body-*` classes to style the main content of your pages. Each class specifies a `font-size` that corresponds to a [font size token](/docs/tokens/typography/#font-size) from your theme.
+Use body classes to style the main content of your pages. Each `wa-body-*` class specifies the following properties:

-Alternatively, use `wa-body` to apply the same styling without an explicit font size.
+- `font-family: var(--wa-font-family-body);`
+- `font-weight: var(--wa-font-weight-body);`
+- `line-height: var(--wa-line-height-normal);`

-| Class Name    | Preview                                            |
-| ------------- | -------------------------------------------------- |
-| `wa-body-2xs` | <div class="wa-body-2xs">Five boxing wizards</div> |
-| `wa-body-xs`  | <div class="wa-body-xs">Five boxing wizards</div>  |
-| `wa-body-s`   | <div class="wa-body-s">Five boxing wizards</div>   |
-| `wa-body-m`   | <div class="wa-body-m">Five boxing wizards</div>   |
-| `wa-body-l`   | <div class="wa-body-l">Five boxing wizards</div>   |
-| `wa-body-xl`  | <div class="wa-body-xl">Five boxing wizards</div>  |
-| `wa-body-2xl` | <div class="wa-body-2xl">Five boxing wizards</div> |
-| `wa-body-3xl` | <div class="wa-body-3xl">Five boxing wizards</div> |
-| `wa-body-4xl` | <div class="wa-body-4xl">Five boxing wizards</div> |
+Additionally, each class specifies a `font-size` that corresponds to a [`--wa-font-size-*`](/docs/tokens/typography/#font-size) token from your theme.
+
+| Class Name   | `font-size` Value   | Preview                                                             |
+| ------------ | ------------------- | ------------------------------------------------------------------- |
+| `wa-body-xs` | `--wa-font-size-xs` | <div class="wa-body-xs">Sphinx of black quartz, judge my vow.</div> |
+| `wa-body-s`  | `--wa-font-size-s`  | <div class="wa-body-s">Sphinx of black quartz, judge my vow.</div>  |
+| `wa-body-m`  | `--wa-font-size-m`  | <div class="wa-body-m">Sphinx of black quartz, judge my vow.</div>  |
+| `wa-body-l`  | `--wa-font-size-l`  | <div class="wa-body-l">Sphinx of black quartz, judge my vow.</div>  |
+| `wa-body-xl` | `--wa-font-size-xl` | <div class="wa-body-xl">Sphinx of black quartz, judge my vow.</div> |

 ## Headings

-Use `wa-heading-*` classes to style section titles and headings in your content. Each class specifies a `font-size` that corresponds to a [font size token](/docs/tokens/typography/#font-size) from your theme.
+Use heading classes to style section titles and headings in your content. Each `wa-heading-*` class specifies the following properties:

-Alternatively, use `wa-heading` to apply the same styling without an explicit font size.
+- `font-family: var(--wa-font-family-heading);`
+- `font-weight: var(--wa-font-weight-heading);`
+- `line-height: var(--wa-line-height-condensed);`
+- `text-wrap: balance;`

-| Class Name       | Preview                                               |
-| ---------------- | ----------------------------------------------------- |
-| `wa-heading-2xs` | <div class="wa-heading-2xs">Five boxing wizards</div> |
-| `wa-heading-xs`  | <div class="wa-heading-xs">Five boxing wizards</div>  |
-| `wa-heading-s`   | <div class="wa-heading-s">Five boxing wizards</div>   |
-| `wa-heading-m`   | <div class="wa-heading-m">Five boxing wizards</div>   |
-| `wa-heading-l`   | <div class="wa-heading-l">Five boxing wizards</div>   |
-| `wa-heading-xl`  | <div class="wa-heading-xl">Five boxing wizards</div>  |
-| `wa-heading-2xl` | <div class="wa-heading-2xl">Five boxing wizards</div> |
-| `wa-heading-3xl` | <div class="wa-heading-3xl">Five boxing wizards</div> |
-| `wa-heading-4xl` | <div class="wa-heading-4xl">Five boxing wizards</div> |
+Additionally, each class specifies a `font-size` using a [`--wa-font-size-*`](/docs/tokens/typography/#font-size) token from your theme. Heading classes are one font size larger than the corresponding `wa-body-*` class.
+
+| Class Name       | `font-size` Value    | Preview                                               |
+| ---------------- | -------------------- | ----------------------------------------------------- |
+| `wa-heading-xs`  | `--wa-font-size-s`   | <div class="wa-heading-xs">Five Boxing Wizards</div>  |
+| `wa-heading-s`   | `--wa-font-size-m`   | <div class="wa-heading-s">Five Boxing Wizards</div>   |
+| `wa-heading-m`   | `--wa-font-size-l`   | <div class="wa-heading-m">Five Boxing Wizards</div>   |
+| `wa-heading-l`   | `--wa-font-size-xl`  | <div class="wa-heading-l">Five Boxing Wizards</div>   |
+| `wa-heading-xl`  | `--wa-font-size-2xl` | <div class="wa-heading-xl">Five Boxing Wizards</div>  |
+| `wa-heading-2xl` | `--wa-font-size-3xl` | <div class="wa-heading-2xl">Five Boxing Wizards</div> |
+| `wa-heading-3xl` | `--wa-font-size-4xl` | <div class="wa-heading-3xl">Five Boxing Wizards</div> |

 ## Captions

-Use `wa-caption-*` classes to style descriptions or auxiliary text in your content. Each class specifies a `font-size` that corresponds to a [font size token](/docs/tokens/typography/#font-size) from your theme.
+Use caption classes to style descriptions or auxiliary text in your content. Each `wa-caption-*` class specifies the following properties:

-Alternatively, use `wa-caption` to apply the same styling without an explicit font size.
+- `color: var(--wa-color-text-quiet);`
+- `font-family: var(--wa-font-family-body);`
+- `font-weight: var(--wa-font-weight-body);`
+- `line-height: var(--wa-line-height-condensed);`

-| Class Name       | Preview                                               |
-| ---------------- | ----------------------------------------------------- |
-| `wa-caption-2xs` | <div class="wa-caption-2xs">Five boxing wizards</div> |
-| `wa-caption-xs`  | <div class="wa-caption-xs">Five boxing wizards</div>  |
-| `wa-caption-s`   | <div class="wa-caption-s">Five boxing wizards</div>   |
-| `wa-caption-m`   | <div class="wa-caption-m">Five boxing wizards</div>   |
-| `wa-caption-l`   | <div class="wa-caption-l">Five boxing wizards</div>   |
-| `wa-caption-xl`  | <div class="wa-caption-xl">Five boxing wizards</div>  |
-| `wa-caption-2xl` | <div class="wa-caption-2xl">Five boxing wizards</div> |
-| `wa-caption-3xl` | <div class="wa-caption-3xl">Five boxing wizards</div> |
-| `wa-caption-4xl` | <div class="wa-caption-4xl">Five boxing wizards</div> |
+Additionally, each class specifies a `font-size` using a [`--wa-font-size-*`](/docs/tokens/typography/#font-size) token from your theme. Caption classes are one font size smaller than the corresponding `wa-body-*` class.

-## Longform
-
-Use `wa-longform-*` classes to style lengthy content like essays or blog posts. Each class specifies a `font-size` that corresponds to a [font size token](/docs/tokens/typography/#font-size) from your theme.
-
-Alternatively, use `wa-longform` to apply the same styling without an explicit font size.
-
-| Class Name        | Preview                                                |
-| ----------------- | ------------------------------------------------------ |
-| `wa-longform-2xs` | <div class="wa-longform-2xs">Five boxing wizards</div> |
-| `wa-longform-xs`  | <div class="wa-longform-xs">Five boxing wizards</div>  |
-| `wa-longform-s`   | <div class="wa-longform-s">Five boxing wizards</div>   |
-| `wa-longform-m`   | <div class="wa-longform-m">Five boxing wizards</div>   |
-| `wa-longform-l`   | <div class="wa-longform-l">Five boxing wizards</div>   |
-| `wa-longform-xl`  | <div class="wa-longform-xl">Five boxing wizards</div>  |
-| `wa-longform-2xl` | <div class="wa-longform-2xl">Five boxing wizards</div> |
-| `wa-longform-3xl` | <div class="wa-longform-3xl">Five boxing wizards</div> |
-| `wa-longform-4xl` | <div class="wa-longform-4xl">Five boxing wizards</div> |
-
-## Links
-
-Use `wa-link` to give interactive text a link-like appearance. Alternatively, use `wa-link-plain` to remove typical link styles from `<a>` elements.
-
-| Class Name      | Preview                                                  |
-| --------------- | -------------------------------------------------------- |
-| `wa-link`       | <div class="wa-link">Five boxing wizards</div>           |
-| `wa-link-plain` | <a href="" class="wa-link-plain">Five boxing wizards</a> |
-
-## Lists
-
-Ordered (`<ol>`) and unordered (`<ul>`) lists are given default styles by either Web Awesome's [native styles](/docs/utilities/native/) or your browser. Use `wa-list-plain` to clear any built-in list styles.
-
-| Class Name      | Preview                                                                                                  |
-| --------------- | -------------------------------------------------------------------------------------------------------- |
-| `wa-list-plain` | <ol class="wa-list-plain"><li>First list item</li><li>Second list item</li><li>Final list item</li></ol> |
-
-## Form Controls
-
-Use `wa-form-control-*` classes to style labels, values, placeholders, and hints outside of typical form control contexts with [form control tokens](/docs/tokens/component-groups/#form-controls) from your theme.
-
-| Class Name                    | Preview                                                            |
-| ----------------------------- | ------------------------------------------------------------------ |
-| `wa-form-control-label`       | <div class="wa-form-control-label">Five boxing wizards</div>       |
-| `wa-form-control-value`       | <div class="wa-form-control-value">Five boxing wizards</div>       |
-| `wa-form-control-placeholder` | <div class="wa-form-control-placeholder">Five boxing wizards</div> |
-| `wa-form-control-hint`        | <div class="wa-form-control-hint">Five boxing wizards</div>        |
-
-## Font Size
-
-Use single-purpose `wa-font-size-*` classes to apply a given [font size](/docs/tokens/typography/#font-size) from your theme to any element without additional styling.
-
-| Class Name         | Preview                                                 |
-| ------------------ | ------------------------------------------------------- |
-| `wa-font-size-2xs` | <div class="wa-font-size-2xs">Five boxing wizards</div> |
-| `wa-font-size-xs`  | <div class="wa-font-size-xs">Five boxing wizards</div>  |
-| `wa-font-size-s`   | <div class="wa-font-size-s">Five boxing wizards</div>   |
-| `wa-font-size-m`   | <div class="wa-font-size-m">Five boxing wizards</div>   |
-| `wa-font-size-l`   | <div class="wa-font-size-l">Five boxing wizards</div>   |
-| `wa-font-size-xl`  | <div class="wa-font-size-xl">Five boxing wizards</div>  |
-| `wa-font-size-2xl` | <div class="wa-font-size-2xl">Five boxing wizards</div> |
-| `wa-font-size-3xl` | <div class="wa-font-size-3xl">Five boxing wizards</div> |
-| `wa-font-size-4xl` | <div class="wa-font-size-4xl">Five boxing wizards</div> |
-
-## Font Weight
-
-Use single-purpose `wa-font-weight-*` classes to apply a given [font weight](/docs/tokens/typography/#font-weight) from your theme to any element without additional styling.
-
-| Class Name                | Preview                                                        |
-| ------------------------- | -------------------------------------------------------------- |
-| `wa-font-weight-light`    | <div class="wa-font-weight-light">Five boxing wizards</div>    |
-| `wa-font-weight-normal`   | <div class="wa-font-weight-normal">Five boxing wizards</div>   |
-| `wa-font-weight-semibold` | <div class="wa-font-weight-semibold">Five boxing wizards</div> |
-| `wa-font-weight-bold`     | <div class="wa-font-weight-bold">Five boxing wizards</div>     |
-
-## Text Color
-
-Use single-purpose `wa-color-text-*` classes to apply a given [text color](/docs/tokens/color/#text) from your theme to any element without additional styling.
-
-| Class Name             | Preview                                                     |
-| ---------------------- | ----------------------------------------------------------- |
-| `wa-color-text-quiet`  | <div class="wa-color-text-quiet">Five boxing wizards</div>  |
-| `wa-color-text-normal` | <div class="wa-color-text-normal">Five boxing wizards</div> |
-| `wa-color-text-link`   | <div class="wa-color-text-link">Five boxing wizards</div>   |
-
-## Truncation
-
-Use the `wa-text-truncate` class to truncate text with an ellipsis instead of letting it overflow or wrap.
-
-| Class Name         | Preview                                                     |
-| ------------------ | ----------------------------------------------------------- |
-| `wa-text-truncate` | <div class="wa-text-truncate" style="max-width: 40ch;">The five boxing wizards jump quickly. How quickly daft jumping zebras vex!</div>  |
+| Class Name      | `font-size` Value    | Preview                                                                       |
+| --------------- | -------------------- | ----------------------------------------------------------------------------- |
+| `wa-caption-xs` | `--wa-font-size-2xs` | <div class="wa-caption-xs">The quick brown fox jumps over the lazy dog.</div> |
+| `wa-caption-s`  | `--wa-font-size-xs`  | <div class="wa-caption-s">The quick brown fox jumps over the lazy dog.</div>  |
+| `wa-caption-m`  | `--wa-font-size-s`   | <div class="wa-caption-m">The quick brown fox jumps over the lazy dog.</div>  |
+| `wa-caption-l`  | `--wa-font-size-m`   | <div class="wa-caption-l">The quick brown fox jumps over the lazy dog.</div>  |
+| `wa-caption-xl` | `--wa-font-size-l`   | <div class="wa-caption-xl">The quick brown fox jumps over the lazy dog.</div> |
--- a/packages/webawesome/docs/examples/themes/showcase.njk
+++ b/packages/webawesome/docs/examples/themes/showcase.njk
@@ -91,7 +91,7 @@ layout: false
      <div class="showcase-examples">
        <wa-card>
          <div slot="header" class="wa-split">
-            <h3 class="wa-heading-l">Your Cart</h3>
+            <h3 class="wa-heading-m">Your Cart</h3>
            <wa-button appearance="plain" size="small" tabindex="-1">
              <wa-icon name="xmark" label="Close"></wa-icon>
            </wa-button>
@@ -109,7 +109,7 @@ layout: false
                  <strong>Initiate Saber</strong>
                  <strong>$179.99</strong>
                </div>
-                <div class="wa-split wa-gap-2xs wa-caption-s">
+                <div class="wa-split wa-gap-2xs wa-caption-m">
                  <span>Green</span>
                  <a href="#" tabindex="-1">Remove</a>
                </div>
@@ -128,7 +128,7 @@ layout: false
                  <strong>Repair Droid</strong>
                  <strong>$3,049.99</strong>
                </div>
-                <div class="wa-split wa-gap-2xs wa-caption-s">
+                <div class="wa-split wa-gap-2xs wa-caption-m">
                  <span>R-series</span>
                  <a href="#" tabindex="-1">Remove</a>
                </div>
@@ -140,7 +140,7 @@ layout: false
              <strong>Subtotal</strong>
              <strong>$3,229.98</strong>
            </div>
-            <span class="wa-caption-s">Shipping and taxes calculated at checkout.</span>
+            <span class="wa-caption-m">Shipping and taxes calculated at checkout.</span>
            <wa-button tabindex="-1" variant="brand">
              <wa-icon slot="start" name="shopping-bag"></wa-icon>
              Checkout
@@ -158,7 +158,7 @@ layout: false
        </wa-card>
        <wa-card>
          <div class="wa-stack">
-            <h3 class="wa-heading-l">Sign In</h3>
+            <h3 class="wa-heading-m">Sign In</h3>
            <wa-input tabindex="-1" label="Email" placeholder="ddjarin@mandalore.gov" inert>
              <wa-icon slot="start" name="envelope" variant="regular"></wa-icon>
            </wa-input>
@@ -172,7 +172,7 @@ layout: false
        <wa-card>
          <div class="wa-stack">
            <div class="wa-split">
-              <h3 class="wa-heading-l">To-Do</h3>
+              <h3 class="wa-heading-m">To-Do</h3>
              <wa-button appearance="plain" size="small" tabindex="-1">
                <wa-icon name="plus" label="Add task"></wa-icon>
              </wa-button>
@@ -198,7 +198,7 @@ layout: false
                  <strong>The Stone Troll</strong>
                  <small><wa-badge variant="neutral" appearance="filled">E</wa-badge></small>
                </div>
-                <span class="wa-caption-s">Samwise G</span>
+                <span class="wa-caption-m">Samwise G</span>
              </div>
              <wa-button appearance="plain" size="small" tabindex="-1">
                <wa-icon name="ellipsis" label="Options"></wa-icon>
@@ -207,8 +207,8 @@ layout: false
            <div class="wa-stack wa-gap-2xs">
              <wa-progress-bar value="34"></wa-progress-bar>
              <div class="wa-split">
-                <span class="wa-caption-2xs">1:01</span>
-                <span class="wa-caption-2xs">-1:58</span>
+                <span class="wa-caption-xs">1:01</span>
+                <span class="wa-caption-xs">-1:58</span>
              </div>
            </div>
            <div class="wa-grid wa-align-items-center" style="--min-column-size: 1em; justify-items: center">
@@ -226,7 +226,7 @@ layout: false
        </wa-card>
        <wa-card>
          <div class="wa-stack">
-            <h3 class="wa-heading-l">Chalmun's Spaceport Cantina</h3>
+            <h3 class="wa-heading-m">Chalmun's Spaceport Cantina</h3>
            <div class="wa-cluster wa-gap-xs">
              <wa-rating value="4.6" readonly tabindex="-1"></wa-rating>
              <strong>4.6</strong>
@@ -238,14 +238,14 @@ layout: false
                <wa-icon name="dollar" style="color: var(--wa-color-green-60)"></wa-icon>
                <wa-icon name="dollar" style="color: var(--wa-color-green-60)"></wa-icon>
              </div>
-              <span class="wa-caption-s">&bull;</span>
+              <span class="wa-caption-m">&bull;</span>
              <wa-tag size="small">Cocktail Bar</wa-tag>
              <wa-tag size="small">Gastropub</wa-tag>
              <wa-tag size="small">Local Fare</wa-tag>
            </div>
            <div class="wa-flank wa-gap-xs">
              <wa-icon name="location-dot"></wa-icon>
-              <a href="#" class="wa-caption-s" tabindex="-1">Mos Eisley, Tatooine</a>
+              <a href="#" class="wa-caption-m" tabindex="-1">Mos Eisley, Tatooine</a>
            </div>
          </div>
        </wa-card>
@@ -283,7 +283,7 @@ layout: false
        <wa-card>
          <div class="wa-stack">
            <div class="wa-flank:end">
-              <h3 id="odds-label" class="wa-heading-l">Tell Me the Odds</h3>
+              <h3 id="odds-label" class="wa-heading-m">Tell Me the Odds</h3>
              <wa-switch size="large" aria-labelledby="odds-label" tabindex="-1"></wa-switch>
            </div>
            <p class="wa-body-s">
@@ -296,10 +296,10 @@ layout: false
          <div class="wa-stack">
            <div class="wa-split wa-align-items-start">
              <dl class="wa-stack wa-gap-2xs">
-                <dt class="wa-heading-m">Amount</dt>
-                <dd class="wa-heading-xl">$5,610.00</dd>
+                <dt class="wa-heading-s">Amount</dt>
+                <dd class="wa-heading-l">$5,610.00</dd>
              </dl>
-              <wa-badge appearance="filled-outlined" variant="success">Paid</wa-badge>
+              <wa-badge appearance="filled outlined" variant="success">Paid</wa-badge>
            </div>
            <wa-divider></wa-divider>
            <dl class="wa-stack">
@@ -327,37 +327,37 @@ layout: false
        <wa-card>
          <div class="wa-stack">
            <div class="wa-split">
-              <div class="wa-cluster wa-heading-xl">
+              <div class="wa-cluster wa-heading-l">
                <wa-icon name="book-sparkles"></wa-icon>
                <h3>Fellowship</h3>
              </div>
              <wa-badge>Most Popular</wa-badge>
            </div>
            <span class="wa-flank wa-align-items-baseline wa-gap-2xs">
-              <span class="wa-heading-3xl">$120</span>
-              <span class="wa-caption-m">per year</span>
+              <span class="wa-heading-2xl">$120</span>
+              <span class="wa-caption-l">per year</span>
            </span>
-            <p class="wa-caption-m">Carry great power (and great responsibility).</p>
+            <p class="wa-caption-l">Carry great power (and great responsibility).</p>
            <wa-button variant="brand" tabindex="-1">Get this Plan</wa-button>
          </div>
          <div slot="footer" class="wa-stack wap-gap-s">
-            <h4 class="wa-heading-m">What You Get</h4>
+            <h4 class="wa-heading-s">What You Get</h4>
            <div class="wa-stack">
              <div class="wa-flank">
                <wa-icon name="user"></wa-icon>
-                <span class="wa-caption-s">9 users</span>
+                <span class="wa-caption-m">9 users</span>
              </div>
              <div class="wa-flank">
                <wa-icon name="ring"></wa-icon>
-                <span class="wa-caption-s">1 ring</span>
+                <span class="wa-caption-m">1 ring</span>
              </div>
              <div class="wa-flank">
                <wa-icon name="chess-rook"></wa-icon>
-                <span class="wa-caption-s">API access to Isengard</span>
+                <span class="wa-caption-m">API access to Isengard</span>
              </div>
              <div class="wa-flank">
                <wa-icon name="feather"></wa-icon>
-                <span class="wa-caption-s">Priority eagle support</span>
+                <span class="wa-caption-m">Priority eagle support</span>
              </div>
            </div>
          </div>
@@ -377,10 +377,10 @@ layout: false
          <div class="wa-flank:end">
            <div class="wa-stack wa-gap-xs">
              <div class="wa-cluster wa-gap-xs">
-                <h3 class="wa-heading-m">Migs Mayfeld</h3>
+                <h3 class="wa-heading-s">Migs Mayfeld</h3>
                <wa-badge pill>Admin</wa-badge>
              </div>
-              <span class="wa-caption-s">Imperial Sharpshooter</span>
+              <span class="wa-caption-m">Imperial Sharpshooter</span>
            </div>
            <wa-avatar
              image="https://images.unsplash.com/photo-1633268335280-a41fbde58707?q=80&w=3348&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D"
@@ -408,8 +408,8 @@ layout: false
                <wa-icon slot="icon" name="egg-fried"></wa-icon>
              </wa-avatar>
              <div class="wa-gap-2xs wa-stack">
-                <span class="wa-heading-m">Second Breakfast</span>
-                <span class="wa-caption-s">19 Items</span>
+                <span class="wa-heading-s">Second Breakfast</span>
+                <span class="wa-caption-m">19 Items</span>
              </div>
            </a>
            <wa-dropdown>
@@ -425,10 +425,10 @@ layout: false
        </wa-card>
        <wa-card with-header with-footer>
          <div slot="header" class="wa-stack wa-gap-xs">
-            <h2 class="wa-heading-l">Decks</h2>
+            <h2 class="wa-heading-m">Decks</h2>
          </div>
          <div class="wa-stack wa-gap-xl">
-            <p class="wa-caption-s">
+            <p class="wa-caption-m">
              You haven't created any decks yet. Get started by selecting an aspect that matches your play style.
            </p>
            <div class="wa-grid wa-gap-xl" style="--min-column-size: 30ch">
@@ -440,10 +440,10 @@ layout: false
                  <wa-icon slot="icon" name="shield"></wa-icon>
                </wa-avatar>
                <div class="wa-stack wa-gap-2xs">
-                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-m">
+                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-s">
                    Vigilance <wa-icon name="arrow-right"></wa-icon>
                  </span>
-                  <p class="wa-caption-s">Protect, defend, and restore as you ready heavy-hitters.</p>
+                  <p class="wa-caption-m">Protect, defend, and restore as you ready heavy-hitters.</p>
                </div>
              </a>
              <a href="" class="wa-flank wa-align-items-start wa-link-plain" tabindex="-1">
@@ -454,10 +454,10 @@ layout: false
                  <wa-icon slot="icon" name="chevrons-up"></wa-icon>
                </wa-avatar>
                <div class="wa-stack wa-gap-2xs">
-                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-m">
+                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-s">
                    Command <wa-icon name="arrow-right"></wa-icon>
                  </span>
-                  <p class="wa-caption-s">Build imposing armies and stockpile resources.</p>
+                  <p class="wa-caption-m">Build imposing armies and stockpile resources.</p>
                </div>
              </a>
              <a href="" class="wa-flank wa-align-items-start wa-link-plain" tabindex="-1">
@@ -468,10 +468,10 @@ layout: false
                  <wa-icon slot="icon" name="explosion"></wa-icon>
                </wa-avatar>
                <div class="wa-stack wa-gap-2xs">
-                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-m">
+                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-s">
                    Aggression <wa-icon name="arrow-right"></wa-icon>
                  </span>
-                  <p class="wa-caption-s">Relentlessly deal damage and apply pressure to your opponent.</p>
+                  <p class="wa-caption-m">Relentlessly deal damage and apply pressure to your opponent.</p>
                </div>
              </a>
              <a href="" class="wa-flank wa-align-items-start wa-link-plain" tabindex="-1">
@@ -482,10 +482,10 @@ layout: false
                  <wa-icon slot="icon" name="moon-stars"></wa-icon>
                </wa-avatar>
                <div class="wa-stack wa-gap-2xs">
-                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-m">
+                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-s">
                    Cunning <wa-icon name="arrow-right"></wa-icon>
                  </span>
-                  <p class="wa-caption-s">Disrupt and frustrate your opponent with dastardly tricks.</p>
+                  <p class="wa-caption-m">Disrupt and frustrate your opponent with dastardly tricks.</p>
                </div>
              </a>
            </div>
--- a/packages/webawesome/docs/index.md
+++ b/packages/webawesome/docs/index.md
@@ -182,6 +182,25 @@ layout: page
      }
    }
  }
+  .beta-notice {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 1rem;
+    & > * {
+      flex-basis: calc(((30ch * 2 + 1rem) - 100%) * 999);
+    }
+    & > * {
+      flex-grow: 2;
+    }
+    & > * + * {
+      flex-grow: 1;
+    }
+    & wa-callout,
+    & wa-button::part(base) {
+      height: 100%;
+      width: 100%;
+    }
+  }
  wa-button.tile::part(base) {
    border-color: var(--wa-color-surface-border);
    border-radius: 0.75rem;
@@ -236,16 +255,24 @@ layout: page
    <div class="hero-cta">
      {%- raw -%}
        {% if currentUser.hasPro %}
-          <span class="wa-font-size-l" style="text-align: center; width: 100%;">Thanks for being a Web Awesome Pro subscriber!</span>
+          <span style="text-align: center; width: 100%; font-size: var(--wa-font-size-l);">Thanks for being a Web Awesome Pro subscriber!</span>
        {% else %}
-          <div class="wa-stack wa-gap-xs">
-            <h3 class="wa-heading-m">Get More with Web Awesome Pro!</h3>
-            <p>Unlock Pro-only themes, components, patterns, and great services like the Theme Builder.</p>
-          </div>
-          <wa-button class="wa-dark" size="small" href="/purchase">
-            <wa-icon slot="start" name="rocket-launch"></wa-icon>
-            Purchase Pro
-          </wa-button>
+          {% if App.flags.stripeEnabled %}
+            <div class="wa-stack wa-gap-xs">
+              <h3 class="wa-heading-s">Get More with Web Awesome Pro!</h3>
+              <p>Unlock Pro-only themes, components, patterns, and great services like the Theme Builder.</p>
+            </div>
+            <wa-button class="wa-dark" size="small" href="/purchase">
+              <wa-icon slot="start" name="rocket-launch"></wa-icon>
+              Purchase Pro
+            </wa-button>
+          {% else %}
+            <span><em>Psst!</em> You can pre-order Web Awesome Pro at a low, guaranteed-for-life price &mdash; but not for long. Get in while the gettin’s good.</span>
+            <wa-button class="wa-dark" size="small" href="https://www.kickstarter.com/projects/fontawesome/web-awesome">
+              <wa-icon slot="start" name="person-running"></wa-icon>
+              Pre-order WA Pro
+            </wa-button>
+          {% endif %}
        {% endif %}
      {% endraw %}
    </div>
@@ -253,18 +280,33 @@ layout: page
 </div>

 <div class="home-wrapper">
-  <wa-button href="/docs/" appearance="outlined" class="tile">
-    <div class="wa-stack">
-      <div class="wa-split">
-        <div class="wa-cluster icon-heading">
-          <wa-icon name="pen-ruler" class="brand-orange"></wa-icon>
-          <h3>Get started</h3>
+  <div class="beta-notice">
+    <div>
+      <wa-callout variant="brand">
+        <div class="wa-stack">
+          <div class="wa-cluster icon-heading">
+            <wa-icon name="sparkles" variant="regular"></wa-icon>
+            <h3>Bigger and beta than ever</h3>
+          </div>
+          <p>This beta is battle-tested and built to last, but if you see something, say something. Please <a href="https://github.com/shoelace-style/webawesome/issues">report bugs</a> or <a href="https://github.com/shoelace-style/webawesome/discussions">ask for help</a>!</p>
        </div>
-        <wa-icon name="arrow-right"></wa-icon>
-      </div>
-      <p>Check out our installation guide to start building with Web Awesome.</p>
+      </wa-callout>
    </div>
-  </wa-button>
+    <div>
+      <wa-button href="/docs/" appearance="outlined" class="tile">
+        <div class="wa-stack">
+          <div class="wa-split">
+            <div class="wa-cluster icon-heading">
+              <wa-icon name="pen-ruler" class="brand-orange"></wa-icon>
+              <h3>Get started</h3>
+            </div>
+            <wa-icon name="arrow-right"></wa-icon>
+          </div>
+          <p>Check out our installation guide to start building with Web Awesome.</p>
+        </div>
+      </wa-button>
+    </div>
+  </div>
  <wa-divider></wa-divider>
  <div class="summary">
    <h2 class="brand-font">What's <span class="emphasis">Web</span> Awesome?</h2>
--- a/packages/webawesome/docs/manifest.json
+++ b/packages/webawesome/docs/manifest.json
@@ -1,21 +0,0 @@
-{
-  "name": "Web Awesome",
-  "short_name": "Web Awesome",
-  "description": "Build better with Web Awesome, the open source library of web components from Font Awesome.",
-  "start_url": "/",
-  "display": "standalone",
-  "theme_color": "#f36944",
-  "background_color": "#ffffff",
-  "icons": [
-    {
-      "src": "/assets/images/app-icons/app-icon-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "/assets/images/app-icons/app-icon-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ]
-}
--- a/packages/webawesome/package.json
+++ b/packages/webawesome/package.json
@@ -4,7 +4,7 @@
    "access": "public"
  },
  "description": "A forward-thinking library of web components.",
-  "version": "3.1.0",
+  "version": "3.0.0-beta.6",
  "homepage": "https://webawesome.com/",
  "author": "Web Awesome",
  "license": "MIT",
@@ -64,10 +64,10 @@
    "spellcheck": "cspell \"**/*.{js,ts,json,html,css,md}\" --no-progress --config=\"../../cspell.json\"",
    "verify": "npm run prettier && npm run build && npm run test",
    "prepublishOnly": "npm run verify",
-    "check-updates": "npm-check-updates --cooldown 7 --interactive --format group",
+    "check-updates": "npx npm-check-updates --interactive --format group",
    "print-version": "echo $npm_package_version",
    "tag-version": "git tag -a \"v$(npm run print-version | tail -n1)\" -m \"tag v$(npm run print-version | tail -n1)\"",
-    "postversion": "node ./scripts/update-root-version.js"
+    "postversion": "npm run tag-version"
  },
  "engines": {
    "node": ">=14.17.0"
@@ -90,8 +90,6 @@
  },
  "devDependencies": {
    "@wc-toolkit/jsx-types": "^1.3.0",
-    "eleventy-plugin-git-commit-date": "^0.1.3",
-    "esbuild": "^0.25.11",
-    "npm-check-updates": "^19.1.2"
+    "eleventy-plugin-git-commit-date": "^0.1.3"
  }
 }
--- a/packages/webawesome/scripts/build.js
+++ b/packages/webawesome/scripts/build.js
@@ -18,7 +18,6 @@ import { getCdnDir, getDistDir, getDocsDir, getRootDir, getSiteDir } from './uti

 const __dirname = dirname(fileURLToPath(import.meta.url));

-const currentYear = new Date().getFullYear();
 const spinner = ora({ text: 'Web Awesome', color: 'cyan' }).start();
 const getPackageData = async () => JSON.parse(await readFile(join(getRootDir(), 'package.json'), 'utf-8'));
 const getVersion = async () => JSON.stringify((await getPackageData()).version.toString());
@@ -226,10 +225,10 @@ export async function build(options = {}) {
      bundle: true,
      splitting: true,
      minify: false,
-      banner: {
-        js: `/*! Copyright ${currentYear} Fonticons, Inc. - https://webawesome.com/license */`,
-      },
      plugins: [replace({ __WEBAWESOME_VERSION__: await getVersion() })],
+      loader: {
+        '.css': 'text',
+      },
    };

    const unbundledConfig = {
--- a/packages/webawesome/scripts/update-root-version.js
+++ b/packages/webawesome/scripts/update-root-version.js
@@ -1,27 +0,0 @@
-#!/usr/bin/env node
-
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as url from 'url';
-
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
-
-const monorepoRoot = path.resolve(__dirname, '..', '..', '..');
-const rootPackageJSONFile = path.join(monorepoRoot, 'package.json');
-const webawesomePackageJSONFile = path.join(path.resolve(__dirname, '..'), 'package.json');
-
-const rootPackageJSON = JSON.parse(fs.readFileSync(rootPackageJSONFile, { encoding: 'utf8' }));
-const webawesomePackageJSON = JSON.parse(fs.readFileSync(webawesomePackageJSONFile, { encoding: 'utf8' }));
-
-const currentVersion = webawesomePackageJSON.version;
-rootPackageJSON.version = currentVersion;
-
-fs.writeFileSync(rootPackageJSONFile, JSON.stringify(rootPackageJSON, null, 2));
-
-const versionsFile = path.join(monorepoRoot, 'VERSIONS.txt');
-const versions = fs.readFileSync(versionsFile, { encoding: 'utf8' }).split(/\r?\n/);
-
-// TODO: Make this smart and understand semver and "insert" in the correct spot instead of appending.
-if (!versions.includes(currentVersion)) {
-  fs.appendFileSync(versionsFile, webawesomePackageJSON.version);
-}
--- a/packages/webawesome/src/components/animated-image/animated-image.css
+++ b/packages/webawesome/src/components/animated-image/animated-image.css
@@ -0,0 +1,65 @@
+:host {
+  --control-box-size: 3rem;
+  --icon-size: calc(var(--control-box-size) * 0.625);
+
+  display: inline-flex;
+  position: relative;
+  cursor: pointer;
+}
+
+img {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
+img[aria-hidden='true'] {
+  display: none;
+}
+
+.control-box {
+  display: flex;
+  position: absolute;
+  align-items: center;
+  justify-content: center;
+  top: calc(50% - var(--control-box-size) / 2);
+  right: calc(50% - var(--control-box-size) / 2);
+  width: var(--control-box-size);
+  height: var(--control-box-size);
+  font-size: calc(var(--icon-size) * 0.75);
+  background: none;
+  border: solid var(--wa-border-width-s) currentColor;
+  background-color: rgb(0 0 0 / 50%);
+  border-radius: var(--wa-border-radius-circle);
+  color: white;
+  pointer-events: none;
+  transition: opacity var(--wa-transition-normal) var(--wa-transition-easing);
+}
+
+@media (hover: hover) {
+  :host([play]:hover) .control-box {
+    opacity: 1;
+  }
+}
+
+:where(:host([play]:not(:hover))) .control-box {
+  opacity: 0;
+}
+
+:host([play]) slot[name='play-icon'],
+:host(:not([play])) slot[name='pause-icon'] {
+  display: none;
+}
+
+/* Show control box on keyboard focus */
+.animated-image {
+  &:focus {
+    outline: none;
+  }
+
+  &:focus-visible .control-box {
+    opacity: 1;
+    outline: var(--wa-focus-ring);
+    outline-offset: var(--wa-focus-ring-offset);
+  }
+}
--- a/packages/webawesome/src/components/animated-image/animated-image.styles.ts
+++ b/packages/webawesome/src/components/animated-image/animated-image.styles.ts
@@ -1,69 +0,0 @@
-import { css } from 'lit';
-
-export default css`
-  :host {
-    --control-box-size: 3rem;
-    --icon-size: calc(var(--control-box-size) * 0.625);
-
-    display: inline-flex;
-    position: relative;
-    cursor: pointer;
-  }
-
-  img {
-    display: block;
-    width: 100%;
-    height: 100%;
-  }
-
-  img[aria-hidden='true'] {
-    display: none;
-  }
-
-  .control-box {
-    display: flex;
-    position: absolute;
-    align-items: center;
-    justify-content: center;
-    top: calc(50% - var(--control-box-size) / 2);
-    right: calc(50% - var(--control-box-size) / 2);
-    width: var(--control-box-size);
-    height: var(--control-box-size);
-    font-size: calc(var(--icon-size) * 0.75);
-    background: none;
-    border: solid var(--wa-border-width-s) currentColor;
-    background-color: rgb(0 0 0 / 50%);
-    border-radius: var(--wa-border-radius-circle);
-    color: white;
-    pointer-events: none;
-    transition: opacity var(--wa-transition-normal) var(--wa-transition-easing);
-  }
-
-  @media (hover: hover) {
-    :host([play]:hover) .control-box {
-      opacity: 1;
-    }
-  }
-
-  :where(:host([play]:not(:hover))) .control-box {
-    opacity: 0;
-  }
-
-  :host([play]) slot[name='play-icon'],
-  :host(:not([play])) slot[name='pause-icon'] {
-    display: none;
-  }
-
-  /* Show control box on keyboard focus */
-  .animated-image {
-    &:focus {
-      outline: none;
-    }
-
-    &:focus-visible .control-box {
-      opacity: 1;
-      outline: var(--wa-focus-ring);
-      outline-offset: var(--wa-focus-ring-offset);
-    }
-  }
-`;
--- a/packages/webawesome/src/components/animated-image/animated-image.ts
+++ b/packages/webawesome/src/components/animated-image/animated-image.ts
@@ -6,7 +6,7 @@ import { watch } from '../../internal/watch.js';
 import WebAwesomeElement from '../../internal/webawesome-element.js';
 import { LocalizeController } from '../../utilities/localize.js';
 import '../icon/icon.js';
-import styles from './animated-image.styles.js';
+import styles from './animated-image.css';

 /**
 * @summary A component for displaying animated GIFs and WEBPs that play and pause on interaction.
--- a/packages/webawesome/src/components/animation/animation.css
+++ b/packages/webawesome/src/components/animation/animation.css
@@ -0,0 +1,3 @@
+:host {
+  display: contents;
+}
--- a/packages/webawesome/src/components/animation/animation.styles.ts
+++ b/packages/webawesome/src/components/animation/animation.styles.ts
@@ -1,7 +0,0 @@
-import { css } from 'lit';
-
-export default css`
-  :host {
-    display: contents;
-  }
-`;
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m18.608 5.8c0 1.04658-.6184 1.94874-1.5097 2.36103l5.3017 4.63897 5.2196-1.0439c-.2647-.3858-.4196-.8529-.4196-1.3561 0-1.32548 1.0745-2.4 2.4-2.4s2.4 1.07452 2.4 2.4c0 1.3085-1.0471 2.3724-2.3491 2.3995l-5.7878 12.3578c-.5267 1.1245-1.6562 1.8427-2.8979 1.8427h-9.9303c-1.2417 0-2.37129-.7182-2.89794-1.8427l-5.78784-12.3578c-1.30199-.0271-2.34912-1.091-2.34912-2.3995 0-1.32548 1.07452-2.4 2.4-2.4s2.4 1.07452 2.4 2.4c0 .5032-.15488.9703-.41957 1.3561l5.21957 1.0439 5.3072-4.64383c-.8857-.4145-1.4992-1.31368-1.4992-2.35617 0-1.43594 1.1641-2.6 2.6-2.6s2.6 1.16406 2.6 2.6z" fill="#f36944" fill-rule="evenodd"/></svg>