Merge branch 'styling-attributes' of https://github.com/shoelace-style/webawesome into styling-attributes

Experiment
Themes category in docs (#477 )
2026-01-19 07:29:14 +00:00 · 2025-01-13 13:20:31 -05:00 · 2025-01-13 13:20:25 -05:00 · 2025-01-13 13:14:12 -05:00 · 2025-01-10 15:32:28 -05:00 · 2025-01-10 13:29:14 -05:00
94 changed files with 1947 additions and 1409 deletions
--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ To generate a production build, run the following command.
 npm run build
 ```

+You can also run `npm run build:serve` to start an [`http-server`](https://www.npmjs.com/package/http-server) instance on `http://localhost:4000` after the build completes, so you can preview the production build.
+
 ### Creating New Components

 To scaffold a new component, run the following command, replacing `wa-tag-name` with the desired tag name.
--- a/docs/.eleventy.js
+++ b/docs/.eleventy.js
@@ -20,6 +20,15 @@ const packageData = JSON.parse(await readFile('./package.json', 'utf-8'));
 const isAlpha = process.argv.includes('--alpha');
 const isDev = process.argv.includes('--develop');

+const globalData = {
+  package: packageData,
+  isAlpha,
+  layout: 'page.njk',
+};
+
+const passThroughExtensions = ['js', 'css', 'png', 'svg', 'jpg', 'mp4'];
+const passThrough = [...passThroughExtensions.map(ext => 'docs/**/*.' + ext)];
+
 export default function (eleventyConfig) {
  // NOTE - alpha setting removes certain pages
  if (isAlpha) {
@@ -32,8 +41,9 @@ export default function (eleventyConfig) {
  }

  // Add template data
-  eleventyConfig.addGlobalData('package', packageData);
-  eleventyConfig.addGlobalData('isAlpha', isAlpha);
+  for (let name in globalData) {
+    eleventyConfig.addGlobalData(name, globalData[name]);
+  }

  // Template filters - {{ content | filter }}
  eleventyConfig.addFilter('inlineMarkdown', content => markdown.renderInline(content || ''));
@@ -148,9 +158,18 @@ export default function (eleventyConfig) {
  //   eleventyConfig.addPlugin(formatCodePlugin());
  // }

+  eleventyConfig.addPassthroughCopy({
+    'docs/assets': 'assets',
+  });
+
+  for (let glob of passThrough) {
+    eleventyConfig.addPassthroughCopy(glob);
+  }
+
  return {
    markdownTemplateEngine: 'njk',
    dir: {
+      input: 'docs',
      includes: '_includes',
      layouts: '_layouts',
    },
--- a/docs/_data/componentList.js
+++ b/docs/_data/componentList.js
@@ -31,13 +31,25 @@ const components = manifest.modules.flatMap(module => {
        return prop.kind === 'field' && prop.privacy !== 'private';
      });

-      return {
+      let ret = {
        ...declaration,
        slug: declaration.tagName.replace(/^wa-/, ''),
        methods,
        attributes,
        properties,
      };
+
+      // Add named keys to these arrays
+      for (let thing of ['methods', 'attributes', 'properties', 'cssProperties', 'cssParts', 'cssStates', 'events']) {
+        if (ret[thing]) {
+          ret[thing] = ret[thing].reduce((acc, item) => {
+            acc[item.name] = item;
+            return acc;
+          }, ret[thing]);
+        }
+      }
+
+      return ret;
    });
 });

--- a/docs/_includes/base-wide.njk
+++ b/docs/_includes/base-wide.njk
--- a/docs/_includes/base.njk
+++ b/docs/_includes/base.njk
@@ -1,91 +1,25 @@
 <!DOCTYPE html>
 <html lang="en" data-fa-kit-code="b10bfbde90" data-cdn-url="{% cdnUrl %}">
  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="{{ description }}">
+    {% include 'head.njk' %}
    <meta name="theme-color" content="#f36944">
-    {% if noindex %}<meta name="robots" content="noindex">{% endif %}
-
-    <title>{{ title }}</title>
-
-    <link rel="icon" href="/assets/images/webawesome-logo.svg" />
-    <link rel="apple-touch-icon" href="/assets/images/app-icon.png">
-
-    {# Scripts #}
-    {# Hydration stuff #}
-    <script src="/assets/scripts/hydration-errors.js"></script>
-    <link rel="stylesheet" href="/assets/styles/hydration-errors.css">
-    <link rel="preconnect" href="https://cdn.jsdelivr.net">
-    <script type="module" src="https://cdn.jsdelivr.net/npm/@hotwired/turbo@8.0.10/+esm"></script>

    <script type="module" src="/assets/scripts/code-examples.js"></script>
-    <script type="module" src="/assets/scripts/color-scheme.js"></script>
    <script type="module" src="/assets/scripts/copy-code.js"></script>
-    <script type="module" src="/assets/scripts/preset-theme.js"></script>
+
    <script type="module" src="/assets/scripts/scroll.js"></script>
    <script type="module" src="/assets/scripts/turbo.js"></script>
    <script type="module" src="/assets/scripts/search.js"></script>
    <script type="module" src="/assets/scripts/outline.js"></script>
    <script defer data-domain="backers.webawesome.com" src="https://plausible.io/js/script.js"></script>

-    {# Web Awesome #}
-    <script type="module" src="/dist/webawesome.ssr-loader.js"></script>
-    <link rel="stylesheet" id="theme-stylesheet" href="/dist/styles/themes/default.css" />
-    <link rel="stylesheet" href="/dist/styles/webawesome.css" />
-    <link id="color-stylesheet" rel="stylesheet" href="/dist/styles/utilities.css" />
-    <link rel="stylesheet" href="/dist/styles/forms.css" />
-
    {# Docs styles #}
    <link rel="stylesheet" href="/assets/styles/docs.css" />
-
-    {# Set the theme to prevent flashing #}
-    <script>
-      function getColorScheme() {
-        return localStorage.getItem('colorScheme') || 'auto';
-      }
-
-      function getPresetTheme () {
-        return localStorage.getItem('presetTheme') || 'default';
-      }
-
-      function isDark() {
-        const colorScheme = getColorScheme()
-        if (colorScheme === 'auto') {
-          return window.matchMedia('(prefers-color-scheme: dark)').matches;
-        }
-        return colorScheme === 'dark';
-      }
-
-      const oldStylesheet = document.querySelector("#theme-stylesheet")
-
-      const newStylesheet = document.createElement("link")
-
-      let preset = getPresetTheme()
-      newStylesheet.href = `/dist/styles/themes/${preset}.css`
-      newStylesheet.rel = "preload"
-      newStylesheet.as = "style"
-
-      document.head.append(newStylesheet)
-
-      function updateStylesheet () {
-        newStylesheet.rel = "stylesheet"
-        newStylesheet.id = "theme-stylesheet"
-        requestAnimationFrame(() => oldStylesheet.remove())
-      }
-
-      newStylesheet.addEventListener("load", updateStylesheet)
-
-      document.documentElement.classList.toggle(
-        `wa-theme-${preset}-dark`,
-        isDark()
-      );
-    </script>
  </head>
  <body class="layout-{{ layout | stripExtension }}">
    <!-- use view="desktop" as default to reduce layout jank on desktop site. -->
    <wa-page view="desktop" disable-navigation-toggle="">
-      <header slot="header">
+      <header slot="header" class="wa-split">
        {# Logo #}
        <div id="docs-branding">
          {# Nav toggle #}
@@ -101,9 +35,9 @@
          <wa-badge variant="warning" appearance="filled" class="only-desktop">Alpha</wa-badge>
        </div>

-        <div id="docs-toolbar">
+        <div id="docs-toolbar" class="wa-cluster wa-gap-xs">
          {# Desktop selectors #}
-          <div class="only-desktop">
+          <div class="only-desktop wa-cluster wa-gap-xs">
            {% include "preset-theme-selector.njk" %}
            {% include "color-scheme-selector.njk" %}
          </div>
@@ -121,7 +55,7 @@
      {% if hasSidebar %}
        {# Mobile selectors #}
        <div class="wa-mobile-only" slot="navigation-header">
-          <div style="display: grid; grid-template-columns: repeat(2, minmax(0, 1fr));">
+          <div class="wa-cluster wa-gap-xs">
            {% include "preset-theme-selector.njk" %}
            {% include "color-scheme-selector.njk" %}
          </div>
@@ -149,22 +83,14 @@
          </details>
        </nav>

-        {% set breadcrumbs = page.url | breadcrumbs %}
-        {% if breadcrumbs.length > 0 %}
-          <wa-breadcrumb id="docs-breadcrumbs">
-            {% for crumb in breadcrumbs %}
-              <wa-breadcrumb-item href="{{ crumb.url }}">{{ crumb.title }}</wa-breadcrumb-item>
-            {% endfor %}
-            <wa-breadcrumb-item>{# Current page #}</wa-breadcrumb-item>
-          </wa-breadcrumb>
-          {% else %}
-        {% endif %}

-        {% block beforeContent %}{% endblock %}
+
+        {% block header %}
+          {% include 'breadcrumbs.njk' %}
+          <h1 class="title">{{ title }}</h1>
+        {% endblock %}

        {% block content %}
-          <h1 class="title">{{ title }}</h1>
-
          {{ content | safe }}
        {% endblock %}

--- a/docs/_includes/breadcrumbs.njk
+++ b/docs/_includes/breadcrumbs.njk
@@ -0,0 +1,10 @@
+{% set breadcrumbs = page.url | breadcrumbs %}
+{% if breadcrumbs.length > 0 %}
+  <wa-breadcrumb id="docs-breadcrumbs">
+  {% for crumb in breadcrumbs %}
+    <wa-breadcrumb-item href="{{ crumb.url }}">{{ crumb.title }}</wa-breadcrumb-item>
+  {% endfor %}
+  <wa-breadcrumb-item>{# Current page #}</wa-breadcrumb-item>
+  </wa-breadcrumb>
+  {% else %}
+{% endif %}
--- a/docs/_includes/color-scheme-selector.njk
+++ b/docs/_includes/color-scheme-selector.njk
@@ -1,15 +1,19 @@
 {# Color scheme selector #}
-<wa-dropdown id="color-scheme-selector">
-  <wa-button slot="trigger" appearance="filled" size="small" pill caret title="Press \ to toggle">
+<wa-select class="color-scheme-selector" appearance="filled" size="small" value="auto" pill title="Press \ to toggle">
+  <wa-icon class="only-light" slot="prefix" name="sun" variant="regular"></wa-icon>
+  <wa-icon class="only-dark" slot="prefix" name="moon" variant="regular"></wa-icon>
+  <wa-option value="light">
+    <wa-icon slot="prefix" name="sun" variant="regular"></wa-icon>
+    Light
+  </wa-option>
+  <wa-option value="dark">
+    <wa-icon slot="prefix" name="moon" variant="regular"></wa-icon>
+    Dark
+  </wa-option>
+  <wa-divider></wa-divider>
+  <wa-option value="auto">
    <wa-icon class="only-light" slot="prefix" name="sun" variant="regular"></wa-icon>
    <wa-icon class="only-dark" slot="prefix" name="moon" variant="regular"></wa-icon>
-    <span class="only-light">Light</span>
-    <span class="only-dark">Dark</span>
-  </wa-button>
-  <wa-menu>
-    <wa-menu-item type="checkbox" value="light">Light</wa-menu-item>
-    <wa-menu-item type="checkbox" value="dark">Dark</wa-menu-item>
-    <wa-divider></wa-divider>
-    <wa-menu-item type="checkbox" value="auto">System</wa-menu-item>
-  </wa-menu>
-</wa-dropdown>
+    System
+  </wa-option>
+</wa-select>
--- a/docs/_includes/head.njk
+++ b/docs/_includes/head.njk
@@ -0,0 +1,53 @@
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="{{ description }}">
+{% if noindex %}<meta name="robots" content="noindex">{% endif %}
+
+<title>{{ title }}</title>
+
+{# Dark mode #}
+<script>
+	let colorScheme = localStorage.colorScheme;
+	let isDark = localStorage.colorScheme === "dark";
+	if (!colorScheme || colorScheme === "auto") {
+		isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+	}
+	document.documentElement.classList.toggle('wa-dark', isDark);
+</script>
+
+<link rel="icon" href="/assets/images/webawesome-logo.svg" />
+<link rel="apple-touch-icon" href="/assets/images/app-icon.png">
+
+{# Scripts #}
+{# Hydration stuff #}
+<script src="/assets/scripts/hydration-errors.js"></script>
+<link rel="stylesheet" href="/assets/styles/hydration-errors.css">
+<link rel="preconnect" href="https://cdn.jsdelivr.net">
+<script type="module" src="https://cdn.jsdelivr.net/npm/@hotwired/turbo@8.0.10/+esm"></script>
+
+{# Web Awesome #}
+<script type="module" src="/dist/webawesome.ssr-loader.js"></script>
+
+<script type="module" src="/assets/scripts/theme-picker.js"></script>
+{# Preset Theme #}
+<link id="theme-stylesheet" rel="stylesheet" id="theme-stylesheet" href="/dist/styles/themes/{{ forceTheme or 'default' }}.css" render="blocking" fetchpriority="high" />
+{% if not forceTheme %}
+<script>
+if (localStorage.presetTheme) {
+	let preset = localStorage.presetTheme;
+	let script = document.currentScript;
+	let link = script.previousElementSibling;
+	let newLink = link.cloneNode();
+	newLink.href = link.href.replace("/default.css", `/${preset}.css`);
+	newLink.addEventListener('load', () => {
+		link.remove();
+	});
+	link.after(newLink);
+}
+</script>
+<script type="module" src="/assets/scripts/preset-theme-picker.js"></script>
+{% endif %}
+
+<link rel="stylesheet" href="/dist/styles/webawesome.css" />
+<link id="color-stylesheet" rel="stylesheet" href="/dist/styles/utilities.css" />
+<link rel="stylesheet" href="/dist/styles/forms.css" />
--- a/docs/_includes/page-demo.njk
+++ b/docs/_includes/page-demo.njk
@@ -1,5 +1,5 @@
 <div id="page_slots_demo">
-<link rel="stylesheet" href="/assets/examples/page-demo/demo.css">
+<link rel="stylesheet" href="./demo.css">
 {% set slots = components.page.slots %}

 <fieldset id="page_slots_fieldset">
@@ -22,5 +22,5 @@

 <script type="module">
  const cacheBust = new Date().toString()
-  import(`/assets/examples/page-demo/demo.js?${cacheBust}`)
+  import(`./demo.js?${cacheBust}`)
 </script>
--- a/docs/_includes/preset-theme-selector.njk
+++ b/docs/_includes/preset-theme-selector.njk
@@ -1,19 +1,9 @@
 {# Preset theme selector #}
-<wa-dropdown class="preset-theme-selector">
-  <wa-button slot="trigger" appearance="filled" size="small" pill caret>
-    <wa-icon slot="prefix" name="paintbrush" variant="regular"></wa-icon>
-    <span class="preset-theme-selector__text">Default</span>
-  </wa-button>
-  <wa-menu>
-    <wa-menu-item type="checkbox" value="default">Default</wa-menu-item>
-    <wa-menu-item type="checkbox" value="classic">Classic</wa-menu-item>
-    <wa-menu-item type="checkbox" value="awesome">Awesome</wa-menu-item>
-    <wa-menu-item type="checkbox" value="active">Active</wa-menu-item>
-    <wa-menu-item type="checkbox" value="brutalist">Brutalist</wa-menu-item>
-    <wa-menu-item data-alpha="remove" type="checkbox" value="glassy">Glassy</wa-menu-item>
-    <wa-menu-item type="checkbox" value="mellow">Mellow</wa-menu-item>
-    <wa-menu-item type="checkbox" value="migration">Migration</wa-menu-item>
-    <wa-menu-item data-alpha="remove" type="checkbox" value="playful">Playful</wa-menu-item>
-    <wa-menu-item data-alpha="remove" type="checkbox" value="premium">Premium</wa-menu-item>
-  </wa-menu>
-</wa-dropdown>
+<wa-select appearance="filled" size="small" value="default" pill class="preset-theme-selector">
+  <wa-icon slot="prefix" name="paintbrush" variant="regular"></wa-icon>
+  {% for theme in collections.theme | sort %}
+    <wa-option value="{{ theme.page.fileSlug }}"{{ ' data-alpha="remove"' if theme.noAlpha }}>
+      {{ theme.data.title }}
+    </wa-option>
+  {% endfor %}
+</wa-select>
--- a/docs/_includes/sidebar-group.njk
+++ b/docs/_includes/sidebar-group.njk
@@ -1,6 +1,6 @@
 {# Some collections (like "patterns") will not have any items in the alpha build for example. So this checks to make sure the collection exists. #}
 {% if collections[tag] -%}
-  <wa-details {{ (('/' + tag + '/') in page.url) | attr('open') }}>
+  <wa-details {{ (tag in (tags or [])) | attr('open') }}>
    <h2 slot="summary">
      {% set groupUrl %}/docs/{{ tag }}/{% endset %}
      {% if groupUrl | getCollectionItemFromUrl %}
--- a/docs/_includes/sidebar-link.njk
+++ b/docs/_includes/sidebar-link.njk
@@ -1,6 +1,6 @@
 {% if not (isAlpha and page.data.noAlpha) and page.fileSlug != tag and not page.data.unlisted -%}
 	<li>
-		<a href="/docs/{{ tag }}/{{ page.fileSlug }}">{{ page.data.title }}</a>
+		<a href="{{ page.url }}">{{ page.data.title }}</a>
 		{% if page.data.status == 'experimental' %}<wa-icon name="flask"></wa-icon>{% endif %}
 		{% if page.data.isPro %}<wa-badge class="pro">PRO</wa-badge>{% endif %}

--- a/docs/_includes/sidebar.njk
+++ b/docs/_includes/sidebar.njk
@@ -3,7 +3,6 @@
 <ul>
  <li><a href="/docs/installation">Installation</a></li>
  <li><a href="/docs/usage">Usage</a></li>
-  <li><a href="/docs/themes">Themes</a></li>
  <li><a href="/docs/customizing">Customizing</a></li>
  <li><a href="/docs/form-controls">Form Controls</a></li>
  <li><a href="/docs/localization">Localization</a></li>
@@ -20,6 +19,7 @@
 </ul>

 {% for tag, title in {
+  'themes': 'Themes',
  'components': 'Components',
  'native': 'Native Styles',
  'utilities': 'Style Utilities',
--- a/docs/_includes/status.njk
+++ b/docs/_includes/status.njk
@@ -1,25 +1,25 @@
 {% if since -%}
 	<wa-badge variant="neutral">Since {{ since }}</wa-badge>
-{%- endif %}
+{% endif -%}

-{% if status -%}
+{%- if status %}
 	{%- if status == "wip" %}
 	<wa-badge variant="danger">
 		<wa-icon name="pickaxe"></wa-icon>
 		Work In Progress
 	</wa-badge>
-	{%- elif status == "experimental" -%}
+	{%- elif status == "experimental" %}
 	<wa-badge variant="warning">
 		<wa-icon name="flask"></wa-icon>
 		Experimental
 	</wa-badge>
-	{%- elif status == "stable" -%}
+	{%- elif status == "stable" %}
 	<wa-badge variant="brand">Stable</wa-badge>
 	{%- else %}
 	<wa-badge>{{ status}}</wa-badge>
-	{%- endif %}
+	{%- endif -%}
 {%- endif %}

-{% if isPro -%}
+{%- if isPro %}
 	<wa-badge class="pro">PRO</wa-badge>
-{%- endif %}
+{%- endif -%}
--- a/docs/_includes/theme-showcase.njk
+++ b/docs/_includes/theme-showcase.njk
@@ -0,0 +1,144 @@
+<div class="showcase-examples-wrapper" aria-hidden="true" data-no-outline>
+  <div class="showcase-examples">
+    <wa-card with-header with-footer>
+      <div slot="header" class="wa-split">
+        <h3 class="wa-heading-m">Your Cart</h3>
+        <wa-icon-button name="xmark" tabindex="-1"></wa-icon-button>
+      </div>
+      <div class="wa-stack wa-gap-xl">
+        <div class="wa-flank">
+          <wa-avatar shape="rounded" style="--size: 3em; --background-color: var(--wa-color-green-60); --text-color: var(--wa-color-green-95);">
+            <wa-icon slot="icon" name="sword-laser" family="duotone" style="font-size: 1.5em;"></wa-icon>
+          </wa-avatar>
+          <div class="wa-stack wa-gap-2xs">
+            <div class="wa-split wa-gap-2xs">
+              <strong>Initiate Saber</strong>
+              <strong>$179.99</strong>
+            </div>
+            <div class="wa-split wa-gap-2xs wa-caption-m">
+              <span>Green</span>
+              <a href="#" tabindex="-1">Remove</a>
+            </div>
+          </div>
+        </div>
+        <wa-divider></wa-divider>
+        <div class="wa-flank">
+          <wa-avatar shape="rounded" style="--size: 3em; --background-color: var(--wa-color-teal-60); --text-color: var(--wa-color-teal-95);">
+            <wa-icon slot="icon" name="robot-astromech" family="duotone" style="font-size: 1.5em;"></wa-icon>
+          </wa-avatar>
+          <div class="wa-stack wa-gap-2xs">
+            <div class="wa-split wa-gap-2xs">
+              <strong>Repair Droid</strong>
+              <strong>$3,049.99</strong>
+            </div>
+            <div class="wa-split wa-gap-2xs wa-caption-m">
+              <span>R-series</span>
+              <a href="#" tabindex="-1">Remove</a>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="wa-stack">
+        <div class="wa-split">
+          <strong>Subtotal</strong>
+          <strong>$3,229.98</strong>
+        </div>
+        <span class="wa-caption-m">Shipping and taxes calculated at checkout.</span>
+        <wa-button tabindex="-1" variant="brand">
+          <wa-icon slot="prefix" name="shopping-bag"></wa-icon>
+          Checkout
+        </wa-button>
+      </div>
+    </wa-card>
+    <wa-card>
+      <wa-avatar shape="rounded" style="--size: 1.9lh; float: left; margin-right: var(--wa-space-m);">
+        <wa-icon slot="icon" name="hat-wizard" family="duotone" style="font-size: 1.75em;"></wa-icon>
+      </wa-avatar>
+      <p class="wa-body-l" style="margin: 0;">&ldquo;All we have to decide is what to do with the time that is given to us. There are other forces at work in this world, Frodo, besides the will of evil.&rdquo;</p>
+    </wa-card>
+    <wa-card>
+      <div class="wa-stack">
+        <h3 class="wa-heading-m">Sign In</h3>
+        <wa-input tabindex="-1" label="Email" placeholder="ddjarin@mandalore.gov">
+          <wa-icon slot="prefix" name="envelope" variant="regular"></wa-icon>
+        </wa-input>
+        <wa-input tabindex="-1" label="Password" type="password">
+          <wa-icon slot="prefix" name="lock" variant="regular"></wa-icon>
+        </wa-input>
+        <wa-button tabindex="-1" variant="brand">Sign In</wa-button>
+        <a href="#" tabindex="-1" class="wa-body-s">I forgot my password</a>
+      </div>
+    </wa-card>
+    <wa-card with-footer>
+      <div class="wa-stack">
+        <div class="wa-split">
+          <h3 class="wa-heading-m">To-Do</h3>
+          <wa-icon-button tabindex="-1" name="plus" label="Add task"></wa-icon-button>
+        </div>
+        <wa-checkbox tabindex="-1" checked>Umbrella for Adelard</wa-checkbox>
+        <wa-checkbox tabindex="-1" checked>Waste-paper basket for Dora</wa-checkbox>
+        <wa-checkbox tabindex="-1" checked>Pen and ink for Milo</wa-checkbox>
+        <wa-checkbox tabindex="-1">Mirror for Angelica</wa-checkbox>
+        <wa-checkbox tabindex="-1">Silver spoons for Lobelia</wa-checkbox>
+      </div>
+      <div slot="footer">
+        <a href="" tabindex="-1">View all completed</a>
+      </div>
+    </wa-card>
+    <wa-card>
+      <div class="wa-stack">
+        <div class="wa-frame wa-border-radius-m" style="align-self: center; max-inline-size: 25ch;">
+          <img src="https://images.unsplash.com/photo-1667514627762-521b1c815a89?q=20" alt="Album art">
+        </div>
+        <div class="wa-flank:end wa-align-items-start">
+          <div class="wa-stack wa-gap-3xs">
+            <div class="wa-cluster wa-gap-xs" style="height: 2.25em;">
+              <strong>The Stone Troll</strong>
+              <small><wa-badge variant="neutral" appearance="filled">E</wa-badge></small>
+            </div>
+            <span class="wa-caption-m">Samwise G</span>
+          </div>
+          <wa-icon-button tabindex="-1" name="ellipsis" label="Options"></wa-icon-button>
+        </div>
+        <div class="wa-stack wa-gap-2xs">
+          <wa-progress-bar value="34" style="height: 0.5em"></wa-progress-bar>
+          <div class="wa-split">
+            <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;">
+          <wa-icon-button tabindex="-1" name="backward" label="Skip backward"></wa-icon-button>
+          <wa-icon-button tabindex="-1" name="pause" style="font-size: var(--wa-font-size-2xl);" label="Pause"></wa-icon-button>
+          <wa-icon-button tabindex="-1" name="forward" label="Skip forward"></wa-icon-button>
+        </div>
+      </div>
+    </wa-card>
+    <wa-card>
+      <div class="wa-stack">
+        <h3 class="wa-heading-m">Chalmun's Spaceport Cantina</h3>
+        <div class="wa-cluster wa-gap-xs">
+          <wa-rating value="4.6" read-only></wa-rating>
+          <strong>4.6</strong>
+          <span>(419 reviews)</span>
+        </div>
+        <div class="wa-cluster wa-gap-xs">
+          <div class="wa-cluster wa-gap-3xs">
+            <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>
+            <wa-icon name="dollar" style="color: var(--wa-color-green-60);"></wa-icon>
+          </div>
+          <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>
+          <wa-tag size="small">Gluten Free</wa-tag>
+        </div>
+        <div class="wa-flank wa-gap-xs">
+          <wa-icon name="location-dot"></wa-icon>
+          <a href="#" class="wa-caption-m" tabindex="-1">Mos Eisley, Tatooine</a>
+        </div>
+      </div>
+    </wa-card>
+  </div>
+</div>
--- a/docs/_layouts/blank.njk
+++ b/docs/_layouts/blank.njk
@@ -1,62 +1,11 @@
 <!DOCTYPE html>
 <html lang="en" data-fa-kit-code="b10bfbde90" data-cdn-url="{% cdnUrl %}">
  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="{{ description }}">
-    {% if noindex %}<meta name="robots" content="noindex">{% endif %}
-
-    <title>{{ title }}</title>
-
-    <link rel="icon" href="/assets/images/webawesome-logo.svg" />
-    <link rel="apple-touch-icon" href="/assets/images/app-icon.png">
-
-    {# Scripts #}
-    {# Hydration stuff #}
-    <script src="/assets/scripts/hydration-errors.js"></script>
-    <link rel="stylesheet" href="/assets/styles/hydration-errors.css">
-    <link rel="preconnect" href="https://cdn.jsdelivr.net">
-    <script type="module" src="https://cdn.jsdelivr.net/npm/@hotwired/turbo@8.0.10/+esm"></script>
-
-    {# Web Awesome #}
-    <script type="module" src="/dist/webawesome.ssr-loader.js"></script>
-    <link rel="stylesheet" id="theme-stylesheet" />
-    <link rel="stylesheet" href="/dist/styles/webawesome.css" />
-    <link id="color-stylesheet" rel="stylesheet" href="/dist/styles/utilities.css" />
-    <link rel="stylesheet" href="/dist/styles/forms.css" />
-
-    {# Set the theme to prevent flashing #}
-    <script>
-      function getColorScheme() {
-        return localStorage.getItem('colorScheme') || 'auto';
-      }
-
-      function getPresetTheme () {
-        return localStorage.getItem('presetTheme') || 'default';
-      }
-
-      function isDark() {
-        const colorScheme = getColorScheme()
-        if (colorScheme === 'auto') {
-          return window.matchMedia('(prefers-color-scheme: dark)').matches;
-        }
-        return colorScheme === 'dark';
-      }
-
-      const stylesheet = document.getElementById("theme-stylesheet")
-      let preset = getPresetTheme()
-
-      stylesheet.href = `/dist/styles/themes/${preset}.css`
-
-      document.documentElement.classList.toggle(
-        `wa-theme-${preset}-dark`,
-        isDark()
-      );
-    </script>
+    {% include 'head.njk' %}
  </head>
  <body class="layout-{{ layout | stripExtension }}">

-        {% block beforeContent %}{% endblock %}
+        {% block header %}{% endblock %}

        {% block content %}
          {{ content | safe }}
--- a/docs/_layouts/block.njk
+++ b/docs/_layouts/block.njk
@@ -4,7 +4,8 @@
 {% extends '../_includes/base.njk' %}

 {# Component header #}
-{% block beforeContent %}
+{% block header %}
+  {% include 'breadcrumbs.njk' %}
  <h1 class="title">{{ title }}</h1>
  <div class="block-info">
    {% set snippets = (elements or element or snippets or snippet) | dict  %}
--- a/docs/_layouts/page-wide.njk
+++ b/docs/_layouts/page-wide.njk
@@ -1,4 +0,0 @@
-{% set hasSidebar = true %}
-{% set hasOutline = true %}
-
-{% extends "../_includes/base-wide.njk" %}
--- a/docs/_layouts/theme.njk
+++ b/docs/_layouts/theme.njk
@@ -0,0 +1,85 @@
+{% set hasSidebar = true %}
+{% set hasOutline = true %}
+{# {% set forceTheme = page.fileSlug %} #}
+
+{% extends '../_includes/base.njk' %}
+
+{% block header %}
+<iframe src='{{ page.url }}demo.html'></iframe>
+{% endblock %}
+
+{% block afterContent %}
+{% markdown %}
+## How to use this theme
+
+You can import this theme from the Web Awesome CDN.
+
+<wa-tab-group>
+<wa-tab panel="html">In HTML</wa-tab>
+<wa-tab panel="css">In CSS</wa-tab>
+<wa-tab-panel name="html">
+
+Simply add the following code to the `<head>` of your page:
+```html
+<link rel="stylesheet" href="{% cdnUrl 'styles/themes/' + page.fileSlug + '.css' %}" />
+```
+</wa-tab-panel>
+<wa-tab-panel name="css">
+
+Simply add the following code at the top of your CSS file:
+```css
+@import url('{% cdnUrl 'styles/themes/' + page.fileSlug + '.css' %}');
+```
+</wa-tab-panel>
+</wa-tab-group>
+
+## Dark mode
+
+To activate the dark color scheme of the theme on any element and its contents, apply the class `wa-dark` to it.
+This means you can use different color schemes throughout the page.
+Here, we use the default theme with a dark sidebar:
+
+```html
+<html>
+  <head>
+    <link rel="stylesheet" href="path/to/web-awesome/dist/styles/themes/default.css" />
+  </head>
+
+  <body>
+    <nav class="wa-dark">
+      <!-- dark-themed sidebar -->
+    </nav>
+
+    <!-- light-themed content -->
+  </body>
+</html>
+```
+
+You can apply the class to the `<html>` element on your page to activate the dark color scheme for the entire page.
+
+```html
+<html class="wa-dark">
+  <head>
+    <link rel="stylesheet" href="path/to/web-awesome/dist/styles/themes/{{ page.fileSlug }}.css" />
+    <!-- other links, scripts, and metadata -->
+  </head>
+  <body>
+    <!-- page content -->
+  </body>
+</html>
+```
+### Detecting Color Scheme Preference
+
+Web Awesome's themes have both light and dark styles built in.
+However, Web Awesome doesn't try to auto-detect the user's light/dark mode preference.
+This should be done at the application level.
+As a best practice, to provide a dark theme in your app, you should:
+
+- Check for [`prefers-color-scheme`](https://stackoverflow.com/a/57795495/567486) and use its value by default
+- Allow the user to override the setting in your app
+- Remember the user's preference and restore it on subsequent logins
+
+Web Awesome avoids using the `prefers-color-scheme` media query because not all apps support dark mode, and it would break things for the ones that don't.
+
+{% endmarkdown %}
+{% endblock %}
--- a/docs/_utils/filters.js
+++ b/docs/_utils/filters.js
@@ -14,6 +14,18 @@ export function trimPipes(content) {
  return typeof content === 'string' ? content.replace(/^(\s|\|)/g, '').replace(/(\s|\|)$/g, '') : content;
 }

+export function stripQuotes(content) {
+  return content.replace(/^(['"])(.+)\1$/g, '$2');
+}
+
+export function getEnumValues(type) {
+  return type
+    .split('|')
+    .map(value => value.trim())
+    .filter(Boolean)
+    .map(stripQuotes);
+}
+
 export function keys(obj) {
  return Object.keys(obj);
 }
@@ -167,6 +179,9 @@ export function sort(arr, by = { 'data.order': 1, 'data.title': '' }) {
 * @returns { Object.<string, object[]> } An object with keys for each tag, and an array of items for each tag.
 */
 export function groupByTags(collection, tags) {
+  if (!collection) {
+    console.error(`Empty collection passed to groupByTags() to group by ${JSON.stringify(tags)}`);
+  }
  if (!tags) {
    // Default to grouping by union of all tags
    tags = Array.from(new Set(collection.flatMap(item => item.data.tags)));
--- a/docs/assets/images/themer/migration/blog_feature.jpg
+++ b/docs/assets/images/themer/migration/blog_feature.jpg
--- a/docs/assets/images/themer/migration/carousel-1.jpg
+++ b/docs/assets/images/themer/migration/carousel-1.jpg
--- a/docs/assets/images/themer/migration/carousel-2.jpg
+++ b/docs/assets/images/themer/migration/carousel-2.jpg
--- a/docs/assets/images/themer/migration/carousel-3.jpg
+++ b/docs/assets/images/themer/migration/carousel-3.jpg
--- a/docs/assets/images/themer/migration/keymaker.jpg
+++ b/docs/assets/images/themer/migration/keymaker.jpg
--- a/docs/assets/images/themer/migration/morpheus.jpg
+++ b/docs/assets/images/themer/migration/morpheus.jpg
--- a/docs/assets/images/themer/migration/seraph.jpg
+++ b/docs/assets/images/themer/migration/seraph.jpg
--- a/docs/assets/scripts/color-scheme.js
+++ b/docs/assets/scripts/color-scheme.js
@@ -1,59 +0,0 @@
-//
-// Color scheme selector
-//
-(() => {
-  function setColorScheme(newColorScheme) {
-    colorScheme = newColorScheme;
-    localStorage.setItem('colorScheme', colorScheme);
-    const presetTheme = window.getPresetTheme();
-
-    // Update the UI
-    updateSelection();
-
-    // Toggle the dark mode class
-    document.documentElement.classList.toggle(`wa-theme-${presetTheme}-dark`, window.isDark());
-  }
-
-  function updateSelection() {
-    const menu = document.querySelector('#color-scheme-selector wa-menu');
-    if (!menu) return;
-    [...menu.querySelectorAll('wa-menu-item')].forEach(async item => {
-      await customElements.whenDefined(item.localName);
-      await item.updateComplete;
-      item.checked = item.getAttribute('value') === colorScheme;
-    });
-  }
-
-  let colorScheme = window.getColorScheme();
-
-  // Selection is not preserved when changing page, so update when opening dropdown
-  document.addEventListener('wa-show', event => {
-    const colorSchemeSelector = event.target.closest('#color-scheme-selector');
-    if (!colorSchemeSelector) return;
-    updateSelection();
-  });
-
-  // Listen for selections
-  document.addEventListener('wa-select', event => {
-    const menu = event.target.closest('#color-scheme-selector wa-menu');
-    if (!menu) return;
-    setColorScheme(event.detail.item.value);
-  });
-
-  // Update the color scheme when the preference changes
-  window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => setColorScheme(colorScheme));
-
-  // Toggle with backslash
-  document.addEventListener('keydown', event => {
-    if (
-      event.key === '\\' &&
-      !event.composedPath().some(el => ['input', 'textarea'].includes(el?.tagName?.toLowerCase()))
-    ) {
-      event.preventDefault();
-      setColorScheme(window.isDark() ? 'light' : 'dark');
-    }
-  });
-
-  // Set the initial color scheme and sync the UI
-  setColorScheme(colorScheme);
-})();
--- a/docs/assets/scripts/preset-theme-picker.js
+++ b/docs/assets/scripts/preset-theme-picker.js
@@ -0,0 +1,64 @@
+import { domChange, nextFrame, ThemeAspect } from './theme-picker.js';
+
+const presetTheme = new ThemeAspect({
+  defaultValue: 'default',
+  key: 'presetTheme',
+  picker: 'wa-select.preset-theme-selector',
+
+  applyChange() {
+    const oldStylesheets = [...document.querySelectorAll('#theme-stylesheet')];
+    const oldStylesheet = oldStylesheets.pop();
+
+    if (oldStylesheets.length > 0) {
+      // Remove all but the last one
+      for (let stylesheet of oldStylesheets) {
+        stylesheet.remove();
+      }
+    }
+
+    const href = `/dist/styles/themes/${this.value}.css`;
+
+    if (!oldStylesheet || oldStylesheet.getAttribute('href') !== href) {
+      const newStylesheet = document.createElement('link');
+      Object.assign(newStylesheet, { href, id: 'theme-stylesheet', rel: 'preload', as: 'style' });
+      oldStylesheet.after(newStylesheet);
+
+      newStylesheet.addEventListener(
+        'load',
+        e => {
+          domChange(
+            async instant => {
+              // Swap stylesheets
+              newStylesheet.rel = 'stylesheet';
+
+              if (instant) {
+                // If no VT, delay by 1 frame to make it smoother
+                await nextFrame();
+              }
+
+              oldStylesheet.remove();
+            },
+            { behavior: 'smooth' },
+          );
+        },
+        { once: true },
+      );
+    }
+  },
+});
+
+/**
+ * Without this, there's a flash of the incorrect preset theme.
+ */
+function updateSelectionBeforeTurboLoad(e) {
+  const newElement = e.detail.newBody || e.detail.newFrame || e.detail.newStream;
+  if (newElement) {
+    presetTheme.syncUI(newElement);
+  }
+}
+
+['turbo:before-render', 'turbo:before-stream-render', 'turbo:before-frame-render'].forEach(eventName => {
+  document.addEventListener(eventName, updateSelectionBeforeTurboLoad);
+});
+
+window.presetTheme = presetTheme;
--- a/docs/assets/scripts/preset-theme.js
+++ b/docs/assets/scripts/preset-theme.js
@@ -1,99 +0,0 @@
-(() => {
-  function applyThemeChange(stylesheet, newStylesheet) {
-    newStylesheet.rel = 'stylesheet';
-    newStylesheet.id = stylesheet.id;
-    requestAnimationFrame(() => {
-      stylesheet.remove();
-    });
-  }
-
-  function setPresetTheme(newPresetTheme) {
-    presetTheme = newPresetTheme;
-    localStorage.setItem('presetTheme', presetTheme);
-
-    const stylesheet = document.getElementById('theme-stylesheet');
-    const newStylesheet = Object.assign(document.createElement('link'), {
-      href: `/dist/styles/themes/${presetTheme}.css`,
-      rel: 'preload',
-      as: 'style',
-    });
-
-    newStylesheet.addEventListener(
-      'load',
-      () => {
-        const canUseViewTransitions =
-          document.startViewTransition && !window.matchMedia('(prefers-reduced-motion: reduce)').matches;
-
-        if (canUseViewTransitions) {
-          document.startViewTransition(() => applyThemeChange(stylesheet, newStylesheet));
-        } else {
-          applyThemeChange(stylesheet, newStylesheet);
-        }
-      },
-      { once: true },
-    );
-
-    document.head.append(newStylesheet);
-    updateSelection();
-    document.documentElement.classList.toggle(`wa-theme-${presetTheme}-dark`, window.isDark());
-  }
-
-  function updateSelection(container = document) {
-    const menus = container.querySelectorAll('.preset-theme-selector wa-menu');
-    if (!menus) return;
-
-    [...menus].forEach(menu => {
-      // Clear all checked states
-      [...menu.querySelectorAll('wa-menu-item')].forEach(async item => {
-        await customElements.whenDefined(item.localName);
-        await item.updateComplete;
-        item.checked = false; // Reset all items to unchecked first
-      });
-
-      // Then set only the selected item as checked
-      const selectedItem = menu.querySelector(`wa-menu-item[value="${presetTheme}"]`);
-      if (selectedItem) {
-        customElements.whenDefined(selectedItem.localName).then(async () => {
-          await selectedItem.updateComplete;
-          selectedItem.checked = true;
-          container.querySelector('.preset-theme-selector__text').textContent = selectedItem.innerText;
-        });
-      }
-    });
-  }
-
-  let presetTheme = window.getPresetTheme();
-
-  // Selection is not preserved when changing page, so update when opening dropdown
-  document.addEventListener('wa-show', event => {
-    const presetThemeSelector = event.target.closest('.preset-theme-selector');
-    if (!presetThemeSelector) return;
-    updateSelection();
-  });
-
-  // Listen for selections
-  document.addEventListener('wa-select', event => {
-    const menu = event.target.closest('.preset-theme-selector wa-menu');
-    if (!menu) return;
-    setPresetTheme(event.detail.item.value);
-  });
-
-  // Update the color scheme when the preference changes
-  window.matchMedia('(prefers-preset-theme: dark)').addEventListener('change', () => setPresetTheme(presetTheme));
-  updateSelection();
-
-  /**
-   * Without this, there's a flash of the incorrect preset theme.
-   */
-  function updateSelectionBeforeTurboLoad(e) {
-    const newElement = e.detail.newBody || e.detail.newFrame || e.detail.newStream;
-    if (!newElement) {
-      return;
-    }
-    updateSelection(newElement);
-  }
-
-  ['turbo:before-render', 'turbo:before-stream-render', 'turbo:before-frame-render'].forEach(eventName => {
-    document.addEventListener(eventName, updateSelectionBeforeTurboLoad);
-  });
-})();
--- a/docs/assets/scripts/sync-iframe-height.js
+++ b/docs/assets/scripts/sync-iframe-height.js
@@ -0,0 +1,37 @@
+/**
+ * Sync iframe height with its content page (for same-origin iframes)
+ * NOT CURRENTLY USED ANYWHERE
+ */
+for (let iframe of document.querySelectorAll('iframe')) {
+  if (iframe.contentDocument) {
+    // Already loaded
+    syncIframeHeight(iframe);
+  }
+
+  iframe.onload = () => {
+    console.log('iframe loaded');
+    if (iframe.contentDocument) {
+      // Same origin
+      iframe.contentWindow.iframe = iframe;
+      syncIframeHeight(iframe);
+      const resizeObserver = new ResizeObserver(entries => {
+        for (let entry of entries) {
+          if (entry.target === iframe.contentDocument.body) {
+            syncIframeHeight(iframe);
+          }
+        }
+      });
+
+      resizeObserver.observe(iframe.contentDocument.body);
+      window.addEventListener('turbo:render', syncIframeHeight(iframe));
+    }
+  };
+}
+
+function syncIframeHeight(iframe) {
+  iframe.style.height = '0px';
+
+  requestAnimationFrame(() => {
+    iframe.style.height = iframe.contentDocument.body.scrollHeight + 'px';
+  });
+}
--- a/docs/assets/scripts/theme-picker.js
+++ b/docs/assets/scripts/theme-picker.js
@@ -0,0 +1,115 @@
+// Helper for view transitions
+export function domChange(fn, { behavior = 'smooth' } = {}) {
+  const canUseViewTransitions =
+    document.startViewTransition && !window.matchMedia('(prefers-reduced-motion: reduce)').matches;
+
+  if (canUseViewTransitions && behavior === 'smooth') {
+    document.startViewTransition(fn);
+  } else {
+    fn(true);
+  }
+}
+
+export function nextFrame() {
+  return new Promise(resolve => requestAnimationFrame(resolve));
+}
+
+export class ThemeAspect {
+  constructor(options) {
+    Object.assign(this, options);
+    this.set();
+
+    // Update when local storage changes.
+    // That way changes in one window will propagate to others (including iframes).
+    window.addEventListener('storage', event => {
+      if (event.key === this.key) {
+        this.set();
+      }
+    });
+
+    // Listen for selections
+    document.addEventListener('wa-change', event => {
+      const picker = event.target.closest(this.picker);
+      if (picker) {
+        this.set(picker.value);
+      }
+    });
+  }
+
+  get() {
+    return localStorage.getItem(this.key) ?? this.defaultValue;
+  }
+
+  computed = {};
+
+  get computedValue() {
+    if (this.value in this.computed) {
+      return this.computed[this.value];
+    }
+
+    return this.value;
+  }
+
+  set(value = this.get()) {
+    if (value === this.value) {
+      return;
+    }
+
+    this.value = value;
+
+    if (this.value === this.defaultValue) {
+      localStorage.removeItem(this.key);
+    } else {
+      localStorage.setItem(this.key, this.value);
+    }
+
+    this.applyChange();
+    this.syncUI();
+  }
+
+  syncUI(container = document) {
+    for (let picker of container.querySelectorAll(this.picker)) {
+      picker.setAttribute('value', this.value);
+      picker.value = this.value;
+    }
+  }
+}
+
+const colorScheme = new ThemeAspect({
+  defaultValue: 'auto',
+  key: 'colorScheme',
+  picker: 'wa-select.color-scheme-selector',
+
+  computed: {
+    get auto() {
+      return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+    },
+  },
+
+  applyChange() {
+    // Toggle the dark mode class
+    domChange(() => {
+      let dark = this.computedValue === 'dark';
+      document.documentElement.classList.toggle(`wa-dark`, dark);
+
+      for (let el of document.querySelectorAll('.wa-invert')) {
+        el.classList.toggle('wa-dark', !dark);
+        el.classList.toggle('wa-light', dark);
+      }
+    });
+  },
+});
+
+// Update the color scheme when the preference changes
+window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => colorScheme.set());
+
+// Toggle color scheme with backslash
+document.addEventListener('keydown', event => {
+  if (
+    event.key === '\\' &&
+    !event.composedPath().some(el => ['input', 'textarea'].includes(el?.tagName?.toLowerCase()))
+  ) {
+    event.preventDefault();
+    colorScheme.set(theming.colorScheme.resolvedValue === 'dark' ? 'light' : 'dark');
+  }
+});
--- a/docs/assets/styles/docs.css
+++ b/docs/assets/styles/docs.css
@@ -10,8 +10,8 @@
  --wa-brand-grey: #30323b;
 }

-html.wa-theme-default-dark .only-light,
-html:not(.wa-theme-default-dark) .only-dark {
+.wa-dark .only-light,
+.only-dark:not(.wa-dark, .wa-dark *) {
  display: none;
 }

@@ -34,10 +34,6 @@ wa-page::part(header-actions) {
 }

 wa-page > header {
-  flex: 1 1 auto;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
  padding-inline: var(--wa-space-xl);

  a[href='/'] {
@@ -215,6 +211,20 @@ wa-page::part(menu) {
  scrollbar-width: thin;
 }

+wa-page[view='mobile'] :is([slot='navigation-header'], [slot='navigation']) {
+  padding: 0;
+
+  & wa-details::part(icon) {
+    padding-inline: var(--wa-space-xs); /* aligns details icons with drawer close icon */
+  }
+}
+
+[slot='navigation-header'] wa-menu {
+  font-family: var(--wa-font-family-body);
+  font-size: var(--wa-font-size-m);
+  font-weight: var(--wa-font-weight-normal);
+}
+
 /* Main content */
 wa-page > main {
  max-width: 80ch;
@@ -326,16 +336,18 @@ wa-page > main:has(> .index-grid) {

  a {
    border-radius: var(--wa-border-radius-l);
+    text-decoration: none;
  }

  wa-card {
-    --box-shadow: none;
+    box-shadow: none;
    --spacing: var(--wa-space-m);
    inline-size: 100%;

    &:hover {
      --border-color: var(--wa-color-brand-border-loud);
-      --box-shadow: 0 0 0 var(--wa-border-width-s) var(--border-color);
+      border-color: var(--border-color);
+      box-shadow: 0 0 0 var(--wa-border-width-s) var(--border-color);

      .page-name {
        color: var(--wa-color-brand-on-quiet);
@@ -443,3 +455,20 @@ wa-page > main:has(> .index-grid) {
    padding: var(--wa-space-3xl);
  }
 }
+
+.layout-theme {
+  wa-page > main {
+    max-width: 140ch;
+
+    .max-line-length {
+      max-width: 80ch;
+    }
+  }
+
+  iframe {
+    width: 100%;
+    min-height: 16lh;
+    height: 65vh;
+    max-height: 21lh;
+  }
+}
--- a/docs/assets/styles/outline.css
+++ b/docs/assets/styles/outline.css
@@ -31,6 +31,9 @@
 }

@media screen and (max-width: 1199px) {
+  wa-page [slot='aside'] {
+    display: none;
+  }
  #outline {
    padding-block: 0.25rem;
    margin-block-end: -1rem;
--- a/docs/assets/styles/theme-headers.css
+++ b/docs/assets/styles/theme-headers.css
@@ -4,7 +4,7 @@
 */

 /* #region Default */
-html[class*='wa-theme-default'] .preview-container {
+html.wa-theme-default .preview-container {
  container-name: default-theme;
 }

@@ -58,12 +58,12 @@ html[class*='wa-theme-default'] .preview-container {
 }
 /* #endregion */

-/* #region Migration */
-html[class*='wa-theme-migration'] .preview-container {
-  container-name: migration-theme;
+/* #region Tailspin */
+html.wa-theme-tailspin .preview-container {
+  container-name: tailspin-theme;
 }

-@container migration-theme (min-width: 0) {
+@container tailspin-theme (min-width: 0) {
  .project-header {
    background: var(--wa-color-surface-default);
  }
@@ -139,7 +139,7 @@ html[class*='wa-theme-migration'] .preview-container {
 /* #endregion */

 /* #region Brutalist */
-html[class*='wa-theme-brutalist'] .preview-container {
+html.wa-theme-brutalist .preview-container {
  container-name: brutalist-theme;
 }

@@ -268,7 +268,7 @@ html[class*='wa-theme-brutalist'] .preview-container {
    border: var(--wa-panel-border-width) var(--wa-panel-border-style) var(--wa-color-surface-border);
  }

-  .wa-theme-brutalist-dark {
+  .wa-theme-brutalist.wa-dark {
    & p a::before {
      background: var(--wa-color-yellow-40);
    }
@@ -332,7 +332,7 @@ html[class*='wa-theme-brutalist'] .preview-container {
 /* #endregion */

 /* #region Playful */
-html[class*='wa-theme-playful'] .preview-container {
+html.wa-theme-playful .preview-container {
  container-name: playful-theme;
 }

@@ -416,7 +416,7 @@ html[class*='wa-theme-playful'] .preview-container {
    background-color: var(--wa-color-neutral-fill-quiet);
  }

-  &:not(.wa-theme-premium-dark) .message-composer wa-card {
+  &:not(.wa-theme-premium.wa-dark) .message-composer wa-card {
    --wa-color-neutral-fill-quiet: var(--wa-color-gray-90);
  }

@@ -434,7 +434,7 @@ html[class*='wa-theme-playful'] .preview-container {
  }

  .support-table wa-card {
-    --background: var(--wa-color-surface-raised);
+    background: var(--wa-color-surface-raised);
  }

  .support-table th {
@@ -469,13 +469,13 @@ html[class*='wa-theme-playful'] .preview-container {
    padding-block-end: var(--wa-space-xs);
  }

-  .wa-theme-playful-dark {
+  .wa-theme-playful.wa-dark {
    & .hero-background {
      background: linear-gradient(180deg, var(--wa-color-green-60) 69.42%, var(--wa-color-green-30) 100%);
    }

    & .message-composer wa-card {
-      --border-color: var(--wa-color-gray-30);
+      border-color: var(--wa-color-gray-30);
    }

    & .message-composer wa-card::part(header) {
@@ -505,7 +505,7 @@ html[class*='wa-theme-playful'] .preview-container {
 /* #endregion */

 /* #region Active */
-html[class*='wa-theme-active'] .preview-container {
+html.wa-theme-active .preview-container {
  container-name: active-theme;
 }

@@ -578,7 +578,7 @@ html[class*='wa-theme-active'] .preview-container {
 /* #endregion */

 /* #region Premium */
-html[class*='wa-theme-premium'] .preview-container {
+html.wa-theme-premium .preview-container {
  container-name: premium-theme;
 }

@@ -644,7 +644,7 @@ html[class*='wa-theme-premium'] .preview-container {
  }

  .message-composer wa-card {
-    --background: var(--wa-color-surface-raised);
+    background: var(--wa-color-surface-raised);
  }

  .message-composer wa-card::part(header) {
@@ -652,7 +652,7 @@ html[class*='wa-theme-premium'] .preview-container {
    background-color: var(--wa-color-neutral-fill-quiet);
  }

-  &:not(.wa-theme-premium-dark) .message-composer wa-card {
+  &:not(.wa-theme-premium.wa-dark) .message-composer wa-card {
    --wa-color-neutral-fill-quiet: var(--wa-color-base-95);
  }

@@ -702,7 +702,7 @@ html[class*='wa-theme-premium'] .preview-container {
    font-style: italic;
  }

-  .wa-theme-premium-dark {
+  .wa-theme-premium.wa-dark {
    & .message-composer .tools .grouped-buttons:not(:last-of-type) {
      --wa-color-neutral-border-quiet: var(--wa-color-base-40);
    }
--- a/docs/docs/components/callout.md
+++ b/docs/docs/components/callout.md
@@ -19,40 +19,43 @@ icon: callout
 Set the `variant` attribute to change the callout's variant.

 ```html {.example}
-{% for variant, info in {
-  brand: {
-    title: 'This is super informative',
-    content: 'You can tell by how pretty the callout is.',
-    icon: 'circle-info'
-  },
-  success: {
-    title: 'Your changes have been saved',
-    content: 'You can safely exit the app now.',
-    icon: 'circle-check'
-  },
-  neutral: {
-    title: 'Your settings have been updated',
-    content: 'Settings will take effect on next login.',
-    icon: 'gear'
-  },
-  warning: {
-    title: 'Your session has ended',
-    content: 'Please login again to continue.',
-    icon: 'triangle-exclamation'
-  },
-  danger: {
-    title: 'Your account has been deleted',
-    content: 'We’re very sorry to see you go!',
-    icon: 'circle-exclamation'
-  }
-} %}
-  <wa-callout variant="{{ variant }}">
-    <wa-icon slot="icon" name="{{ info.icon }}" variant="regular"></wa-icon>
-    <strong>{{ info.title }}</strong><br />
-    {{ info.content }}
-  </wa-callout>
-  {% if not loop.last %}<br />{% endif %}
-{% endfor %}
+<wa-callout variant="brand">
+  <wa-icon slot="icon" name="circle-info" variant="regular"></wa-icon>
+  <strong>This is super informative</strong><br />
+  You can tell by how pretty the callout is.
+</wa-callout>
+
+<br />
+
+<wa-callout variant="success">
+  <wa-icon slot="icon" name="circle-check" variant="regular"></wa-icon>
+  <strong>Your changes have been saved</strong><br />
+  You can safely exit the app now.
+</wa-callout>
+
+<br />
+
+<wa-callout variant="neutral">
+  <wa-icon slot="icon" name="gear" variant="regular"></wa-icon>
+  <strong>Your settings have been updated</strong><br />
+  Settings will take effect on next login.
+</wa-callout>
+
+<br />
+
+<wa-callout variant="warning">
+  <wa-icon slot="icon" name="triangle-exclamation" variant="regular"></wa-icon>
+  <strong>Your session has ended</strong><br />
+  Please login again to continue.
+</wa-callout>
+
+<br />
+
+<wa-callout variant="danger">
+  <wa-icon slot="icon" name="circle-exclamation" variant="regular"></wa-icon>
+  <strong>Your account has been deleted</strong><br />
+  We're very sorry to see you go!
+</wa-callout>
 ```

 ### Appearance
--- a/docs/docs/components/cheatsheet/cheatsheet.js
+++ b/docs/docs/components/cheatsheet/cheatsheet.js
--- a/docs/docs/components/cheatsheet/index.njk
+++ b/docs/docs/components/cheatsheet/index.njk
@@ -45,7 +45,7 @@ table code {
 	}
 }
 </script>
-<script type="module" src="/assets/scripts/cheatsheet.js"></script>
+<script type="module" src="./cheatsheet.js"></script>

 {% for type, all in componentsBy -%}
 {% set typeTitle = "CSS custom properties" if type == "cssProperty" else ("CSS parts" if type == "cssPart" else (type | title) + "s") %}
--- a/docs/docs/components/page-samples/documentation.md
+++ b/docs/docs/components/page-samples/documentation.md
@@ -127,7 +127,7 @@ eleventyExcludeFromCollections: true
    </a>
  </nav>
  <header slot="main-header">
-    <div class="wa-flank:end wa-border-radius-l wa-theme-default-dark" style="background-color: var(--wa-color-surface-lowered); --content-percentage: 35%; padding: var(--wa-space-m);">
+    <div class="wa-flank:end wa-border-radius-l wa-dark" style="background-color: var(--wa-color-surface-lowered); --content-percentage: 35%; padding: var(--wa-space-m);">
      <div class="wa-stack" style="margin: var(--wa-space-2xl);">
        <h1>Great Horned Owl</h1>
        <wa-divider></wa-divider>
--- a/docs/docs/components/page-samples/media-app.md
+++ b/docs/docs/components/page-samples/media-app.md
@@ -5,7 +5,7 @@ layout: blank
 eleventyExcludeFromCollections: true
 ---

-<wa-page class="wa-theme-default-dark">
+<wa-page class="wa-dark">
  <header slot="header">
    <div class="wa-cluster">
      <wa-icon-button name="bars" label="Menu" data-toggle-nav></wa-icon-button>
--- a/docs/docs/components/page.md
+++ b/docs/docs/components/page.md
@@ -1,7 +1,7 @@
 ---
 title: Page
 description: Pages offer an easy way to scaffold entire page layouts using minimal markup.
-tags: [organization, layout]
+tags: [pro, organization, layout]
 isPro: true
 order: 0
 # icon: page
@@ -119,7 +119,7 @@ It can be opened using a button with `[data-toggle-nav]` that appears in the `su
    </a>
  </nav>
  <header slot="main-header">
-    <div class="wa-flank:end wa-border-radius-l wa-theme-default-dark" style="background-color: var(--wa-color-surface-lowered); --content-percentage: 35%; padding: var(--wa-space-m);">
+    <div class="wa-flank:end wa-border-radius-l wa-dark" style="background-color: var(--wa-color-surface-lowered); --content-percentage: 35%; padding: var(--wa-space-m);">
      <div class="wa-stack" style="margin: var(--wa-space-2xl);">
        <h1>Great Horned Owl</h1>
        <wa-divider></wa-divider>
@@ -299,7 +299,7 @@ It can be opened using a button with `[data-toggle-nav]` that appears in the `su
 A sample media app page using `header`, `navigation-header`, `main-header`, and `main-footer` along with the default slot. The navigation menu collapses into a drawer at the default `mobile-breakpoint` and can be opened using a button with `[data-toggle-nav]` that appears in the `header` slot.

 ```html {.example viewport="1600"}
-<wa-page class="wa-theme-default-dark">
+<wa-page class="wa-dark">
  <header slot="header">
    <div class="wa-cluster">
      <wa-icon-button name="bars" label="Menu" data-toggle-nav></wa-icon-button>
--- a/docs/docs/components/page/demo-page.css
+++ b/docs/docs/components/page/demo-page.css
--- a/docs/assets/examples/page-demo/demo.css
+++ b/docs/assets/examples/page-demo/demo.css
--- a/docs/assets/examples/page-demo/demo.js
+++ b/docs/assets/examples/page-demo/demo.js
@@ -7,7 +7,7 @@ let stylesheets = Array.from(document.querySelectorAll("link[rel=stylesheet][hre
  .join('\n');
 let includes = `${stylesheets}
  <script src="/dist/webawesome.loader.js" type="module"></script>
-  <link rel="stylesheet" href="/assets/examples/page-demo/page.css">`;
+  <link rel="stylesheet" href="./demo-page.css">`;

 async function render() {
  await customElements.whenDefined('wa-checkbox');
--- a/docs/docs/customizing.md
+++ b/docs/docs/customizing.md
@@ -15,9 +15,9 @@ Because these custom properties live at the page level, they're prefixed with `-
 To customize a theme, simply override any of these custom properties in your own stylesheet by scoping your styles to `:root`, `:host`, and, if needed, the class for the specific theme you want to override. Here's an example that changes the default brand color (blue) to violet in the light theme using existing [literal colors](/docs/theming/color/#literal-colors).

 ```css
-:root,
+:where(:root),
 :host,
-.wa-theme-default-light {
+.wa-theme-default {
  /* Changes the brand color to violet across the library */
  --wa-color-brand-fill-quiet: var(--wa-color-violet-95);
  --wa-color-brand-fill-normal: var(--wa-color-violet-90);
--- a/docs/docs/experimental/themer.md
+++ b/docs/docs/experimental/themer.md
@@ -505,7 +505,7 @@ hasOutline: false
      <wa-option data-alpha="remove" value="premium">Premium</wa-option>
      <wa-option data-alpha="remove" value="playful">Playful</wa-option>
      <wa-option data-alpha="remove" value="brutalist">Brutalist</wa-option>
-      <wa-option data-alpha="remove" value="migration">Migration</wa-option>
+      <wa-option data-alpha="remove" value="tailspin">Tailspin</wa-option>
      <wa-option data-alpha="remove" value="glassy">Glassy</wa-option>
      <wa-option data-alpha="remove" value="active">Active</wa-option>
      <wa-option value="classic">Classic</wa-option>
@@ -876,7 +876,7 @@ hasOutline: false

    switch(themeSelect.value) {
      case 'classic':
-      case 'migration':
+      case 'tailspin':
        colorPalette = 'classic';
        break;
      case 'awesome':
@@ -1044,7 +1044,7 @@ hasOutline: false

    switch(themeSelect.value) {
      case 'premium':
-      case 'migration':
+      case 'tailspin':
      case 'playful':
      case 'brutalist':
      case 'classic':
@@ -1256,7 +1256,7 @@ hasOutline: false
      case 'brutalist':
        presetLogoIcons = ['leaf', 'mug-hot', 'book-open', 'landmark'];
        break;
-      case 'migration':
+      case 'tailspin':
        presetLogoIcons = ['wind', 'feather', 'lemon', 'wind-turbine'];
        break;
      case 'glassy':
@@ -1490,7 +1490,7 @@ hasOutline: false
          }
        });
        break;
-      case 'migration':
+      case 'tailspin':
        iconFamily.value = 'fa-classic';
        iconStyle.value = 'solid';
        useFaIcons();
@@ -1742,7 +1742,7 @@ hasOutline: false

  /* strata product cards */

-  .products wa-card::part(base) {
+  .products wa-card {
    height: 100%;
  }

@@ -2123,7 +2123,7 @@ hasOutline: false
 <h3>Ontological Shock</h3>
 <p>The allegory is related to Plato's theory of Forms, which holds that the true essence of an object is not what we perceive with our senses, but rather its quality, and that most people perceive only the shadow of the object and are thus limited to false perception.</p>
 <pre class="codeblock">
-<code class="language-html">&lt;html class="wa-theme-default-dark"&gt;
+<code class="language-html">&lt;html class="wa-dark"&gt;
  &lt;head&gt;
    &lt;link rel="stylesheet" href="path/to/webawesome/dist/styles/themes/dark.css" /&gt;
  &lt;/head&gt;
--- a/docs/docs/resources/changelog.md
+++ b/docs/docs/resources/changelog.md
@@ -12,7 +12,7 @@ Components with the <wa-badge variant="warning" pill>Experimental</wa-badge> bad
 During the alpha period, things might break! We take breaking changes very seriously, but sometimes they're necessary to make the final product that much better. We appreciate your patience!
 :::

-## Next
+## 3.0.0-alpha.8

 - Simplified the internal structure and CSS properties of `<wa-card>`, removed `base` part.
 - Added `appearance` to `<wa-callout>` and `<wa-tag>`
@@ -29,7 +29,7 @@ During the alpha period, things might break! We take breaking changes very serio
  - Active
  - Brutalist
  - Mellow
-  - Migration
+  - Tailspin
  - Playful
 - Renamed `--wa-form-control-resting-color` to `--wa-form-control-border-color` for familiarity and accuracy
 - Removed size-based `--wa-form-control-height-*` tokens in favor of `--wa-form-control-height` (see [size utilities](/docs/utilities/size/))
--- a/docs/docs/test/styling.njk
+++ b/docs/docs/test/styling.njk
@@ -0,0 +1,36 @@
+---
+title: Styling Tests
+---
+
+<h2>Appearance and variant tests</h2>
+
+{% for component in componentsBy.attribute.variant %}
+{%- if component.attributes.appearance -%}
+<h3><a href="../{{ component.url }}"><code>&lt;{{ component.tagName }}&gt;</code></a></h3>
+
+{% set variantValues = component.attributes.variant.type.text | getEnumValues %}
+{% set appearanceValues = component.attributes.appearance.type.text | getEnumValues %}
+
+<table>
+<thead>
+	<tr>
+		<th>Variant</th>
+		{% for appearance in appearanceValues %}
+			<th>{{ appearance }}</th>
+		{%- endfor %}
+	</tr>
+</thead>
+{% for variant in variantValues %}
+<tr>
+	<th>{{ variant }}</th>
+	{% for appearance in appearanceValues %}
+	<td>
+		<{{ component.tagName }} variant={{ variant }} appearance={{ appearance }}>{{ variant }} {{ appearance }}</{{ component.tagName }}>
+	</td>
+	{%- endfor %}
+</tr>
+{%- endfor %}
+</table>
+
+{% endif %}
+{%- endfor %}
--- a/docs/docs/themes.md
+++ b/docs/docs/themes.md
@@ -1,139 +0,0 @@
---
-title: Themes
-description: Everything you need to know about theming Web Awesome.
-layout: page-outline
---
-
-Themes are collections of pre-defined CSS custom properties that thread through every Web Awesome component and pattern.
-
-Web Awesome includes two pre-made themes:
- **Default** for a clean look that prioritizes accessibility and performance
- **Classic** for the look and feel of Shoelace with more accessible color pairings
-
-## What's a Theme?
-
-Themes are a standard collection of [CSS custom properties](https://developer.mozilla.org/en-US/docs/Web/CSS/--*) that cover all styles from colors to transitions. We use these custom properties throughout Web Awesome components to ensure a cohesive look and feel. Our [Theming pages](/docs/theming/) document these styles so that you can use them freely throughout your project and customize them as needed.
-
-Themes are scoped to unique classes for each color scheme, such as `wa-theme-default-light` and `wa-theme-default-dark`, and the `:host` selector. Scoping to unique classes allows you to import multiple themes and use them interchangeably without collisions, while scoping to `:host` ensures the styles are applied to the shadow roots of custom elements.
-
-Additionally, styles may be scoped to the `:root` selector to be activated automatically. For pre-made themes, *all* custom properties are scoped to both `:root` and the class for the light color scheme (`wa-theme-default-light` or `wa-theme-classic-light`), activating the light color scheme by default.
-
-Other themes or color schemes must be activated with the corresponding class, like the dark color scheme for pre-made themes (`wa-theme-default-dark` or `wa-theme-classic-dark`), which only defines a subset of custom properties for colors. This ensures that non-color styles only need to be defined once for the theme, regardless of whether the color scheme is light or dark.
-
-For example, the default theme is set up like this:
-
-```css
-:root,
-:host,
-.wa-theme-default-light {
-  /* all CSS custom properties for color, typography, space, etc. */
-}
-
-.wa-theme-default-dark,
-.wa-theme-default-dark :host {
-  /* subset of CSS custom properties for color */
-}
-```
-
-## Using Themes
-
-You can import the default and classic themes from the Web Awesome CDN. Simply add the following code to the `<head>` of your page to import the **default** theme:
-
-```html
-<link rel="stylesheet" href="https://early.webawesome.com/webawesome@3.0.0-alpha.4/dist/styles/themes/default.css" />
-```
-
-Or import the **classic** theme:
-
-```html
-<link rel="stylesheet" href="https://early.webawesome.com/webawesome@3.0.0-alpha.4/dist/styles/themes/classic.css" />
-```
-
-Both the default and classic themes include both light and dark color schemes. When importing either theme, the light color scheme is activated by default. To activate the dark color scheme, apply the appropriate class (`wa-theme-default-dark` or `wa-theme-classic-dark`, depending on theme) to the `<html>` element on your page, like this example for the default theme:
-```html
-<html class="wa-theme-default-dark">
-  <head>
-    <link rel="stylesheet" href="path/to/web-awesome/dist/styles/themes/default.css" />
-    <!-- other links, scripts, and metadata -->
-  </head>
-  <body>
-    <!-- page content -->
-  </body>
-</html>
-```
-
-Because themes are scoped to specific classes, you can activate different color schemes or entire themes on different containers throughout the page. This example uses the default theme with a dark sidebar.
-
-```html
-<html>
-  <head>
-    <link rel="stylesheet" href="path/to/web-awesome/dist/styles/themes/default.css" />
-  </head>
-
-  <body>
-    <nav class="wa-theme-default-dark">
-      <!-- dark-themed sidebar -->
-    </nav>
-
-    <!-- light-themed content -->
-  </body>
-</html>
-```
-
-## Creating Themes
-
-There are two ways to create themes. The easiest way is to customize the default theme. The advanced way is to create a new theme from scratch. Which method you choose depends on your project's requirements and the amount of effort you're willing to invest.
-
-### Customizing a Built-in Theme
-
-Overriding the default theme is the easiest way to customize Web Awesome. You can do this by importing the default theme as-is, then creating a separate stylesheet that overrides [the theming API](/docs/customizing#design-tokens) and adds [component styles](/docs/customizing#css-parts) to your liking. You must import your theme _after_ the default theme.
-
-If you're customizing the default light styles, scope your styles to the following selectors.
-
-```css
-:root,
-:host,
-.wa-theme-default-light {
-  /* your custom styles here */
-}
-```
-
-If you're customizing the default dark styles, scope your styles to the following selectors.
-
-```css
-:host,
-.wa-theme-default-dark {
-  /* your custom styles here */
-}
-```
-
-By customizing a built-in theme, you'll maintain a smaller stylesheet containing only the changes you've made. Contrast this to [creating a new theme](#creating-a-new-theme), where you need to explicitly define every custom property required by the library. This approach is more "future-proof," as new design tokens that emerge in subsequent versions of Web Awesome will be accounted for by built-in themes.
-
-While this approach is easier to maintain, the drawback is that your theme can't be activated independently — it's tied to the built-in theme you're extending.
-
-### Creating a New Theme
-
-Creating a new theme is more of an undertaking than [customizing an existing one](#customizing-a-built-in-theme). At a minimum, you must implement all of the required custom properties. The easiest way to do this is by "forking" a built-in theme and modifying it from there.
-
-Start by changing the selector to match your theme's name. Assuming your new theme is called "Purple Power", your theme should be scoped like this.
-
-```css
-:host,
-.wa-theme-purple-power {
-  /* your custom styles here */
-}
-```
-
-By creating a new theme, you won't be relying on a built-in theme as a foundation. Because of this, you can activate it independently as an alternative to the default theme. This is the recommended approach if you're looking to open source your theme for others to use.
-
-You will, however, need to maintain your theme more carefully, as new versions of Web Awesome change the theming API in ways that your theme won't have accounted for. It's recommended that you clearly specify which version(s) of Web Awesome your theme is designed to work with and keep it up to date as new versions of Web Awesome are released.
-
-## Detecting Color Scheme Preference
-
-Web Awesome's default theme has both light and dark styles built in. However, Web Awesome doesn't try to auto-detect the user's light/dark mode preference. This should be done at the application level. As a best practice, to provide a dark theme in your app, you should:
-
- Check for [`prefers-color-scheme`](https://stackoverflow.com/a/57795495/567486) and use its value by default
- Allow the user to override the setting in your app
- Remember the user's preference and restore it on subsequent logins
-
-Web Awesome avoids using the `prefers-color-scheme` media query because not all apps support dark mode, and it would break things for the ones that don't.
--- a/docs/docs/themes/active.md
+++ b/docs/docs/themes/active.md
@@ -0,0 +1,6 @@
+---
+title: Active
+description: Energetic and tactile, always in motion.
+isPro: true
+tags: pro
+---
--- a/docs/docs/themes/awesome.md
+++ b/docs/docs/themes/awesome.md
@@ -0,0 +1,5 @@
+---
+title: Awesome
+description: Punchy and vibrant, the rockstar of themes.
+order: 0.2
+---
--- a/docs/docs/themes/brutalist.md
+++ b/docs/docs/themes/brutalist.md
@@ -0,0 +1,6 @@
+---
+title: Brutalist
+description: Sharp, square, and unapologetically bold.
+isPro: true
+tags: pro
+---
--- a/docs/docs/themes/classic.md
+++ b/docs/docs/themes/classic.md
@@ -0,0 +1,5 @@
+---
+title: Classic
+description: Timeless elegance that never goes out of style.
+order: 0.1
+---
--- a/docs/docs/themes/creating.md
+++ b/docs/docs/themes/creating.md
@@ -0,0 +1,59 @@
+---
+title: Creating Themes
+layout: page-outline
+order: 999
+override:tags: [themes]
+---
+
+There are two ways to create themes.
+The easiest way is to customize the default theme.
+The advanced way is to create a new theme from scratch.
+Which method you choose depends on your project's requirements and the amount of effort you're willing to invest.
+
+## Customizing a Built-in Theme
+
+Overriding the default theme is the easiest way to customize Web Awesome.
+You can do this by importing the default theme as-is, then creating a separate stylesheet that overrides [the theming API](/docs/customizing#design-tokens) and adds [component styles](/docs/customizing#css-parts) to your liking. You must import your theme _after_ the default theme.
+
+If you're customizing the default light styles, scope your styles to the following selectors.
+
+```css
+:where(:root),
+:host,
+.wa-theme-default,
+.wa-light {
+  /* your custom styles here */
+}
+```
+
+If you're customizing the default dark styles, scope your styles to the following selectors.
+
+```css
+.wa-dark,
+:is(:host-context(.wa-dark)) {
+  /* your custom styles here */
+}
+```
+
+By customizing a built-in theme, you'll maintain a smaller stylesheet containing only your changes. Contrast this to [creating a new theme](#creating-a-new-theme), where you need to explicitly define every custom property required by the library. This approach is more "future-proof," as new design tokens that emerge in subsequent versions of Web Awesome will be accounted for by built-in themes.
+
+While this approach is easier to maintain, the drawback is that your theme can't be activated independently — it's tied to the built-in theme you're extending.
+
+## Creating a New Theme
+
+Creating a new theme is more of an undertaking than [customizing an existing one](#customizing-a-built-in-theme). At a minimum, you must implement all of the required custom properties. The easiest way to do this is by "forking" a built-in theme and modifying it from there.
+
+Start by changing the selector to match your theme's name. Assuming your new theme is called "Purple Power", your theme should be scoped like this.
+
+```css
+:where(:root),
+:host,
+.wa-theme-purple-power,
+.wa-light {
+  /* your custom styles here */
+}
+```
+
+By creating a new theme, you won't be relying on a built-in theme as a foundation. Because of this, you can activate it independently as an alternative to the default theme. This is the recommended approach if you're looking to open source your theme for others to use.
+
+You will, however, need to maintain your theme more carefully, as new versions of Web Awesome change the theming API in ways that your theme won't have accounted for. It's recommended that you clearly specify which version(s) of Web Awesome your theme is designed to work with and keep it up to date as new versions of Web Awesome are released.
--- a/docs/docs/themes/default.md
+++ b/docs/docs/themes/default.md
@@ -0,0 +1,5 @@
+---
+title: Default
+description: Your trusty companion, like a perfectly broken-in pair of jeans.
+order: 0
+---
--- a/docs/docs/themes/demo.njk
+++ b/docs/docs/themes/demo.njk
@@ -0,0 +1,40 @@
+---
+layout: blank
+pagination:
+  data: collections.theme
+  size: 1
+  alias: theme
+permalink: '/docs/themes/{{ theme.fileSlug }}/demo.html'
+eleventyExcludeFromCollections: true
+override:tags: []
+eleventyComputed:
+  forceTheme: "{{ theme.fileSlug }}"
+---
+<script>
+  document.getElementById('theme-stylesheet').href = '/dist/styles/themes/{{ theme.fileSlug }}.css';
+</script>
+<script type=module>
+  document.getElementById('theme-stylesheet').href = '/dist/styles/themes/{{ theme.fileSlug }}.css';
+</script>
+
+<link rel="stylesheet" href="/dist/styles/themes/{{ theme.fileSlug }}.css" />
+<link rel="stylesheet" href="/docs/themes/showcase.css" />
+
+{% set content %}
+<header>
+  {% include 'breadcrumbs.njk' %}
+  <h1 class="title">{{ theme.data.title }}</h1>
+  <p>{% include 'status.njk' %}</p>
+  <p id="theme-showcase-description">{{ theme.data.description | inlineMarkdown | safe }}</p>
+</header>
+{% include 'theme-showcase.njk' %}
+{% endset %}
+
+<wa-image-comparer style="width: 100%" position="90">
+<div slot="after" class="theme-showcase wa-gap-xl">
+{{ content | safe }}
+</div>
+<div slot="before" class="theme-showcase wa-gap-xl wa-invert">
+  {{ content | safe }}
+</div>
+</wa-image-comparer>
--- a/docs/docs/themes/glassy.md
+++ b/docs/docs/themes/glassy.md
@@ -0,0 +1,7 @@
+---
+title: Glassy
+description: Smooth, sleek, and reflective.
+isPro: true
+tags: pro
+noAlpha: true
+---
--- a/docs/docs/themes/index.njk
+++ b/docs/docs/themes/index.njk
@@ -0,0 +1,55 @@
+---
+title: Themes
+description: Themes are collections of pre-defined CSS custom properties that thread through every Web Awesome component and pattern.
+layout: overview
+override:tags: []
+forTag: theme
+categories:
+  other: Free
+  pro: Pro
+---
+
+<div class="max-line-length">
+{% markdown %}
+
+## What's a Theme?
+
+Themes are a collection of standardized [CSS custom properties](https://developer.mozilla.org/en-US/docs/Web/CSS/--*) that cover a range of styles from colors to transitions. We use these custom properties throughout Web Awesome components for a cohesive look and feel. Our [Theming pages](/docs/theming/) document these styles so that you can use them freely throughout your project and customize them as needed.
+
+Themes are scoped to unique classes, such as `wa-theme-default` or `wa-theme-classic`.
+Scoping to unique classes allows you to import multiple themes and use them interchangeably without collisions.
+Please note that if you import multiple themes, the last one will be the default that will apply if no class is used.
+
+Each theme may also include both light and dark color schemes with the classes `wa-light` and `wa-dark`.
+You can use these classes to apply a specific color scheme to an entire page or just a section.
+In pre-made themes, we use a light color scheme by default.
+
+
+Additionally, styles may be scoped to the `:root` selector to be activated automatically.
+For pre-made themes, *all* custom properties are scoped to `:root`, the theme class, and `wa-light`.
+
+Finally, we scope themes to `:host` and `:host-context()` to ensure the styles are applied to the shadow roots of custom elements.
+
+For example, the default theme is set up like this:
+
+```css
+:where(:root),
+:host,
+.wa-theme-default,
+.wa-light {
+  /* all CSS custom properties for color, typography, space, etc. */
+}
+
+.wa-dark,
+:host-context(.wa-dark) {
+  /* subset of CSS custom properties for a dark color scheme */
+}
+```
+
+## Using Themes
+
+You can import pre-made themes from the Web Awesome CDN.
+Refer to each theme’s page for copyable code snippets.
+
+{% endmarkdown %}
+</div>
--- a/docs/docs/themes/mellow.md
+++ b/docs/docs/themes/mellow.md
@@ -0,0 +1,6 @@
+---
+title: Mellow
+description: Soft and soothing, like a lazy Sunday morning.
+isPro: true
+tags: pro
+---
--- a/docs/docs/themes/playful.md
+++ b/docs/docs/themes/playful.md
@@ -0,0 +1,7 @@
+---
+title: Playful
+description: Fun, colorful, and full of personality.
+isPro: true
+tags: pro
+noAlpha: true
+---
--- a/docs/docs/themes/premium.md
+++ b/docs/docs/themes/premium.md
@@ -0,0 +1,7 @@
+---
+title: Premium
+description: The ultimate in sophistication and style.
+isPro: true
+tags: pro
+noAlpha: true
+---
--- a/docs/docs/themes/showcase.css
+++ b/docs/docs/themes/showcase.css
@@ -0,0 +1,90 @@
+html {
+  background: transparent;
+}
+
+html,
+body,
+.theme-showcase {
+  height: 100vh;
+  overflow: hidden;
+}
+
+.theme-showcase {
+  background-color: var(--wa-color-surface-lowered);
+  border-radius: var(--wa-border-radius-l);
+  padding: var(--wa-space-xl);
+  box-sizing: border-box;
+  overflow: hidden;
+
+  @media (width < 500px) {
+    flex-flow: column;
+  }
+
+  header {
+    min-width: min(25ch, 100vw);
+    align-self: center;
+
+    h1 {
+      margin-bottom: var(--wa-space-2xs);
+    }
+
+    wa-breadcrumb-item:not(:first-of-type, :last-of-type) {
+      display: none;
+    }
+
+    p:empty {
+      display: none;
+    }
+  }
+}
+
+.showcase-examples-wrapper {
+  inline-size: 100%;
+  block-size: 100%;
+}
+
+.showcase-examples {
+  column-gap: var(--wa-space-xl);
+
+  & wa-card {
+    display: inline-block;
+    width: 100%;
+
+    &:has(+ wa-card) {
+      margin-block-end: var(--wa-space-xl);
+    }
+  }
+
+  @supports not (zoom: 1) {
+    column-count: 1;
+
+    @media (width > 750px) {
+      column-count: 2;
+    }
+
+    @media (width > 950px) {
+      column-count: 3;
+    }
+  }
+
+  @supports (zoom: 1) {
+    column-count: 1;
+    zoom: 40%;
+
+    @media (width > 350px) {
+      column-count: 2;
+    }
+
+    @media (width > 450px) {
+      zoom: 55%;
+    }
+
+    @media (width > 750px) {
+      zoom: 70%;
+    }
+
+    @media (width > 950px) {
+      column-count: 3;
+    }
+  }
+}
--- a/docs/docs/themes/tailspin.md
+++ b/docs/docs/themes/tailspin.md
@@ -0,0 +1,6 @@
+---
+title: Tailspin
+description: Like a bird in flight, guiding you from there to here.
+isPro: true
+tags: pro
+---
--- a/docs/docs/themes/themes.json
+++ b/docs/docs/themes/themes.json
@@ -0,0 +1,4 @@
+{
+  "layout": "theme.njk",
+  "tags": ["themes", "theme"]
+}
--- a/docs/index.md
+++ b/docs/index.md
@@ -268,7 +268,7 @@ layout: page
    <h1 class="brand-font">Make something <span class="emphasis">awesome</span> with open-source web components</h1>
    <div class="hero-cta">
      <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-theme-default-dark" size="small" href="https://www.kickstarter.com/projects/fontawesome/web-awesome">
+      <wa-button class="wa-dark" size="small" href="https://www.kickstarter.com/projects/fontawesome/web-awesome">
        <wa-icon slot="prefix" name="person-running"></wa-icon>
        Pre-order WA Pro
      </wa-button>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@shoelace-style/webawesome",
-  "version": "3.0.0-alpha.7",
+  "version": "3.0.0-alpha.8",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@shoelace-style/webawesome",
-      "version": "3.0.0-alpha.7",
+      "version": "3.0.0-alpha.8",
      "license": "MIT",
      "dependencies": {
        "@ctrl/tinycolor": "^4.1.0",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@shoelace-style/webawesome",
  "description": "A forward-thinking library of web components.",
-  "version": "3.0.0-alpha.7",
+  "version": "3.0.0-alpha.8",
  "homepage": "https://webawesome.com/",
  "author": "Web Awesome",
  "license": "MIT",
@@ -46,7 +46,9 @@
  "scripts": {
    "start": "node scripts/build.js --develop",
    "build": "node scripts/build.js",
+    "build:serve": "npm run build && npx http-server _site -p 4000",
    "build:alpha": "node scripts/build.js --alpha",
+    "build:alpha:serve": "npm run build:alpha && npx http-server _site -p 4000",
    "start:alpha": "node scripts/build.js --alpha --develop",
    "publish-alpha-cdn": "./publish-alpha-cdn.sh",
    "create": "plop --plopfile scripts/plop/plopfile.js",
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -74,6 +74,10 @@ function generateManifest() {
    execSync('cem analyze --config "custom-elements-manifest.js"');
  } catch (error) {
    console.error(`\n\n${error.message}`);
+
+    if (!isDeveloping) {
+      process.exit(1);
+    }
  }

  spinner.succeed();
@@ -91,6 +95,10 @@ function generateReactWrappers() {
    execSync(`node scripts/make-react.js --outdir "${cdnDir}"`, { stdio: 'inherit' });
  } catch (error) {
    console.error(`\n\n${error.message}`);
+
+    if (!isDeveloping) {
+      process.exit(1);
+    }
  }
  spinner.succeed();

@@ -119,7 +127,7 @@ async function generateStyles() {
        file.includes('themes/awesome') ||
        file.includes('themes/active') ||
        file.includes('themes/mellow') ||
-        file.includes('themes/migration') ||
+        file.includes('themes/tailspin') ||
        file.includes('themes/brutalist')
      ) {
        return false;
@@ -147,6 +155,9 @@ async function generateTypes() {
  try {
    execSync(`tsc --project ./tsconfig.prod.json --outdir "${cdnDir}"`);
  } catch (error) {
+    if (!isDeveloping) {
+      process.exit(1);
+    }
    return Promise.reject(error.stdout);
  }

@@ -219,6 +230,9 @@ async function generateBundle() {
  } catch (error) {
    spinner.fail();
    console.log(chalk.red(`\n${error}`));
+    if (!isDeveloping) {
+      process.exit(1);
+    }
  }

  spinner.succeed();
@@ -235,6 +249,10 @@ async function regenerateBundle() {
  } catch (error) {
    spinner.fail();
    console.log(chalk.red(`\n${error}`));
+
+    if (!isDeveloping) {
+      process.exit(1);
+    }
  }

  spinner.succeed();
@@ -250,24 +268,31 @@ async function generateDocs() {
  if (isAlpha) args.push('--alpha');
  if (isDeveloping) args.push('--develop');

-  // 11ty
-  const output = (await runScript(join(__dirname, 'docs.js'), args))
-    // Cleanup the output
-    .replace('[11ty]', '')
-    .replace(' seconds', 's')
-    .replace(/\(.*?\)/, '')
-    .toLowerCase()
-    .trim();
+  let output;
+  try {
+    // 11ty
+    output = (await runScript(join(__dirname, 'docs.js'), args))
+      // Cleanup the output
+      .replace('[11ty]', '')
+      .replace(' seconds', 's')
+      .replace(/\(.*?\)/, '')
+      .toLowerCase()
+      .trim();

-  // Copy assets
-  await copy(join(docsDir, 'assets'), join(siteDir, 'assets'), { overwrite: true });
+    // Copy dist (production only)
+    if (!isDeveloping) {
+      await copy(cdnDir, join(siteDir, 'dist'));
+    }

-  // Copy dist (production only)
-  if (!isDeveloping) {
-    await copy(cdnDir, join(siteDir, 'dist'));
+    spinner.succeed(`Writing the docs ${chalk.gray(`(${output}`)})`);
+  } catch (error) {
+    console.error('\n\n' + chalk.red(error) + '\n');
+
+    spinner.fail(chalk.red(`Error while writing the docs.`));
+    if (!isDeveloping) {
+      process.exit(1);
+    }
  }
-
-  spinner.succeed(`Writing the docs ${chalk.gray(`(${output}`)})`);
 }

 // Initial build
@@ -368,6 +393,10 @@ if (isDeveloping) {
      reload();
    } catch (err) {
      console.error(chalk.red(err));
+
+      if (!isDeveloping) {
+        process.exit(1);
+      }
    }
  });

--- a/src/components/button/button.ts
+++ b/src/components/button/button.ts
@@ -5,13 +5,18 @@ import { html, literal } from 'lit/static-html.js';
 import { WaBlurEvent } from '../../events/blur.js';
 import { WaFocusEvent } from '../../events/focus.js';
 import { WaInvalidEvent } from '../../events/invalid.js';
+import {
+  appearanceStyles,
+  sizeStyles,
+  variantStyles,
+  type AppearanceAttribute,
+  type SizeAttribute,
+  type VariantAttribute,
+} from '../../internal/styling-attributes.js';
 import { MirrorValidator } from '../../internal/validators/mirror-validator.js';
 import { watch } from '../../internal/watch.js';
 import { WebAwesomeFormAssociatedElement } from '../../internal/webawesome-formassociated-element.js';
 import nativeStyles from '../../styles/native/button.css';
-import appearanceStyles from '../../styles/utilities/appearance.css';
-import sizeStyles from '../../styles/utilities/size.css';
-import variantStyles from '../../styles/utilities/variants.css';
 import { LocalizeController } from '../../utilities/localize.js';
 import '../icon/icon.js';
 import '../spinner/spinner.js';
@@ -69,13 +74,13 @@ export default class WaButton extends WebAwesomeFormAssociatedElement {
  @property() title = ''; // make reactive to pass through

  /** The button's theme variant. */
-  @property() variant: 'neutral' | 'brand' | 'success' | 'warning' | 'danger' = 'neutral';
+  @property({ reflect: true }) variant: VariantAttribute = 'neutral';

  /** The button's visual appearance. */
-  @property({ reflect: true }) appearance: 'accent' | 'filled' | 'outlined' | 'plain' = 'accent';
+  @property({ reflect: true }) appearance: AppearanceAttribute = 'accent';

  /** The button's size. */
-  @property({ reflect: true }) size: 'small' | 'medium' | 'large' = 'medium';
+  @property({ reflect: true }) size: SizeAttribute = 'medium';

  /** Draws the button with a caret. Used to indicate that the button triggers a dropdown menu or similar behavior. */
  @property({ type: Boolean, reflect: true }) caret = false;
--- a/src/components/tag/tag.ts
+++ b/src/components/tag/tag.ts
@@ -1,10 +1,15 @@
 import { html } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { WaRemoveEvent } from '../../events/remove.js';
+import {
+  appearanceStyles,
+  sizeStyles,
+  variantStyles,
+  type AppearanceAttribute,
+  type SizeAttribute,
+  type VariantAttribute,
+} from '../../internal/styling-attributes.js';
 import WebAwesomeElement from '../../internal/webawesome-element.js';
-import appearanceStyles from '../../styles/utilities/appearance.css';
-import sizeStyles from '../../styles/utilities/size.css';
-import variantStyles from '../../styles/utilities/variants.css';
 import { LocalizeController } from '../../utilities/localize.js';
 import '../icon-button/icon-button.js';
 import styles from './tag.css';
@@ -33,14 +38,13 @@ export default class WaTag extends WebAwesomeElement {
  private readonly localize = new LocalizeController(this);

  /** The tag's theme variant. */
-  @property({ reflect: true }) variant: 'brand' | 'success' | 'neutral' | 'warning' | 'danger' | 'text' = 'neutral';
+  @property({ reflect: true }) variant: VariantAttribute = 'neutral';

  /** The tag's visual appearance. */
-  @property({ reflect: true }) appearance: 'accent' | 'outlined accent' | 'filled' | 'outlined' | 'outlined filled' =
-    'outlined filled';
+  @property({ reflect: true }) appearance: AppearanceAttribute = 'outlined filled';

  /** The tag's size. */
-  @property({ reflect: true }) size: 'small' | 'medium' | 'large' = 'medium';
+  @property({ reflect: true }) size: SizeAttribute = 'medium';

  /** Draws a pill-style tag with rounded edges. */
  @property({ type: Boolean, reflect: true }) pill = false;
--- a/src/internal/styling-attributes.ts
+++ b/src/internal/styling-attributes.ts
@@ -0,0 +1,16 @@
+export { default as appearanceStyles } from '../styles/utilities/appearance.css';
+export { default as sizeStyles } from '../styles/utilities/size.css';
+export { default as variantStyles } from '../styles/utilities/variants.css';
+
+export type AppearanceAttribute =
+  | 'outlined'
+  | 'accent'
+  | 'outlined accent'
+  | 'accent outlined'
+  | 'filled'
+  | 'outlined filled'
+  | 'filled outlined'
+  | 'plain';
+
+export type VariantAttribute = 'brand' | 'success' | 'neutral' | 'warning' | 'danger' | 'text';
+export type SizeAttribute = 'small' | 'medium' | 'large';
--- a/src/styles/native/input.css
+++ b/src/styles/native/input.css
@@ -14,13 +14,22 @@ input:where(:not(
    [type='reset'],
    [type='submit']
  )) {
-  &:not(:host *) {
+  /* Styling root, i.e. excluding elements within a host.
+     This is so that these properties can be overridden.
+   */
+  &:not(:host *),
+  /* Safari and FF don't like :host:not(:host *) or :where(:host) so we need to add :host explicitly.
+    However, we can't just specify :host, because then it would become & :host which matches nothing.
+    :host(*) is the same as :host and the & prevents it from becoming a descendant selector.
+   */
+  :host(:is(&, *)) {
    /* Defaults for root element. */
    --outlined-background-color: var(--wa-form-control-background-color);
    --outlined-border-color: var(--wa-form-control-border-color);
    --outlined-text-color: var(--wa-form-control-value-color);

-    :where(&) {
+    :where(&),
+    :host(:where(&, *)) {
      /* Defaults with 0 specificity.
       * Do NOT reset --background-color and --border-color here so they trickle in from the appearance utils
       * Instead we provide the fallback when setting
--- a/src/styles/native/select.css
+++ b/src/styles/native/select.css
@@ -6,7 +6,12 @@ label:has(select),
  --outlined-border-color: var(--wa-form-control-border-color);
  --outlined-text-color: var(--wa-form-control-value-color);

-  :where(&) {
+  /* Safari and FF don't like :where(:host) so we need to add :host explicitly.
+    However, we can't just specify :host, because then it would become & :host which matches nothing.
+    :host(*) is the same as :host and the & prevents it from becoming a descendant selector.
+   */
+  :where(&),
+  :host(:where(&, *)) {
    /* Defaults with 0 specificity.
       * Do NOT reset --background-color and --border-color here so they trickle in from the appearance utils
       * Instead we provide the fallback when setting
@@ -15,6 +20,7 @@ label:has(select),
    --box-shadow: initial;
  }
 }
+
 select,
 :host [part~='combobox'] {
  background-color: var(--background-color, var(--wa-form-control-background-color));
@@ -70,15 +76,16 @@ select {
 }
 label:has(select) {
  position: relative;
+  --icon-caret: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 512 512"><path d="M233.4 406.6c12.5 12.5 32.8 12.5 45.3 0l192-192c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L256 338.7 86.6 169.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l192 192z"/></svg>');
+
  &::after {
    content: '';
    background-color: var(--wa-color-neutral-on-quiet);
-    mask: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 512 512"><path d="M233.4 406.6c12.5 12.5 32.8 12.5 45.3 0l192-192c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L256 338.7 86.6 169.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l192 192z"/></svg>')
-      center no-repeat;
+    mask: var(--icon-caret) 50% 50% no-repeat;
    width: 1rem;
    height: var(--wa-form-control-height);
    position: absolute;
-    bottom: 0;
+    bottom: var(--wa-form-control-border-width);
    right: var(--wa-space);
  }
 }
--- a/src/styles/themes/active.css
+++ b/src/styles/themes/active.css
@@ -9,9 +9,10 @@
@import url('default/groups.css');
@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap');

-:root,
+:where(:root),
 :host,
-.wa-theme-active-light {
+.wa-theme-active,
+.wa-light {
  color-scheme: light;
  color: var(--wa-color-text-normal);

@@ -79,7 +80,7 @@
  --wa-color-neutral-on-normal: var(--wa-color-gray-30);
  --wa-color-neutral-on-loud: black;

-  /** 
+  /**
   * Typography
   */
  --wa-font-family-body: 'Inter', sans-serif;
@@ -98,8 +99,8 @@
  --wa-form-control-border-color: var(--wa-color-neutral-border-normal);
 }

-.wa-theme-active-dark,
-:is(:host-context(.wa-theme-active-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);

@@ -182,59 +183,61 @@
 /**
 * Component Styles
 */
-:root {
+:where(:root),
+:host,
+.wa-theme-active {
  --wa-theme-active-shadow-pop-out: inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
    inset 0 0.0625rem 0.125rem 0 rgb(255 255 255 / 0.2) /* inner highlight */,
    inset 0 -0.0625rem 0.0625rem 0 rgb(0 0 0 / 0.2) /* inner shadow */, var(--wa-shadow-s) /* outer shadow */;
  --wa-theme-active-shadow-punch-in: inset 0 0 0 0 transparent /* shine */,
    inset 0 0.125rem 0.125rem 0 rgb(0 0 0 / 0.1) /* inner highlight */,
    inset 0 -0.0625rem 0.25rem 0 rgb(0 0 0 / 0.1) /* inner shadow */, 0 0 0 0 transparent /* outer shadow */;
-}

-:is(button, input:where([type='button'], [type='reset'], [type='submit']), wa-button, .wa-button):not(
-    [appearance='plain'],
-    .wa-plain
-  ) {
-  box-shadow: var(--wa-theme-active-shadow-pop-out);
+  :is(button, input:where([type='button'], [type='reset'], [type='submit']), wa-button, .wa-button):not(
+      [appearance='plain'],
+      .wa-plain
+    ) {
+    box-shadow: var(--wa-theme-active-shadow-pop-out);

-  &:not([disabled], [loading]):active {
-    box-shadow: var(--wa-theme-active-shadow-punch-in);
-  }
-}
-
-wa-card {
-  --box-shadow: var(--wa-theme-active-shadow-pop-out);
-}
-
-input:not([type='button'], [type='reset'], [type='submit'], :checked),
-select,
-textarea,
-:is(wa-checkbox, wa-radio, wa-switch):not(:state(checked)),
-wa-input,
-wa-select,
-wa-textarea {
-  &:not([appearance='filled']):not([disabled]) {
-    --box-shadow: inset var(--wa-shadow-s);
-  }
-}
-
-input[type='radio'],
-wa-radio {
-  --background-color-checked: var(--wa-form-control-activated-color);
-  --checked-icon-color: var(--wa-color-brand-on-loud);
-  --checked-icon-scale: 0.4;
-}
-
-input[type='range'],
-wa-slider,
-wa-switch {
-  --thumb-shadow: var(--wa-theme-active-shadow-pop-out);
-}
-
-wa-progress-bar {
-  box-shadow: inset var(--wa-shadow-s);
-
-  &::part(indicator) {
-    box-shadow: inset 0 -0.5em 1em -0.5em oklch(from var(--indicator-color) calc(l - 0.1) c h);
+    &:not([disabled], [loading]):active {
+      box-shadow: var(--wa-theme-active-shadow-punch-in);
+    }
+  }
+
+  wa-card {
+    box-shadow: var(--wa-theme-active-shadow-pop-out);
+  }
+
+  input:not([type='button'], [type='reset'], [type='submit'], :checked),
+  select,
+  textarea,
+  :is(wa-checkbox, wa-radio, wa-switch):not(:state(checked)),
+  wa-input,
+  wa-select,
+  wa-textarea {
+    &:not([appearance='filled']):not([disabled]) {
+      --box-shadow: inset var(--wa-shadow-s);
+    }
+  }
+
+  input[type='radio'],
+  wa-radio {
+    --background-color-checked: var(--wa-form-control-activated-color);
+    --checked-icon-color: var(--wa-color-brand-on-loud);
+    --checked-icon-scale: 0.4;
+  }
+
+  input[type='range'],
+  wa-slider,
+  wa-switch {
+    --thumb-shadow: var(--wa-theme-active-shadow-pop-out);
+  }
+
+  wa-progress-bar {
+    box-shadow: inset var(--wa-shadow-s);
+
+    &::part(indicator) {
+      box-shadow: inset 0 -0.5em 1em -0.5em oklch(from var(--indicator-color) calc(l - 0.1) c h);
+    }
  }
 }
--- a/src/styles/themes/awesome.css
+++ b/src/styles/themes/awesome.css
@@ -9,9 +9,10 @@
@import url('default/groups.css');
@import url('https://fonts.googleapis.com/css2?family=Quicksand:wght@300..700&display=swap');

-:root,
+:where(:root),
 :host,
-.wa-theme-awesome-light {
+.wa-theme-awesome,
+.wa-light {
  color-scheme: light;
  color: var(--wa-color-text-normal);

@@ -141,8 +142,8 @@
  --wa-tooltip-line-height: var(--wa-line-height-normal);
 }

-.wa-theme-awesome-dark,
-:is(:host-context(.wa-theme-awesome-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);

@@ -151,7 +152,7 @@
   */
  --wa-color-surface-raised: var(--wa-color-gray-10);
  --wa-color-surface-default: var(--wa-color-gray-05);
-  --wa-color-surface-lowered: var(--wa-color-gray-05);
+  --wa-color-surface-lowered: color-mix(in oklab, var(--wa-color-surface-default), black 20%);
  --wa-color-surface-border: var(--wa-color-gray-20);

  --wa-color-text-normal: var(--wa-color-gray-95);
@@ -240,117 +241,120 @@
  --wa-form-control-required-content-color: inherit;
 }

-/* #region Custom Styles */
-wa-badge {
-  border-radius: var(--wa-border-radius-m);
-  font-weight: var(--wa-font-weight-bold);
-  text-transform: uppercase;
-}
-
-:is(
-    button,
-    input:where([type='button'], [type='reset'], [type='submit']),
-    wa-button,
-    wa-radio-group > wa-radio-button,
-    .wa-button
-  ):not([appearance='plain'], .wa-plain) {
-  --wa-transition-slow: 0;
-  --wa-transition-normal: 0;
-  --wa-transition-fast: 0;
-
-  --border-color: var(--text-color);
-  --border-color-hover: var(--border-color);
-  --border-color-active: var(--border-color);
-  box-shadow: var(--wa-shadow-offset-x-s) var(--wa-shadow-offset-y-s) var(--wa-shadow-blur-s) var(--wa-shadow-spread-s)
-    var(--border-color);
-  --background-color-active: var(--border-color);
-  --text-color-active: var(--background-color);
-
-  margin-bottom: var(--wa-shadow-offset-y-s);
-
-  &:is([appearance='outlined'], .wa-outlined) {
-    --background-color: var(--wa-color-surface-default);
+:where(:root),
+:host,
+.wa-theme-awesome {
+  /* #region Custom Styles */
+  wa-badge {
+    border-radius: var(--wa-border-radius-m);
+    font-weight: var(--wa-font-weight-bold);
+    text-transform: uppercase;
  }

-  &:not([disabled], [loading]):active,
-  &::part(checked) {
-    box-shadow: none;
-    transform: translateY(var(--wa-shadow-offset-y-s));
+  :is(
+      button,
+      input:where([type='button'], [type='reset'], [type='submit']),
+      wa-button,
+      wa-radio-group > wa-radio-button,
+      .wa-button
+    ):not([appearance='plain'], .wa-plain) {
+    --wa-transition-slow: 0;
+    --wa-transition-normal: 0;
+    --wa-transition-fast: 0;
+
+    --border-color: var(--text-color);
+    --border-color-hover: var(--border-color);
+    --border-color-active: var(--border-color);
+    box-shadow: var(--wa-shadow-offset-x-s) var(--wa-shadow-offset-y-s) var(--wa-shadow-blur-s)
+      var(--wa-shadow-spread-s) var(--border-color);
+    --background-color-active: var(--border-color);
+    --text-color-active: var(--background-color);
+
+    margin-bottom: var(--wa-shadow-offset-y-s);
+
+    &:is([appearance='outlined'], .wa-outlined) {
+      --background-color: var(--wa-color-surface-default);
+    }
+
+    &:not([disabled], [loading]):active,
+    &::part(checked) {
+      box-shadow: none;
+      transform: translateY(var(--wa-shadow-offset-y-s));
+    }
+
+    .wa-dark & {
+      --border-color: var(--wa-color-border-quiet);
+    }
  }

-  .wa-theme-awesome-dark & {
-    --border-color: var(--wa-color-border-quiet);
+  wa-callout {
+    &:is([appearance~='outlined'], .wa-outlined) {
+      border-color: var(--wa-color-border-normal);
+    }
+    &:not([appearance~='accent'], .wa-accent) {
+      color: var(--wa-color-text-normal);
+    }
+    &:not([appearance~='accent'], .wa-accent) {
+      --icon-color: var(--wa-color-border-normal);
+    }
  }
-}

-wa-callout {
-  &:is([appearance~='outlined'], .wa-outlined) {
-    border-color: var(--wa-color-border-normal);
+  wa-card {
+    background-color: var(--wa-color-surface-raised);
  }
-  &:not([appearance~='accent'], .wa-accent) {
-    color: var(--wa-color-text-normal);
+  wa-card::part(header) {
+    border-bottom-style: dotted;
  }
-  &:not([appearance~='accent'], .wa-accent) {
-    --icon-color: var(--wa-color-border-normal);
+  wa-card::part(footer) {
+    border-top-style: dotted;
  }
-}

-wa-card {
-  --background-color: var(--wa-color-surface-raised);
-  --border-style: none;
-}
-wa-card::part(header) {
-  border-bottom: var(--border-width) dotted var(--border-color);
-}
-wa-card::part(footer) {
-  border-top: var(--border-width) dotted var(--border-color);
-}
-
-input[type='checkbox'],
-wa-checkbox {
-  --checked-icon-color: var(--wa-color-surface-default);
-}
-
-wa-radio-group > wa-radio-button {
-  &::part(base):active,
-  &::part(checked) {
-    --background-color: var(--border-color);
-    --background-color-hover: var(--border-color);
-    --border-color: var(--wa-color-neutral-border-loud);
-    --text-color: var(--wa-color-surface-default);
+  input[type='checkbox'],
+  wa-checkbox {
+    --checked-icon-color: var(--wa-color-surface-default);
  }
-}

-wa-switch {
-  --height: 1.5em;
-}
+  wa-radio-group > wa-radio-button {
+    &::part(base):active,
+    &::part(checked) {
+      --background-color: var(--border-color);
+      --background-color-hover: var(--border-color);
+      --border-color: var(--wa-color-neutral-border-loud);
+      --text-color: var(--wa-color-surface-default);
+    }
+  }

-wa-tag {
-  font-weight: var(--wa-font-weight-bold);
-}
+  wa-switch {
+    --height: 1.5em;
+  }

-:is(
-    input:where(
-        :not(
-          [type='button'],
-          [type='checkbox'],
-          [type='color'],
-          [type='file'],
-          [type='hidden'],
-          [type='image'],
-          [type='radio'],
-          [type='range'],
-          [type='reset'],
-          [type='submit']
-        )
-      ),
-    select,
-    textarea,
-    wa-input,
-    wa-select,
-    wa-textarea,
-    .wa-text-field
-  ):not(:focus, [appearance='filled'], .wa-filled) {
-  --box-shadow: inset var(--wa-shadow-s);
+  wa-tag {
+    font-weight: var(--wa-font-weight-bold);
+  }
+
+  :is(
+      input:where(
+          :not(
+            [type='button'],
+            [type='checkbox'],
+            [type='color'],
+            [type='file'],
+            [type='hidden'],
+            [type='image'],
+            [type='radio'],
+            [type='range'],
+            [type='reset'],
+            [type='submit']
+          )
+        ),
+      select,
+      textarea,
+      wa-input,
+      wa-select,
+      wa-textarea,
+      .wa-text-field
+    ):not(:focus, [appearance='filled'], .wa-filled) {
+    --box-shadow: inset var(--wa-shadow-s);
+  }
+  /* #endregion */
 }
-/* #endregion */
--- a/src/styles/themes/brutalist.css
+++ b/src/styles/themes/brutalist.css
@@ -9,9 +9,10 @@
@import url('default/groups.css');
@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Sans+Condensed:wght@100;200;300;400;500;600;700&family=Space+Grotesk:wght@300..700&family=Space+Mono:wght@400;700&display=swap');

-:root,
+:where(:root),
 :host,
-.wa-theme-brutalist-light {
+.wa-theme-brutalist,
+.wa-light {
  color-scheme: light;
  color: var(--wa-color-text-normal);

@@ -122,8 +123,8 @@
  --wa-form-control-activated-color: var(--wa-color-neutral-fill-loud);
 }

-.wa-theme-brutalist-dark,
-:is(:host-context(.wa-theme-brutalist-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);

@@ -206,87 +207,91 @@
 /**
 * Component Styles
 */
-blockquote,
-pre {
-  border-inline-start: var(--wa-border-style) var(--wa-border-width-m) var(--wa-color-surface-border);
-}
-wa-badge {
-  text-transform: uppercase;
-}
-
-wa-callout,
-wa-tag {
-  border-inline-start-color: var(--border-color, var(--wa-color-border-loud));
-  border-inline-start-width: var(--wa-border-width-s);
-
-  &:not([appearance~='outlined'], .wa-outlined) {
-    border-block-start-width: 0;
-    border-block-end-width: 0;
-    border-inline-end-width: 0;
+:where(:root),
+:host,
+.wa-theme-brutalist {
+  blockquote,
+  pre {
+    border-inline-start: var(--wa-border-style) var(--wa-border-width-m) var(--wa-color-surface-border);
+  }
+  wa-badge {
+    text-transform: uppercase;
  }

-  &:not([appearance~='accent'], .wa-accent) {
-    --icon-color: var(--wa-color-fill-loud);
-    --text-color: var(--wa-color-text-normal);
+  wa-callout,
+  wa-tag {
+    border-inline-start-color: var(--border-color, var(--wa-color-border-loud));
+    border-inline-start-width: var(--wa-border-width-s);
+
+    &:not([appearance~='outlined'], .wa-outlined) {
+      border-block-start-width: 0;
+      border-block-end-width: 0;
+      border-inline-end-width: 0;
+    }
+
+    &:not([appearance~='accent'], .wa-accent) {
+      --icon-color: var(--wa-color-fill-loud);
+      --text-color: var(--wa-color-text-normal);
+    }
+  }
+
+  wa-callout {
+    --spacing: var(--wa-space-s) var(--wa-space-m);
+
+    &::part(icon) {
+      --spacing: var(--wa-space-m);
+    }
+  }
+
+  wa-carousel {
+    --pagination-color: var(--wa-color-neutral-fill-normal);
+  }
+
+  wa-carousel::part(scroll-container) {
+    padding: var(--wa-shadow-offset-y-s) var(--wa-shadow-offset-x-s); /* make room for the box-shadow */
+  }
+
+  wa-carousel::part(pagination-item),
+  wa-image-comparer::part(handle),
+  wa-progress-bar::part(base),
+  wa-slider::part(base),
+  input[type='range'],
+  wa-switch::part(control),
+  wa-switch::part(thumb) {
+    border-radius: var(--wa-border-radius-square);
+  }
+
+  wa-carousel-item {
+    border: var(--wa-panel-border-width) var(--wa-panel-border-style) var(--wa-color-surface-border);
+    box-shadow: var(--wa-shadow-s);
+  }
+
+  :is(
+    input:where(
+        :not(
+          [type='button'],
+          [type='checkbox'],
+          [type='color'],
+          [type='file'],
+          [type='hidden'],
+          [type='image'],
+          [type='radio'],
+          [type='range'],
+          [type='reset'],
+          [type='submit']
+        )
+      ),
+    select,
+    textarea,
+    wa-input,
+    wa-select,
+    wa-textarea,
+    .wa-text-field
+  ) {
+    --border-width: 0 0 var(--wa-form-control-border-width) var(--wa-form-control-border-width);
+  }
+
+  wa-rating {
+    --symbol-color-active: var(--wa-color-neutral-fill-loud);
  }
 }
-
-wa-callout {
-  --spacing: var(--wa-space-s) var(--wa-space-m);
-
-  &::part(icon) {
-    --spacing: var(--wa-space-m);
-  }
-}
-
-wa-carousel {
-  --pagination-color: var(--wa-color-neutral-fill-normal);
-}
-
-wa-carousel::part(scroll-container) {
-  padding: var(--wa-shadow-offset-y-s) var(--wa-shadow-offset-x-s); /* make room for the box-shadow */
-}
-
-wa-carousel::part(pagination-item),
-wa-image-comparer::part(handle),
-wa-progress-bar::part(base),
-wa-slider::part(base),
-input[type='range'],
-wa-switch::part(control),
-wa-switch::part(thumb) {
-  border-radius: var(--wa-border-radius-square);
-}
-
-wa-carousel-item {
-  border: var(--wa-panel-border-width) var(--wa-panel-border-style) var(--wa-color-surface-border);
-  box-shadow: var(--wa-shadow-s);
-}
-
-:is(
-  input:where(
-      :not(
-        [type='button'],
-        [type='checkbox'],
-        [type='color'],
-        [type='file'],
-        [type='hidden'],
-        [type='image'],
-        [type='radio'],
-        [type='range'],
-        [type='reset'],
-        [type='submit']
-      )
-    ),
-  select,
-  textarea,
-  wa-input,
-  wa-select,
-  wa-textarea,
-  .wa-text-field
-) {
-  --border-width: 0 0 var(--wa-form-control-border-width) var(--wa-form-control-border-width);
-}
-
-wa-rating {
-  --symbol-color-active: var(--wa-color-neutral-fill-loud);
-}
--- a/src/styles/themes/classic.css
+++ b/src/styles/themes/classic.css
@@ -8,9 +8,10 @@
@import url('default/transitions.css');
@import url('default/groups.css');

-:root,
+:where(:root),
 :host,
-.wa-theme-classic-light {
+.wa-theme-classic,
+.wa-light {
  color-scheme: light;

  /**
@@ -116,8 +117,8 @@
  --wa-tooltip-content-color: var(--wa-color-surface-default);
 }

-.wa-theme-classic-dark,
-:is(:host-context(.wa-theme-classic-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);

@@ -126,7 +127,7 @@
   */
  --wa-color-surface-raised: var(--wa-color-gray-10);
  --wa-color-surface-default: var(--wa-color-gray-05);
-  --wa-color-surface-lowered: var(--wa-color-gray-05);
+  --wa-color-surface-lowered: color-mix(in oklab, var(--wa-color-surface-default), black 20%);
  --wa-color-surface-border: var(--wa-color-gray-20);

  --wa-color-text-normal: var(--wa-color-gray-80);
@@ -204,132 +205,136 @@
 /**
 * Component Styles
 */
-wa-avatar {
-  --background-color: var(--wa-color-neutral-fill-loud);
-  --text-color: var(--wa-color-neutral-on-loud);
-}
-
-button,
-input:where([type='button'], [type='reset'], [type='submit']),
-wa-button,
-.wa-button,
-wa-radio-button {
-  font-size: var(--wa-size-smaller);
-}
-
-wa-radio-button {
-  --background-color-active: color-mix(in oklab, var(--background-color-hover), var(--wa-color-mix-active));
-  --background-color-hover: var(--wa-form-control-activated-color);
-  --border-color: var(--wa-form-control-border-color);
-  --border-color-active: var(--background-color-active);
-  --border-color-hover: var(--background-color-hover);
-  --text-color-active: var(--text-color-hover);
-  --text-color-hover: var(--wa-color-brand-on-loud);
-  --indicator-color: var(--wa-background-color);
-
-  &[checked] {
-    --background-color: var(--wa-form-control-activated-color);
-    --border-color: var(--background-color);
-    --text-color: var(--wa-color-brand-on-loud);
+:where(:root),
+:host,
+.wa-theme-classic {
+  wa-avatar {
+    --background-color: var(--wa-color-neutral-fill-loud);
+    --text-color: var(--wa-color-neutral-on-loud);
  }
-}

-wa-breadcrumb {
-  font-size: var(--wa-font-size-s);
-}
+  button,
+  input:where([type='button'], [type='reset'], [type='submit']),
+  wa-button,
+  .wa-button,
+  wa-radio-button {
+    font-size: var(--wa-size-smaller);
+  }

-wa-callout {
-  --spacing: var(--wa-space-l);
-  font-size: var(--wa-size-smaller);
+  wa-radio-button {
+    --background-color-active: color-mix(in oklab, var(--background-color-hover), var(--wa-color-mix-active));
+    --background-color-hover: var(--wa-form-control-activated-color);
+    --border-color: var(--wa-form-control-border-color);
+    --border-color-active: var(--background-color-active);
+    --border-color-hover: var(--background-color-hover);
+    --text-color-active: var(--text-color-hover);
+    --text-color-hover: var(--wa-color-brand-on-loud);
+    --indicator-color: var(--wa-background-color);

-  &:is([appearance~='outlined'], .wa-outlined) {
-    border-width: var(--wa-border-width-l) var(--wa-border-width-s) var(--wa-border-width-s) var(--wa-border-width-s);
-    border-color: var(--border-color, var(--wa-color-border-loud)) var(--wa-color-surface-border)
-      var(--wa-color-surface-border) var(--wa-color-surface-border);
-
-    &:not([appearance~='accent'], .wa-accent) {
-      --border-color: var(--wa-color-fill-loud);
+    &[checked] {
+      --background-color: var(--wa-form-control-activated-color);
+      --border-color: var(--background-color);
+      --text-color: var(--wa-color-brand-on-loud);
    }
  }
-  &:not([appearance~='accent'], .wa-accent) {
-    --icon-color: var(--wa-color-fill-loud);
-    --text-color: var(--wa-color-text-normal);
+
+  wa-breadcrumb {
+    font-size: var(--wa-font-size-s);
+  }
+
+  wa-callout {
+    --spacing: var(--wa-space-l);
+    font-size: var(--wa-size-smaller);
+
+    &:is([appearance~='outlined'], .wa-outlined) {
+      border-width: var(--wa-border-width-l) var(--wa-border-width-s) var(--wa-border-width-s) var(--wa-border-width-s);
+      border-color: var(--border-color, var(--wa-color-border-loud)) var(--wa-color-surface-border)
+        var(--wa-color-surface-border) var(--wa-color-surface-border);
+
+      &:not([appearance~='accent'], .wa-accent) {
+        --border-color: var(--wa-color-fill-loud);
+      }
+    }
+    &:not([appearance~='accent'], .wa-accent) {
+      --icon-color: var(--wa-color-fill-loud);
+      --text-color: var(--wa-color-text-normal);
+    }
+  }
+
+  wa-card {
+    background-color: var(--wa-color-surface-raised);
+  }
+
+  wa-carousel {
+    --box-shadow: var(--wa-shadow-s);
+    --pagination-color-active: var(--wa-color-neutral-fill-loud);
+  }
+
+  wa-dialog,
+  wa-drawer {
+    --spacing: var(--wa-space-l);
+  }
+
+  :is(
+      input:where(
+          :not(
+            [type='button'],
+            [type='checkbox'],
+            [type='color'],
+            [type='file'],
+            [type='hidden'],
+            [type='image'],
+            [type='radio'],
+            [type='range'],
+            [type='reset'],
+            [type='submit']
+          )
+        ),
+      select,
+      textarea,
+      wa-input,
+      wa-select,
+      wa-textarea,
+      .wa-text-field
+    ):not([appearance='filled'], .wa-filled) {
+    --wa-focus-ring: var(--wa-focus-ring-style) var(--wa-focus-ring-width)
+      color-mix(in oklab, var(--wa-color-focus), transparent 50%);
+    --wa-focus-ring-offset: 0;
+  }
+
+  input[type='radio'],
+  wa-radio {
+    --background-color-checked: var(--border-color-checked);
+    --checked-icon-color: var(--wa-color-surface-default);
+    --checked-icon-scale: 0.4;
+  }
+
+  input[type='range'],
+  wa-slider {
+    --thumb-gap: 0;
+  }
+
+  wa-switch {
+    --background-color: var(--wa-color-gray-50);
+    --border-color: var(--background-color);
+    --height: calc(1em * var(--wa-form-control-value-line-height) - var(--border-width) * 2);
+    --thumb-color: var(--wa-color-surface-default);
+    --thumb-size: calc(var(--height) + 4px);
+    --width: calc(var(--height) * 2);
+
+    &::part(thumb) {
+      border: var(--wa-border-width-s) var(--wa-border-style) var(--background-color);
+    }
+    &[checked]::part(thumb) {
+      border-color: var(--background-color-checked);
+    }
+  }
+
+  wa-progress-bar {
+    --height: 1rem;
+  }
+
+  wa-tab {
+    font-size: var(--wa-font-size-s);
  }
 }
-
-wa-card {
-  --background-color: var(--wa-color-surface-raised);
-}
-
-wa-carousel {
-  --box-shadow: var(--wa-shadow-s);
-  --pagination-color-active: var(--wa-color-neutral-fill-loud);
-}
-
-wa-dialog,
-wa-drawer {
-  --spacing: var(--wa-space-l);
-}
-
-:is(
-    input:where(
-        :not(
-          [type='button'],
-          [type='checkbox'],
-          [type='color'],
-          [type='file'],
-          [type='hidden'],
-          [type='image'],
-          [type='radio'],
-          [type='range'],
-          [type='reset'],
-          [type='submit']
-        )
-      ),
-    select,
-    textarea,
-    wa-input,
-    wa-select,
-    wa-textarea,
-    .wa-text-field
-  ):not([appearance='filled'], .wa-filled) {
-  --wa-focus-ring: var(--wa-focus-ring-style) var(--wa-focus-ring-width)
-    color-mix(in oklab, var(--wa-color-focus), transparent 50%);
-  --wa-focus-ring-offset: 0;
-}
-
-input[type='radio'],
-wa-radio {
-  --background-color-checked: var(--border-color-checked);
-  --checked-icon-color: var(--wa-color-surface-default);
-  --checked-icon-scale: 0.4;
-}
-
-input[type='range'],
-wa-slider {
-  --thumb-gap: 0;
-}
-
-wa-switch {
-  --background-color: var(--wa-color-gray-50);
-  --border-color: var(--background-color);
-  --height: calc(1em * var(--wa-form-control-value-line-height) - var(--border-width) * 2);
-  --thumb-color: var(--wa-color-surface-default);
-  --thumb-size: calc(var(--height) + 4px);
-  --width: calc(var(--height) * 2);
-
-  &::part(thumb) {
-    border: var(--wa-border-width-s) var(--wa-border-style) var(--background-color);
-  }
-  &[checked]::part(thumb) {
-    border-color: var(--background-color-checked);
-  }
-}
-
-wa-progress-bar {
-  --height: 1rem;
-}
-
-wa-tab {
-  font-size: var(--wa-font-size-s);
-}
--- a/src/styles/themes/default.css
+++ b/src/styles/themes/default.css
@@ -8,15 +8,16 @@
@import url('default/transitions.css');
@import url('default/groups.css');

-:root,
+:where(:root),
 :host,
-.wa-theme-default-light {
+.wa-theme-default,
+.wa-light {
  color-scheme: light;
  color: var(--wa-color-text-normal);
 }

-.wa-theme-default-dark,
-:is(:host-context(.wa-theme-migration-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);
 }
--- a/src/styles/themes/default/color-semantic.css
+++ b/src/styles/themes/default/color-semantic.css
@@ -1,8 +1,10 @@
 /**
 * Foundational Colors and Semantic Colors
 */
-:where(:root, :host),
-.wa-theme-default-light {
+:where(:root),
+:host,
+.wa-theme-default,
+.wa-light {
  /**
   * Foundational Colors
   */
@@ -102,14 +104,14 @@
 }

 /** need to wrap :host-context() in an :is() selector for unsupported browsers */
-.wa-theme-default-dark,
-:is(:host-context(.wa-theme-default-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  /**
   * Foundational Colors
   */
  --wa-color-surface-raised: var(--wa-color-gray-10);
  --wa-color-surface-default: var(--wa-color-gray-05);
-  --wa-color-surface-lowered: color-mix(in oklab, var(--wa-color-surface-default), black 10%);
+  --wa-color-surface-lowered: color-mix(in oklab, var(--wa-color-surface-default), black 20%);
  --wa-color-surface-border: var(--wa-color-gray-20);

  --wa-color-text-normal: var(--wa-color-gray-95);
--- a/src/styles/themes/default/color.css
+++ b/src/styles/themes/default/color.css
@@ -6,7 +6,8 @@
 * A difference of 50 between lightness values ensures a minimum 4.5:1 contrast ratio.
 * A difference of 60 between lightness values ensures a minimum 7:1 contrast ratio.
 */
-:where(:root, :host) {
+:where(:root),
+:host {
  --wa-color-red-95: #ffefef;
  --wa-color-red-90: #ffdddc;
  --wa-color-red-80: #ffb7b6;
--- a/src/styles/themes/default/groups.css
+++ b/src/styles/themes/default/groups.css
@@ -1,8 +1,10 @@
 /**
 * Component Groups
 */
-:where(:root, :host),
-.wa-theme-default-light {
+:where(:root),
+:host,
+.wa-theme-default,
+.wa-light {
  /* Form controls */
  --wa-form-control-background-color: var(--wa-color-surface-default);

@@ -45,8 +47,8 @@
 }

 /** need to wrap :host-context() in an :is() selector for unsupported browsers */
-.wa-theme-default-dark,
-:is(:host-context(.wa-theme-default-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  /* Form controls */
  --wa-form-control-background-color: var(--wa-color-surface-default);

--- a/src/styles/themes/default/outlines.css
+++ b/src/styles/themes/default/outlines.css
@@ -1,7 +1,8 @@
 /**
  * Borders and outlines
  */
-:where(:root, :host) {
+:where(:root),
+:host {
  --wa-border-style: solid;

  /* A multiplier is provided to uniformly increase or decrease all border widths. */
--- a/src/styles/themes/default/rounding.css
+++ b/src/styles/themes/default/rounding.css
@@ -1,7 +1,8 @@
 /**
 * Rounding
 */
-:where(:root, :host) {
+:where(:root),
+:host {
  /* A multiplier is provided to uniformly increase or decrease all border radii. */
  --wa-border-radius-scale: 1;
  --wa-border-radius-s: calc(var(--wa-border-radius-scale) * 0.1875rem);
--- a/src/styles/themes/default/shadows.css
+++ b/src/styles/themes/default/shadows.css
@@ -3,7 +3,8 @@
 * Shadow properties are highly modular to make it easy to create custom shadow effects or transform elements based on specific shadow qualities.
 * A multiplier is provided for each shadow quality to uniformly scale all related values.
 */
-:where(:root, :host) {
+:where(:root),
+:host {
  --wa-shadow-offset-x-scale: 0;
  --wa-shadow-offset-x-s: calc(var(--wa-shadow-offset-x-scale) * 0.125rem);
  --wa-shadow-offset-x-m: calc(var(--wa-shadow-offset-x-scale) * 0.25rem);
--- a/src/styles/themes/default/space.css
+++ b/src/styles/themes/default/space.css
@@ -1,7 +1,8 @@
 /**
 * Spacing
 */
-:where(:root, :host) {
+:where(:root),
+:host {
  /* A multiplier is provided to uniformly increase or decrease all spacing. */
  --wa-space-scale: 1;
  --wa-space-3xs: calc(var(--wa-space-scale) * 0.125rem); /* 2px */
--- a/src/styles/themes/default/transitions.css
+++ b/src/styles/themes/default/transitions.css
@@ -1,7 +1,8 @@
 /**
 * Transitions
 */
-:where(:root, :host) {
+:where(:root),
+:host {
  --wa-transition-easing: ease;
  --wa-transition-slow: 300ms;
  --wa-transition-normal: 150ms;
--- a/src/styles/themes/default/typography.css
+++ b/src/styles/themes/default/typography.css
@@ -1,7 +1,8 @@
 /**
 * Typography
 */
-:where(:root, :host) {
+:where(:root),
+:host {
  --wa-font-family-body: ui-sans-serif, system-ui, sans-serif;
  --wa-font-family-heading: var(--wa-font-family-body);
  --wa-font-family-code: ui-monospace, monospace;
--- a/src/styles/themes/glassy.css
+++ b/src/styles/themes/glassy.css
@@ -8,9 +8,10 @@
@import url('default/transitions.css');
@import url('default/groups.css');

-:root,
+:where(:root),
 :host,
-.wa-theme-glassy-light {
+.wa-theme-glassy,
+.wa-light {
  color-scheme: light;
  color: var(--wa-color-text-normal);

@@ -33,8 +34,8 @@
  --wa-shadow-blur-scale: 3;
 }

-.wa-theme-glassy-dark,
-:is(:host-context(.wa-theme-glassy-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);

@@ -117,83 +118,87 @@
 /**
 * Component Styles
 */
-wa-button:not([appearance='plain']) {
-  box-shadow:
-    inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
-    inset 0 0.125rem 0 0 rgb(255 255 255 / 0.1) /* top highlight */,
-    inset 0 1.25em 0 0 rgb(255 255 255 / 0.1) /* upper tint */,
-    inset 0 -1.125em 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
-    inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.2) /* bottom highlight */,
-    var(--wa-shadow-s) /* outer shadow */;
-
-  margin-bottom: var(--wa-shadow-offset-y-s);
-  transition: transform var(--wa-transition-fast);
-
-  &:not([disabled]) {
-    &:hover {
-      box-shadow:
-        inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
-        inset 0 0.125rem 0 0 rgb(255 255 255 / 0.1) /* top highlight */,
-        inset 0 1.25em 0 0 rgb(255 255 255 / 0.1) /* upper tint */,
-        inset 0 -1.125em 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
-        inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.1) /* bottom highlight */,
-        var(--wa-shadow-m) /* outer shadow */;
-    }
-
-    &:active {
-      box-shadow:
-        inset 0 -0.0625rem 0 0 rgb(255 255 255 / 0.1) /* shine */,
-        inset 0 0.125rem 0 0 rgb(0 0 0 / 0.1) /* top highlight */,
-        inset 0 1.25em 0 0 rgb(255 255 255 / 0.08) /* upper tint */,
-        inset 0 -1.125em 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
-        inset 0 -0.125rem 0 0 rgb(255 255 255 / 0.04) /* bottom highlight */,
-        0 0 0 0 transparent /* outer shadow */;
-
-      transform: translateY(var(--wa-shadow-offset-y-s));
-    }
-  }
-}
-
-wa-checkbox,
-wa-input:not(:focus),
-wa-radio,
-wa-select {
-  --box-shadow: inset var(--wa-shadow-s), inset 0 1.25em 0 0 rgb(0 0 0 / 0.02) /* upper tint */,
-    inset 0 -1.125em 0 0 rgb(255 255 255 / 0.05) /* lower shade */;
-}
-
-wa-checkbox:state(checked),
-wa-radio:state(checked) {
-  --box-shadow: inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
-    inset 0 0.125rem 0 0 rgb(255 255 255 / 0.05) /* top highlight */,
-    inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.2) /* bottom highlight */, var(--wa-shadow-s) /* outer shadow */;
-}
-
-wa-textarea:not(:focus) {
-  &:not([appearance='filled']):not([disabled]) {
-    --box-shadow: var(--wa-shadow-s);
-  }
-}
-
-wa-switch {
-  --box-shadow: inset var(--wa-shadow-s);
-  --thumb-shadow: inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
-    inset 0 0.125rem 0 0 rgb(255 255 255 / 0.05) /* top highlight */,
-    inset 0 calc(var(--height) * 0.25) 0 0 rgb(255 255 255 / 0.04) /* upper tint */,
-    inset 0 calc(var(--height) * -0.25) 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
-    inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.2) /* bottom highlight */, var(--wa-shadow-s) /* outer shadow */;
-}
-
-wa-progress-bar {
-  box-shadow: inset var(--wa-shadow-s);
-
-  &::part(indicator) {
+:where(:root),
+:host,
+.wa-theme-glassy {
+  wa-button:not([appearance='plain']) {
    box-shadow:
      inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
      inset 0 0.125rem 0 0 rgb(255 255 255 / 0.1) /* top highlight */,
-      inset 0 0.625rem 0 0 rgb(255 255 255 / 0.1) /* upper tint */,
-      inset 0 -0.5rem 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
+      inset 0 1.25em 0 0 rgb(255 255 255 / 0.1) /* upper tint */,
+      inset 0 -1.125em 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
      inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.2) /* bottom highlight */,
      var(--wa-shadow-s) /* outer shadow */;
+
+    margin-bottom: var(--wa-shadow-offset-y-s);
+    transition: transform var(--wa-transition-fast);
+
+    &:not([disabled]) {
+      &:hover {
+        box-shadow:
+          inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
+          inset 0 0.125rem 0 0 rgb(255 255 255 / 0.1) /* top highlight */,
+          inset 0 1.25em 0 0 rgb(255 255 255 / 0.1) /* upper tint */,
+          inset 0 -1.125em 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
+          inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.1) /* bottom highlight */,
+          var(--wa-shadow-m) /* outer shadow */;
+      }
+
+      &:active {
+        box-shadow:
+          inset 0 -0.0625rem 0 0 rgb(255 255 255 / 0.1) /* shine */,
+          inset 0 0.125rem 0 0 rgb(0 0 0 / 0.1) /* top highlight */,
+          inset 0 1.25em 0 0 rgb(255 255 255 / 0.08) /* upper tint */,
+          inset 0 -1.125em 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
+          inset 0 -0.125rem 0 0 rgb(255 255 255 / 0.04) /* bottom highlight */,
+          0 0 0 0 transparent /* outer shadow */;
+
+        transform: translateY(var(--wa-shadow-offset-y-s));
+      }
+    }
+  }
+
+  wa-checkbox,
+  wa-input:not(:focus),
+  wa-radio,
+  wa-select {
+    --box-shadow: inset var(--wa-shadow-s), inset 0 1.25em 0 0 rgb(0 0 0 / 0.02) /* upper tint */,
+      inset 0 -1.125em 0 0 rgb(255 255 255 / 0.05) /* lower shade */;
+  }
+
+  wa-checkbox:state(checked),
+  wa-radio:state(checked) {
+    --box-shadow: inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
+      inset 0 0.125rem 0 0 rgb(255 255 255 / 0.05) /* top highlight */,
+      inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.2) /* bottom highlight */, var(--wa-shadow-s) /* outer shadow */;
+  }
+
+  wa-textarea:not(:focus) {
+    &:not([appearance='filled']):not([disabled]) {
+      --box-shadow: var(--wa-shadow-s);
+    }
+  }
+
+  wa-switch {
+    --box-shadow: inset var(--wa-shadow-s);
+    --thumb-shadow: inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
+      inset 0 0.125rem 0 0 rgb(255 255 255 / 0.05) /* top highlight */,
+      inset 0 calc(var(--height) * 0.25) 0 0 rgb(255 255 255 / 0.04) /* upper tint */,
+      inset 0 calc(var(--height) * -0.25) 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
+      inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.2) /* bottom highlight */, var(--wa-shadow-s) /* outer shadow */;
+  }
+
+  wa-progress-bar {
+    box-shadow: inset var(--wa-shadow-s);
+
+    &::part(indicator) {
+      box-shadow:
+        inset 0 0.0625rem 0 0 rgb(255 255 255 / 0.2) /* shine */,
+        inset 0 0.125rem 0 0 rgb(255 255 255 / 0.1) /* top highlight */,
+        inset 0 0.625rem 0 0 rgb(255 255 255 / 0.1) /* upper tint */,
+        inset 0 -0.5rem 0 0 rgb(0 0 0 / 0.04) /* lower shade */,
+        inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.2) /* bottom highlight */,
+        var(--wa-shadow-s) /* outer shadow */;
+    }
  }
 }
--- a/src/styles/themes/mellow.css
+++ b/src/styles/themes/mellow.css
@@ -9,9 +9,10 @@
@import url('default/groups.css');
@import url('https://fonts.googleapis.com/css2?family=Lora:ital,wght@0,400..700;1,400..700&family=Mulish:ital,wght@0,200..1000;1,200..1000&display=swap');

-:root,
+:where(:root),
 :host,
-.wa-theme-mellow-light {
+.wa-theme-mellow,
+.wa-light {
  color-scheme: light;
  color: var(--wa-color-text-normal);

@@ -119,8 +120,8 @@
  --wa-form-control-border-color: var(--wa-color-neutral-border-normal);
 }

-.wa-theme-mellow-dark,
-:is(:host-context(.wa-theme-mellow-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);

@@ -129,7 +130,7 @@
   */
  --wa-color-surface-raised: var(--wa-color-gray-10);
  --wa-color-surface-default: var(--wa-color-gray-05);
-  --wa-color-surface-lowered: var(--wa-color-gray-05);
+  --wa-color-surface-lowered: color-mix(in oklab, var(--wa-color-surface-default), black 20%);
  --wa-color-surface-border: color-mix(in oklab, var(--wa-color-gray-30), transparent);

  --wa-color-text-normal: var(--wa-color-blue-90);
@@ -201,28 +202,32 @@
 /**
 * Component Styles
 */
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  letter-spacing: calc(1em * -0.02);
-}
+:where(:root),
+:host,
+.wa-theme-mellow {
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    letter-spacing: calc(1em * -0.02);
+  }

-wa-callout {
-  border-width: var(--wa-panel-border-width) var(--wa-panel-border-width) var(--wa-panel-border-width)
-    calc(var(--wa-panel-border-width) * 4);
-}
+  wa-callout {
+    border-width: var(--wa-panel-border-width) var(--wa-panel-border-width) var(--wa-panel-border-width)
+      calc(var(--wa-panel-border-width) * 4);
+  }

-wa-card::part(header) {
-  border-bottom: var(--border-width) dotted var(--border-color);
-}
-wa-card::part(footer) {
-  border-top: var(--border-width) dotted var(--border-color);
-}
+  wa-card::part(header) {
+    border-bottom-style: dotted;
+  }
+  wa-card::part(footer) {
+    border-top-style: dotted;
+  }

-input[type='radio'],
-wa-radio {
-  --checked-icon-scale: 0.6;
+  input[type='radio'],
+  wa-radio {
+    --checked-icon-scale: 0.6;
+  }
 }
--- a/src/styles/themes/playful.css
+++ b/src/styles/themes/playful.css
@@ -8,9 +8,10 @@
@import url('default/groups.css');
@import url('https://fonts.googleapis.com/css2?family=Azeret+Mono:ital@0;1&family=Fredoka:wght@300..700&family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap');

-:root,
+:where(:root),
 :host,
-.wa-theme-playful-light {
+.wa-theme-playful,
+.wa-light {
  color-scheme: light;
  color: var(--wa-color-text-normal);

@@ -203,8 +204,8 @@
  --wa-form-control-border-color: var(--wa-color-neutral-border-normal);
 }

-.wa-theme-playful-dark,
-:is(:host-context(.wa-theme-playful-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);

@@ -287,93 +288,97 @@
 /**
 * Component Styles
 */
-wa-button:not([disabled]) {
-  transition-property: all;
+:where(:root),
+:host,
+.wa-theme-playful {
+  wa-button:not([disabled]) {
+    transition-property: all;

-  &:hover {
-    transform: scale(1.02, 1.02);
+    &:hover {
+      transform: scale(1.02, 1.02);
+    }
+
+    &:active {
+      transform: scale(0.98, 0.98);
+    }
+  }
+  wa-button:is([appearance~='accent'], [appearance~='filled']) {
+    --button-gradient-top: oklch(from var(--background-color) calc(l - 0.1) c h);
+    --button-gradient-middle: var(--background-color);
+    --button-gradient-bottom: oklch(from var(--background-color) calc(l + 0.1) c h);
+    --button-shadow-outer: oklch(from var(--background-color) calc(l + 0.1) c h);
+    --button-shadow-inner-a: oklch(from var(--background-color) calc(l - 0.2) c h);
+    --button-shadow-inner-b: oklch(from var(--background-color) calc(l + 0.3) c h);
+    --button-text-shadow: oklch(from var(--background-color) calc(l - 0.1) c h);
+    --border-color: var(--button-gradient-middle);
+    --border-width: 1px;
+    --border-color-hover: var(--button-gradient-middle);
+    --border-color-active: var(--button-gradient-middle);
+
+    &::part(base) {
+      background: linear-gradient(
+        180deg,
+        var(--button-gradient-top) 0%,
+        var(--button-gradient-middle) 51.88%,
+        var(--button-gradient-bottom) 100%
+      );
+      box-shadow:
+        0px 6px 16px var(--button-shadow-outer),
+        inset 0 -2px 8px var(--button-shadow-inner-a),
+        inset 0 2px 8px var(--button-shadow-inner-b);
+    }
+
+    &:not([disabled])::part(base):hover {
+      background: linear-gradient(
+        180deg,
+        var(--button-gradient-bottom) 0%,
+        var(--button-gradient-middle) 51.88%,
+        var(--button-gradient-top) 100%
+      );
+    }
+
+    &:not([disabled])::part(base):active {
+      background: linear-gradient(
+        180deg,
+        color-mix(in oklab, var(--button-gradient-top), var(--wa-color-mix-active)) 0%,
+        color-mix(in oklab, var(--button-gradient-middle), var(--wa-color-mix-active)) 51.88%,
+        color-mix(in oklab, var(--button-gradient-bottom), var(--wa-color-mix-active)) 100%
+      );
+      box-shadow:
+        inset 0 -2px 8px var(--button-shadow-inner-a),
+        inset 0 2px 8px var(--button-shadow-inner-b);
+    }
  }

-  &:active {
-    transform: scale(0.98, 0.98);
-  }
-}
-wa-button:is([appearance~='accent'], [appearance~='filled']) {
-  --button-gradient-top: oklch(from var(--background-color) calc(l - 0.1) c h);
-  --button-gradient-middle: var(--background-color);
-  --button-gradient-bottom: oklch(from var(--background-color) calc(l + 0.1) c h);
-  --button-shadow-outer: oklch(from var(--background-color) calc(l + 0.1) c h);
-  --button-shadow-inner-a: oklch(from var(--background-color) calc(l - 0.2) c h);
-  --button-shadow-inner-b: oklch(from var(--background-color) calc(l + 0.3) c h);
-  --button-text-shadow: oklch(from var(--background-color) calc(l - 0.1) c h);
-  --border-color: var(--button-gradient-middle);
-  --border-width: 1px;
-  --border-color-hover: var(--button-gradient-middle);
-  --border-color-active: var(--button-gradient-middle);
-
-  &::part(base) {
-    background: linear-gradient(
-      180deg,
-      var(--button-gradient-top) 0%,
-      var(--button-gradient-middle) 51.88%,
-      var(--button-gradient-bottom) 100%
-    );
-    box-shadow:
-      0px 6px 16px var(--button-shadow-outer),
-      inset 0 -2px 8px var(--button-shadow-inner-a),
-      inset 0 2px 8px var(--button-shadow-inner-b);
+  wa-button::part(label) {
+    font-weight: var(--wa-font-weight-bold);
+    text-shadow: 0 2px 2px var(--button-text-shadow);
  }

-  &:not([disabled])::part(base):hover {
-    background: linear-gradient(
-      180deg,
-      var(--button-gradient-bottom) 0%,
-      var(--button-gradient-middle) 51.88%,
-      var(--button-gradient-top) 100%
-    );
+  wa-callout {
+    border-style: dashed;
  }

-  &:not([disabled])::part(base):active {
-    background: linear-gradient(
-      180deg,
-      color-mix(in oklab, var(--button-gradient-top), var(--wa-color-mix-active)) 0%,
-      color-mix(in oklab, var(--button-gradient-middle), var(--wa-color-mix-active)) 51.88%,
-      color-mix(in oklab, var(--button-gradient-bottom), var(--wa-color-mix-active)) 100%
-    );
-    box-shadow:
-      inset 0 -2px 8px var(--button-shadow-inner-a),
-      inset 0 2px 8px var(--button-shadow-inner-b);
+  wa-checkbox::part(check-icon) {
+    filter: drop-shadow(var(--wa-shadow-offset-x-s) var(--wa-shadow-offset-y-s) 0.125em var(--wa-color-shadow));
+  }
+
+  wa-rating {
+    --symbol-color: color-mix(in oklab, var(--symbol-color-active), transparent);
+  }
+
+  wa-switch {
+    --thumb-size: 0.8em;
+    --height: 1.5em;
+    --width: calc(var(--thumb-size) * 3);
+  }
+
+  wa-switch[checked]::part(thumb) {
+    box-shadow: var(--wa-shadow-s);
+  }
+
+  wa-tag {
+    border-style: dashed;
+    border-color: var(--wa-color-border-quiet);
  }
 }
-
-wa-button::part(label) {
-  font-weight: var(--wa-font-weight-bold);
-  text-shadow: 0 2px 2px var(--button-text-shadow);
-}
-
-wa-callout {
-  border-style: dashed;
-}
-
-wa-checkbox::part(check-icon) {
-  filter: drop-shadow(var(--wa-shadow-offset-x-s) var(--wa-shadow-offset-y-s) 0.125em var(--wa-color-shadow));
-}
-
-wa-rating {
-  --symbol-color: color-mix(in oklab, var(--symbol-color-active), transparent);
-}
-
-wa-switch {
-  --thumb-size: 0.8em;
-  --height: 1.5em;
-  --width: calc(var(--thumb-size) * 3);
-}
-
-wa-switch[checked]::part(thumb) {
-  box-shadow: var(--wa-shadow-s);
-}
-
-wa-tag {
-  border-style: dashed;
-  border-color: var(--wa-color-border-quiet);
-}
--- a/src/styles/themes/premium.css
+++ b/src/styles/themes/premium.css
@@ -10,9 +10,10 @@
@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Playfair+Display:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&display=swap');

-:root,
+:where(:root),
 :host,
-.wa-theme-premium-light {
+.wa-theme-premium,
+.wa-light {
  color-scheme: light;
  color: var(--wa-color-text-normal);

@@ -104,8 +105,8 @@
  --wa-form-control-border-color: var(--wa-color-neutral-border-normal);
 }

-.wa-theme-premium-dark,
-:is(:host-context(.wa-theme-premium-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);

@@ -188,89 +189,91 @@
 /**
 * Component Styles
 */
-wa-rating {
-  --symbol-size: var(--wa-font-size-l);
-  --symbol-color-active: var(--wa-color-text-quiet);
-}
-
-wa-switch {
-  --background: transparent;
-  --border-color: var(--wa-color-neutral-border-normal);
-  --thumb-color: var(--border-color);
-  --thumb-color-checked: var(--wa-color-brand-fill-quiet);
-  --thumb-size: 1em;
-  --height: 1.5em;
-  --width: calc(var(--thumb-size) * 2.5);
-}
-
-wa-button {
-  --box-shadow: inset 0 0.03125rem 0 0 rgb(255 255 255 / 0.5), inset 0 0.125rem 0 0 rgb(255 255 255 / 0.1),
-    inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.2), var(--wa-shadow-s);
-}
-
-wa-button[appearance='outlined'] {
-  --box-shadow: none;
-}
-
-wa-card {
-  --border-radius: var(--wa-border-radius-l);
-}
-
-wa-alert {
-  font-size: var(--wa-font-size-s);
-  --border-color: var(--background);
-}
-
-wa-carousel {
-  --pagination-color-active: var(--wa-color-brand-fill-loud);
-  --pagination-color: var(--wa-color-neutral-fill-normal);
-}
-
-wa-badge,
-wa-button::part(label),
-wa-tag {
-  text-transform: uppercase;
-}
-
-wa-badge,
-wa-tag {
-  border-width: 0;
-}
-
-&:not(.wa-theme-premium-dark) wa-alert {
-  &[variant='brand'] {
-    --background: var(--wa-color-primary-95);
+.wa-theme-premium {
+  wa-rating {
+    --symbol-size: var(--wa-font-size-l);
+    --symbol-color-active: var(--wa-color-text-quiet);
  }
-  &[variant='success'] {
-    --background: var(--wa-color-green-95);
+
+  wa-switch {
+    --background: transparent;
+    --border-color: var(--wa-color-neutral-border-normal);
+    --thumb-color: var(--border-color);
+    --thumb-color-checked: var(--wa-color-brand-fill-quiet);
+    --thumb-size: 1em;
+    --height: 1.5em;
+    --width: calc(var(--thumb-size) * 2.5);
  }
-  &[variant='warning'] {
-    --background: var(--wa-color-yellow-95);
+
+  wa-button {
+    --box-shadow: inset 0 0.03125rem 0 0 rgb(255 255 255 / 0.5), inset 0 0.125rem 0 0 rgb(255 255 255 / 0.1),
+      inset 0 -0.0625rem 0 0 rgb(0 0 0 / 0.2), var(--wa-shadow-s);
  }
-  &[variant='danger'] {
-    --background: var(--wa-color-red-95);
-  }
-}
-
-wa-badge {
-  &[variant='brand'] {
-    --background: var(--wa-color-primary-80);
-    --text-color: var(--wa-color-primary-20);
-  }
-  &[variant='success'] {
-    --background: var(--wa-color-green-80);
-    --text-color: var(--wa-color-green-20);
-  }
-  &[variant='warning'] {
-    --background: var(--wa-color-yellow-80);
-    --text-color: var(--wa-color-yellow-20);
-  }
-  &[variant='danger'] {
-    --background: var(--wa-color-red-80);
-    --text-color: var(--wa-color-red-20);
-  }
-  &[variant='neutral'] {
-    --background: white;
-    --text-color: var(--wa-color-base-30);
+
+  wa-button[appearance='outlined'] {
+    --box-shadow: none;
+  }
+
+  wa-card {
+    border-radius: var(--wa-border-radius-l);
+  }
+
+  wa-alert {
+    font-size: var(--wa-font-size-s);
+    --border-color: var(--background);
+  }
+
+  wa-carousel {
+    --pagination-color-active: var(--wa-color-brand-fill-loud);
+    --pagination-color: var(--wa-color-neutral-fill-normal);
+  }
+
+  wa-badge,
+  wa-button::part(label),
+  wa-tag {
+    text-transform: uppercase;
+  }
+
+  wa-badge,
+  wa-tag {
+    border-width: 0;
+  }
+
+  &:not(.wa-dark) wa-alert {
+    &[variant='brand'] {
+      --background: var(--wa-color-primary-95);
+    }
+    &[variant='success'] {
+      --background: var(--wa-color-green-95);
+    }
+    &[variant='warning'] {
+      --background: var(--wa-color-yellow-95);
+    }
+    &[variant='danger'] {
+      --background: var(--wa-color-red-95);
+    }
+  }
+
+  wa-badge {
+    &[variant='brand'] {
+      --background: var(--wa-color-primary-80);
+      --text-color: var(--wa-color-primary-20);
+    }
+    &[variant='success'] {
+      --background: var(--wa-color-green-80);
+      --text-color: var(--wa-color-green-20);
+    }
+    &[variant='warning'] {
+      --background: var(--wa-color-yellow-80);
+      --text-color: var(--wa-color-yellow-20);
+    }
+    &[variant='danger'] {
+      --background: var(--wa-color-red-80);
+      --text-color: var(--wa-color-red-20);
+    }
+    &[variant='neutral'] {
+      --background: white;
+      --text-color: var(--wa-color-base-30);
+    }
  }
 }
--- a/src/styles/themes/migration.css
+++ b/src/styles/themes/migration.css
@@ -9,9 +9,10 @@
@import url('default/groups.css');
@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap');

-:root,
+:where(:root),
 :host,
-.wa-theme-migration-light {
+.wa-theme-tailspin,
+.wa-light {
  color-scheme: light;
  color: var(--wa-color-text-normal);

@@ -124,8 +125,8 @@
  --wa-form-control-label-line-height: var(--wa-line-height-normal);
 }

-.wa-theme-migration-dark,
-:is(:host-context(.wa-theme-migration-dark)) {
+.wa-dark,
+:is(:host-context(.wa-dark)) {
  color-scheme: dark;
  color: var(--wa-color-text-normal);

@@ -134,7 +135,7 @@
   */
  --wa-color-surface-raised: var(--wa-color-gray-10);
  --wa-color-surface-default: var(--wa-color-gray-05);
-  --wa-color-surface-lowered: color-mix(in oklab, var(--wa-color-surface-default), black 10%);
+  --wa-color-surface-lowered: color-mix(in oklab, var(--wa-color-surface-default), black 20%);
  --wa-color-surface-border: rgb(255 255 255 / 0.1);

  --wa-color-text-normal: white;
@@ -208,57 +209,62 @@
 /**
 * Component Styles
 */
-h1,
-h2,
-h3,
-h4 {
-  letter-spacing: calc(1em * -0.03);
-}
+:where(:root),
+:host,
+.wa-theme-tailspin,
+:is(:host-context(.wa-theme-tailspin)) {
+  h1,
+  h2,
+  h3,
+  h4 {
+    letter-spacing: calc(1em * -0.03);
+  }

-wa-avatar {
-  --background-color: var(--wa-color-neutral-fill-quiet);
-  --text-color: var(--wa-color-neutral-on-quiet);
-}
+  wa-avatar {
+    --background-color: var(--wa-color-neutral-fill-quiet);
+    --text-color: var(--wa-color-neutral-on-quiet);
+  }

-a,
-wa-badge,
-wa-tag {
-  font-weight: var(--wa-font-weight-semibold);
-}
+  a,
+  wa-badge,
+  wa-tag {
+    font-weight: var(--wa-font-weight-semibold);
+  }

-:is(button, input:where([type='button'], [type='reset'], [type='submit']), wa-button, .wa-button):not(
-    [appearance='plain'],
-    .wa-plain
-  ) {
-  box-shadow: var(--wa-shadow-s);
-}
+  :is(button, input:where([type='button'], [type='reset'], [type='submit']), wa-button, .wa-button):not(
+      [appearance='plain'],
+      .wa-plain
+    ) {
+    box-shadow: var(--wa-shadow-s);
+  }

-wa-callout {
-  border-radius: var(--wa-border-radius-m);
+  wa-callout {
+    border-radius: var(--wa-border-radius-m);

-  &::part(icon) {
-    opacity: 0.6;
+    &::part(icon) {
+      opacity: 0.6;
+    }
+  }
+
+  input[type='radio'],
+  wa-radio {
+    --background-color-checked: var(--wa-form-control-activated-color);
+    --checked-icon-color: var(--wa-color-brand-on-loud);
+    --checked-icon-scale: 0.4;
+  }
+
+  wa-switch {
+    --background-color: var(--wa-color-neutral-fill-normal);
+    --border-color: transparent;
+    --height: calc(var(--thumb-size) * (18 / 14));
+    --thumb-color: white;
+    --thumb-color-checked: var(--thumb-color);
+    --thumb-size: 1.25em;
+    --thumb-shadow: var(--wa-shadow-s);
+    --width: calc(var(--thumb-size) * (32 / 14));
+  }
+
+  wa-tab {
+    color: var(--wa-color-text-quiet);
  }
 }
-
-input[type='radio'],
-wa-radio {
-  --background-color-checked: var(--wa-form-control-activated-color);
-  --checked-icon-color: var(--wa-color-brand-on-loud);
-  --checked-icon-scale: 0.4;
-}
-
-wa-switch {
-  --background-color: var(--wa-color-neutral-fill-normal);
-  --border-color: transparent;
-  --height: calc(var(--thumb-size) * (18 / 14));
-  --thumb-color: white;
-  --thumb-color-checked: var(--thumb-color);
-  --thumb-size: 1.25em;
-  --thumb-shadow: var(--wa-shadow-s);
-  --width: calc(var(--thumb-size) * (32 / 14));
-}
-
-wa-tab {
-  color: var(--wa-color-text-quiet);
-}
--- a/src/styles/utilities/appearance.css
+++ b/src/styles/utilities/appearance.css
@@ -36,6 +36,12 @@
  --text-color: var(--wa-color-on-normal, var(--wa-color-neutral-on-normal));
 }

+/* 0 specificity. Safari doesn't like :where(:host()) so we need a separate rule. */
+:where(.wa-filled),
+:host(:where([appearance~='filled'])) {
+  --border-color: transparent;
+}
+
 .wa-plain,
 :host([appearance~='plain']) {
  --background-color: transparent;
--- a/src/styles/utilities/size.css
+++ b/src/styles/utilities/size.css
@@ -16,7 +16,7 @@
  font-size: var(--wa-size);
 }

-:root,
+:where(:root),
 :host,
 .wa-size-s,
 .wa-size-m,
Author	SHA1	Message	Date
Lea Verou	bc775fd2b9	Merge branch 'styling-attributes' of https://github.com/shoelace-style/webawesome into styling-attributes	2025-01-13 13:20:31 -05:00
Lea Verou	96fd2941df	Experiment	2025-01-13 13:20:25 -05:00
Lea Verou	a07f6280a3	Themes category in docs (#477 ) Co-authored-by: Lindsay M <126139086+lindsaym-fa@users.noreply.github.com> Co-authored-by: lindsaym-fa <dev@lindsaym.design>	2025-01-13 13:14:12 -05:00
Lea Verou	6822b25772	Rewrite color scheme logic (#481 ) - Minimize needless swaps - Centralize logic - Use an actual `<wa-select>` rather than hacking it with `<wa-dropdown>` - Move shared includes to shared template - Rewrite critical theme JS - Refactor of theme picker code - Utilize view transitions better and use them for color scheme too - Do not store default value in localStorage - Removed unused `*-wide` templates - Fixed #482	2025-01-10 15:32:28 -05:00
Konnor Rogers	200188b0c3	properly report build failures (#485 ) * properly report build failures * prettier	2025-01-10 13:29:14 -05:00
Lea Verou	bc6fe95f13	`npm run build:alpha:serve` per @KonnorRogers suggestion	2025-01-10 13:13:01 -05:00
Lea Verou	3a33fa208a	Add command for testing the build without having to push to Vercel	2025-01-10 13:13:01 -05:00
Lea Verou	3ec4e6de07	Fix build	2025-01-10 13:13:01 -05:00
Lea Verou	6644288f2b	Experiment	2025-01-10 12:29:12 -05:00
Lea Verou	eb07dc1410	Use passthrough copy (#474 )	2025-01-09 17:24:18 -05:00
Lindsay M	5bfeb8044e	Theme showcase improvements (#480 ) * Presentation improvements * Change `-webkit-text-size-adjust` to supported value (`none` isn't a supported keyword on iOS) * Try using `text-size-adjust` * Throwing caution to the wind * Give up on `text-size-adjust` and add 1-column view	2025-01-09 13:31:31 -05:00
lindsaym-fa	aa915c3e28	Doc revisions	2025-01-09 11:57:35 -05:00
Lea Verou	c79457a607	Attempt at better style isolation between themes Still doesn't quite fix #475 but might be a nudge in the right direction.	2025-01-09 11:57:35 -05:00
Lea Verou	419f0610e4	Template-tweaks - Move breadcrumbs to separate template - Rename `beforeContent` to `header` - Move breadcrumbs inside header	2025-01-09 02:26:01 -05:00
Cory LaViska	7ab5ca8640	3.0.0-alpha.8	2025-01-08 18:30:48 -05:00
Cory LaViska	c39faff936	update version (#473 )	2025-01-08 18:17:31 -05:00
Lindsay M	6d31db57f6	Revise and add showcase to Themes doc (#456 ) * Initial progress * Make responsive * quick fix to show theme name/description * Small styling tweaks * Documentation updates * Revisions and improvements * Avoid using static URLs 'cause that's ridiculous --------- Co-authored-by: Cory LaViska <cory@abeautifulsite.net>	2025-01-08 17:33:09 -05:00
Lea Verou	21ed4f82b0	Improve UX of Layout section	2025-01-08 17:13:38 -05:00
Lea Verou	844e374a72	Fix #470	2025-01-08 16:23:34 -05:00
Lea Verou	e5f4c14608	Fix native select caret positioning, fixes #411	2025-01-08 15:58:33 -05:00
Lea Verou	1ad963f5ad	`wa-card` styling fixes	2025-01-08 15:36:12 -05:00
Lea Verou	4476117932	Add default layout as a failsafe	2025-01-08 15:20:26 -05:00
Lindsay M	e52a7a5ce5	Pre-release theme touchup (#465 ) * Fix themed card styles * Improve lowered surface colors across themes	2025-01-08 15:04:27 -05:00
Lindsay M	fa66f4262d	Fix mobile theme selector; fixes #440 (#446 ) * Fix styling * Fix mobile theme selector label	2025-01-08 15:01:20 -05:00
Lea Verou	a87f3627bb	Fix #451 without changing logic/specificity	2025-01-08 15:00:45 -05:00
Cory LaViska	06e432589f	change migration => tailspin (#463 )	2025-01-08 13:59:27 -05:00
Cory LaViska	b4c4074ae1	fix mobile color picker bug (#462 )	2025-01-08 13:49:57 -05:00
Lea Verou	19042fcca4	Decouple dark mode & theme, fixes #445 closes #385 (#457 ) Co-authored-by: Lindsay M <126139086+lindsaym-fa@users.noreply.github.com>	2025-01-08 12:50:29 -05:00
Lea Verou	8541369ae1	Fix #437 regression (#458 )	2025-01-08 12:33:19 -05:00