update cdn to jsdelivr for public pens

update path
update VERSIONS.txt with good versions (#1656 )
2026-01-12 20:19:13 +00:00 · 2025-10-27 12:26:17 -04:00 · 2025-10-27 12:26:03 -04:00 · 2025-10-24 15:00:17 -04:00 · 2025-10-24 11:33:00 -04:00 · 2025-10-24 11:13:04 -04:00
253 changed files with 6284 additions and 3918 deletions
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Twitter: [@webawesomer](https://twitter.com/webawesomer)

 ## Developers ✨

-Developers can use this documentation to learn how to build Web Awesome from source. You will need Node >= 14.17 to build and run the project locally.
+Developers can use this documentation to learn how to build Web Awesome from source. You will need Node.js 14.17 or later to build and run the project locally.

 **You don't need to do any of this to use Web Awesome!** This page is for people who want to contribute to the project, tinker with the source, or create a custom build of Web Awesome.

@@ -29,31 +29,29 @@ If that's not what you're trying to do, the [documentation website](https://weba

 ### What are you using to build Web Awesome?

-Components are built with [LitElement](https://lit-element.polymer-project.org/), a custom elements base class that provides an intuitive API and reactive data binding. The build is a custom script with bundling powered by [esbuild](https://esbuild.github.io/).
+Components are built with [Lit](https://lit.dev/), a custom elements base class that provides an intuitive API and reactive data binding. The build is a custom script with bundling powered by [esbuild](https://esbuild.github.io/).

 ### Understanding the Web Awesome monorepo

-Web Awesome uses [NPM workspaces](https://docs.npmjs.com/cli/v11/using-npm/workspaces) for its monorepo structure and is fairly minimal in what it provides.
+Web Awesome uses [npm workspaces](https://docs.npmjs.com/cli/v11/using-npm/workspaces) for its monorepo structure and is fairly minimal in what it provides.

-By using a NPM workspaces and a monorepo structure, we can get consistent builds, shared configurations, and reduced duplication across repositories which reduces regressions and forces consistency across `webawesome`, `webawesome-pro`, and `webawesome-app`.
+By using npm workspaces and a monorepo structure, we can get consistent builds, shared configurations, and reduced duplication across repositories which reduces regressions and forces consistency across `webawesome`, `webawesome-pro`, and `webawesome-app`.

 Generally, if you plan to only work with the free version of `webawesome` it is easiest to go to `packages/webawesome` and run all commands from there.

-### Where do NPM dependencies go?
+### Where do npm dependencies go?

-Any dependencies intended to be used across all packages (IE: `prettier`, `eslint`) that are _NOT_ used at runtime should be in the root `devDependencies` of `package.json`.
+Any dependencies intended to be used across all packages (i.e., `prettier`, `eslint`) that are **not** used at runtime should be in the root `devDependencies` of `package.json`.

 ```bash
 npm install -D -w prettier
 ```

-Any dependencies that will be used at runtime by a package should be part of the specific package's `"dependencies"` such as `lit`. This is required because if that dependency is not in the `packages/*/package.json`, it will not be installed when used via NPM.
+Any dependencies that will be used at runtime by a package should be part of the specific package's `dependencies` such as `lit`. This is required because if that dependency is not in the `packages/*/package.json`, it will not be installed when used via npm.

-Individual packages are also free to install devDependencies as needed as long as they are specific to that package only.
+Individual packages are also free to install `devDependencies` as needed as long as they are specific to that package only.

-To do install a package specific to a package, change your working directory to that package's root
-
-IE: `cd packages/webawesome && npm install <package-name>`
+To install a package specific to a Web Awesome package, change your working directory to that package's root (i.e., `cd packages/webawesome && npm install <package-name>`).

 ### Forking the Repo

@@ -67,14 +65,14 @@ npm install

 ### Developing

-Once you've cloned the repo, run the following command from the respective directory within `packages/*`
+Once you've cloned the repo, run the following command from the respective directory within `packages/*`.

 ```bash
 cd packages/webawesome
 npm start
 ```

-This will spin up the dev server. After the initial build, a browser will open automatically. There is currently no hot module reloading (HMR), as browser's don't provide a way to reregister custom elements, but most changes to the source will reload the browser automatically.
+This will spin up the dev server. After the initial build, a browser will open automatically. There is currently no hot module reloading (HMR), as browsers don't provide a way to reregister custom elements, but most changes to the source will reload the browser automatically.

 ### Building

@@ -102,7 +100,7 @@ This will generate a source file, a stylesheet, and a docs page for you. When yo

 Right now the only additional packages are in private repositories.

-To add additional packages from other repositories, run: `git clone <url> packages/<package-name>` to clone your repo into `packages/`.
+To add additional packages from other repositories, run `git clone <url> packages/<package-name>` to clone your repo into `packages/`.

 Make sure to run `npm install` at the root of the monorepo after adding your package!

@@ -112,4 +110,4 @@ Web Awesome is an open source project and contributions are encouraged! If you'r

 ## License

-Web Awesome is available under the terms of the MIT license.
+Web Awesome is available under the terms of the [MIT License](LICENSE.md).
--- a/VERSIONS.txt
+++ b/VERSIONS.txt
@@ -0,0 +1,2 @@
+3.0.0-beta.5
+3.0.0-beta.6
--- a/cspell.json
+++ b/cspell.json
@@ -92,6 +92,7 @@
    "heroicons",
    "hexa",
    "Hotwire",
+    "hrefs",
    "Iconoir",
    "Iframes",
    "iife",
@@ -135,6 +136,7 @@
    "noopener",
    "noreferrer",
    "noscript",
+    "Notdog",
    "novalidate",
    "nowrap",
    "Numberish",
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
        "@custom-elements-manifest/analyzer": "^0.10.4",
        "@lit-labs/eleventy-plugin-lit": "^1.0.3",
        "@lit-labs/testing": "^0.2.5",
-        "@lit/react": "^1.0.6",
+        "@lit/react": "^1.0.8",
        "@open-wc/testing": "^3.2.0",
        "@types/mocha": "^10.0.10",
        "@types/react": "^18.2.28",
@@ -589,6 +589,10 @@
        "node": ">=12.17"
      }
    },
+    "node_modules/@awesome.me/webawesome": {
+      "resolved": "packages/webawesome",
+      "link": true
+    },
    "node_modules/@babel/code-frame": {
      "version": "7.23.5",
      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
@@ -2025,10 +2029,9 @@
      }
    },
    "node_modules/@lit/react": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@lit/react/-/react-1.0.7.tgz",
-      "integrity": "sha512-cencnwwLXQKiKxjfFzSgZRngcWJzUDZi/04E0fSaF86wZgchMdvTyu+lE36DrUfvuus3bH8+xLPrhM1cTjwpzw==",
-      "dev": true,
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@lit/react/-/react-1.0.8.tgz",
+      "integrity": "sha512-p2+YcF+JE67SRX3mMlJ1TKCSTsgyOVdAwd/nxp3NuV1+Cb6MWALbN6nT7Ld4tpmYofcE5kcaSY1YBB9erY+6fw==",
      "peerDependencies": {
        "@types/react": "17 || 18 || 19"
      }
@@ -2484,10 +2487,6 @@
      "resolved": "https://registry.npmjs.org/@shoelace-style/localize/-/localize-3.2.1.tgz",
      "integrity": "sha512-r4C9C/5kSfMBIr0D9imvpRdCNXtUNgyYThc4YlS6K5Hchv1UyxNQ9mxwj+BTRH2i1Neits260sR3OjKMnplsFA=="
    },
-    "node_modules/@shoelace-style/webawesome": {
-      "resolved": "packages/webawesome",
-      "link": true
-    },
    "node_modules/@shoelace-style/webawesome-pro": {
      "resolved": "packages/webawesome-pro",
      "link": true
@@ -2876,8 +2875,7 @@
    "node_modules/@types/prop-types": {
      "version": "15.7.14",
      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
-      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
-      "dev": true
+      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ=="
    },
    "node_modules/@types/qs": {
      "version": "6.9.11",
@@ -2895,7 +2893,6 @@
      "version": "18.3.23",
      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.23.tgz",
      "integrity": "sha512-/LDXMQh55EzZQ0uVAZmKKhfENivEvWz6E+EYzh+/MCjMhNsotd+ZHhBGIjFDTi6+fz0OhQQQLbTgdQIxxCsC0w==",
-      "dev": true,
      "dependencies": {
        "@types/prop-types": "*",
        "csstype": "^3.0.2"
@@ -2986,6 +2983,12 @@
        "@types/node": "*"
      }
    },
+    "node_modules/@wc-toolkit/jsx-types": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@wc-toolkit/jsx-types/-/jsx-types-1.3.0.tgz",
+      "integrity": "sha512-2rcRyPNEAdesFlokSSFBuCjpPPrMySk4NqyVJsqCs/WczcAUnIGwjnJk2fd/SNmzSjxGFRIFLAhXOgFOHLPvxQ==",
+      "dev": true
+    },
    "node_modules/@web/browser-logs": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/@web/browser-logs/-/browser-logs-0.4.0.tgz",
@@ -5799,8 +5802,7 @@
    "node_modules/csstype": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "dev": true
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
    },
    "node_modules/custom-element-jet-brains-integration": {
      "version": "1.7.0",
@@ -6476,6 +6478,16 @@
      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
      "dev": true
    },
+    "node_modules/eleventy-plugin-git-commit-date": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/eleventy-plugin-git-commit-date/-/eleventy-plugin-git-commit-date-0.1.3.tgz",
+      "integrity": "sha512-dmdkGpMuRj8apWptC1QGqAsLHCguddFlfPjbjflGCqXdJ8cdhEjrzzvI/rL0XUvzCC4ETgGl9i/wDU6ujZ94gA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3"
+      }
+    },
    "node_modules/emoji-regex": {
      "version": "10.4.0",
      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
@@ -13006,12 +13018,6 @@
        "node": ">=0.8.0"
      }
    },
-    "node_modules/style-observer": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/style-observer/-/style-observer-0.0.7.tgz",
-      "integrity": "sha512-t75H3CRy+vd5q3yqyrf/De4tkz33hPQTiCcfh0NTesI5G7kJnZ227LEYTwqjKTtaFOCJvqZcYFHpJlF8bsk3bQ==",
-      "license": "MIT"
-    },
    "node_modules/supports-color": {
      "version": "7.2.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -13974,42 +13980,83 @@
      }
    },
    "packages/webawesome": {
-      "name": "@shoelace-style/webawesome",
-      "version": "3.0.0-beta.1",
+      "name": "@awesome.me/webawesome",
+      "version": "3.0.0-beta.6",
      "license": "MIT",
      "dependencies": {
-        "@ctrl/tinycolor": "^4.1.0",
+        "@ctrl/tinycolor": "4.1.0",
        "@floating-ui/dom": "^1.6.13",
+        "@lit/react": "^1.0.8",
        "@shoelace-style/animations": "^1.2.0",
        "@shoelace-style/localize": "^3.2.1",
        "composed-offset-position": "^0.0.6",
        "lit": "^3.2.1",
-        "qr-creator": "^1.0.0",
-        "style-observer": "^0.0.7"
+        "nanoid": "^5.1.5",
+        "qr-creator": "^1.0.0"
+      },
+      "devDependencies": {
+        "@wc-toolkit/jsx-types": "^1.3.0",
+        "eleventy-plugin-git-commit-date": "^0.1.3"
      },
-      "devDependencies": {},
      "engines": {
        "node": ">=14.17.0"
      }
    },
    "packages/webawesome-pro": {
      "name": "@shoelace-style/webawesome-pro",
-      "version": "3.0.0-alpha.13",
-      "license": "TODO",
+      "version": "3.0.0-beta.6",
      "dependencies": {
-        "@ctrl/tinycolor": "^4.1.0",
+        "@ctrl/tinycolor": "4.1.0",
        "@floating-ui/dom": "^1.6.13",
+        "@lit/react": "^1.0.8",
        "@shoelace-style/animations": "^1.2.0",
        "@shoelace-style/localize": "^3.2.1",
        "composed-offset-position": "^0.0.6",
        "lit": "^3.2.1",
-        "qr-creator": "^1.0.0",
-        "style-observer": "^0.0.7"
+        "nanoid": "^5.1.5",
+        "qr-creator": "^1.0.0"
+      },
+      "devDependencies": {
+        "@wc-toolkit/jsx-types": "^1.3.0",
+        "eleventy-plugin-git-commit-date": "^0.1.3"
      },
-      "devDependencies": {},
      "engines": {
        "node": ">=14.17.0"
      }
+    },
+    "packages/webawesome-pro/node_modules/nanoid": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
+      "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.js"
+      },
+      "engines": {
+        "node": "^18 || >=20"
+      }
+    },
+    "packages/webawesome/node_modules/nanoid": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
+      "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.js"
+      },
+      "engines": {
+        "node": "^18 || >=20"
+      }
    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -18,13 +18,12 @@
  "engines": {
    "node": ">=14.17.0"
  },
-  "dependencies": {},
  "devDependencies": {
    "@11ty/eleventy": "3.0.0",
    "@custom-elements-manifest/analyzer": "^0.10.4",
    "@lit-labs/eleventy-plugin-lit": "^1.0.3",
    "@lit-labs/testing": "^0.2.5",
-    "@lit/react": "^1.0.6",
+    "@lit/react": "^1.0.8",
    "@open-wc/testing": "^3.2.0",
    "@types/mocha": "^10.0.10",
    "@types/react": "^18.2.28",
@@ -87,4 +86,3 @@
    ]
  }
 }
-
--- a/packages/webawesome/LICENSE.md
+++ b/packages/webawesome/LICENSE.md
@@ -0,0 +1,7 @@
+Copyright (c) 2025 Fonticons, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/packages/webawesome/README.md
+++ b/packages/webawesome/README.md
@@ -0,0 +1 @@
+Visit our documentation! <https://webawesome.com>
--- a/packages/webawesome/custom-elements-manifest.js
+++ b/packages/webawesome/custom-elements-manifest.js
@@ -1,3 +1,4 @@
+import { jsxTypesPlugin } from '@wc-toolkit/jsx-types';
 import { customElementJetBrainsPlugin } from 'custom-element-jet-brains-integration';
 import { customElementVsCodePlugin } from 'custom-element-vs-code-integration';
 // import { customElementVuejsPlugin } from 'custom-element-vuejs-integration';
@@ -164,6 +165,7 @@ export default {
      ],
    }),

+    // Generate custom JetBrains data
    customElementJetBrainsPlugin({
      outdir: './dist-cdn',
      excludeCss: true,
@@ -176,6 +178,16 @@ export default {
      },
    }),

+    // Generate JSX types (see https://wc-toolkit.com/integrations/jsx/)
+    jsxTypesPlugin({
+      fileName: 'custom-elements-jsx.d.ts',
+      outdir,
+      defaultExport: true,
+      componentTypePath: (_name, _tag, modulePath) => {
+        return `./${modulePath}`;
+      },
+    }),
+
    //
    // TODO - figure out why this broke when events were updated
    //
--- a/packages/webawesome/docs/.eleventy.js
+++ b/packages/webawesome/docs/.eleventy.js
@@ -1,30 +1,75 @@
+import { nanoid } from 'nanoid';
+import { parse as HTMLParse } from 'node-html-parser';
+import { execFileSync } from 'node:child_process';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { parse } from 'path';
-import { anchorHeadingsPlugin } from './_utils/anchor-headings.js';
-import { codeExamplesPlugin } from './_utils/code-examples.js';
-import { copyCodePlugin } from './_utils/copy-code.js';
-import { currentLink } from './_utils/current-link.js';
-import { highlightCodePlugin } from './_utils/highlight-code.js';
+import { anchorHeadingsTransformer } from './_transformers/anchor-headings.js';
+import { codeExamplesTransformer } from './_transformers/code-examples.js';
+import { copyCodeTransformer } from './_transformers/copy-code.js';
+import { currentLinkTransformer } from './_transformers/current-link.js';
+import { highlightCodeTransformer } from './_transformers/highlight-code.js';
+import { outlineTransformer } from './_transformers/outline.js';
 import { getComponents } from './_utils/manifest.js';
 import { markdown } from './_utils/markdown.js';
-// import { formatCodePlugin } from './_utils/format-code.js';
+import { SimulateWebAwesomeApp } from './_utils/simulate-webawesome-app.js';
+// import { formatCodePlugin } from './_plugins/format-code.js';
 // import litPlugin from '@lit-labs/eleventy-plugin-lit';
 import { readFile } from 'fs/promises';
-import nunjucks from 'nunjucks';
 import process from 'process';
 import * as url from 'url';
-import { outlinePlugin } from './_utils/outline.js';
-import { replaceTextPlugin } from './_utils/replace-text.js';
-import { searchPlugin } from './_utils/search.js';
+import { replaceTextPlugin } from './_plugins/replace-text.js';
+import { searchPlugin } from './_plugins/search.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const isDev = process.argv.includes('--develop');
+const ignoreGit = process.env.ELEVENTY_IGNORE_GIT === 'true';
 const passThroughExtensions = ['js', 'css', 'png', 'svg', 'jpg', 'mp4'];

+async function getPackageData() {
+  return JSON.parse(await readFile(path.join(__dirname, '..', 'package.json'), 'utf-8'));
+}
+
 export default async function (eleventyConfig) {
-  const packageData = JSON.parse(await readFile(path.join(__dirname, '..', 'package.json'), 'utf-8'));
  const docsDir = path.join(process.env.BASE_DIR || '.', 'docs');
-  const allComponents = getComponents();
+  let packageData = await getPackageData();
+  let allComponents = getComponents();
+
+  const distDir = process.env.UNBUNDLED_DIST_DIRECTORY || path.resolve(__dirname, '../dist');
+  const customElementsManifest = path.join(distDir, 'custom-elements.json');
+  const stylesheets = path.join(distDir, 'styles');
+
+  eleventyConfig.addWatchTarget(customElementsManifest);
+  eleventyConfig.setWatchThrottleWaitTime(10); // in milliseconds
+
+  eleventyConfig.on('eleventy.beforeWatch', async function (changedFiles) {
+    let updatePackageData = false;
+    let updateComponentData = false;
+    changedFiles.forEach(file => {
+      if (file.includes('package.json')) {
+        updatePackageData = true;
+      }
+
+      if (file.includes('custom-elements.json')) {
+        updateComponentData = true;
+      }
+    });
+
+    if (updatePackageData) {
+      packageData = await getPackageData();
+    }
+
+    if (updateComponentData) {
+      allComponents = getComponents();
+    }
+
+    // Invalidate last-modified cache for changed content files during watch
+    if (Array.isArray(changedFiles)) {
+      for (const file of changedFiles) {
+        if (/\.(md|njk|html)$/i.test(file)) {
+          lastModCache.delete(file);
+        }
+      }
+    }
+  });

  /**
   * If you plan to add or remove any of these extensions, make sure to let either Konnor or Cory know as these
@@ -52,14 +97,99 @@ export default async function (eleventyConfig) {
  // Template filters - {{ content | filter }}
  eleventyConfig.addFilter('inlineMarkdown', content => markdown.renderInline(content || ''));
  eleventyConfig.addFilter('markdown', content => markdown.render(content || ''));
-  eleventyConfig.addFilter('stripExtension', string => parse(string + '').name);
+  eleventyConfig.addFilter('stripExtension', string => path.parse(string + '').name);
  eleventyConfig.addFilter('stripPrefix', content => content.replace(/^wa-/, ''));
+  eleventyConfig.addFilter('uniqueId', (_value, length = 8) => nanoid(length));
+  // Returns last modified date as ISO 8601 (UTC, Z-suffixed)
+  // Fallback order: front matter override -> Git last commit date -> filesystem mtime -> now
+  // Caching: in-memory per inputPath during one build/dev session
+  // Override: pass a Date or string: {{ page.inputPath | gitLastModifiedISO(lastUpdated) }}
+  const lastModCache = new Map();
+  let repoRoot = null; // lazily resolved; null => not resolved, undefined => failed
+
+  function getLastModifiedISO(inputPath, overrideDate) {
+    if (overrideDate instanceof Date) {
+      return overrideDate.toISOString();
+    }
+    if (typeof overrideDate === 'string' && overrideDate) {
+      const parsed = new Date(overrideDate);
+      if (!isNaN(parsed.getTime())) return parsed.toISOString();
+    }
+    if (!inputPath) return new Date().toISOString();
+    if (lastModCache.has(inputPath)) return lastModCache.get(inputPath);
+
+    // Try Git (ISO via %cI). Use a repo-root-relative path for portability.
+    if (!ignoreGit) {
+      try {
+        if (repoRoot === null) {
+          try {
+            repoRoot = execFileSync('git', ['rev-parse', '--show-toplevel'], {
+              stdio: ['ignore', 'pipe', 'ignore'],
+              cwd: __dirname,
+            })
+              .toString()
+              .trim();
+          } catch (_) {
+            repoRoot = undefined;
+          }
+        }
+
+        const gitPath = repoRoot ? path.relative(repoRoot, inputPath) : inputPath;
+        const args = ['log', '-1', '--format=%cI', '--follow', '--', gitPath];
+        const result = execFileSync('git', args, {
+          stdio: ['ignore', 'pipe', 'ignore'],
+          cwd: repoRoot || path.dirname(inputPath),
+        })
+          .toString()
+          .trim();
+        if (result) {
+          const iso = new Date(result).toISOString();
+          lastModCache.set(inputPath, iso);
+          return iso;
+        }
+      } catch (_) {
+        // continue to fs fallback
+      }
+    }
+
+    // Fallback to filesystem mtime
+    try {
+      const stats = fs.statSync(inputPath);
+      const iso = new Date(stats.mtime).toISOString();
+      lastModCache.set(inputPath, iso);
+      return iso;
+    } catch (_) {
+      const now = new Date().toISOString();
+      lastModCache.set(inputPath, now);
+      return now;
+    }
+  }
+
+  eleventyConfig.addFilter('gitLastModifiedISO', function (inputPath, overrideDate) {
+    return getLastModifiedISO(inputPath, overrideDate);
+  });
+
+  // Attach lastUpdatedISO to page data so templates can use {{ lastUpdatedISO }} directly
+  eleventyConfig.addGlobalData('eleventyComputed', {
+    lastUpdatedISO: data => getLastModifiedISO(data.page?.inputPath, data.lastUpdated),
+  });
  // Trims whitespace and pipes from the start and end of a string. Useful for CEM types, which can be pipe-delimited.
  // With Prettier 3, this means a leading pipe will exist be present when the line wraps.
  eleventyConfig.addFilter('trimPipes', content => {
    return typeof content === 'string' ? content.replace(/^(\s|\|)/g, '').replace(/(\s|\|)$/g, '') : content;
  });

+  /**
+   * @example
+    {% set foo = {foo: "bar"} %}
+    {% set bar = {bar: "baz"} %}
+    {% set merged = foo | merge(bar) %}
+    {{ merged | dump }}
+   */
+  eleventyConfig.addFilter('merge', function (obj1, obj2) {
+    return Object.assign({}, obj1, obj2);
+  });
+
  // Custom filter to sort with a priority item first, e.g.
  // {{ collection | sortWithFirst('fileSlug', 'default') }} => the item with the fileSlug of 'default' will be first
  eleventyConfig.addFilter('sortWithFirst', function (collection, property, firstValue) {
@@ -97,7 +227,11 @@ export default async function (eleventyConfig) {

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

  // Turns `{% server "foo" %} into `{{ server.foo | safe }}` when the WEBAWESOME_SERVER variable is set to "true"
@@ -109,28 +243,6 @@ export default async function (eleventyConfig) {
    return '';
  });

-  eleventyConfig.addTransform('second-nunjucks-transform', function NunjucksTransform(content) {
-    // For a server build, we expect a server to run the second transform.
-    if (serverBuild) {
-      return content;
-    }
-
-    // Only run the transform on files nunjucks would transform.
-    if (!this.page.inputPath.match(/.(md|html|njk)$/)) {
-      return content;
-    }
-
-    /** This largely mimics what an app would do and just stubs out what we don't care about. */
-    return nunjucks.renderString(content, {
-      // Stub the server EJS shortcodes.
-      server: {
-        head: '',
-        loginOrAvatar: '',
-        flashes: '',
-      },
-    });
-  });
-
  // Paired shortcodes - {% shortCode %}content{% endShortCode %}
  eleventyConfig.addPairedShortcode('markdown', content => markdown.render(content || ''));

@@ -148,34 +260,43 @@ export default async function (eleventyConfig) {
  // Use our own markdown instance
  eleventyConfig.setLibrary('md', markdown);

+  // for files with `unpublished: true`, it will make sure they do not make it into the final build at all, but will be usable in development.
+  eleventyConfig.addPreprocessor('unpublished', '*', (data, content) => {
+    if (data.unpublished && process.env.ELEVENTY_RUN_MODE === 'build') {
+      return false;
+    }
+
+    return content;
+  });
+
  // Add anchors to headings
-  eleventyConfig.addPlugin(anchorHeadingsPlugin({ container: '#content' }));
+  eleventyConfig.addTransform('doc-transforms', function (content) {
+    let doc = HTMLParse(content, { blockTextElements: { code: true } });

-  // Add an outline to the page
-  eleventyConfig.addPlugin(
-    outlinePlugin({
-      container: '#content',
-      target: '.outline-links',
-      selector: 'h2, h3',
-      ifEmpty: doc => {
-        doc.querySelector('#outline')?.remove();
-      },
-    }),
-  );
+    const transformers = [
+      anchorHeadingsTransformer({ container: '#content' }),
+      outlineTransformer({
+        container: '#content',
+        target: '.outline-links',
+        selector: 'h2, h3',
+        ifEmpty: doc => {
+          doc.querySelector('#outline')?.remove();
+        },
+      }),
+      // Add current link classes
+      currentLinkTransformer(),
+      codeExamplesTransformer(),
+      highlightCodeTransformer(),
+      copyCodeTransformer(),
+    ];

-  // Add current link classes
-  eleventyConfig.addPlugin(currentLink());
+    for (const transformer of transformers) {
+      transformer.call(this, doc);
+    }

-  // Add code examples for `<code class="example">` blocks
-  eleventyConfig.addPlugin(codeExamplesPlugin());
+    return doc.toString();
+  });

-  // Highlight code blocks with Prism
-  eleventyConfig.addPlugin(highlightCodePlugin());
-
-  // Add copy code buttons to code blocks
-  eleventyConfig.addPlugin(copyCodePlugin);
-
-  // Various text replacements
  eleventyConfig.addPlugin(
    replaceTextPlugin([
      {
@@ -185,17 +306,17 @@ export default async function (eleventyConfig) {
      // Replace [issue:1234] with a link to the issue on GitHub
      {
        replace: /\[pr:([0-9]+)\]/gs,
-        replaceWith: '<a href="https://github.com/shoelace-style/webawesome/pull/$1">#$1</a>',
+        replaceWith: '<a href="https://github.com/shoelace-style/webawesome/pull/$1" target="_blank">#$1</a>',
      },
      // Replace [pr:1234] with a link to the pull request on GitHub
      {
        replace: /\[issue:([0-9]+)\]/gs,
-        replaceWith: '<a href="https://github.com/shoelace-style/webawesome/issues/$1">#$1</a>',
+        replaceWith: '<a href="https://github.com/shoelace-style/webawesome/issues/$1" target="_blank">#$1</a>',
      },
      // Replace [discuss:1234] with a link to the discussion on GitHub
      {
        replace: /\[discuss:([0-9]+)\]/gs,
-        replaceWith: '<a href="https://github.com/shoelace-style/webawesome/discussions/$1">#$1</a>',
+        replaceWith: '<a href="https://github.com/shoelace-style/webawesome/discussions/$1" target="_blank">#$1</a>',
      },
    ]),
  );
@@ -218,16 +339,18 @@ export default async function (eleventyConfig) {
  //   eleventyConfig.addPlugin(formatCodePlugin());
  // }

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

  for (let glob of passThrough) {
    eleventyConfig.addPassthroughCopy(glob);
  }

  // // SSR plugin
-  // // Make sure this is the last thing, we don't want to run the risk of accidentally transforming shadow roots with
-  // // the nunjucks 2nd transform.
  // if (!isDev) {
  //   //
  //   // Problematic components in SSR land:
@@ -250,6 +373,20 @@ export default async function (eleventyConfig) {
  //     componentModules,
  //   });
  // }
+
+  // For a server build, we expect a server to run the second transform.
+  // For dev builds, we run the second transform in a middleware.
+  if (!isDev && !serverBuild) {
+    eleventyConfig.addTransform('simulate-webawesome-app', function (content) {
+      // Only run the transform on files nunjucks would transform.
+      if (!this.page.inputPath.match(/.(md|html|njk)$/)) {
+        return content;
+      }
+
+      /** This largely mimics what an app would do and just stubs out what we don't care about. */
+      return SimulateWebAwesomeApp(content);
+    });
+  }
 }

 export const config = {
--- a/packages/webawesome/docs/503.md
+++ b/packages/webawesome/docs/503.md
@@ -0,0 +1,312 @@
+---
+title: Web Awesome is Undergoing Maintenance
+description: We're performing routine maintenance to keep things running smoothly. Check back soon!
+layout: blank
+permalink: 503.html
+noindex: true
+unlisted: true
+---
+
+{% block head %}
+
+  <link id="site-stylesheet" rel="stylesheet" href="/assets/styles/theme-site.css" />
+  <link id="site-stylesheet" rel="stylesheet" href="/assets/styles/site.css" />
+{% endblock %}
+
+<style>
+  :root {
+    --scene-vertical-offset: calc(var(--wa-space-2xs) * -1);
+    --wa-font-family-heading: cera-round-pro;
+    --vehicle-offset: 25ch;
+    --vehicle-duration: 20s;
+    --vehicle-start: calc(-1 * var(--vehicle-offset));
+    --vehicle-end: calc(100% + var(--vehicle-offset));
+  }
+
+  html, wa-page {
+    background-color: var(--wa-color-surface-lowered);
+  }
+
+  wa-icon[name='traffic-cone'] {
+    --primary-color: var(--wa-color-brand-70);
+    --secondary-color: var(--wa-color-text-normal);
+    --secondary-opacity: 1.0;
+  }
+
+  wa-page.background-grid {
+    --grid-line-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 96%);
+    --subgrid-line-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 98%);
+  }
+
+  wa-page > [slot='main-footer'] {
+    border-block-end: var(--wa-border-style) calc(var(--wa-border-width-l) * 10) var(--wa-color-text-normal);
+    padding: 0;
+    background-color: transparent;
+  }
+
+  .header-content {
+    margin-inline: auto;
+    max-width: var(--content-width-l);
+    padding-inline: var(--content-padding-inline);
+  }
+
+  .icon-brand-logo {
+    font-size: var(--wa-font-size-xl);
+    color: var(--wa-brand-orange);
+  }
+
+  /* centering main-content */
+  wa-page::part(main-content) {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+
+  #content {
+    max-width: var(--content-width-m);
+    padding-inline: var(--content-padding-inline);
+    margin-inline: auto;
+  }
+
+  .heading-stacked-subtitle {
+    text-transform: uppercase;
+    letter-spacing: 0.1em;
+  }
+
+  .heading-stacked-subtitle wa-icon {
+    position: relative;
+    inset-block-start: calc(var(--wa-space-3xs) * -0.75);
+    font-size: 0.75em;
+  }
+
+  .heading-stacked-subtitle wa-icon[name="traffic-cone"] {
+    --secondary-color: var(--wa-color-text-normal);
+    --primary-color: var(--wa-color-brand-70);
+    margin-inline: calc(var(--wa-space-xs) * -1.15) calc(var(--wa-space-xs) * -0.75);
+  }
+
+  .copy {
+    code {
+      font-size: 0.75em;
+    }
+
+    strong {
+      text-decoration: underline;
+      text-decoration-color: var(--wa-color-brand-70);
+      text-decoration-thickness: var(--wa-border-width-m);
+      text-underline-offset: var(--wa-space-2xs);
+    }
+  }
+
+  .status {
+    width: 100%;
+    --min-column-size: 30ch;
+
+    wa-callout {
+      background-color: var(--wa-color-surface-default);
+    }
+  }
+
+  .linkies {
+    /* nudge those linkies left */
+    margin-inline-start: calc(var(--wa-space-xs) * -1);
+
+    a {
+      padding-inline: var(--wa-space-xs);
+    }
+  }
+
+  .scene {
+    width: 100%;
+    position: relative;
+    overflow-x: clip;
+    inset-block-end: var(--scene-vertical-offset);
+
+    .vehicle {
+      position: absolute;
+      inset-inline-start: var(--vehicle-start);
+      inset-block-end: 0; /* align all vehicles to bottom */
+      animation: driveAcross var(--vehicle-duration) linear infinite;
+      transform-origin: center;
+      z-index: 1;
+    }
+
+    .vehicle-with-object {
+      white-space: nowrap;
+      display: flex;
+      align-items: baseline;
+      gap: var(--wa-space-3xs);
+    }
+
+    .scene-left {
+      position: absolute;
+      inset-block-end: 0;
+      inset-inline-start: var(--wa-space-l);
+    }
+
+    .scene-left wa-icon[name='toilet-portable'] {
+      position: relative;
+      inset-block-start: var(--scene-vertical-offset);
+      margin-inline: calc(var(--wa-space-xs) * -1);
+    }
+
+    .scene-left wa-icon[name='traffic-cone'] {
+      position: relative;
+      inset-block-start: var(--scene-vertical-offset);
+    }
+
+    .blocks {
+      position: absolute;
+      inset-inline-end: calc(var(--wa-space-l) * -1);
+      inset-block-end: 0;
+      z-index: 2;
+    }
+
+    .blocks wa-icon[name='block-brick'] {
+      margin-inline: calc(var(--wa-space-xs) * -1);
+    }
+
+    .blocks-bottom {
+      margin-block-start: calc(var(--wa-space-2xs) * -1);
+    }
+
+    wa-icon[family='duotone'] {
+      --secondary-opacity: 1.0;
+    }
+
+    wa-icon[name='bulldozer'],
+    wa-icon[name='excavator'] {
+      --secondary-color: var(--wa-color-brand-70);
+    }
+
+    wa-icon[name='block-brick'],
+    wa-icon[name='toilet-portable'] {
+      --secondary-color: var(--wa-color-neutral-70);
+    }
+  }
+
+  @keyframes driveAcross {
+    0% {
+      left: var(--vehicle-start);
+    }
+    100% {
+      left: var(--vehicle-end);
+    }
+  }
+
+  /* Unique rumble animations for each vehicle type */
+  @keyframes rumble-bulldozer {
+    0%, 100% { transform: translateY(0px) rotate(0deg); }
+    25% { transform: translateY(-1px) rotate(0.5deg); }
+    50% { transform: translateY(1px) rotate(-0.3deg); }
+    75% { transform: translateY(-0.5px) rotate(0.2deg); }
+  }
+
+
+  /* Apply rumble animation to the single vehicle */
+  .vehicle-driving { animation: driveAcross var(--vehicle-duration) linear infinite; }
+  .vehicle wa-icon[name="bulldozer"] { animation: rumble-bulldozer 0.1s ease-in-out infinite; }
+</style>
+
+<wa-page disable-sticky="header" class="background-grid">
+  <header slot="header">
+    <div class="header-content wa-split" style="flex-wrap: nowrap;">
+      <wa-icon variant="brands" name="web-awesome" class="icon-brand-logo"></wa-icon>
+      <div>
+        <wa-button id="contact-us-button" appearance="plain" href="mailto:hello@webawesome.com?subject=Help%2C%20Web%20Awesome">
+          <wa-icon variant="regular" name="headset" label="Need help? Contact Us" class="icon-embiggen"></wa-icon>
+        </wa-button>
+        <wa-tooltip for="contact-us-button" aria-hidden="true">Contact Us</wa-tooltip>
+      </div>
+    </div>
+  </header>
+  <main id="content">
+    <div class="content-container wa-stack wa-gap-xl wa-align-items-center">
+      <h1 class="brand-font wa-stack wa-gap-s heading heading-stacked"  style="text-align: center;">
+        <span class="wa-heading-l heading-stacked-subtitle">
+          under 
+          <span class="wa-visually-hidden">maintenance</span>
+          <span aria-hidden="true">
+            m
+            <wa-icon family="duotone" variant="solid" name="traffic-cone"></wa-icon>
+            inten
+            <wa-icon family="duotone" variant="solid" name="traffic-cone"></wa-icon>
+            nce
+          </span>
+        </span>
+        <span class="wa-heading-4xl heading-stacked-title">Hey! We're Workin&apos; Here</span>
+      </h1>
+      <p class="copy wa-body-l line-length line-length-m" style="text-align: center;">Mind the <code>wa-gap</code>! webawesome.com is undergoing maintenance and will be back shortly.</p>
+      <div class="wa-grid wa-gap-xl status">
+        <wa-callout appearance="plain" variant="neutral">
+          <wa-icon slot="icon" family="duotone" variant="regular" name="diamond-exclamation" class="icon-embiggen" style="--secondary-opacity: 1; --secondary-color: var(--wa-color-warning-fill-normal);"></wa-icon>
+          <strong>Temporarily Unavailable</strong><br />
+          Access to Docs, Accounts, and Teams
+        </wa-callout>
+        <wa-callout appearance="plain" variant="neutral">
+          <wa-icon slot="icon" family="duotone" variant="regular" name="bolt" class="icon-embiggen" style="--secondary-opacity: 1; --secondary-color: var(--wa-color-success-fill-normal);"></wa-icon>
+          <strong>Fully Operational</strong><br />
+          Services (such as CDNs) and Support
+        </wa-callout>
+      </div>
+      <div class="wa-cluster wa-gap-xs linkies">
+        <h2 class="wa-visually-hidden">Web Awesome Elsewhere</h2>
+        <a href="https://github.com/shoelace-style/webawesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+          <wa-icon family="brands" name="github" label="GitHub"></wa-icon>
+        </a>
+        <a href="https://bsky.app/profile/webawesome.com" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+          <wa-icon family="brands" name="bluesky" label="Bluesky"></wa-icon>
+        </a>
+        <a href="https://mastodon.social/@webawesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+          <wa-icon family="brands" name="mastodon" label="Mastodon"></wa-icon>
+        </a>
+        <a href="https://x.com/webawesomer" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+          <wa-icon family="brands" name="x-twitter" label="Twitter (X)"></wa-icon>
+        </a>
+        <a href="https://www.threads.com/@web.awesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+          <wa-icon family="brands" name="threads" label="Threads"></wa-icon>
+        </a>
+        <a href="mailto:hello@webawesome.com?subject=Help%2C%20Web%20Awesome" class="appearance-plain">
+          <wa-icon variant="regular" name="envelope" label="Email Web Awesome"></wa-icon>
+        </a>
+      </div>
+    </div>
+  </main>
+  <div slot="main-footer" class="footer">
+    <div class="scene">
+      <div class="scene-left wa-cluster wa-align-items-end">
+        <wa-icon family="duotone" variant="solid" name="traffic-cone"></wa-icon>
+        <div class="wa-cluster wa-gap-0">
+          <wa-icon family="duotone" variant="regular" name="toilet-portable" class="wa-font-size-2xl"></wa-icon>
+          <wa-icon family="duotone" variant="regular" name="toilet-portable" class="wa-font-size-2xl"></wa-icon>
+          <wa-icon family="duotone" variant="regular" name="toilet-portable" class="wa-font-size-2xl"></wa-icon>
+        </div>
+        <wa-icon family="duotone" variant="regular" name="excavator" class="wa-font-size-3xl"></wa-icon>
+        <wa-icon family="duotone" variant="solid" name="traffic-cone"></wa-icon>
+      </div>
+      <div class="blocks wa-stack wa-align-items-center wa-gap-0">
+        <div class="blocks-top wa-cluster wa-gap-0">
+          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
+          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
+          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
+        </div>
+        <div class="blocks-bottom wa-cluster wa-gap-0">
+          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
+          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
+          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
+          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
+          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl"></wa-icon>
+        </div>
+      </div>
+      <div class="track">
+        <wa-icon family="duotone" variant="regular" name="bulldozer" class="spacer-dot-gif wa-font-size-3xl" style="opacity: 0;"></wa-icon>
+        <span class="vehicle vehicle-driving vehicle-with-object">
+          <wa-icon family="duotone" variant="regular" name="bulldozer" class="wa-font-size-3xl"></wa-icon>
+          <wa-icon family="duotone" variant="regular" name="block-brick" class="wa-font-size-2xl" style="position: relative; inset-inline-start: calc(var(--wa-space-2xs) * -1);"></wa-icon>
+        </span>
+      </div>
+    </div>
+
+  </div>
+</wa-page>
--- a/packages/webawesome/docs/_data/themer.js
+++ b/packages/webawesome/docs/_data/themer.js
@@ -12,22 +12,22 @@ export const themes = [
    isPro: false,
    fonts: {
      body: {
-        name: 'OS Default',
+        name: 'OS Default (sans-serif)',
        css: 'ui-sans-serif, system-ui, sans-serif',
        href: null,
      },
      heading: {
-        name: 'OS Default',
+        name: 'OS Default (sans-serif)',
        css: 'ui-sans-serif, system-ui, sans-serif',
        href: null,
      },
      code: {
-        name: 'OS Default',
+        name: 'OS Default (monospace)',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
-        name: 'OS Default',
+        name: 'OS Default (serif)',
        css: 'ui-serif, serif',
        href: null,
      },
@@ -74,22 +74,22 @@ export const themes = [
      body: {
        name: 'Quicksand',
        css: 'Quicksand, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Crimson+Pro:ital,wght@0,200..900;1,200..900&family=Quicksand:wght@300..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Quicksand:wght@300..700&display=swap',
      },
      heading: {
        name: 'Quicksand',
        css: 'Quicksand, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Crimson+Pro:ital,wght@0,200..900;1,200..900&family=Quicksand:wght@300..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Quicksand:wght@300..700&display=swap',
      },
      code: {
-        name: 'OS Default',
+        name: 'OS Default (monospace)',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
        name: 'Crimson Pro',
        css: '"Crimson Pro", serif',
-        href: 'https://fonts.googleapis.com/css2?family=Crimson+Pro:ital,wght@0,200..900;1,200..900&family=Quicksand:wght@300..700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Crimson+Pro:ital,wght@0,200..900;1,200..900&display=swap',
      },
    },
    icons: {
@@ -132,22 +132,22 @@ export const themes = [
    isPro: false,
    fonts: {
      body: {
-        name: 'OS Default',
+        name: 'OS Default (sans-serif)',
        css: 'ui-sans-serif, system-ui, sans-serif',
        href: null,
      },
      heading: {
-        name: 'OS Default',
+        name: 'OS Default (sans-serif)',
        css: 'ui-sans-serif, system-ui, sans-serif',
        href: null,
      },
      code: {
-        name: 'OS Default',
+        name: 'OS Default (monospace)',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
-        name: 'OS Default',
+        name: 'OS Default (serif)',
        css: 'ui-serif, serif',
        href: null,
      },
@@ -194,22 +194,22 @@ export const themes = [
      body: {
        name: 'Inter',
        css: 'Inter, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Aleo:ital,wght@0,100..900;1,100..900&family=Geist+Mono:wght@100..900&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Inter:ital,wght@0,100..900;1,100..900&display=swap',
      },
      heading: {
        name: 'Inter',
        css: 'Inter, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Aleo:ital,wght@0,100..900;1,100..900&family=Geist+Mono:wght@100..900&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Inter:ital,wght@0,100..900;1,100..900&display=swap',
      },
      code: {
        name: 'Geist Mono',
        css: '"Geist Mono", monospace',
-        href: 'https://fonts.googleapis.com/css2?family=Aleo:ital,wght@0,100..900;1,100..900&family=Geist+Mono:wght@100..900&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Geist+Mono:wght@100..900&display=swap',
      },
      longform: {
        name: 'Aleo',
        css: 'Aleo, serif',
-        href: 'https://fonts.googleapis.com/css2?family=Aleo:ital,wght@0,100..900;1,100..900&family=Geist+Mono:wght@100..900&family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Aleo:ital,wght@0,100..900;1,100..900&display=swap',
      },
    },
    icons: {
@@ -254,22 +254,22 @@ export const themes = [
      body: {
        name: 'Space Grotesk',
        css: '"Space Grotesk", sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Podkova:wght@400..800&family=Space+Grotesk:wght@300..700&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Space+Grotesk:wght@300..700&display=swap',
      },
      heading: {
        name: 'IBM Plex Sans Condensed',
        css: '"IBM Plex Sans Condensed", sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Podkova:wght@400..800&family=Space+Grotesk:wght@300..700&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap',
      },
      code: {
        name: 'Space Mono',
        css: '"Space Mono", monospace',
-        href: 'https://fonts.googleapis.com/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Podkova:wght@400..800&family=Space+Grotesk:wght@300..700&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
      },
      longform: {
        name: 'Podkova',
        css: 'Podkova, serif',
-        href: 'https://fonts.googleapis.com/css2?family=IBM+Plex+Sans+Condensed:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Podkova:wght@400..800&family=Space+Grotesk:wght@300..700&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Podkova:wght@400..800&display=swap',
      },
    },
    icons: {
@@ -314,22 +314,22 @@ export const themes = [
      body: {
        name: 'Figtree',
        css: 'Figtree, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&family=Figtree:ital,wght@0,300..900;1,300..900&family=Fraunces:ital,opsz,wght@0,9..144,100..900;1,9..144,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Figtree:ital,wght@0,300..900;1,300..900&display=swap',
      },
      heading: {
        name: 'Figtree',
        css: 'Figtree, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&family=Figtree:ital,wght@0,300..900;1,300..900&family=Fraunces:ital,opsz,wght@0,9..144,100..900;1,9..144,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Figtree:ital,wght@0,300..900;1,300..900&display=swap',
      },
      code: {
        name: 'Chivo Mono',
        css: '"Chivo Mono", monospace',
-        href: 'https://fonts.googleapis.com/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&family=Figtree:ital,wght@0,300..900;1,300..900&family=Fraunces:ital,opsz,wght@0,9..144,100..900;1,9..144,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&display=swap',
      },
      longform: {
        name: 'Fraunces',
        css: 'Fraunces, serif',
-        href: 'https://fonts.googleapis.com/css2?family=Chivo+Mono:ital,wght@0,100..900;1,100..900&family=Figtree:ital,wght@0,300..900;1,300..900&family=Fraunces:ital,opsz,wght@0,9..144,100..900;1,9..144,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Fraunces:ital,wght@0,100..900;1,100..900&display=swap',
      },
    },
    icons: {
@@ -374,22 +374,22 @@ export const themes = [
      body: {
        name: 'Wix Madefor Text',
        css: '"Wix Madefor Text", sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto+Serif:ital,opsz,wght@0,8..144,100..900;1,8..144,100..900&family=Roboto:ital,wght@0,100..900;1,100..900&family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
      },
      heading: {
        name: 'Wix Madefor Text',
        css: '"Wix Madefor Text", sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto+Serif:ital,opsz,wght@0,8..144,100..900;1,8..144,100..900&family=Roboto:ital,wght@0,100..900;1,100..900&family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
      },
      code: {
        name: 'Roboto Mono',
        css: '"Roboto Mono", monospace',
-        href: 'https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto+Serif:ital,opsz,wght@0,8..144,100..900;1,8..144,100..900&family=Roboto:ital,wght@0,100..900;1,100..900&family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&display=swap',
      },
      longform: {
        name: 'Roboto Serif',
        css: '"Roboto Serif", serif',
-        href: 'https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Roboto+Serif:ital,opsz,wght@0,8..144,100..900;1,8..144,100..900&family=Roboto:ital,wght@0,100..900;1,100..900&family=Wix+Madefor+Text:ital,wght@0,400..800;1,400..800&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Roboto+Serif:ital,wght@0,100..900;1,100..900&display=swap',
      },
    },
    icons: {
@@ -434,22 +434,22 @@ export const themes = [
      body: {
        name: 'Mulish',
        css: 'Mulish, sans-serif',
-        href: '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',
+        href: 'https://fonts.bunny.net/css2?family=Mulish:ital,wght@0,200..1000;1,200..1000&display=swap',
      },
      heading: {
        name: 'Lora',
        css: 'Lora, serif',
-        href: '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',
+        href: 'https://fonts.bunny.net/css2?family=Lora:ital,wght@0,400..700;1,400..700&display=swap',
      },
      code: {
-        name: 'OS Default',
+        name: 'OS Default (monospace)',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
        name: 'Lora',
        css: 'Lora, serif',
-        href: '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',
+        href: 'https://fonts.bunny.net/css2?family=Lora:ital,wght@0,400..700;1,400..700&display=swap',
      },
    },
    icons: {
@@ -494,22 +494,22 @@ export const themes = [
      body: {
        name: 'Nunito',
        css: 'Nunito, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&family=BioRhyme:wght@200..800&family=Fredoka:wght@300..700&family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
      },
      heading: {
        name: 'Fredoka',
        css: 'Fredoka, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&family=BioRhyme:wght@200..800&family=Fredoka:wght@300..700&family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Fredoka:wght@300..700&display=swap',
      },
      code: {
        name: 'Azeret Mono',
        css: '"Azeret Mono", monospace',
-        href: 'https://fonts.googleapis.com/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&family=BioRhyme:wght@200..800&family=Fredoka:wght@300..700&family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&display=swap',
      },
      longform: {
        name: 'BioRhyme',
        css: 'BioRhyme, serif',
-        href: 'https://fonts.googleapis.com/css2?family=Azeret+Mono:ital,wght@0,100..900;1,100..900&family=BioRhyme:wght@200..800&family=Fredoka:wght@300..700&family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=BioRhyme:wght@200..800&display=swap',
      },
    },
    icons: {
@@ -554,22 +554,22 @@ export const themes = [
      body: {
        name: 'DM Sans',
        css: '"DM Sans", sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&family=Playfair+Display:ital,wght@0,400..900;1,400..900&family=Playfair:ital,opsz,wght@0,5..1200,300..900;1,5..1200,300..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=DM+Sans:ital,wght@0,100..1000;1,100..1000&display=swap',
      },
      heading: {
        name: 'Playfair Display',
        css: '"Playfair Display", serif',
-        href: 'https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&family=Playfair+Display:ital,wght@0,400..900;1,400..900&family=Playfair:ital,opsz,wght@0,5..1200,300..900;1,5..1200,300..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap',
      },
      code: {
-        name: 'OS Default',
+        name: 'OS Default (monospace)',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
        name: 'Playfair',
        css: 'Playfair, serif',
-        href: 'https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&family=Playfair+Display:ital,wght@0,400..900;1,400..900&family=Playfair:ital,opsz,wght@0,5..1200,300..900;1,5..1200,300..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Playfair:ital,wght@0,300..900;1,300..900&display=swap',
      },
    },
    icons: {
@@ -614,20 +614,20 @@ export const themes = [
      body: {
        name: 'Inter',
        css: 'Inter, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Inter:ital,wght@0,100..900;1,100..900&display=swap',
      },
      heading: {
        name: 'Inter',
        css: 'Inter, sans-serif',
-        href: 'https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap',
+        href: 'https://fonts.bunny.net/css2?family=Inter:ital,wght@0,100..900;1,100..900&display=swap',
      },
      code: {
-        name: 'OS Default',
+        name: 'OS Default (monospace)',
        css: 'ui-monospace, monospace',
        href: null,
      },
      longform: {
-        name: 'OS Default',
+        name: 'OS Default (serif)',
        css: 'ui-serif, serif',
        href: null,
      },
@@ -715,7 +715,10 @@ export const elementPresets = themes.map(theme => ({
 * All palettes used by themes in a simple array.
 */
 export const palettes = themes
-  .map(theme => theme.palette)
+  .map(theme => ({
+    ...theme.palette,
+    isPro: theme.isPro,
+  }))
  .filter(
    (palette, index, array) =>
      array.findIndex(p => p.name === palette.name && p.filename === palette.filename) === index,
--- a/packages/webawesome/docs/_includes/base.njk
+++ b/packages/webawesome/docs/_includes/base.njk
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" data-fa-kit-code="b10bfbde90" data-cdn-url="{% cdnUrl %}" class="wa-cloak">
+<html lang="en" data-fa-kit-code="38c11e3f20" data-cdn-url="{% cdnUrl %}" class="wa-cloak">
  <head>
    {% include 'head.njk' %}
    <meta name="theme-color" content="#f36944">
@@ -13,12 +13,11 @@
    <script type="module" src="/assets/scripts/color-scheme.js"></script>
    <script type="module" src="/assets/scripts/theme.js"></script>
    {% if hasSidebar %}<script type="module" src="/assets/scripts/sidebar.js"></script>{% endif %}
-    <script defer data-domain="backers.webawesome.com" src="https://plausible.io/js/script.js"></script>
+    <script defer data-domain="webawesome.com" src="https://plausible.io/js/script.js"></script>

-    {# Docs styles #}
-    <link rel="stylesheet" href="/assets/styles/docs.css" />
-
-    {% block head %}{% endblock %}
+    {% block head %}
+      <link rel="stylesheet" href="/assets/styles/docs.css" />
+    {% endblock %}

    <script type="module">
      // Set the initial color scheme before the page renders to prevent flashing
@@ -26,67 +25,60 @@
      const isDark = value === 'dark' || (value === 'auto' && matchMedia('(prefers-color-scheme: dark)').matches);
      document.documentElement.classList.toggle('wa-dark', isDark);
    </script>
-
-    <script type="module">
-      // Set the initial theme before the page renders to prevent flashing
-      const savedTheme = localStorage.getItem('theme') || 'default';
-
-      // Update the theme stylesheet link first
-      const themeStylesheet = document.getElementById('theme-stylesheet');
-      if (themeStylesheet) {
-        themeStylesheet.href = `/dist/styles/themes/${savedTheme}.css`;
-      }
-
-      if (savedTheme !== 'default') {
-        document.documentElement.classList.add(`wa-theme-${savedTheme}`);
-      }
-    </script>
  </head>
-  <body class="layout-{{ layout | stripExtension }}{{ ' page-wide' if wide }}">
-    <!-- use view="desktop" as default to reduce layout jank on desktop site. -->
-    <wa-page view="desktop" disable-navigation-toggle="" mobile-breakpoint="1180">
-      <header slot="header" class="wa-split">
-        {# Logo #}
-        <div id="docs-branding">
-          {# Nav toggle #}
-          <wa-button appearance="plain" size="small" data-toggle-nav>
-            <wa-icon name="bars" label="Toggle navigation"></wa-icon>
-          </wa-button>
+  <body class="layout-{{ layout | stripExtension }} page-{{ pageClass or page.fileSlug or 'home' }}{{ ' page-wide' if wide }}">
+    {% set defaultWaPageAttributes = defaultWaPageAttributes or { view: 'desktop', 'disable-navigation-toggle': true, 'mobile-breakpoint': 1180 } %}
+    {% set waPageAttributes = waPageAttributes or {} %}
+    {% set mergedWaPageAttributes = defaultWaPageAttributes | merge(waPageAttributes) %}
+    <wa-page
+      {% for key, value in mergedWaPageAttributes %}
+        {% if value != null and value != false %}
+          {{ key }}="{{ value }}"
+        {% endif %}
+      {% endfor %}
+    >
+        {% block pageHeader %}
+          <header slot="header" class="wa-split">
+            {# Nav toggle #}
+              <wa-button appearance="plain" size="small" data-toggle-nav>
+                <wa-icon name="bars" label="Toggle navigation" class="icon-default icon-embiggen"></wa-icon>
+                <wa-icon name="burger" aria-hidden="true" class="icon-hover icon-embiggen"></wa-icon>
+              </wa-button>

-          <a href="/" aria-label="Web Awesome">
-            <span class="wa-desktop-only">{% include "logo.njk" %}</span>
-            <span class="wa-mobile-only">{% include "logo-simple.njk" %}</span>
-          </a>
-          <small id="version-number" class="wa-desktop-only">{{ package.version }}</small>
-          <wa-badge variant="brand" appearance="filled" class="wa-desktop-only">Beta</wa-badge>
-        </div>
+              {# Logo - Desktop #}
+              <a class="brand-logo wa-desktop-only" href="/" aria-label="Web Awesome">
+                {% include "logo.njk" %}
+              </a>

-        <div id="docs-toolbar" class="wa-cluster wa-gap-xs">
-          {# Desktop selectors #}
-          <div class="wa-desktop-only wa-cluster wa-gap-xs">
-            {% include "theme-selector.njk" %}
-            {% include "color-scheme-selector.njk" %}
-          </div>
+            {#- Logo - mobile branding -#}
+            <a href="/" class="brand-logo wa-mobile-only" aria-label="Web Awesome">
+              {# Logo - Mobile #}
+              {% include "logo-simple.njk" %}
+            </a>

-          {# Search #}
-          <wa-button id="search-trigger" appearance="outlined" size="small" data-search>
-            <wa-icon slot="start" name="magnifying-glass"></wa-icon>
-            Search
-            <kbd slot="end" class="wa-desktop-only">/</kbd>
-          </wa-button>
-
-          {# Login #}
-          {% server "loginOrAvatar" %}
-        </div>
-      </header>
+            <div id="docs-toolbar" class="wa-cluster gap-s">
+              <div class="wa-desktop-only wa-cluster wa-gap-2xs">
+                {% include "theme-selector.njk" %}
+                {% include "color-scheme-selector.njk" %}
+                {% include "github-icon-buttons.njk" %}
+              </div>
+              {#- Login -#}
+              {% include "login-or-avatar.njk" ignore missing %}
+            </div>
+          </header>
+        {% endblock %}

      {# Sidebar #}
      {% if hasSidebar %}
        {# Mobile selectors #}
        <div class="wa-mobile-only" slot="navigation-header">
-          <div class="wa-cluster wa-gap-xs">
-            {% include "theme-selector.njk" %}
-            {% include "color-scheme-selector.njk" %}
+          <div class="wa-cluster wa-gap-s">
+            <a class="brand-logo" href="/" aria-label="Web Awesome">{% include "logo-simple.njk" %}</a>
+            <div class="wa-cluster wa-gap-2xs" style="flex-wrap: nowrap;">
+              {% include "theme-selector.njk" %}
+              {% include "color-scheme-selector.njk" %}
+              {% include "github-icon-buttons.njk" %}
+            </div>
          </div>
        </div>
        <div slot="navigation" id="sidebar" class="docs-aside" data-remember-scroll>
@@ -130,6 +122,9 @@
      </main>

      {% include 'search.njk' %}
+
+      {# Footer #}
+      {% block pageFooter %}{% endblock %}
    </wa-page>

  </body>
--- a/packages/webawesome/docs/_includes/color-scheme-selector.njk
+++ b/packages/webawesome/docs/_includes/color-scheme-selector.njk
@@ -1,25 +1,35 @@
-<wa-select class="color-scheme-selector" appearance="filled" size="small" value="auto" pill title="Press \ to toggle">
-  <wa-icon class="only-light" slot="start" name="sun" variant="regular"></wa-icon>
-  <wa-icon class="only-dark" slot="start" name="moon" variant="regular"></wa-icon>
-  <wa-option value="light">
-    <wa-icon slot="start" name="sun" variant="regular"></wa-icon>
+<wa-dropdown class="color-scheme-selector" title="Press \ to toggle">
+  <wa-button slot="trigger" id="color-scheme-selector-trigger" appearance="plain">
+    <wa-icon name="sun-bright" variant="regular" class="icon-embiggen only-light"></wa-icon>
+    <wa-icon name="moon-stars" variant="regular" class="icon-embiggen only-dark"></wa-icon>
+  </wa-button>
+  <wa-dropdown-item value="light">
+    <wa-icon slot="icon" name="sun-bright" variant="regular" class="icon-embiggen"></wa-icon>
    Light
-  </wa-option>
-  <wa-option value="dark">
-    <wa-icon slot="start" name="moon" variant="regular"></wa-icon>
+  </wa-dropdown-item>
+  <wa-dropdown-item value="dark">
+    <wa-icon slot="icon" name="moon-stars" variant="regular" class="icon-embiggen"></wa-icon>
    Dark
-  </wa-option>
+  </wa-dropdown-item>
  <wa-divider></wa-divider>
-  <wa-option value="auto">
-    <wa-icon class="only-light" slot="start" name="sun" variant="regular"></wa-icon>
-    <wa-icon class="only-dark" slot="start" name="moon" variant="regular"></wa-icon>
+  <wa-dropdown-item value="auto">
+    <wa-icon  slot="icon" name="sun-bright" variant="regular" class="only-light icon-embiggen"></wa-icon>
+    <wa-icon slot="icon" name="moon-stars" variant="regular" class="only-dark icon-embiggen"></wa-icon>
    System
-  </wa-option>
-</wa-select>
+  </wa-dropdown-item>
+</wa-dropdown>
+<wa-tooltip for="color-scheme-selector-trigger" id="color-scheme-tooltip">Select Color Scheme</wa-tooltip>

 <script>
-  // Immediately set the correct value from storage
-  document.querySelectorAll('wa-select.color-scheme-selector').forEach(el => {
-    el.setAttribute('value', localStorage.getItem('color-scheme') || 'auto');
+  // Handle dropdown selection and trigger input event for color-scheme.js
+  document.querySelectorAll('wa-dropdown.color-scheme-selector').forEach(el => {
+    el.addEventListener('wa-select', (event) => {
+      const selectedValue = event.detail.item.value;
+
+      // Trigger input event for color-scheme.js
+      el.value = selectedValue;
+      el.dispatchEvent(new Event('input', { bubbles: true }));
+    });
  });
 </script>
+
--- a/packages/webawesome/docs/_includes/github-icon-buttons.njk
+++ b/packages/webawesome/docs/_includes/github-icon-buttons.njk
@@ -0,0 +1,8 @@
+<wa-button id="github-repo-button" href="https://github.com/shoelace-style/webawesome" rel="noopener noreferrer" target="_blank" appearance="plain">
+  <wa-icon family="brands" name="github" label="View Repository on GitHub" class="icon-embiggen"></wa-icon>
+</wa-button>
+<wa-tooltip for="github-repo-button" distance="2">View on GitHub</wa-tooltip>
+<wa-button id="github-star-button" href="https://github.com/shoelace-style/webawesome/stargazers" rel="noopener noreferrer" target="_blank" appearance="plain">
+  <wa-icon name="star" variant="regular" label="Star Repository on GitHub" class="icon-embiggen"></wa-icon>
+</wa-button>
+<wa-tooltip for="github-star-button" distance="2">Star on GitHub</wa-tooltip>
--- a/packages/webawesome/docs/_includes/head.njk
+++ b/packages/webawesome/docs/_includes/head.njk
@@ -21,10 +21,20 @@
 <script type="module" src="/dist/webawesome.loader.js"></script>

 <link id="theme-stylesheet" rel="stylesheet" href="/dist/styles/themes/default.css" render="blocking" fetchpriority="high" />
-{% for palette in themer.palettes %}
-	<link rel="stylesheet" href="/dist/styles/color/palettes/{{palette.filename}}" />
-{% endfor %}
+
 <link rel="stylesheet" href="/dist/styles/webawesome.css" />

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

 <!-- Design tokens -->
 <wa-details appearance="outlined">
  <h2 slot="summary">
-    <a href="/docs/tokens/" title="Overview">
-      Design Tokens
+    <a class="wa-cluster wa-gap-xs" href="/docs/tokens/" title="Overview">
      <wa-icon name="grid-2" aria-hidden="true"></wa-icon>
+      Design Tokens
    </a>
  </h2>
  <ul>
@@ -342,3 +401,47 @@
    <li><a href="/docs/tokens/component-groups/">Component Groups</a></li>
  </ul>
 </wa-details>
+
+{# Policies #}
+<h2>Terms &amp; Policies</h2>
+<ul>
+  <li><a href="/license"><span class="wa-visually-hidden">Web Awesome </span>Free License</a></li>
+  <li><a href="/license/pro"><span class="wa-visually-hidden">Web Awesome </span>Pro License</a></li>
+  <li><a href="/tos">Terms of Service</a></li>
+  <li><a href="/privacy">Privacy Policy</a></li>
+  <li><a href="/refunds">Refund Policy</a></li>
+</ul>
+
+<wa-divider style="--spacing: var(--wa-space-xl);"></wa-divider>
+
+<div class="wa-stack wa-gap-xl" id="colophon">
+  <div class="wa-stack wa-gap-xs">
+    {% include "logo-simple.njk" %}
+    <h2 class="wa-heading-s">Web Awesome</h2>
+    <p class="wa-caption-xs wa-cluster wa-gap-xs">
+      Version {{ package.version }}
+      <wa-icon id="version-icon-info" family="duotone" variant="regular" name="party-horn"></wa-icon>
+      <wa-tooltip for="version-icon-info" distance="2" class="wa-font-size-xs">Here be freshly launched Awesome and no wa-dragons</wa-tooltip>
+    </p>
+    <p class="wa-caption-xs">&copy; Fonticons, Inc.</p>
+  </div>
+
+  <div class="wa-cluster wa-gap-0 wa-caption-xs the-socials">
+    <h2 class="wa-visually-hidden">Web Awesome Elsewhere</h2>
+    <a href="https://github.com/shoelace-style/webawesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+      <wa-icon family="brands" name="github" label="GitHub"></wa-icon>
+    </a>
+    <a href="https://bsky.app/profile/webawesome.com" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+      <wa-icon family="brands" name="bluesky" label="Bluesky"></wa-icon>
+    </a>
+    <a href="https://mastodon.social/@webawesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+      <wa-icon family="brands" name="mastodon" label="Mastodon"></wa-icon>
+    </a>
+    <a href="https://x.com/webawesomer" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+      <wa-icon family="brands" name="x-twitter" label="Twitter (X)"></wa-icon>
+    </a>
+    <a href="https://www.threads.com/@web.awesome" rel="noopener noreferrer" target="_blank" class="appearance-plain">
+      <wa-icon family="brands" name="threads" label="Threads"></wa-icon>
+    </a>
+  </div>
+</div>
--- a/packages/webawesome/docs/_includes/theme-selector.njk
+++ b/packages/webawesome/docs/_includes/theme-selector.njk
@@ -1,16 +1,18 @@
-<wa-select appearance="filled" size="small" value="default" pill class="theme-selector">
-  <wa-icon slot="start" name="paintbrush" variant="regular"></wa-icon>
+<wa-dropdown class="theme-selector" title="Select Theme">
+  <wa-button slot="trigger" id="theme-selector-trigger" appearance="plain">
+    <wa-icon name="paintbrush" variant="regular" class="icon-embiggen"></wa-icon>
+  </wa-button>

  {# Free themes #}
  {% for theme in themer.themes %}
    {% if not theme.isPro %}
-      <wa-option
+      <wa-dropdown-item
        value="{{ theme.filename | stripExtension }}"
        data-brand="{{ theme.colorBrand.color }}"
        data-palette="{{ theme.palette.filename | stripExtension }}"
      >
        {{ theme.name }}
-      </wa-option>
+      </wa-dropdown-item>
    {% endif %}
  {% endfor %}

@@ -18,24 +20,27 @@
  {% for theme in themer.themes %}
    {% if loop.first %}<wa-divider></wa-divider>{% endif %}
    {% if theme.isPro %}
-      <wa-option
+      <wa-dropdown-item
        value="{{ theme.filename | stripExtension }}"
        data-brand="{{ theme.colorBrand.color }}"
        data-palette="{{ theme.palette.filename | stripExtension }}"
      >
        {{ theme.name }}
-      </wa-option>
+      </wa-dropdown-item>
    {% endif %}
  {% endfor %}
-</wa-select>
+</wa-dropdown>
+<wa-tooltip for="theme-selector-trigger" id="theme-tooltip">Select Theme</wa-tooltip>

 <script>
-  // Immediately set the correct values from storage
-  document.querySelectorAll('wa-select.theme-selector').forEach(el => {
-    el.setAttribute('value', localStorage.getItem('theme') || 'default');
-  });
+  // Handle dropdown selection and trigger input event for theme.js
+  document.querySelectorAll('wa-dropdown.theme-selector').forEach(el => {
+    el.addEventListener('wa-select', (event) => {
+      const selectedValue = event.detail.item.value;

-  // Apply saved brand and palette classes
-  document.documentElement.classList.add(`wa-brand-${localStorage.getItem('brand') || 'blue'}`);
-  document.documentElement.classList.add(`wa-palette-${localStorage.getItem('palette') || 'default'}`);
+      // Trigger input event for theme.js
+      el.value = selectedValue;
+      el.dispatchEvent(new Event('input', { bubbles: true }));
+    });
+  });
 </script>
--- a/packages/webawesome/docs/_includes/visual-tests/appearance.njk
+++ b/packages/webawesome/docs/_includes/visual-tests/appearance.njk
@@ -33,11 +33,11 @@
      <th><code>filled</code> + <code>outlined</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge variant="brand" appearance="filled outlined">Brand</wa-badge>
-          <wa-badge variant="neutral" appearance="filled outlined">Neutral</wa-badge>
-          <wa-badge variant="success" appearance="filled outlined">Success</wa-badge>
-          <wa-badge variant="warning" appearance="filled outlined">Warning</wa-badge>
-          <wa-badge variant="danger" appearance="filled outlined">Danger</wa-badge>
+          <wa-badge variant="brand" appearance="filled-outlined">Brand</wa-badge>
+          <wa-badge variant="neutral" appearance="filled-outlined">Neutral</wa-badge>
+          <wa-badge variant="success" appearance="filled-outlined">Success</wa-badge>
+          <wa-badge variant="warning" appearance="filled-outlined">Warning</wa-badge>
+          <wa-badge variant="danger" appearance="filled-outlined">Danger</wa-badge>
        </div>
      </td>
      <td>
@@ -174,11 +174,11 @@
      <th><code>filled</code> + <code>outlined</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button variant="brand" appearance="filled outlined">Brand</wa-button>
-          <wa-button variant="neutral" appearance="filled outlined">Neutral</wa-button>
-          <wa-button variant="success" appearance="filled outlined">Success</wa-button>
-          <wa-button variant="warning" appearance="filled outlined">Warning</wa-button>
-          <wa-button variant="danger" appearance="filled outlined">Danger</wa-button>
+          <wa-button variant="brand" appearance="filled-outlined">Brand</wa-button>
+          <wa-button variant="neutral" appearance="filled-outlined">Neutral</wa-button>
+          <wa-button variant="success" appearance="filled-outlined">Success</wa-button>
+          <wa-button variant="warning" appearance="filled-outlined">Warning</wa-button>
+          <wa-button variant="danger" appearance="filled-outlined">Danger</wa-button>
        </div>
      </td>
      <td>
@@ -375,23 +375,23 @@
      <th><code>filled</code> + <code>outlined</code></th>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout variant="brand" appearance="filled outlined">
+          <wa-callout variant="brand" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
            Brand
          </wa-callout>
-          <wa-callout variant="neutral" appearance="filled outlined">
+          <wa-callout variant="neutral" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
            Neutral
          </wa-callout>
-          <wa-callout variant="success" appearance="filled outlined">
+          <wa-callout variant="success" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
            Success
          </wa-callout>
-          <wa-callout variant="warning" appearance="filled outlined">
+          <wa-callout variant="warning" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
            Warning
          </wa-callout>
-          <wa-callout variant="danger" appearance="filled outlined">
+          <wa-callout variant="danger" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
            Danger
          </wa-callout>
@@ -636,11 +636,11 @@
      <th><code>filled</code> + <code>outlined</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag variant="brand" appearance="filled outlined">Brand</wa-tag>
-          <wa-tag variant="neutral" appearance="filled outlined">Neutral</wa-tag>
-          <wa-tag variant="success" appearance="filled outlined">Success</wa-tag>
-          <wa-tag variant="warning" appearance="filled outlined">Warning</wa-tag>
-          <wa-tag variant="danger" appearance="filled outlined">Danger</wa-tag>
+          <wa-tag variant="brand" appearance="filled-outlined">Brand</wa-tag>
+          <wa-tag variant="neutral" appearance="filled-outlined">Neutral</wa-tag>
+          <wa-tag variant="success" appearance="filled-outlined">Success</wa-tag>
+          <wa-tag variant="warning" appearance="filled-outlined">Warning</wa-tag>
+          <wa-tag variant="danger" appearance="filled-outlined">Danger</wa-tag>
        </div>
      </td>
      <td>
@@ -775,4 +775,4 @@
    </tr>
  </tbody>
 </table>
-</div>
+</div>
--- a/packages/webawesome/docs/_includes/visual-tests/color.njk
+++ b/packages/webawesome/docs/_includes/visual-tests/color.njk
@@ -12,22 +12,18 @@
      <th><code>brand</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge variant="brand" appearance="accent outlined">A+O</wa-badge>
          <wa-badge variant="brand" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="brand" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge variant="brand" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge variant="brand" appearance="filled">Filled</wa-badge>
          <wa-badge variant="brand" appearance="outlined">Outlined</wa-badge>
-          <wa-badge variant="brand" appearance="plain">Plain</wa-badge>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge class="wa-brand" appearance="accent outlined">A+O</wa-badge>
          <wa-badge class="wa-brand" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-brand" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge class="wa-brand" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge class="wa-brand" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-brand" appearance="outlined">Outlined</wa-badge>
-          <wa-badge class="wa-brand" appearance="plain">Plain</wa-badge>
        </div>
      </td>
    </tr>
@@ -35,22 +31,18 @@
      <th><code>neutral</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge variant="neutral" appearance="accent outlined">A+O</wa-badge>
          <wa-badge variant="neutral" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="neutral" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge variant="neutral" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge variant="neutral" appearance="filled">Filled</wa-badge>
          <wa-badge variant="neutral" appearance="outlined">Outlined</wa-badge>
-          <wa-badge variant="neutral" appearance="plain">Plain</wa-badge>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge class="wa-neutral" appearance="accent outlined">A+O</wa-badge>
          <wa-badge class="wa-neutral" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-neutral" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge class="wa-neutral" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge class="wa-neutral" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-neutral" appearance="outlined">Outlined</wa-badge>
-          <wa-badge class="wa-neutral" appearance="plain">Plain</wa-badge>
        </div>
      </td>
    </tr>
@@ -58,22 +50,18 @@
      <th><code>success</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge variant="success" appearance="accent outlined">A+O</wa-badge>
          <wa-badge variant="success" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="success" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge variant="success" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge variant="success" appearance="filled">Filled</wa-badge>
          <wa-badge variant="success" appearance="outlined">Outlined</wa-badge>
-          <wa-badge variant="success" appearance="plain">Plain</wa-badge>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge class="wa-success" appearance="accent outlined">A+O</wa-badge>
          <wa-badge class="wa-success" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-success" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge class="wa-success" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge class="wa-success" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-success" appearance="outlined">Outlined</wa-badge>
-          <wa-badge class="wa-success" appearance="plain">Plain</wa-badge>
        </div>
      </td>
    </tr>
@@ -81,22 +69,18 @@
      <th><code>warning</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge variant="warning" appearance="accent outlined">A+O</wa-badge>
          <wa-badge variant="warning" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="warning" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge variant="warning" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge variant="warning" appearance="filled">Filled</wa-badge>
          <wa-badge variant="warning" appearance="outlined">Outlined</wa-badge>
-          <wa-badge variant="warning" appearance="plain">Plain</wa-badge>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge class="wa-warning" appearance="accent outlined">A+O</wa-badge>
          <wa-badge class="wa-warning" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-warning" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge class="wa-warning" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge class="wa-warning" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-warning" appearance="outlined">Outlined</wa-badge>
-          <wa-badge class="wa-warning" appearance="plain">Plain</wa-badge>
        </div>
      </td>
    </tr>
@@ -104,22 +88,18 @@
      <th><code>danger</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge variant="danger" appearance="accent outlined">A+O</wa-badge>
          <wa-badge variant="danger" appearance="accent">Accent</wa-badge>
-          <wa-badge variant="danger" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge variant="danger" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge variant="danger" appearance="filled">Filled</wa-badge>
          <wa-badge variant="danger" appearance="outlined">Outlined</wa-badge>
-          <wa-badge variant="danger" appearance="plain">Plain</wa-badge>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-badge class="wa-danger" appearance="accent outlined">A+O</wa-badge>
          <wa-badge class="wa-danger" appearance="accent">Accent</wa-badge>
-          <wa-badge class="wa-danger" appearance="filled outlined">F+O</wa-badge>
+          <wa-badge class="wa-danger" appearance="filled-outlined">Filled-Outlined</wa-badge>
          <wa-badge class="wa-danger" appearance="filled">Filled</wa-badge>
          <wa-badge class="wa-danger" appearance="outlined">Outlined</wa-badge>
-          <wa-badge class="wa-danger" appearance="plain">Plain</wa-badge>
        </div>
      </td>
    </tr>
@@ -142,9 +122,8 @@
      <th><code>brand</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button variant="brand" appearance="accent outlined">A+O</wa-button>
          <wa-button variant="brand" appearance="accent">Accent</wa-button>
-          <wa-button variant="brand" appearance="filled outlined">F+O</wa-button>
+          <wa-button variant="brand" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button variant="brand" appearance="filled">Filled</wa-button>
          <wa-button variant="brand" appearance="outlined">Outlined</wa-button>
          <wa-button variant="brand" appearance="plain">Plain</wa-button>
@@ -152,9 +131,8 @@
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button class="wa-brand" appearance="accent outlined">A+O</wa-button>
          <wa-button class="wa-brand" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-brand" appearance="filled outlined">F+O</wa-button>
+          <wa-button class="wa-brand" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button class="wa-brand" appearance="filled">Filled</wa-button>
          <wa-button class="wa-brand" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-brand" appearance="plain">Plain</wa-button>
@@ -165,9 +143,8 @@
      <th><code>neutral</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button variant="neutral" appearance="accent outlined">A+O</wa-button>
          <wa-button variant="neutral" appearance="accent">Accent</wa-button>
-          <wa-button variant="neutral" appearance="filled outlined">F+O</wa-button>
+          <wa-button variant="neutral" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button variant="neutral" appearance="filled">Filled</wa-button>
          <wa-button variant="neutral" appearance="outlined">Outlined</wa-button>
          <wa-button variant="neutral" appearance="plain">Plain</wa-button>
@@ -175,9 +152,8 @@
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button class="wa-neutral" appearance="accent outlined">A+O</wa-button>
          <wa-button class="wa-neutral" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-neutral" appearance="filled outlined">F+O</wa-button>
+          <wa-button class="wa-neutral" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button class="wa-neutral" appearance="filled">Filled</wa-button>
          <wa-button class="wa-neutral" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-neutral" appearance="plain">Plain</wa-button>
@@ -188,9 +164,8 @@
      <th><code>success</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button variant="success" appearance="accent outlined">A+O</wa-button>
          <wa-button variant="success" appearance="accent">Accent</wa-button>
-          <wa-button variant="success" appearance="filled outlined">F+O</wa-button>
+          <wa-button variant="success" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button variant="success" appearance="filled">Filled</wa-button>
          <wa-button variant="success" appearance="outlined">Outlined</wa-button>
          <wa-button variant="success" appearance="plain">Plain</wa-button>
@@ -198,9 +173,8 @@
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button class="wa-success" appearance="accent outlined">A+O</wa-button>
          <wa-button class="wa-success" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-success" appearance="filled outlined">F+O</wa-button>
+          <wa-button class="wa-success" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button class="wa-success" appearance="filled">Filled</wa-button>
          <wa-button class="wa-success" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-success" appearance="plain">Plain</wa-button>
@@ -211,9 +185,8 @@
      <th><code>warning</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button variant="warning" appearance="accent outlined">A+O</wa-button>
          <wa-button variant="warning" appearance="accent">Accent</wa-button>
-          <wa-button variant="warning" appearance="filled outlined">F+O</wa-button>
+          <wa-button variant="warning" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button variant="warning" appearance="filled">Filled</wa-button>
          <wa-button variant="warning" appearance="outlined">Outlined</wa-button>
          <wa-button variant="warning" appearance="plain">Plain</wa-button>
@@ -221,9 +194,8 @@
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button class="wa-warning" appearance="accent outlined">A+O</wa-button>
          <wa-button class="wa-warning" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-warning" appearance="filled outlined">F+O</wa-button>
+          <wa-button class="wa-warning" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button class="wa-warning" appearance="filled">Filled</wa-button>
          <wa-button class="wa-warning" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-warning" appearance="plain">Plain</wa-button>
@@ -234,9 +206,8 @@
      <th><code>danger</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button variant="danger" appearance="accent outlined">A+O</wa-button>
          <wa-button variant="danger" appearance="accent">Accent</wa-button>
-          <wa-button variant="danger" appearance="filled outlined">F+O</wa-button>
+          <wa-button variant="danger" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button variant="danger" appearance="filled">Filled</wa-button>
          <wa-button variant="danger" appearance="outlined">Outlined</wa-button>
          <wa-button variant="danger" appearance="plain">Plain</wa-button>
@@ -244,9 +215,8 @@
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button class="wa-danger" appearance="accent outlined">A+O</wa-button>
          <wa-button class="wa-danger" appearance="accent">Accent</wa-button>
-          <wa-button class="wa-danger" appearance="filled outlined">F+O</wa-button>
+          <wa-button class="wa-danger" appearance="filled-outlined">Filled-Outlined</wa-button>
          <wa-button class="wa-danger" appearance="filled">Filled</wa-button>
          <wa-button class="wa-danger" appearance="outlined">Outlined</wa-button>
          <wa-button class="wa-danger" appearance="plain">Plain</wa-button>
@@ -272,17 +242,13 @@
      <th><code>brand</code></th>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout variant="brand" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-star"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout variant="brand" appearance="accent">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="brand" appearance="filled outlined">
+          <wa-callout variant="brand" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout variant="brand" appearance="filled">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
@@ -300,17 +266,13 @@
      </td>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout class="wa-brand" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-star"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout class="wa-brand" appearance="accent">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-brand" appearance="filled outlined">
+          <wa-callout class="wa-brand" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout class="wa-brand" appearance="filled">
            <wa-icon slot="icon" name="circle-star"></wa-icon>
@@ -331,17 +293,13 @@
      <th><code>neutral</code></th>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout variant="neutral" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-info"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout variant="neutral" appearance="accent">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="neutral" appearance="filled outlined">
+          <wa-callout variant="neutral" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout variant="neutral" appearance="filled">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
@@ -359,17 +317,13 @@
      </td>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout class="wa-neutral" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-info"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout class="wa-neutral" appearance="accent">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-neutral" appearance="filled outlined">
+          <wa-callout class="wa-neutral" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout class="wa-neutral" appearance="filled">
            <wa-icon slot="icon" name="circle-info"></wa-icon>
@@ -390,17 +344,13 @@
      <th><code>success</code></th>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout variant="success" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-check"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout variant="success" appearance="accent">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="success" appearance="filled outlined">
+          <wa-callout variant="success" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout variant="success" appearance="filled">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
@@ -418,17 +368,13 @@
      </td>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout class="wa-success" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-check"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout class="wa-success" appearance="accent">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-success" appearance="filled outlined">
+          <wa-callout class="wa-success" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout class="wa-success" appearance="filled">
            <wa-icon slot="icon" name="circle-check"></wa-icon>
@@ -449,17 +395,13 @@
      <th><code>warning</code></th>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout variant="warning" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout variant="warning" appearance="accent">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="warning" appearance="filled outlined">
+          <wa-callout variant="warning" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout variant="warning" appearance="filled">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
@@ -477,17 +419,13 @@
      </td>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout class="wa-warning" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout class="wa-warning" appearance="accent">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-warning" appearance="filled outlined">
+          <wa-callout class="wa-warning" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout class="wa-warning" appearance="filled">
            <wa-icon slot="icon" name="circle-exclamation"></wa-icon>
@@ -508,17 +446,13 @@
      <th><code>danger</code></th>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout variant="danger" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout variant="danger" appearance="accent">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout variant="danger" appearance="filled outlined">
+          <wa-callout variant="danger" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout variant="danger" appearance="filled">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
@@ -536,17 +470,13 @@
      </td>
      <td>
        <div class="wa-grid wa-gap-2xs">
-          <wa-callout class="wa-danger" appearance="accent outlined">
-            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
-            A+O
-          </wa-callout>
          <wa-callout class="wa-danger" appearance="accent">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
            Accent
          </wa-callout>
-          <wa-callout class="wa-danger" appearance="filled outlined">
+          <wa-callout class="wa-danger" appearance="filled-outlined">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
-            F+O
+            Filled-Outlined
          </wa-callout>
          <wa-callout class="wa-danger" appearance="filled">
            <wa-icon slot="icon" name="circle-xmark"></wa-icon>
@@ -582,22 +512,18 @@
      <th><code>brand</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag variant="brand" appearance="accent outlined">A+O</wa-tag>
          <wa-tag variant="brand" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="brand" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag variant="brand" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag variant="brand" appearance="filled">Filled</wa-tag>
          <wa-tag variant="brand" appearance="outlined">Outlined</wa-tag>
-          <wa-tag variant="brand" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag class="wa-brand" appearance="accent outlined">A+O</wa-tag>
          <wa-tag class="wa-brand" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-brand" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag class="wa-brand" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag class="wa-brand" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-brand" appearance="outlined">Outlined</wa-tag>
-          <wa-tag class="wa-brand" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
@@ -605,22 +531,18 @@
      <th><code>neutral</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag variant="neutral" appearance="accent outlined">A+O</wa-tag>
          <wa-tag variant="neutral" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="neutral" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag variant="neutral" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag variant="neutral" appearance="filled">Filled</wa-tag>
          <wa-tag variant="neutral" appearance="outlined">Outlined</wa-tag>
-          <wa-tag variant="neutral" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag class="wa-neutral" appearance="accent outlined">A+O</wa-tag>
          <wa-tag class="wa-neutral" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-neutral" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag class="wa-neutral" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag class="wa-neutral" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-neutral" appearance="outlined">Outlined</wa-tag>
-          <wa-tag class="wa-neutral" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
@@ -628,22 +550,18 @@
      <th><code>success</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag variant="success" appearance="accent outlined">A+O</wa-tag>
          <wa-tag variant="success" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="success" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag variant="success" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag variant="success" appearance="filled">Filled</wa-tag>
          <wa-tag variant="success" appearance="outlined">Outlined</wa-tag>
-          <wa-tag variant="success" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag class="wa-success" appearance="accent outlined">A+O</wa-tag>
          <wa-tag class="wa-success" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-success" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag class="wa-success" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag class="wa-success" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-success" appearance="outlined">Outlined</wa-tag>
-          <wa-tag class="wa-success" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
@@ -651,22 +569,18 @@
      <th><code>warning</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag variant="warning" appearance="accent outlined">A+O</wa-tag>
          <wa-tag variant="warning" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="warning" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag variant="warning" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag variant="warning" appearance="filled">Filled</wa-tag>
          <wa-tag variant="warning" appearance="outlined">Outlined</wa-tag>
-          <wa-tag variant="warning" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag class="wa-warning" appearance="accent outlined">A+O</wa-tag>
          <wa-tag class="wa-warning" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-warning" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag class="wa-warning" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag class="wa-warning" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-warning" appearance="outlined">Outlined</wa-tag>
-          <wa-tag class="wa-warning" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
@@ -674,25 +588,21 @@
      <th><code>danger</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag variant="danger" appearance="accent outlined">A+O</wa-tag>
          <wa-tag variant="danger" appearance="accent">Accent</wa-tag>
-          <wa-tag variant="danger" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag variant="danger" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag variant="danger" appearance="filled">Filled</wa-tag>
          <wa-tag variant="danger" appearance="outlined">Outlined</wa-tag>
-          <wa-tag variant="danger" appearance="plain">Plain</wa-tag>
        </div>
      </td>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-tag class="wa-danger" appearance="accent outlined">A+O</wa-tag>
          <wa-tag class="wa-danger" appearance="accent">Accent</wa-tag>
-          <wa-tag class="wa-danger" appearance="filled outlined">F+O</wa-tag>
+          <wa-tag class="wa-danger" appearance="filled-outlined">Filled-Outlined</wa-tag>
          <wa-tag class="wa-danger" appearance="filled">Filled</wa-tag>
          <wa-tag class="wa-danger" appearance="outlined">Outlined</wa-tag>
-          <wa-tag class="wa-danger" appearance="plain">Plain</wa-tag>
        </div>
      </td>
    </tr>
  </tbody>
 </table>
-</div>
+</div>
--- a/packages/webawesome/docs/_includes/visual-tests/native.njk
+++ b/packages/webawesome/docs/_includes/visual-tests/native.njk
@@ -39,14 +39,14 @@
      </td>
    </tr>
    <tr>
-      <th><code>filled</code> + <code>outlined</code></th>
+      <th><code>filled-outlined</code></th>
      <td>
        <div class="wa-cluster wa-gap-2xs">
-          <wa-button variant="brand" appearance="filled outlined">Brand</wa-button>
-          <wa-button variant="neutral" appearance="filled outlined">Neutral</wa-button>
-          <wa-button variant="success" appearance="filled outlined">Success</wa-button>
-          <wa-button variant="warning" appearance="filled outlined">Warning</wa-button>
-          <wa-button variant="danger" appearance="filled outlined">Danger</wa-button>
+          <wa-button variant="brand" appearance="filled-outlined">Brand</wa-button>
+          <wa-button variant="neutral" appearance="filled-outlined">Neutral</wa-button>
+          <wa-button variant="success" appearance="filled-outlined">Success</wa-button>
+          <wa-button variant="warning" appearance="filled-outlined">Warning</wa-button>
+          <wa-button variant="danger" appearance="filled-outlined">Danger</wa-button>
        </div>
      </td>
      <td>
@@ -429,7 +429,7 @@
        </wa-select>
      </td>
      <td>
-        <label>Select 
+        <label>Select
          <select value="1">
            <option value="1">Option</option>
          </select>
@@ -444,7 +444,7 @@
        </wa-select>
      </td>
      <td>
-        <label>Select (filled) 
+        <label>Select (filled)
          <select class="wa-filled" value="1">
            <option value="1">Option</option>
          </select>
@@ -459,7 +459,7 @@
        </wa-select>
      </td>
      <td>
-        <label class="wa-size-s">Select (small) 
+        <label class="wa-size-s">Select (small)
          <select value="1">
            <option value="1">Option</option>
          </select>
@@ -474,7 +474,7 @@
        </wa-select>
      </td>
      <td>
-        <label class="wa-size-m">Select (medium) 
+        <label class="wa-size-m">Select (medium)
          <select value="1">
            <option value="1">Option</option>
          </select>
@@ -489,7 +489,7 @@
        </wa-select>
      </td>
      <td>
-        <label class="wa-size-l">Select (large) 
+        <label class="wa-size-l">Select (large)
          <select value="1">
            <option value="1">Option</option>
          </select>
@@ -582,4 +582,4 @@
    </tr>
  </tbody>
 </table>
-</div>
+</div>
--- a/packages/webawesome/docs/_includes/visual-tests/size.njk
+++ b/packages/webawesome/docs/_includes/visual-tests/size.njk
@@ -40,66 +40,6 @@
 </div>
 <wa-divider></wa-divider>

-<h3>Button Group</h3>
-
-<div class="table-scroll">
-<table>
-  <thead>
-    <th></th>
-    <th><code>size=""</code></th>
-    <th><code>.wa-size-[s|m|l]</code></th>
-  </thead>
-  <tbody>
-    <tr>
-      <th><code>small</code>/<code>s</code></th>
-      <td>
-        <wa-button-group orientation="horizontal" size="small">
-          <wa-button value="1">Button L</wa-button>
-          <wa-button value="2">Button R</wa-button>
-        </wa-button-group>
-      </td>
-      <td>
-        <wa-button-group orientation="horizontal" class="wa-size-s">
-          <wa-button value="1">Button L</wa-button>
-          <wa-button value="2">Button R</wa-button>
-        </wa-button-group>
-      </td>
-    </tr>
-    <tr>
-      <th><code>medium</code>/<code>m</code></th>
-      <td>
-        <wa-button-group orientation="horizontal" size="medium">
-          <wa-button value="1">Button L</wa-button>
-          <wa-button value="2">Button R</wa-button>
-        </wa-button-group>
-      </td>
-      <td>
-        <wa-button-group orientation="horizontal" class="wa-size-m">
-          <wa-button value="1">Button L</wa-button>
-          <wa-button value="2">Button R</wa-button>
-        </wa-button-group>
-      </td>
-    </tr>
-    <tr>
-      <th><code>large</code>/<code>l</code></th>
-      <td>
-        <wa-button-group orientation="horizontal" size="large">
-          <wa-button value="1">Button L</wa-button>
-          <wa-button value="2">Button R</wa-button>
-        </wa-button-group>
-      </td>
-      <td>
-        <wa-button-group orientation="horizontal" class="wa-size-l">
-          <wa-button value="1">Button L</wa-button>
-          <wa-button value="2">Button R</wa-button>
-        </wa-button-group>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</div>
-<wa-divider></wa-divider>
-
 <h3>Callout</h3>

 <div class="table-scroll">
--- a/packages/webawesome/docs/_layouts/blank.njk
+++ b/packages/webawesome/docs/_layouts/blank.njk
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html lang="en" data-fa-kit-code="b10bfbde90" data-cdn-url="{% cdnUrl %}">
+<html lang="en" data-fa-kit-code="38c11e3f20" data-cdn-url="{% cdnUrl %}">
  <head>
    {% include 'head.njk' %}
    {% block head %}{% endblock %}
  </head>
-  <body class="layout-{{ layout | stripExtension }}">
+  <body class="layout-{{ layout | stripExtension }} page-{{ pageClass or page.fileSlug or 'home' }}">
    {% block content %}
      {{ content | safe }}
    {% endblock %}
--- a/packages/webawesome/docs/_layouts/component.njk
+++ b/packages/webawesome/docs/_layouts/component.njk
@@ -26,7 +26,7 @@
    <p>Learn more about <a href="/docs/usage/#slots">using slots</a>.</p>

    <wa-scroller>
-      <table class="component-table">
+      <table class="component-table wa-hover-rows">
        <thead>
          <tr>
            <th class="table-name">Name</th>
@@ -57,7 +57,7 @@
    <p>Learn more about <a href="/docs/usage/#attributes-and-properties">attributes and properties</a>.</p>

    <wa-scroller>
-      <table class="component-table">
+      <table class="component-table wa-hover-rows">
        <thead>
          <tr>
            <th class="table-name">Name</th>
@@ -104,7 +104,7 @@
    <p>Learn more about <a href="/docs/usage/#methods">methods</a>.</p>

    <wa-scroller>
-      <table class="component-table">
+      <table class="component-table wa-hover-rows">
        <thead>
          <tr>
            <th class="table-name">Name</th>
@@ -139,7 +139,7 @@
    <p>Learn more about <a href="/docs/usage/#events">events</a>.</p>

    <wa-scroller>
-      <table class="component-table">
+      <table class="component-table wa-hover-rows">
        <thead>
          <tr>
            <th class="table-name">Name</th>
@@ -166,7 +166,7 @@
    <p>Learn more about <a href="/docs/customizing/#custom-properties">CSS custom properties</a>.</p>

    <wa-scroller>
-      <table class="component-table">
+      <table class="component-table wa-hover-rows">
        <thead>
          <tr>
            <th class="table-name">Name</th>
@@ -198,7 +198,7 @@
    <p>Learn more about <a href="/docs/customizing/#custom-states">custom states</a>.</p>

    <wa-scroller>
-      <table class="component-table">
+      <table class="component-table wa-hover-rows">
        <thead>
          <tr>
            <th class="table-name">Name</th>
@@ -225,7 +225,7 @@
    <p>Learn more about <a href="/docs/customizing/#css-parts">CSS parts</a>.</p>

    <wa-scroller>
-      <table class="component-table">
+      <table class="component-table wa-hover-rows">
        <thead>
          <tr>
            <th class="table-name">Name</th>
@@ -264,6 +264,9 @@
    The <a href="/docs/#quick-start-autoloading-via-cdn">autoloader</a> is the recommended way to import components. If you prefer to do it manually, use one of the following code snippets.
  </p>

+
+  {% set componentName = component.tagName | stripPrefix %}
+  {% set componentPath = ["components/", componentName, "/", componentName, ".js"] | join("") %}
  <wa-tab-group label="How would you like to import this component?">
    <wa-tab panel="cdn">CDN</wa-tab>
    <wa-tab panel="npm">npm</wa-tab>
@@ -272,19 +275,20 @@
      <p>
        To manually import this component from the CDN, use the following code.
      </p>
-      <pre><code class="language-js">import '{% cdnUrl component.path %}';</code></pre>
+
+      <pre><code class="language-js">import '{% cdnUrl componentPath %}';</code></pre>
    </wa-tab-panel>
    <wa-tab-panel name="npm">
-      Coming soon!
+      <p>
+        To manually import this component from NPM, use the following code.
+      </p>
+      <pre><code class="language-js">import '@awesome.me/webawesome/dist/{{ componentPath }}';</code></pre>
    </wa-tab-panel>
    <wa-tab-panel name="react">
-      Coming soon!
-      {# NOTE - disabled for alpha/beta
      <p>
        To manually import this component from React, use the following code.
      </p>
-      <pre><code class="language-js">import '@shoelace-style/webawesome/react/{{ component.tagName | stripPrefix }}';</code></pre>
-      #}
+      <pre><code class="language-js">import {{ component.name }} from '@awesome.me/webawesome/dist/react/{{ componentName }}';</code></pre>
    </wa-tab-panel>
  </wa-tab-group>

@@ -293,11 +297,11 @@
  <div class="component-help">
    <strong>Need a hand?</strong>
    <wa-button size="small" appearance="filled" variant="neutral" href="https://github.com/shoelace-style/webawesome/issues" target="_blank">
-      <wa-icon slot="prefix" name="bug"></wa-icon>
+      <wa-icon slot="start" variant="regular" name="bug"></wa-icon>
      Report a bug
    </wa-button>
    <wa-button size="small" appearance="filled" variant="neutral" href="https://github.com/shoelace-style/webawesome/discussions" target="_blank">
-      <wa-icon slot="prefix" name="message-question"></wa-icon>
+      <wa-icon slot="start" variant="regular" name="message-question"></wa-icon>
      Ask for help
    </wa-button>
  </div>
--- a/packages/webawesome/docs/_layouts/pattern.njk
+++ b/packages/webawesome/docs/_layouts/pattern.njk
@@ -0,0 +1,8 @@
+{% set hasSidebar = true %}
+{% set hasOutline = true %}
+{% set section = 'docs' %}
+
+{% block beforeContent %}
+    <p>{{ description }}</p>
+{% endblock %}
+{% extends "../_includes/base.njk" %}
--- a/packages/webawesome/docs/_plugins/replace-text.js
+++ b/packages/webawesome/docs/_plugins/replace-text.js
--- a/packages/webawesome/docs/_plugins/search.js
+++ b/packages/webawesome/docs/_plugins/search.js
@@ -1,4 +1,5 @@
 /* eslint-disable no-invalid-this */
+import { readFileSync } from 'fs';
 import { mkdir, writeFile } from 'fs/promises';
 import lunr from 'lunr';
 import { parse } from 'node-html-parser';
@@ -23,19 +24,22 @@ export function searchPlugin(options = {}) {
    ...options,
  };

+  // Hoist above so that it can "cache" properly for incremental builds.
  return function (eleventyConfig) {
-    const pagesToIndex = new Map();
+    let pagesToIndex = new Map();

    eleventyConfig.addPreprocessor('exclude-unlisted-from-search', '*', function (data, content) {
      if (data.unlisted) {
        // no-op
+        pagesToIndex.delete(data.page.inputPath);
      } else {
-        pagesToIndex.set(data.page.inputPath, {});
+        pagesToIndex.set(data.page.inputPath, true);
      }

      return content;
    });

+    // With incremental builds we need this to be last in case stuff was added from metadata. _BUT_ in incremental builds, not every page is added to the "transform".
    eleventyConfig.addTransform('search', function (content) {
      if (!pagesToIndex.has(this.page.inputPath)) {
        return content;
@@ -67,11 +71,30 @@ export function searchPlugin(options = {}) {
      return content;
    });

-    eleventyConfig.on('eleventy.after', ({ directories }) => {
+    eleventyConfig.on('eleventy.after', async ({ directories }) => {
      const { output } = directories;
      const outputFilename = path.resolve(join(output, 'search.json'));
+      const cachedPages = path.resolve(join(output, 'cached_pages.json'));
+
+      function getCachedPages() {
+        let content = { pages: [] };
+        try {
+          content = JSON.parse(readFileSync(cachedPages));
+        } catch (e) {}
+
+        const cachedPagesMap = new Map(content.pages);
+        for (const [key, value] of cachedPagesMap.entries()) {
+          // A page uses a cached value if `true` and it didnt get its value set in the "transform" hook. This is to get around the limitation of incremental builds not going over every file in transform.
+          if (pagesToIndex.get(key) === true) {
+            pagesToIndex.set(key, value);
+          }
+        }
+      }
+
      const map = [];
-      const searchIndex = lunr(async function () {
+
+      getCachedPages();
+      const searchIndex = lunr(function () {
        let index = 0;

        this.ref('id');
@@ -84,9 +107,11 @@ export function searchPlugin(options = {}) {
          map[index] = { title: page.title, description: page.description, url: page.url };
          index++;
        }
-        await mkdir(dirname(outputFilename), { recursive: true });
-        await writeFile(outputFilename, JSON.stringify({ searchIndex, map }), 'utf-8');
      });
+
+      await mkdir(dirname(outputFilename), { recursive: true });
+      await writeFile(outputFilename, JSON.stringify({ searchIndex, map }), 'utf-8');
+      await writeFile(cachedPages, JSON.stringify({ pages: [...pagesToIndex.entries()] }, null, 2));
    });
  };
 }
--- a/packages/webawesome/docs/_transformers/anchor-headings.js
+++ b/packages/webawesome/docs/_transformers/anchor-headings.js
@@ -0,0 +1,81 @@
+import { parse } from 'node-html-parser';
+import slugify from 'slugify';
+import { v4 as uuid } from 'uuid';
+
+function createId(text) {
+  let slug = slugify(String(text), {
+    remove: /[^\w|\s]/g,
+    lower: true,
+  });
+
+  // ids must start with a letter
+  if (!/^[a-z]/i.test(slug)) {
+    slug = `wa_${slug}`;
+  }
+
+  return slug;
+}
+
+/**
+ * Eleventy plugin to add anchors to headings to content.
+ */
+export function anchorHeadingsTransformer(options = {}) {
+  options = {
+    container: 'body',
+    headingSelector: 'h2, h3, h4, h5, h6',
+    anchorLabel: 'Jump to heading',
+    ...options,
+  };
+
+  /** doc is a parsed HTML document */
+  return function (doc) {
+    const container = doc.querySelector(options.container);
+
+    if (!container) {
+      return doc;
+    }
+
+    // Look for headings
+    let selector = `:is(${options.headingSelector}):not([data-no-anchor], [data-no-anchor] *)`;
+    container.querySelectorAll(selector).forEach(heading => {
+      const hasAnchor = heading.querySelector('a');
+      const existingId = heading.getAttribute('id');
+      const clone = parse(heading.outerHTML);
+
+      // Create a clone of the heading so we can remove [data-no-anchor] elements from the text content
+      clone.querySelectorAll('[data-no-anchor]').forEach(el => el.remove());
+
+      if (hasAnchor) {
+        return;
+      }
+
+      let id = existingId;
+      if (!id) {
+        const slug = createId(clone.textContent ?? '') ?? uuid().slice(-12);
+        id = slug;
+        let suffix = 1;
+
+        // Make sure the slug is unique in the document
+        while (doc.getElementById(id) !== null) {
+          id = `${slug}-${++suffix}`;
+        }
+      }
+
+      // Create the anchor
+      const anchor = parse(`
+        <a href="#${encodeURIComponent(id)}">
+          <span class="wa-visually-hidden"></span>
+          <span aria-hidden="true">#</span>
+        </a>
+      `);
+      anchor.querySelector('.wa-visually-hidden').textContent = options.anchorLabel;
+
+      // Update the heading
+      if (!existingId) {
+        heading.setAttribute('id', id);
+      }
+      heading.classList.add('anchor-heading');
+      heading.appendChild(anchor);
+    });
+  };
+}
--- a/packages/webawesome/docs/_transformers/code-examples.js
+++ b/packages/webawesome/docs/_transformers/code-examples.js
@@ -1,43 +1,51 @@
 import { parse } from 'node-html-parser';
 import { v4 as uuid } from 'uuid';
-import { markdown } from '../_utils/markdown.js';
+import { copyCode } from './copy-code.js';
+import { highlightCode } from './highlight-code.js';

 /**
 * Eleventy plugin to turn `<code class="example">` blocks into live examples.
 */
-export function codeExamplesPlugin(options = {}) {
+export function codeExamplesTransformer(options = {}) {
  options = {
    container: 'body',
    ...options,
  };

-  return function (eleventyConfig) {
-    eleventyConfig.addTransform('code-examples', content => {
-      const doc = parse(content, { blockTextElements: { code: true } });
-      const container = doc.querySelector(options.container);
+  return function (doc) {
+    const container = doc.querySelector(options.container);

-      if (!container) {
-        return content;
-      }
+    if (!container) {
+      return;
+    }

-      // Look for external links
-      container.querySelectorAll('code.example').forEach(code => {
-        const pre = code.closest('pre');
-        const hasButtons = !code.classList.contains('no-buttons');
-        const isOpen = code.classList.contains('open') || !hasButtons;
-        const noEdit = code.classList.contains('no-edit');
-        const id = `code-example-${uuid().slice(-12)}`;
-        let preview = pre.textContent;
+    // Look for external links
+    container.querySelectorAll('code.example').forEach(code => {
+      let pre = code.closest('pre');
+      const hasButtons = !code.classList.contains('no-buttons');
+      const isOpen = code.classList.contains('open') || !hasButtons;
+      const noEdit = code.classList.contains('no-edit');
+      const id = `code-example-${uuid().slice(-12)}`;
+      let preview = pre.textContent;

-        // Run preview scripts as modules to prevent collisions
-        const root = parse(preview, { blockTextElements: { script: true } });
-        root.querySelectorAll('script').forEach(script => script.setAttribute('type', 'module'));
-        preview = root.toString();
+      const langClass = [...code.classList.values()].find(val => val.startsWith('language-'));
+      const lang = langClass ? langClass.replace(/^language-/, '') : 'plain';

-        const codeExample = parse(`
+      code.innerHTML = highlightCode(code.textContent ?? '', lang);
+
+      // Run preview scripts as modules to prevent collisions
+      const root = parse(preview, { blockTextElements: { script: true } });
+      root.querySelectorAll('script').forEach(script => script.setAttribute('type', 'module'));
+      preview = root.toString();
+
+      copyCode(code);
+
+      const codeExample = parse(`
          <div class="code-example ${isOpen ? 'open' : ''}">
            <div class="code-example-preview">
-              ${preview}
+              <div>
+                ${preview}
+              </div>
              <div class="code-example-resizer" aria-hidden="true">
                <wa-icon name="grip-lines-vertical"></wa-icon>
              </div>
@@ -77,10 +85,7 @@ export function codeExamplesPlugin(options = {}) {
          </div>
        `);

-        pre.replaceWith(codeExample);
-      });
-
-      return doc.toString();
+      pre.replaceWith(codeExample);
    });
  };
 }
--- a/packages/webawesome/docs/_transformers/copy-code.js
+++ b/packages/webawesome/docs/_transformers/copy-code.js
@@ -0,0 +1,38 @@
+export function copyCode(code) {
+  const pre = code.closest('pre');
+  let preId = pre.getAttribute('id') || `code-block-${crypto.randomUUID()}`;
+  let codeId = code.getAttribute('id') || `${preId}-inner`;
+
+  if (!code.getAttribute('id')) {
+    code.setAttribute('id', codeId);
+  }
+  if (!pre.getAttribute('id')) {
+    pre.setAttribute('id', preId);
+  }
+
+  // Add a copy button
+  pre.innerHTML += `<wa-copy-button from="${codeId}" class="copy-button wa-dark"></wa-copy-button>`;
+}
+
+/**
+ * Eleventy plugin to add copy buttons to code blocks.
+ */
+export function copyCodeTransformer(options = {}) {
+  options = {
+    container: 'body',
+    ...options,
+  };
+
+  return function (doc) {
+    const container = doc.querySelector(options.container);
+
+    if (!container) {
+      return;
+    }
+
+    // Look for code blocks
+    container.querySelectorAll('pre > code').forEach(code => {
+      copyCode(code);
+    });
+  };
+}
--- a/packages/webawesome/docs/_transformers/current-link.js
+++ b/packages/webawesome/docs/_transformers/current-link.js
@@ -24,30 +24,25 @@ function normalize(pathname) {
 /**
 * Eleventy plugin to decorate current links with a custom class.
 */
-export function currentLink(options = {}) {
+export function currentLinkTransformer(options = {}) {
  options = {
    container: 'body',
    className: 'current',
    ...options,
  };

-  return function (eleventyConfig) {
-    eleventyConfig.addTransform('current-link', function (content) {
-      const doc = parse(content);
-      const container = doc.querySelector(options.container);
+  return function (doc) {
+    const container = doc.querySelector(options.container);

-      if (!container) {
-        return content;
+    if (!container) {
+      return;
+    }
+
+    // Compare the href attribute to 11ty's page URL
+    container.querySelectorAll('a[href]').forEach(a => {
+      if (normalize(a.getAttribute('href')) === normalize(this.page.url)) {
+        a.classList.add(options.className);
      }
-
-      // Compare the href attribute to 11ty's page URL
-      container.querySelectorAll('a[href]').forEach(a => {
-        if (normalize(a.getAttribute('href')) === normalize(this.page.url)) {
-          a.classList.add(options.className);
-        }
-      });
-
-      return doc.toString();
    });
  };
 }
--- a/packages/webawesome/docs/_transformers/format-code.js
+++ b/packages/webawesome/docs/_transformers/format-code.js
--- a/packages/webawesome/docs/_transformers/highlight-code.js
+++ b/packages/webawesome/docs/_transformers/highlight-code.js
@@ -37,36 +37,31 @@ export function highlightCode(code, language = 'plain') {
 * Eleventy plugin to highlight code blocks with the `language-*` attribute using Prism.js. Unlike most plugins, this
 * works on the entire document — not just markdown content.
 */
-export function highlightCodePlugin(options = {}) {
+export function highlightCodeTransformer(options = {}) {
  options = {
    container: 'body',
    ...options,
  };

-  return function (eleventyConfig) {
-    eleventyConfig.addTransform('highlight-code', content => {
-      const doc = parse(content, { blockTextElements: { code: true } });
-      const container = doc.querySelector(options.container);
+  return function (doc) {
+    const container = doc.querySelector(options.container);

-      if (!container) {
-        return content;
-      }
+    if (!container) {
+      return;
+    }

-      // Look for <code class="language-*"> and highlight each one
-      container.querySelectorAll('code[class*="language-"]').forEach(code => {
-        const langClass = [...code.classList.values()].find(val => val.startsWith('language-'));
-        const lang = langClass ? langClass.replace(/^language-/, '') : 'plain';
+    // Look for <code class="language-*"> and highlight each one
+    container.querySelectorAll('code[class*="language-"]').forEach(code => {
+      const langClass = [...code.classList.values()].find(val => val.startsWith('language-'));
+      const lang = langClass ? langClass.replace(/^language-/, '') : 'plain';

-        try {
-          code.innerHTML = highlightCode(code.textContent ?? '', lang);
-        } catch (err) {
-          if (!options.ignoreMissingLangs) {
-            throw new Error(err.message);
-          }
+      try {
+        code.innerHTML = highlightCode(code.textContent ?? '', lang);
+      } catch (err) {
+        if (!options.ignoreMissingLangs) {
+          throw new Error(err.message);
        }
-      });
-
-      return doc.toString();
+      }
    });
  };
 }
--- a/packages/webawesome/docs/_transformers/outline.js
+++ b/packages/webawesome/docs/_transformers/outline.js
@@ -0,0 +1,64 @@
+import { parse } from 'node-html-parser';
+
+/**
+ * Eleventy plugin to add an outline (table of contents) to the page. Headings must have an id, otherwise they won't be
+ * included in the outline. An unordered list containing links will be appended to the target element.
+ *
+ * If no headings are found for the outline, the `ifEmpty()` function will be called with a `node-html-parser` object as
+ * the first argument. This can be used to toggle classes or remove elements when the outline is empty.
+ *
+ * See the `node-html-parser` docs for more details: https://www.npmjs.com/package/node-html-parser
+ */
+export function outlineTransformer(options = {}) {
+  options = {
+    container: 'body',
+    target: '.outline',
+    selector: 'h2,h3',
+    ifEmpty: () => null,
+    ...options,
+  };
+
+  return function (doc) {
+    const container = doc.querySelector(options.container);
+    const ul = parse('<ul></ul>');
+    let numLinks = 0;
+
+    if (!container) {
+      return;
+    }
+
+    container.querySelectorAll(options.selector).forEach(heading => {
+      const id = heading.getAttribute('id');
+      const level = heading.tagName.slice(1);
+      const clone = parse(heading.outerHTML);
+
+      if (heading.closest('[data-no-outline]')) {
+        return;
+      }
+
+      // Create a clone of the heading so we can remove links and [data-no-outline] elements from the text content
+      clone.querySelectorAll('.wa-visually-hidden, [hidden], [aria-hidden="true"]').forEach(el => el.remove());
+      clone.querySelectorAll('[data-no-outline]').forEach(el => el.remove());
+
+      // Generate the link
+      const li = parse(`<li data-level="${level}"><a></a></li>`);
+      const a = li.querySelector('a');
+      a.setAttribute('href', `#${encodeURIComponent(id)}`);
+      a.textContent = clone.textContent.trim().replace(/#$/, '');
+
+      // Add it to the list
+      ul.firstChild.appendChild(li);
+      numLinks++;
+    });
+
+    if (numLinks > 0) {
+      // Append the list to all matching targets
+      doc.querySelectorAll(options.target).forEach(target => {
+        target.appendChild(parse(ul.outerHTML));
+      });
+    } else {
+      // Remove if empty
+      options.ifEmpty(doc);
+    }
+  };
+}
--- a/packages/webawesome/docs/_utils/anchor-headings.js
+++ b/packages/webawesome/docs/_utils/anchor-headings.js
@@ -1,85 +0,0 @@
-import { parse } from 'node-html-parser';
-import slugify from 'slugify';
-import { v4 as uuid } from 'uuid';
-
-function createId(text) {
-  let slug = slugify(String(text), {
-    remove: /[^\w|\s]/g,
-    lower: true,
-  });
-
-  // ids must start with a letter
-  if (!/^[a-z]/i.test(slug)) {
-    slug = `wa_${slug}`;
-  }
-
-  return slug;
-}
-
-/**
- * Eleventy plugin to add anchors to headings to content.
- */
-export function anchorHeadingsPlugin(options = {}) {
-  options = {
-    container: 'body',
-    headingSelector: 'h2, h3, h4, h5, h6',
-    anchorLabel: 'Jump to heading',
-    ...options,
-  };
-
-  return function (eleventyConfig) {
-    eleventyConfig.addTransform('anchor-headings', content => {
-      const doc = parse(content);
-      const container = doc.querySelector(options.container);
-
-      if (!container) {
-        return content;
-      }
-
-      // Look for headings
-      let selector = `:is(${options.headingSelector}):not([data-no-anchor], [data-no-anchor] *)`;
-      container.querySelectorAll(selector).forEach(heading => {
-        const hasAnchor = heading.querySelector('a');
-        const existingId = heading.getAttribute('id');
-        const clone = parse(heading.outerHTML);
-
-        // Create a clone of the heading so we can remove [data-no-anchor] elements from the text content
-        clone.querySelectorAll('[data-no-anchor]').forEach(el => el.remove());
-
-        if (hasAnchor) {
-          return;
-        }
-
-        let id = existingId;
-        if (!id) {
-          const slug = createId(clone.textContent ?? '') ?? uuid().slice(-12);
-          id = slug;
-          let suffix = 1;
-
-          // Make sure the slug is unique in the document
-          while (doc.getElementById(id) !== null) {
-            id = `${slug}-${++suffix}`;
-          }
-        }
-
-        // Create the anchor
-        const anchor = parse(`
-          <a href="#${encodeURIComponent(id)}">
-            <span class="wa-visually-hidden"></span>
-            <span aria-hidden="true">#</span>
-          </a>
-        `);
-        anchor.querySelector('.wa-visually-hidden').textContent = options.anchorLabel;
-
-        // Update the heading
-        if (!existingId) {
-          heading.setAttribute('id', id);
-        }
-        heading.classList.add('anchor-heading');
-        heading.appendChild(anchor);
-      });
-
-      return doc.toString();
-    });
-  };
-}
--- a/packages/webawesome/docs/_utils/copy-code.js
+++ b/packages/webawesome/docs/_utils/copy-code.js
@@ -1,41 +0,0 @@
-import { parse } from 'node-html-parser';
-
-/**
- * Eleventy plugin to add copy buttons to code blocks.
- */
-export function copyCodePlugin(eleventyConfig, options = {}) {
-  options = {
-    container: 'body',
-    ...options,
-  };
-
-  let codeCount = 0;
-  eleventyConfig.addTransform('copy-code', content => {
-    const doc = parse(content, { blockTextElements: { code: true } });
-    const container = doc.querySelector(options.container);
-
-    if (!container) {
-      return content;
-    }
-
-    // Look for code blocks
-    container.querySelectorAll('pre > code').forEach(code => {
-      const pre = code.closest('pre');
-      let preId = pre.getAttribute('id') || `code-block-${++codeCount}`;
-      let codeId = code.getAttribute('id') || `${preId}-inner`;
-
-      if (!code.getAttribute('id')) {
-        code.setAttribute('id', codeId);
-      }
-      if (!pre.getAttribute('id')) {
-        pre.setAttribute('id', preId);
-      }
-
-      // Add a copy button
-      pre.innerHTML += `<wa-button href="#${preId}" class="block-link-icon" appearance="plain" size="small"><wa-icon name="link" label="Copy link"></wa-icon></wa-button>
-        <wa-copy-button from="${codeId}" class="copy-button"></wa-copy-button>`;
-    });
-
-    return doc.toString();
-  });
-}
--- a/packages/webawesome/docs/_utils/outline.js
+++ b/packages/webawesome/docs/_utils/outline.js
@@ -1,69 +0,0 @@
-import { parse } from 'node-html-parser';
-
-/**
- * Eleventy plugin to add an outline (table of contents) to the page. Headings must have an id, otherwise they won't be
- * included in the outline. An unordered list containing links will be appended to the target element.
- *
- * If no headings are found for the outline, the `ifEmpty()` function will be called with a `node-html-parser` object as
- * the first argument. This can be used to toggle classes or remove elements when the outline is empty.
- *
- * See the `node-html-parser` docs for more details: https://www.npmjs.com/package/node-html-parser
- */
-export function outlinePlugin(options = {}) {
-  options = {
-    container: 'body',
-    target: '.outline',
-    selector: 'h2,h3',
-    ifEmpty: () => null,
-    ...options,
-  };
-
-  return function (eleventyConfig) {
-    eleventyConfig.addTransform('outline', content => {
-      const doc = parse(content);
-      const container = doc.querySelector(options.container);
-      const ul = parse('<ul></ul>');
-      let numLinks = 0;
-
-      if (!container) {
-        return content;
-      }
-
-      container.querySelectorAll(options.selector).forEach(heading => {
-        const id = heading.getAttribute('id');
-        const level = heading.tagName.slice(1);
-        const clone = parse(heading.outerHTML);
-
-        if (heading.closest('[data-no-outline]')) {
-          return;
-        }
-
-        // Create a clone of the heading so we can remove links and [data-no-outline] elements from the text content
-        clone.querySelectorAll('.wa-visually-hidden, [hidden], [aria-hidden="true"]').forEach(el => el.remove());
-        clone.querySelectorAll('[data-no-outline]').forEach(el => el.remove());
-
-        // Generate the link
-        const li = parse(`<li data-level="${level}"><a></a></li>`);
-        const a = li.querySelector('a');
-        a.setAttribute('href', `#${encodeURIComponent(id)}`);
-        a.textContent = clone.textContent.trim().replace(/#$/, '');
-
-        // Add it to the list
-        ul.firstChild.appendChild(li);
-        numLinks++;
-      });
-
-      if (numLinks > 0) {
-        // Append the list to all matching targets
-        doc.querySelectorAll(options.target).forEach(target => {
-          target.appendChild(parse(ul.outerHTML));
-        });
-      } else {
-        // Remove if empty
-        options.ifEmpty(doc);
-      }
-
-      return doc.toString();
-    });
-  };
-}
--- a/packages/webawesome/docs/_utils/simulate-webawesome-app.js
+++ b/packages/webawesome/docs/_utils/simulate-webawesome-app.js
@@ -0,0 +1,17 @@
+import nunjucks from 'nunjucks';
+
+/**
+ * This function simulates what a server would do running "on top" of eleventy.
+ */
+export function SimulateWebAwesomeApp(str) {
+  return nunjucks.renderString(str, {
+    // Stub the server EJS shortcodes.
+    currentUser: {
+      hasPro: false,
+    },
+    server: {
+      head: '',
+      flashes: '',
+    },
+  });
+}
--- a/packages/webawesome/docs/assets/images/bg-wa-pattern.svg
+++ b/packages/webawesome/docs/assets/images/bg-wa-pattern.svg
--- a/packages/webawesome/docs/assets/scripts/code-examples.js
+++ b/packages/webawesome/docs/assets/scripts/code-examples.js
@@ -56,10 +56,8 @@ document.addEventListener('click', event => {
    const code = codeExample.querySelector('code');
    const cdnUrl = document.documentElement.dataset.cdnUrl;
    const html =
-      `<script data-fa-kit-code="b10bfbde90" type="module" src="${cdnUrl}webawesome.loader.js"></script>\n` +
-      `<link rel="stylesheet" href="${cdnUrl}styles/themes/default.css">\n` +
-      `<link rel="stylesheet" href="${cdnUrl}styles/webawesome.css">\n` +
-      `<link rel="stylesheet" href="${cdnUrl}styles/utilities.css">\n\n` +
+      `<script data-fa-kit-code="38c11e3f20" type="module" src="${cdnUrl}webawesome.loader.js"></script>\n` +
+      `<link rel="stylesheet" href="${cdnUrl}styles/webawesome.css">\n\n` +
      `${code.textContent}`;
    const css = 'html > body {\n  padding: 2rem !important;\n}';
    const js = '';
--- a/packages/webawesome/docs/assets/scripts/color-scheme.js
+++ b/packages/webawesome/docs/assets/scripts/color-scheme.js
@@ -3,17 +3,30 @@ import { doViewTransition } from '../scripts/view-transitions.js';
 //
 // Updates the color scheme when a color scheme selector changes
 //
-function updateTheme(value) {
+async function updateTheme(value) {
  localStorage.setItem('color-scheme', value);

  const isDark = value === 'dark' || (value === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches);

-  doViewTransition(() => {
+  // Disable tooltip during transition
+  const tooltip = document.querySelector('#color-scheme-tooltip');
+  if (tooltip) {
+    tooltip.disabled = true;
+  }
+
+  await doViewTransition(() => {
    document.documentElement.classList.toggle('wa-dark', isDark);
  });

-  // Sync all selectors
+  // Sync all selectors and update tooltip
  document.querySelectorAll('.color-scheme-selector').forEach(el => (el.value = value));
+
+  // Update tooltip content and re-enable after transition completes
+  if (tooltip) {
+    const schemeText = value === 'light' ? 'Light' : value === 'dark' ? 'Dark' : 'System';
+    tooltip.textContent = schemeText;
+    tooltip.disabled = false;
+  }
 }

 // Handle changes
--- a/packages/webawesome/docs/assets/scripts/permalink.js
+++ b/packages/webawesome/docs/assets/scripts/permalink.js
@@ -1,178 +0,0 @@
-import { deepEach, deepGet, deepSet } from './util/deep.js';
-import { camelCase, kebabCase } from './util/string.js';
-
-export default class Permalink extends URLSearchParams {
-  /** Params changed since last URL I/O */
-  changed = false;
-
-  constructor(params) {
-    super(location.search);
-    this.params = params;
-  }
-
-  toJSON() {
-    return Object.fromEntries(this.entries());
-  }
-
-  /**
-   * Set multiple values from an object. Nested values will be joined with a hyphen.
-   * @param {object} values - The object containing the values to set.
-   * @param {object} defaults - The object containing the default values.
-   *
-   */
-  setAll(values, defaults) {
-    deepEach(values, (value, key, parent, path) => {
-      let fullPath = [...path, key];
-      let param = fullPath.map(kebabCase).join('-');
-
-      if (typeof value === 'object') {
-        // We'll handle this when we descend into it
-        return;
-      }
-
-      let defaultValue = deepGet(defaults, fullPath);
-
-      if (equals(value, defaultValue)) {
-        // Remove the param from the URL
-        this.delete(param);
-        return;
-      }
-
-      this.set(param, value);
-    });
-  }
-
-  /**
-   * Convert the URL params to a (potentially nested) object.
-   * @param {object} options - Options object.
-   * @param {(key: string, value: string) => string[]} options.getPath - Function to get the path of a param.
-   * @returns {object} The nested object.
-   */
-  toObject(options = {}) {
-    // Default getPath() assumes hyphens always mean nesting
-    let { ignoreKeys = [], getPath = param => param.split('-') } = options;
-
-    // Get all values as a nested object
-
-    let obj = {};
-
-    for (let [key, value] of this.entries()) {
-      let path = getPath(key, value);
-
-      if (path === null || ignoreKeys.includes(key)) {
-        // Skip this param
-        continue;
-      }
-
-      // Default to key if `getPath()` returns undefined
-      path ??= key;
-
-      path = Array.isArray(path) ? path : [path];
-
-      // Camel case any remaining hyphens
-      path = path.map(camelCase);
-
-      deepSet(obj, path, value);
-    }
-
-    return obj;
-  }
-
-  delete(key, value) {
-    let hadValue = this.has(key);
-    super.delete(key, value);
-
-    if (hadValue) {
-      this.changed = true;
-    }
-  }
-
-  set(key, value, defaultValue) {
-    if (equals(value, defaultValue) || equals(value, '')) {
-      value = null;
-    }
-
-    value ??= null; // undefined -> null
-
-    let oldValue = Array.isArray(value) ? this.getAll(key) : this.get(key);
-    let changed = !equals(value, oldValue);
-
-    if (!changed) {
-      // Nothing to do here
-      return;
-    }
-
-    if (Array.isArray(value)) {
-      super.delete(key);
-      value = value.slice();
-
-      for (let v of value) {
-        if (v || v === 0) {
-          if (typeof v === 'object') {
-            super.append(key, JSON.stringify(v));
-          } else {
-            super.append(key, v);
-          }
-        }
-      }
-    } else if (value === null) {
-      super.delete(key);
-    } else {
-      super.set(key, value);
-    }
-
-    this.sort();
-    this.changed ||= changed;
-  }
-
-  /**
-   * Update page URL if it has changed since last time
-   */
-  updateLocation() {
-    if (this.changed) {
-      // If there’s already a search, replace it.
-      // We don’t want to clog the user’s history while they iterate
-      let search = this.toString();
-      let historyAction = location.search && search ? 'replaceState' : 'pushState';
-      history[historyAction](null, '', `?${search}`);
-      this.changed = false;
-    }
-  }
-}
-
-function equals(value, oldValue) {
-  if (Array.isArray(value) || Array.isArray(oldValue)) {
-    value = toArray(value);
-    oldValue = toArray(oldValue);
-
-    if (value.length !== oldValue.length) {
-      return false;
-    }
-
-    return value.every((v, i) => equals(v, oldValue[i]));
-  }
-
-  // (value ?? oldValue ?? true) returns true if they're both empty (null or undefined)
-  [value, oldValue] = [value, oldValue].map(v => (!v && v !== false && v !== 0 ? null : v));
-  return value === oldValue || String(value) === String(oldValue);
-}
-
-/**
- * Convert a value to an array. `undefined` and `null` values are converted to an empty array.
- * @param {*} value - The value to convert.
- * @returns {any[]} The converted array.
- */
-function toArray(value) {
-  value ??= [];
-
-  if (Array.isArray(value)) {
-    return value;
-  }
-
-  // Don't convert "foo" into ["f", "o", "o"]
-  if (typeof value !== 'string' && typeof value[Symbol.iterator] === 'function') {
-    return Array.from(value);
-  }
-
-  return [value];
-}
--- a/packages/webawesome/docs/assets/scripts/scroll.js
+++ b/packages/webawesome/docs/assets/scripts/scroll.js
@@ -34,7 +34,8 @@ document.addEventListener('click', event => {
        top: target.offsetTop - headerHeight,
        behavior: 'smooth',
      });
-      history.pushState(undefined, undefined, `#${id}`);
+
+      history.replaceState(history.state, '', `#${id}`);
    }
  }
 });
--- a/packages/webawesome/docs/assets/scripts/theme.js
+++ b/packages/webawesome/docs/assets/scripts/theme.js
@@ -6,7 +6,20 @@ import { doViewTransition } from '../scripts/view-transitions.js';
 async function updateTheme(value, isInitialLoad = false) {
  const body = document.body;

+  // Get brand, palette, and theme name from the selected option
+  const themeSelector = document.querySelector('.theme-selector');
+  const selectedOption = themeSelector?.querySelector(`wa-dropdown-item[value="${value}"]`);
+  let brand = selectedOption?.getAttribute('data-brand') || 'blue';
+  let palette = selectedOption?.getAttribute('data-palette') || 'default';
+  let themeName = selectedOption?.textContent.trim() || 'Unknown';
+
  if (!isInitialLoad) {
+    // Disable tooltip during theme transition
+    const tooltip = document.querySelector('#theme-tooltip');
+    if (tooltip) {
+      tooltip.disabled = true;
+    }
+
    // Add fade-out class
    body.classList.add('theme-transitioning');

@@ -22,27 +35,29 @@ async function updateTheme(value, isInitialLoad = false) {
    });
  }

-  localStorage.setItem('theme', value);
+  // Handle site theme vs regular theme
+  let href = `/dist/styles/themes/${value}.css`;

-  // Get brand and palette from the selected option
-  const themeSelector = document.querySelector('.theme-selector');
-  const selectedOption = themeSelector?.querySelector(`wa-option[value="${value}"]`);
-  const brand = selectedOption?.getAttribute('data-brand') || 'blue';
-  const palette = selectedOption?.getAttribute('data-palette') || 'default';
-  const htmlElement = document.documentElement;
-
-  localStorage.setItem('brand', brand);
-  localStorage.setItem('palette', palette);
+  if (document.querySelector('wa-page')?.dataset.pageType === 'site') {
+    brand = 'orange';
+    href = `/assets/styles/theme-site.css`;
+    palette = 'default';
+    value = 'site';
+  } else {
+    localStorage.setItem('brand', brand);
+    localStorage.setItem('palette', palette);
+    localStorage.setItem('theme', value);
+  }

  // Update theme classes
+  const htmlElement = document.documentElement;
  const classesToRemove = Array.from(htmlElement.classList).filter(
    className =>
      className.startsWith('wa-theme-') || className.startsWith('wa-brand-') || className.startsWith('wa-palette-'),
  );
  const themeStylesheet = document.getElementById('theme-stylesheet');
-  const href = `/dist/styles/themes/${value}.css`;

-  doViewTransition(() => {
+  await doViewTransition(() => {
    // Update the theme
    if (themeStylesheet) {
      themeStylesheet.href = href;
@@ -56,16 +71,26 @@ async function updateTheme(value, isInitialLoad = false) {
    htmlElement.classList.add(`wa-palette-${palette}`);

    // Sync all theme selectors
-    document.querySelectorAll('.theme-selector').forEach(el => (el.value = value));
+    document.querySelectorAll('.theme-selector').forEach(el => {
+      el.value = value;
+      el.setAttribute('value', value);
+    });
+
+    // Update tooltip content to reflect the new theme
+    const tooltip = document.querySelector('#theme-tooltip');
+    if (tooltip) {
+      tooltip.textContent = `${themeName} Theme`;
+    }
  });

  if (!isInitialLoad) {
-    // Waiting for the stylesheet and all it's imports to load is tricky. Preloading doesn't work for most themes
-    // because applying the new stylesheet to the document, even without adding the `wa-theme-*` class, causes jank.
-    // Suggestions welcome.
-    setTimeout(() => {
-      body.classList.remove('theme-transitioning');
-    }, 500);
+    // Remove transition class and re-enable tooltip after view transition completes
+    body.classList.remove('theme-transitioning');
+
+    const tooltip = document.querySelector('#theme-tooltip');
+    if (tooltip) {
+      tooltip.disabled = false;
+    }
  }
 }

@@ -77,5 +102,11 @@ document.addEventListener('input', event => {
 });

 // Initialize
-const savedTheme = localStorage.getItem('theme') || 'default';
-updateTheme(savedTheme, true);
+function initializeTheme() {
+  const savedTheme = localStorage.getItem('theme') || 'default';
+  updateTheme(savedTheme, true);
+}
+
+initializeTheme();
+
+document.addEventListener('turbo:render', initializeTheme);
--- a/packages/webawesome/docs/assets/styles/code-examples.css
+++ b/packages/webawesome/docs/assets/styles/code-examples.css
@@ -3,7 +3,7 @@
  border: var(--wa-border-style) var(--wa-panel-border-width) var(--wa-color-neutral-border-quiet);
  border-radius: var(--wa-border-radius-l);
  color: var(--wa-color-text-normal);
-  margin-block-end: var(--wa-flow-spacing);
+  margin-block-end: var(--wa-content-spacing);
  isolation: isolate;
 }

@@ -100,8 +100,8 @@
 .code-example-buttons {
  display: flex;
  align-items: stretch;
-  background: var(--wa-color-surface-default) !important; /* TODO - remove after native styles refactor */
-  color: var(--wa-color-text-quiet) !important; /* TODO - remove after native styles refactor */
+  background: var(--wa-color-surface-default);
+  color: var(--wa-color-text-quiet);
  border-bottom-left-radius: inherit;
  border-bottom-right-radius: inherit;

@@ -116,14 +116,6 @@
    padding: 0.5rem;
    cursor: pointer;

-    @media (hover: hover) {
-      &:hover {
-        border-left: var(--wa-border-style) var(--wa-panel-border-width) var(--wa-color-neutral-border-quiet) !important; /* TODO - remove after native styles refactor */
-        background: var(--wa-color-surface-default) !important; /* TODO - remove after native styles refactor */
-        color: var(--wa-color-text-quiet) !important; /* TODO - remove after native styles refactor */
-      }
-    }
-
    &:first-of-type {
      border-left: none;
      border-bottom-left-radius: var(--wa-border-radius-l);
--- a/packages/webawesome/docs/assets/styles/code-highlighter.css
+++ b/packages/webawesome/docs/assets/styles/code-highlighter.css
@@ -1,22 +1,26 @@
 /* Only code blocks generated by our docs get these styles */
 pre[id*='code-block-'] {
-  background-color: var(--wa-color-gray-20);
+  color-scheme: dark;
  color: white;
+  background-color: var(--code-background, var(--wa-color-neutral-20));

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

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

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

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

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

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

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

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

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

@@ -45,19 +51,3 @@ wa-copy-button.copy-button {
    opacity: 1;
  }
 }
-
-.block-link-icon {
-  position: absolute;
-  inset-block-start: 0;
-  inset-inline-end: calc(100% + var(--wa-space-s));
-
-  transition: var(--wa-transition-slow);
-
-  &:not(:hover, :focus) {
-    opacity: 50%;
-  }
-
-  :not(:hover, :focus-within) > & {
-    opacity: 0;
-  }
-}
--- a/packages/webawesome/docs/assets/styles/docs.css
+++ b/packages/webawesome/docs/assets/styles/docs.css
@@ -5,6 +5,7 @@
@import 'search.css';
@import 'cera-typeface.css';
@import 'theme-icons.css';
+@import 'utils.css';

 :root {
  --wa-brand-orange: #f36944;
@@ -26,10 +27,6 @@ body.theme-transitioning {
  transition: opacity 200ms ease-out;
 }

-wa-page {
-  --wa-flow-spacing: var(--wa-space-xl);
-}
-
 /* Header */
 wa-page::part(header) {
  background-color: var(--wa-color-surface-default);
@@ -52,6 +49,16 @@ wa-page > header {
    line-height: 1;
  }

+  .brand-logo {
+    color: var(--wa-color-text-normal);
+    line-height: 1;
+  }
+
+  .brand-logo svg {
+    width: auto;
+    height: 1.75rem;
+  }
+
  wa-button[data-toggle-nav] {
    --text-color: currentColor;
    font-size: 1rem;
@@ -63,37 +70,6 @@ wa-page > header {
      padding-inline: 0.875rem;
    }
  }
-
-  svg {
-    width: auto;
-    height: 1.75rem;
-  }
-
-  #docs-branding,
-  #docs-toolbar {
-    display: flex;
-    align-items: center;
-    gap: var(--wa-space-xs);
-  }
-
-  #version-number {
-    color: var(--wa-color-text-quiet);
-    font-size: var(--wa-font-size-xs);
-    line-height: 1;
-    margin-block-start: var(--wa-space-2xs);
-  }
-  #version-number + wa-badge {
-    font-size: var(--wa-font-size-2xs);
-    text-transform: uppercase;
-  }
-  wa-button#search-trigger {
-    --background-color: var(--wa-form-control-background-color);
-    --border-color: var(--wa-form-control-border-color);
-  }
-  #search-trigger kbd {
-    font-size: var(--wa-font-size-2xs);
-    line-height: var(--wa-form-control-value-line-height);
-  }
 }

 #sidebar,
@@ -130,8 +106,8 @@ wa-page > header {
    border-inline-start: var(--wa-border-width-s) solid var(--wa-color-surface-border);
    font-size: var(--wa-font-size-s);
    line-height: var(--wa-line-height-condensed);
-    margin: 0;
    padding-inline-start: var(--wa-space-m);
+    margin: 0;
  }

  ul ul {
@@ -144,6 +120,7 @@ wa-page > header {

  li {
    list-style: none;
+    margin: 0;

    + li {
      margin-block-start: var(--wa-space-m);
@@ -166,11 +143,6 @@ wa-page > header {

  li wa-icon {
    color: var(--wa-color-text-quiet);
-    vertical-align: middle;
-
-    &[name='flask'] {
-      margin-inline: 0.125em;
-    }
  }
 }

@@ -178,37 +150,21 @@ wa-page > header {
  margin-block-end: var(--wa-space-m);
 }

-/* Pro badges */
-wa-badge.pro {
-  color: white;
-  background-color: var(--wa-brand-orange);
-  border-color: var(--wa-brand-orange);
-}
-
 #sidebar {
  h2 {
    color: var(--wa-color-text-quiet);

    a {
-      display: flex;
-      align-items: center;
-      gap: 0.4em;
      color: var(--wa-color-text-normal);
      text-decoration: none;

      wa-icon {
-        margin-block-end: -0.15em;
        font-size: var(--wa-font-size-s);
        font-weight: var(--wa-font-weight-action);
-        color: var(--wa-color-gray-70);
      }

      &:hover {
-        color: var(--wa-color-brand-on-normal);
-
-        wa-icon {
-          color: var(--wa-color-brand-on-quiet);
-        }
+        text-decoration: underline;
      }
    }
  }
@@ -225,10 +181,36 @@ wa-badge.pro {
    }
  }

+  li wa-badge {
+    /* adding 1 scale below --wa-font-size-2xs to handle badge proportions in sidebar nav */
+    --font-size-3xs: round(calc(var(--wa-font-size-2xs) / 1.125), 1px); /* 10px */
+    font-size: var(--font-size-3xs);
+  }
+
  wa-details {
    --show-duration: 0;
    --hide-duration: 0;
  }
+
+  .the-socials {
+    /* nudge those linkies left */
+    margin-inline-start: calc(var(--wa-space-xs) * -1);
+
+    a[target='_blank'] {
+      color: var(--wa-color-text-quiet);
+      padding-inline: var(--wa-space-xs);
+
+      &:hover {
+        color: var(--wa-color-text-normal);
+      }
+    }
+  }
+
+  #version-icon-info {
+    --secondary-opacity: 1;
+    --secondary-color: var(--wa-brand-orange);
+    padding-inline: var(--wa-space-xs);
+  }
 }

 wa-button.delete {
@@ -242,6 +224,17 @@ wa-button.delete {
  }
 }

+[slot='navigation-header'] {
+  wa-select::part(listbox) {
+    font-weight: var(--wa-font-weight-normal);
+  }
+}
+
+/* planned sidebar item */
+.is-planned {
+  color: var(--wa-color-text-quiet);
+}
+
 #sidebar-close-button {
  display: none;
 }
@@ -259,8 +252,23 @@ wa-button.delete {
  padding-bottom: 1rem;
 }

+wa-page::part(drawer__dialog),
 wa-page::part(menu) {
-  scrollbar-width: thin;
+  overflow: clip;
+}
+
+/* smaller viewports-based navigation */
+wa-page > [slot='navigation-header'] {
+  padding: 0;
+
+  .brand-logo svg {
+    height: 1.25rem;
+  }
+
+  /* resetting font-weight of dropdown items in .title */
+  wa-dropdown {
+    font-weight: var(--wa-font-weight-normal);
+  }
 }

 wa-page[view='mobile'] :is([slot='navigation-header'], [slot='navigation']) {
@@ -273,7 +281,7 @@ wa-page[view='mobile'] :is([slot='navigation-header'], [slot='navigation']) {

 /* Main content */
 wa-page > main {
-  max-width: 80ch;
+  max-width: var(--content-width-s);
  padding: var(--wa-space-xl);
  margin-inline: auto;
 }
@@ -290,7 +298,7 @@ h1.title {
  gap: var(--wa-space-xs);
  flex-wrap: wrap;
  align-items: center;
-  margin-block-end: var(--wa-flow-spacing);
+  margin-block-end: var(--wa-content-spacing);

  code {
    line-height: var(--wa-line-height-condensed);
@@ -333,7 +341,7 @@ h1.title {
  border: var(--wa-border-style) var(--wa-border-width-s);
  border-radius: var(--wa-border-radius-l);
  padding: 1rem;
-  margin-block-end: var(--wa-flow-spacing);
+  margin-block-end: var(--wa-content-spacing);

  :first-child {
    margin-block-start: 0;
@@ -379,9 +387,30 @@ h1.title {
  }
 }

+/* Images & Figures */
+
+figure.signpost {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-start;
+  gap: var(--wa-space-s);
+
+  img {
+    border: var(--wa-border-style) var(--wa-border-width-m) var(--wa-color-surface-border);
+  }
+
+  figcaption {
+    color: var(--wa-color-text-quiet);
+    font-size: var(--wa-font-size-xs);
+    line-height: var(--wa-line-height-condensed);
+    text-align: center;
+  }
+}
+
 /* Search list pages */
 wa-page > main:has(> .search-list) {
-  max-width: 120ch;
+  max-width: var(--content-width-l);
  margin-inline: auto;
 }

@@ -479,7 +508,6 @@ wa-card .page-name {
    width: 100%;
    height: 100%;
    display: block;
-    --background-color-hover: transparent;
    font-family: var(--wa-font-family-code);

    &::part(button) {
@@ -489,6 +517,7 @@ wa-card .page-name {
    }

    &::part(button):hover {
+      background-color: transparent;
      cursor: copy;
    }

@@ -584,12 +613,6 @@ table.colors {
  min-inline-size: 8rem;
 }

-/* Utilities */
-.two-columns {
-  columns: 2;
-  gap: 1rem;
-}
-
 /* Component API tables */
 wa-scroller:has(.component-table) {
  margin-block-end: var(--wa-space-xl);
@@ -602,7 +625,7 @@ wa-scroller:has(.component-table) {

  .table-arguments,
  .table-description {
-    min-width: 40ch;
+    min-width: var(--line-length-xs);
  }

  .table-reflect {
@@ -630,7 +653,7 @@ wa-scroller:has(.component-table) {
 }

 /** desktop */
-@media screen and not (max-width: 768px) {
+@media screen and not (max-width: 1180px) {
  /* Navigation sidebar */
  wa-page::part(navigation) {
    border-right: var(--wa-border-style) var(--wa-panel-border-width) var(--wa-color-surface-border);
@@ -651,10 +674,10 @@ wa-scroller:has(.component-table) {

 .page-wide {
  wa-page > main {
-    max-width: 140ch;
+    max-width: var(--content-width-l);

    .max-line-length {
-      max-width: 80ch;
+      max-width: var(--line-length-l);
    }
  }
 }
--- a/packages/webawesome/docs/assets/styles/utils.css
+++ b/packages/webawesome/docs/assets/styles/utils.css
@@ -0,0 +1,253 @@
+/* Monorepo Styles
+* These styles include elements that are shared across this repo as well as others included in the Web Awesome monorepo
+ */
+
+@layer wa-utils {
+  :root {
+    /* max-width for fixed width app-based pages
+     * We round() these to avoid obscure component rendering bugs caused by widths with fractional pixels */
+    --content-width-l: round(up, 132ch, 1px);
+    --content-width-m: round(up, 110ch, 1px);
+    --content-width-s: round(up, 80ch, 1px);
+    --content-width-xs: round(up, 50ch, 1px);
+    --content-padding-inline: 4ch;
+    --content-flow-spacing: 8ch;
+
+    --line-length-xs: 30ch;
+    --line-length-s: 45ch;
+    --line-length-m: 66ch;
+    --line-length-l: 77ch;
+    --line-length-xl: 90ch;
+    --line-length-none: none;
+  }
+
+  /* #region brand utilities */
+  .logo-webawesome {
+    color: var(--wa-brand-orange);
+  }
+  /* #endregion */
+
+  /* #region layout utilities */
+  .content-container {
+    margin-inline: auto;
+    max-width: var(--max-width, var(--content-width-l));
+    padding-inline: var(--content-padding-inline);
+  }
+  /* #endregion */
+
+  /* #region Text utilities */
+  .text-truncate {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  /* line-length */
+  .line-length {
+    max-width: var(--line-length, none);
+  }
+
+  .line-length-xs {
+    --line-length: var(--line-length-xs);
+  }
+  .line-length-s {
+    --line-length: var(--line-length-s);
+  }
+  .line-length-m {
+    --line-length: var(--line-length-m);
+  }
+  .line-length-l {
+    --line-length: var(--line-length-l);
+  }
+  .line-length-xl {
+    --line-length: var(--line-length-xl);
+  }
+  .line-length-none {
+    --line-length: none;
+  }
+  /* #endregion */
+
+  /* #region shared UI */
+  /* pro badge */
+  wa-badge.pro {
+    color: white;
+    background-color: var(--wa-brand-orange);
+    border-color: var(--wa-brand-orange);
+
+    + wa-tooltip {
+      font-size: var(--wa-font-size-xs);
+      --max-width: unset;
+    }
+  }
+
+  /* planned badge */
+  wa-badge.planned {
+    background-color: var(--wa-color-neutral-fill-quiet);
+    color: var(--wa-color-neutral-on-quiet);
+
+    + wa-tooltip {
+      font-size: var(--wa-font-size-xs);
+      --max-width: unset;
+    }
+  }
+
+  /* search trigger */
+  wa-button#search-trigger {
+    &::part(base) {
+      background-color: var(--wa-form-control-background-color);
+      border: var(--wa-form-control-border-width) var(--wa-form-control-border-style)
+        var(--wa-form-control-border-color);
+      box-shadow: none;
+    }
+    &::part(label) {
+      text-align: start;
+      width: 100%;
+    }
+  }
+  #search-trigger kbd {
+    font-size: var(--wa-font-size-2xs);
+    line-height: var(--wa-form-control-value-line-height);
+    padding-inline: 0.33em;
+  }
+
+  /* step icons for ordered instructions */
+  .step-icon {
+    --primary-color: var(--wa-color-neutral-20);
+    --secondary-color: var(--wa-color-neutral-80);
+    --secondary-opacity: 1;
+    font-size: 2em;
+
+    .wa-dark & {
+      --primary-color: var(--wa-color-neutral-90);
+      --secondary-color: var(--wa-color-neutral-30);
+    }
+  }
+
+  /* #endregion */
+
+  /* #region funsies + cosmetics */
+
+  /* grid background */
+  .background-grid {
+    --grid-spacing: var(--wa-space-2xl);
+    --grid-line-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 90%);
+    --grid-line-width: var(--wa-border-width-s);
+    --subgrid-spacing: calc(var(--grid-spacing) / 2);
+    --subgrid-line-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 95%);
+    --subgrid-line-width: var(--wa-border-width-s);
+
+    background-image:
+      /* main grid - vertical lines */
+      linear-gradient(to right, var(--grid-line-color) var(--grid-line-width), transparent var(--grid-line-width)),
+      /* main grid - horizontal lines */
+        linear-gradient(to bottom, var(--grid-line-color) var(--grid-line-width), transparent var(--grid-line-width)),
+      /* sub-grid - vertical lines (offset by half the main grid spacing) */
+        linear-gradient(
+          to right,
+          var(--subgrid-line-color) var(--subgrid-line-width),
+          transparent var(--subgrid-line-width)
+        ),
+      /* sub-grid - horizontal lines (offset by half the main grid spacing) */
+        linear-gradient(
+          to bottom,
+          var(--subgrid-line-color) var(--subgrid-line-width),
+          transparent var(--subgrid-line-width)
+        );
+
+    background-size:
+      var(--grid-spacing) var(--grid-spacing),
+      var(--grid-spacing) var(--grid-spacing),
+      var(--subgrid-spacing) var(--subgrid-spacing),
+      var(--subgrid-spacing) var(--subgrid-spacing);
+
+    background-position:
+      0 0,
+      0 0,
+      calc(var(--grid-spacing) / 2) calc(var(--grid-spacing) / 2),
+      calc(var(--grid-spacing) / 2) calc(var(--grid-spacing) / 2);
+  }
+
+  /* dot grid background */
+  .background-dot-grid {
+    --dot-spacing: 1.5rem;
+    --dot-radius: 1.5px;
+    --dot-color: color-mix(in oklab, var(--wa-color-text-normal), transparent 85%);
+
+    background-image: radial-gradient(circle, var(--dot-color) var(--dot-radius), transparent var(--dot-radius));
+    background-size: var(--dot-spacing) var(--dot-spacing);
+  }
+
+  /* wa illustration background pattern */
+  .background-wa-pattern {
+    position: relative;
+
+    & > * {
+      position: relative;
+      z-index: 1;
+    }
+
+    &::after {
+      --background-pattern-image: url('/assets/images/bg-wa-pattern.svg');
+
+      position: absolute;
+      inset: 0;
+      background-color: var(--background-pattern-color, transparent);
+      background-image: var(--background-pattern-image);
+      background-repeat: repeat;
+      content: '';
+      opacity: var(--background-pattern-opacity, 0.3);
+      z-index: 0;
+    }
+  }
+  /* #endregion */
+
+  /* buttons with icon toggle on hover */
+  wa-button .icon-hover {
+    display: none;
+  }
+  wa-button:hover .icon-default {
+    display: none;
+  }
+  wa-button:hover .icon-hover {
+    display: inline-flex;
+  }
+  /* #endregion */
+
+  /* #region resets */
+  code.appearance-plain {
+    background: transparent;
+    border: none;
+  }
+
+  a.appearance-plain {
+    --wa-color-text-link: var(--wa-color-text-normal);
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  ul,
+  ol {
+    &.appearance-plain {
+      list-style: none;
+      padding-inline-start: 0;
+
+      li {
+        padding-inline-start: 0;
+      }
+    }
+  }
+
+  /* increasing visual size of icons in certain contexts (such as in plain buttons) */
+  wa-icon.icon-embiggen {
+    font-size: round(1.125em, 1px);
+  }
+
+  /* decreasing visual size of icons in certain contexts (such as in sidebar nav) */
+  wa-icon.icon-shrink {
+    font-size: round(0.875em, 1px);
+  }
+  /* #endregion */
+}
--- a/packages/webawesome/docs/docs/color-palettes.njk
+++ b/packages/webawesome/docs/docs/color-palettes.njk
@@ -2,7 +2,6 @@
 title: Color Palettes
 description: 'Color palettes give you a full spectrum of colors to add life to your project.'
 layout: page
-isPro: true
 ---

 <p>Color palettes give you a full spectrum of colors to add life to your project.</p>
@@ -14,9 +13,36 @@ isPro: true
 {% endfor %}

 <div id="color-palettes">
+  {% raw %}
+    {% if not currentUser.hasPro %}
+      <p>
+        Additional palettes are available to pro users. Please <a href="/login">login to view pro palettes</a>.
+      </p>
+    {% endif %}
+  {% endraw %}
  <wa-radio-group id="palette-picker" label="Color Palette" value="default" orientation="horizontal">
    {% for palette in themer.palettes %}
-      <wa-radio class="palette-card" value="{{ palette.name | lower }}">{{ palette.name }}</wa-radio>
+      {% if not palette.isPro %}
+        <wa-radio
+          class="palette-card"
+          value="{{ palette.name | lower }}"
+        >
+          {{ palette.name }}
+        </wa-radio>
+      {% else %}
+        {% raw %}
+          {% if currentUser.hasPro %}
+        {% endraw %}
+            <wa-radio
+              class="palette-card"
+              value="{{ palette.name | lower }}"
+            >
+              {{ palette.name }}
+            </wa-radio>
+        {% raw %}
+          {% endif %}
+        {% endraw %}
+      {% endif %}
    {% endfor %}
  </wa-radio-group>

@@ -44,7 +70,7 @@ isPro: true
  {% for palette in themer.palettes %}
  <div class="palette-instructions" data-palette="{{ palette.name | lower }}" {% if not loop.first %}hidden{% endif %}>
    <p>
-      To import this palette, set <code>&lt;html class=&quot;wa-theme-{{ palette.name | lower }}&quot;&gt;</code> and import the following stylesheet:
+      To import this palette, set <code>&lt;html class=&quot;wa-palette-{{ palette.name | lower }}&quot;&gt;</code> and import the following stylesheet:
    </p>
    <pre><code class="language-html">&lt;link rel=&quot;stylesheet&quot; href=&quot;{% cdnUrl %}styles/color/palettes/{{ palette.filename }}&quot; /&gt;</code></pre>
  </div>
@@ -55,7 +81,7 @@ isPro: true
  const paletteContainer = document.getElementById('color-palettes');
  const palettePicker = document.getElementById('palette-picker');

-  // Set first radio as checked and add initial theme class
+  // Set first radio as checked and add initial palette class
  const firstRadio = palettePicker.querySelector('wa-radio');
  if (firstRadio) {
    firstRadio.checked = true;
@@ -95,7 +121,6 @@ isPro: true
      display: flex;
      flex-direction: row;
      flex-wrap: wrap;
-      gap: var(--wa-space-s);
    }

    &::part(form-control-label) {
@@ -124,13 +149,16 @@ isPro: true
    border: 1px solid var(--wa-color-surface-border);
    border-radius: var(--border-radius);
    box-shadow: var(--wa-shadow-s);
-    cursor: pointer;
    transition: all 0.2s ease;
    text-align: center;
    font-weight: var(--wa-font-weight-action);
    text-transform: capitalize;
  }

+  .palette-card:not(:state(disabled)) {
+    cursor: pointer;
+  }
+
  .palette-card:state(checked) {
    border-color: var(--wa-color-brand-border-loud);
    background-color: var(--wa-color-brand-fill-quiet);
--- a/packages/webawesome/docs/docs/components/badge.md
+++ b/packages/webawesome/docs/docs/components/badge.md
@@ -30,31 +30,31 @@ Use the `appearance` attribute to change the badge's visual appearance.
 ```html {.example}
 <div style="margin-block-end: 1rem;">
  <wa-badge appearance="accent" variant="neutral">Accent</wa-badge>
-  <wa-badge appearance="filled outlined" variant="neutral">Filled + Outlined</wa-badge>
+  <wa-badge appearance="filled-outlined" variant="neutral">Filled-Outlined</wa-badge>
  <wa-badge appearance="filled" variant="neutral">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="neutral">Outlined</wa-badge>
 </div>
 <div style="margin-block-end: 1rem;">
  <wa-badge appearance="accent" variant="brand">Accent</wa-badge>
-  <wa-badge appearance="filled outlined" variant="brand">Filled + Outlined</wa-badge>
+  <wa-badge appearance="filled-outlined" variant="brand">Filled-Outlined</wa-badge>
  <wa-badge appearance="filled" variant="brand">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="brand">Outlined</wa-badge>
 </div>
 <div style="margin-block-end: 1rem;">
  <wa-badge appearance="accent" variant="success">Accent</wa-badge>
-  <wa-badge appearance="filled outlined" variant="success">Filled + Outlined</wa-badge>
+  <wa-badge appearance="filled-outlined" variant="success">Filled-Outlined</wa-badge>
  <wa-badge appearance="filled" variant="success">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="success">Outlined</wa-badge>
 </div>
 <div style="margin-block-end: 1rem;">
  <wa-badge appearance="accent" variant="warning">Accent</wa-badge>
-  <wa-badge appearance="filled outlined" variant="warning">Filled + Outlined</wa-badge>
+  <wa-badge appearance="filled-outlined" variant="warning">Filled-Outlined</wa-badge>
  <wa-badge appearance="filled" variant="warning">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="warning">Outlined</wa-badge>
 </div>
 <div>
  <wa-badge appearance="accent" variant="danger">Accent</wa-badge>
-  <wa-badge appearance="filled outlined" variant="danger">Filled + Outlined</wa-badge>
+  <wa-badge appearance="filled-outlined" variant="danger">Filled-Outlined</wa-badge>
  <wa-badge appearance="filled" variant="danger">Filled</wa-badge>
  <wa-badge appearance="outlined" variant="danger">Outlined</wa-badge>
 </div>
--- a/packages/webawesome/docs/docs/components/button-group.md
+++ b/packages/webawesome/docs/docs/components/button-group.md
@@ -15,47 +15,12 @@ category: Actions

 ## Examples

-### Button Sizes
-
-Unless otherwise specified,
-the size of [buttons](/docs/components/button) will be determined by the Button Group's `size` attribute.
-
-```html {.example}
-<wa-button-group size="small" label="Alignment">
-  <wa-button>Left</wa-button>
-  <wa-button>Center</wa-button>
-  <wa-button>Right</wa-button>
-</wa-button-group>
-
-<br /><br />
-
-<wa-button-group size="medium" label="Alignment">
-  <wa-button>Left</wa-button>
-  <wa-button>Center</wa-button>
-  <wa-button>Right</wa-button>
-</wa-button-group>
-
-<br /><br />
-
-<wa-button-group size="large" label="Alignment">
-  <wa-button>Left</wa-button>
-  <wa-button>Center</wa-button>
-  <wa-button>Right</wa-button>
-</wa-button-group>
-```
-
-:::info
-While you can still set the size of [buttons](/docs/components/button) individually,
-and it will override the inherited size,
-it is rarely a good idea to mix sizes within the same button group.
-:::
-
 ### Vertical Button Groups

 Set the `orientation` attribute to `vertical` to make a vertical button group.

 ```html {.example}
-<wa-button-group orientation="vertical" label="Options" style="max-width: 120px;">
+<wa-button-group orientation="vertical" label="Options">
  <wa-button>
    <wa-icon slot="start" name="plus"></wa-icon>
    New
--- a/packages/webawesome/docs/docs/components/button.md
+++ b/packages/webawesome/docs/docs/components/button.md
@@ -31,35 +31,35 @@ Use the `appearance` attribute to change the button's visual appearance.
 <div class="wa-stack">
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="neutral">Accent</wa-button>
-    <wa-button appearance="filled outlined" variant="neutral">Filled + Outlined</wa-button>
+    <wa-button appearance="filled-outlined" variant="neutral">Filled-Outlined</wa-button>
    <wa-button appearance="filled" variant="neutral">Filled</wa-button>
    <wa-button appearance="outlined" variant="neutral">Outlined</wa-button>
    <wa-button appearance="plain" variant="neutral">Plain</wa-button>
  </div>
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="brand">Accent</wa-button>
-    <wa-button appearance="filled outlined" variant="brand">Filled + Outlined</wa-button>
+    <wa-button appearance="filled-outlined" variant="brand">Filled-Outlined</wa-button>
    <wa-button appearance="filled" variant="brand">Filled</wa-button>
    <wa-button appearance="outlined" variant="brand">Outlined</wa-button>
    <wa-button appearance="plain" variant="brand">Plain</wa-button>
  </div>
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="success">Accent</wa-button>
-    <wa-button appearance="filled outlined" variant="success">Filled + Outlined</wa-button>
+    <wa-button appearance="filled-outlined" variant="success">Filled-Outlined</wa-button>
    <wa-button appearance="filled" variant="success">Filled</wa-button>
    <wa-button appearance="outlined" variant="success">Outlined</wa-button>
    <wa-button appearance="plain" variant="success">Plain</wa-button>
  </div>
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="warning">Accent</wa-button>
-    <wa-button appearance="filled outlined" variant="warning">Filled + Outlined</wa-button>
+    <wa-button appearance="filled-outlined" variant="warning">Filled-Outlined</wa-button>
    <wa-button appearance="filled" variant="warning">Filled</wa-button>
    <wa-button appearance="outlined" variant="warning">Outlined</wa-button>
    <wa-button appearance="plain" variant="warning">Plain</wa-button>
  </div>
  <div class="wa-gap-2xs">
    <wa-button appearance="accent" variant="danger">Accent</wa-button>
-    <wa-button appearance="filled outlined" variant="danger">Filled + Outlined</wa-button>
+    <wa-button appearance="filled-outlined" variant="danger">Filled-Outlined</wa-button>
    <wa-button appearance="filled" variant="danger">Filled</wa-button>
    <wa-button appearance="outlined" variant="danger">Outlined</wa-button>
    <wa-button appearance="plain" variant="danger">Plain</wa-button>
@@ -183,6 +183,9 @@ Use the `start` and `end` slots to add presentational elements like `<wa-icon>`
 Use the `with-caret` attribute to add a dropdown indicator when a button will trigger a dropdown, menu, or popover.

 ```html {.example}
+<wa-button size="small" with-caret>
+  <wa-icon name="gear" label="Settings"></wa-icon>
+</wa-button>
 <wa-button size="small" with-caret>Small</wa-button>
 <wa-button size="medium" with-caret>Medium</wa-button>
 <wa-button size="large" with-caret>Large</wa-button>
--- a/packages/webawesome/docs/docs/components/callout.md
+++ b/packages/webawesome/docs/docs/components/callout.md
@@ -60,7 +60,7 @@ Set the `variant` attribute to change the callout's variant.

 ### Appearance

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

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

 <br />

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

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

-  <div slot="footer" class="wa-split">
-    <wa-button variant="brand" pill>More Info</wa-button>
-    <wa-rating label="Rating"></wa-rating>
-  </div>
+  <wa-button slot="footer" variant="brand" pill>More Info</wa-button>
+  <wa-rating slot="footer-actions" label="Rating"></wa-rating>
 </wa-card>

 <style>
@@ -55,14 +53,11 @@ If using SSR, you need to also use the `with-header` attribute to add a header t

 ```html {.example}
 <wa-card class="card-header">
-  <div slot="header" class="wa-split">
-    Header Title
-    <wa-button appearance="plain">
-      <wa-icon name="gear" variant="solid" label="Settings"></wa-icon>
-    </wa-button>
-  </div>
-
+  <h3 slot="header">Header Title</h3>
  This card has a header. You can put all sorts of things in it!
+  <wa-button appearance="plain" slot="header-actions">
+    <wa-icon name="gear" variant="solid" label="Settings"></wa-icon>
+  </wa-button>
 </wa-card>

 <style>
@@ -85,10 +80,9 @@ If using SSR, you need to also use the `with-footer` attribute to add a footer t
 <wa-card class="card-footer">
  This card has a footer. You can put all sorts of things in it!

-  <div slot="footer" class="wa-split">
-    <wa-rating></wa-rating>
-    <wa-button variant="brand">Preview</wa-button>
-  </div>
+  <wa-rating slot="footer"></wa-rating>
+
+  <wa-button slot="footer-actions" variant="brand">Preview</wa-button>
 </wa-card>

 <style>
@@ -143,7 +137,7 @@ Use the `appearance` attribute to change the card's visual appearance.
    />
    Outlined (default)
  </wa-card>
-  {% for appearance in ['outlined filled', 'plain', 'filled', 'accent'] -%}
+  {% for appearance in ['filled-outlined', 'plain', 'filled', 'accent'] -%}
  <wa-card appearance="{{ appearance }}">
    <img
      slot="media"
@@ -155,3 +149,35 @@ Use the `appearance` attribute to change the card's visual appearance.
  {%- endfor %}
 </div>
 ```
+
+### Orientation
+
+Set the `orientation` attribute to `horizontal` to create a card with a horizontal, side-by-side layout. Make sure to set a width or maximum width for the media slot. Horizontal cards do not currently contain the header and footer slots.
+<wa-callout>
+<wa-icon slot="icon" name="circle-info" variant="regular"></wa-icon>
+The `actions` slot is only available for the horizontal orientation
+</wa-callout>
+
+```html {.example}
+<div class="wa-grid">
+  <wa-card orientation="horizontal" class="horizontal-card">
+    <img
+      slot="media"
+      src="https://images.unsplash.com/photo-1559209172-0ff8f6d49ff7?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=500&q=80"
+      alt="A kitten sits patiently between a terracotta pot and decorative grasses."
+    />
+    This is a kitten, but not just any kitten. This kitten likes walking along pallets.
+    <wa-button slot="actions" variant="neutral" appearance="plain"
+      ><wa-icon name="ellipsis" label="actions"></wa-icon
+    ></wa-button>
+  </wa-card>
+</div>
+
+<style>
+  .horizontal-card {
+    img[slot='media'] {
+      max-width: 300px;
+    }
+  }
+</style>
+```
--- a/packages/webawesome/docs/docs/components/carousel.md
+++ b/packages/webawesome/docs/docs/components/carousel.md
@@ -344,7 +344,7 @@ The content of the carousel can be changed by adding or removing carousel items.

 ### Vertical Scrolling

-Setting the `orientation` attribute to `vertical` will render the carousel in a vertical layout. If the content of your slides vary in height, you will need to set amn explicit `height` or `max-height` on the carousel using CSS.
+Setting the `orientation` attribute to `vertical` will render the carousel in a vertical layout. If the content of your slides vary in height, you will need to set an explicit `height` or `max-height` on the carousel using CSS.

 ```html {.example}
 <wa-carousel class="vertical" pagination orientation="vertical">
--- a/packages/webawesome/docs/docs/components/copy-button.md
+++ b/packages/webawesome/docs/docs/components/copy-button.md
@@ -56,10 +56,12 @@ To copy data from an attribute, use `from="id[attr]"` where `id` is the id of th
 <br /><br />

 <!-- Copies the input's "value" property -->
-<wa-input id="my-input" type="text" value="User input" style="display: inline-block; max-width: 300px;"></wa-input>
-<wa-copy-button from="my-input.value"></wa-copy-button>
+<span class="wa-align-items-center wa-gap-2xs">
+  <wa-input id="my-input" type="text" value="User input" style="display: inline-block; max-width: 300px;"></wa-input>
+  <wa-copy-button from="my-input.value"></wa-copy-button>
+</span>

-<br /><br />
+<br />

 <!-- Copies the link's "href" attribute -->
 <a id="my-link" href="https://shoelace.style/">Web Awesome Website</a>
@@ -88,6 +90,7 @@ Copy buttons can be disabled by adding the `disabled` attribute.

 A success indicator is briefly shown after copying. You can customize the length of time the indicator is shown using the `feedback-duration` attribute.

+
 ```html {.example}
 <wa-copy-button value="Web Awesome rocks!" feedback-duration="250"></wa-copy-button>
 ```
@@ -132,4 +135,4 @@ You can customize the button to your liking with CSS.
    outline-offset: 4px;
  }
 </style>
-```
+```
--- a/packages/webawesome/docs/docs/components/details.md
+++ b/packages/webawesome/docs/docs/components/details.md
@@ -48,6 +48,23 @@ Use the `expand-icon` and `collapse-icon` slots to change the expand and collaps
 </style>
 ```

+### Icon Position
+
+The default position for the expand and collapse icons is at the end of the summary. Set the `icon-placement` attribute to `start` to place the icon at the start of the summary.
+
+```html {.example}
+<div class="wa-stack">
+  <wa-details summary="Start" icon-placement="start">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
+    aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+  </wa-details>
+  <wa-details summary="End" icon-placement="end">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
+    aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+  </wa-details>
+</div>
+```
+
 ### HTML in Summary

 To use HTML in the summary, use the `summary` slot.
@@ -68,12 +85,17 @@ Links and other interactive elements will still retain their behavior:

 ### Right-to-Left Languages

-The details component automatically adapts to right-to-left languages:
+The details component, including its `icon-placement`, automatically adapts to right-to-left languages:

 ```html {.example}
-<wa-details summary="تبديلني" lang="ar" dir="rtl">
-  استخدام طريقة لوريم إيبسوم لأنها تعطي توزيعاَ طبيعياَ -إلى حد ما- للأحرف عوضاً عن
-</wa-details>
+<div class="wa-stack">
+  <wa-details summary="تبديلني" lang="ar" dir="rtl">
+    استخدام طريقة لوريم إيبسوم لأنها تعطي توزيعاَ طبيعياَ -إلى حد ما- للأحرف عوضاً عن
+  </wa-details>
+  <wa-details summary="تبديلني" lang="ar" dir="rtl" icon-placement="start">
+    استخدام طريقة لوريم إيبسوم لأنها تعطي توزيعاَ طبيعياَ -إلى حد ما- للأحرف عوضاً عن
+  </wa-details>
+</div>
 ```

 ### Appearance
@@ -86,11 +108,11 @@ Use the `appearance` attribute to change the element’s visual appearance.
    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
    aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
  </wa-details>
-  <wa-details summary="Filled" appearance="filled">
+  <wa-details summary="Filled-outlined" appearance="filled-outlined">
    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
    aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
  </wa-details>
-  <wa-details summary="Filled + Outlined" appearance="filled outlined">
+  <wa-details summary="Filled" appearance="filled">
    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
    aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
  </wa-details>
--- a/packages/webawesome/docs/docs/components/dropdown.md
+++ b/packages/webawesome/docs/docs/components/dropdown.md
@@ -32,7 +32,7 @@ Dropdowns are designed to work well with [dropdown items](/docs/components/dropd
    <wa-dropdown-item slot="submenu" value="show-thumbnails">Show Thumbnails</wa-dropdown-item>
  </wa-dropdown-item>
  <wa-divider></wa-divider>
-  <wa-dropdown-item type="checkbox" checked>Emoji Shortcuts<wa-dropdown-item>
+  <wa-dropdown-item type="checkbox" checked>Emoji Shortcuts</wa-dropdown-item>
  <wa-dropdown-item type="checkbox" checked>Word Wrap</wa-dropdown-item>
  <wa-divider></wa-divider>
  <wa-dropdown-item variant="danger">
@@ -96,7 +96,7 @@ Use the `icon` slot to add icons to [dropdown items](/docs/components/dropdown-i
    Paste
  </wa-dropdown-item>

-  <wa-dropdown-item value="delete">
+  <wa-dropdown-item value="delete" variant="danger">
    <wa-icon slot="icon" name="trash"></wa-icon>
    Delete
  </wa-dropdown-item>
@@ -273,10 +273,10 @@ The distance from the panel to the trigger can be customized using the `distance

 ### Offset

-The offset of the panel along the trigger can be customized using the `offset` attribute. This value is specified in pixels.
+The offset of the panel along the trigger can be customized using the `skidding` attribute. This value is specified in pixels.

 ```html {.example}
-<wa-dropdown offset="30">
+<wa-dropdown skidding="30">
  <wa-button slot="trigger" with-caret>Edit</wa-button>

  <wa-dropdown-item>Cut</wa-dropdown-item>
--- a/packages/webawesome/docs/docs/components/icon.md
+++ b/packages/webawesome/docs/docs/components/icon.md
@@ -7,6 +7,10 @@ category: Imagery

 Web Awesome comes bundled with over 2,000 free icons courtesy of [Font Awesome](https://fontawesome.com/). These icons are part of the `default` icon library. Font Awesome Pro users can unlock additional icon families. Or, if you prefer, you can register your own [custom icon library](#icon-library).

+```html {.example}
+<wa-icon name="face-awesome" variant="light" label="Awesome" style="font-size: 2em;"></wa-icon>
+```
+
 :::info
 Not sure which icon to use? [Find the perfect icon over at Font Awesome!](https://fontawesome.com/search?o=r&m=free&f=brands%2Cclassic)
 :::
@@ -17,73 +21,58 @@ Not sure which icon to use? [Find the perfect icon over at Font Awesome!](https:

 The default icon library is Font Awesome Free, which comes with two icon families: `classic` and `brands`. Use the `family` attribute to set the icon family.

-Many Font Awesome Pro icon families have variants such as `thin`, `light`, `regular`, and `solid`. Font Awesome Pro users can [provide their kit code](/docs/#using-font-awesome-kit-codes) to unlock additional families, including `sharp`, `duotone`, and `sharp-duotone`. For these icon families, use the `variant` attribute to set the variant.
+Many Font Awesome Pro icon families have variants such as `thin`, `light`, `regular`, and `solid`. Font Awesome Pro users can [provide their kit code](/docs/#using-font-awesome-kit-codes) to unlock additional premium icon families, including `sharp`, `duotone`, `sharp-duotone`, and additional Pro+ icon packs.
+
+For supportive icon families, use the `variant` attribute to set the variant.

 ```html {.example}
-<wa-icon name="eyedropper"></wa-icon>
-<wa-icon name="grip-vertical"></wa-icon>
-<wa-icon name="play"></wa-icon>
-<wa-icon name="star"></wa-icon>
-<wa-icon name="user"></wa-icon>
-```
-
-### Colors
-
-Icons inherit their color from the current text color. Thus, you can set the `color` property on the `<wa-icon>` element or an ancestor to change the color.
-
-```html {.example}
-<div style="color: #4a90e2;">
-  <wa-icon name="exclamation-triangle"></wa-icon>
-  <wa-icon name="archive"></wa-icon>
-  <wa-icon name="battery-three-quarters"></wa-icon>
-  <wa-icon name="bell"></wa-icon>
+<div class="wa-stack wa-gap-xl">
+  <div class="wa-flank" style="--flank-size: 12ch;">
+    <span>Classic</span>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon name="eyedropper"></wa-icon>
+      <wa-icon variant="regular" name="grip-vertical"></wa-icon>
+      <wa-icon variant="light" name="play"></wa-icon>
+      <wa-icon variant="thin" name="star"></wa-icon>
+    </div>
+  </div>
+  <div class="wa-flank" style="--flank-size: 12ch;">
+    <span>Duotone</span>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon family="duotone" name="eyedropper"></wa-icon>
+      <wa-icon family="duotone" variant="regular" name="grip-vertical"></wa-icon>
+      <wa-icon family="duotone" variant="light" name="play"></wa-icon>
+      <wa-icon family="duotone" variant="thin" name="star"></wa-icon>
+    </div>
+  </div>
+  <div class="wa-flank" style="--flank-size: 12ch;">
+    <span>Sharp</span>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon family="sharp" name="eyedropper"></wa-icon>
+      <wa-icon family="sharp" variant="regular" name="grip-vertical"></wa-icon>
+      <wa-icon family="sharp" variant="light" name="play"></wa-icon>
+      <wa-icon family="sharp" variant="thin" name="star"></wa-icon>
+    </div>
+  </div>
+  <div class="wa-flank" style="--flank-size: 12ch;">
+    <span>Sharp Duotone</span>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon family="sharp-duotone" name="eyedropper"></wa-icon>
+      <wa-icon family="sharp-duotone" variant="regular" name="grip-vertical"></wa-icon>
+      <wa-icon family="sharp-duotone" variant="light" name="play"></wa-icon>
+      <wa-icon family="sharp-duotone" variant="thin" name="star"></wa-icon>
+    </div>
+  </div>
+  <div class="wa-flank" style="--flank-size: 12ch;">
+    <span>Brands</span>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon family="brands" name="font-awesome"></wa-icon>
+      <wa-icon family="brands" name="web-awesome"></wa-icon>
+      <wa-icon family="brands" name="github"></wa-icon>
+      <wa-icon family="brands" name="discord"></wa-icon>
+    </div>
+  </div>
 </div>
-<div style="color: #9013fe;">
-  <wa-icon name="clock"></wa-icon>
-  <wa-icon name="cloud"></wa-icon>
-  <wa-icon name="download"></wa-icon>
-  <wa-icon name="file"></wa-icon>
-</div>
-<div style="color: #417505;">
-  <wa-icon name="flag"></wa-icon>
-  <wa-icon name="heart"></wa-icon>
-  <wa-icon name="image"></wa-icon>
-  <wa-icon name="bolt-lightning"></wa-icon>
-</div>
-<div style="color: #f5a623;">
-  <wa-icon name="microphone"></wa-icon>
-  <wa-icon name="search"></wa-icon>
-  <wa-icon name="star"></wa-icon>
-  <wa-icon name="trash"></wa-icon>
-</div>
-```
-
-### Sizing
-
-Icons are sized relative to the current font size. To change their size, set the `font-size` property on the icon itself or on a parent element as shown below.
-
-```html {.example}
-<div style="font-size: 32px;">
-  <wa-icon name="bell"></wa-icon>
-  <wa-icon name="heart"></wa-icon>
-  <wa-icon name="image"></wa-icon>
-  <wa-icon name="microphone"></wa-icon>
-  <wa-icon name="search"></wa-icon>
-  <wa-icon name="star"></wa-icon>
-</div>
-```
-
-### Fixed Width Icons
-
-By default, icons have a 1em height and a variable width. Use the `fixed-width` attribute to render the host element in a 1em by 1em box.
-
-```html {.example}
-<wa-icon fixed-width name="cloud"></wa-icon>
-<wa-icon fixed-width name="user"></wa-icon>
-<wa-icon fixed-width name="truck"></wa-icon>
-<wa-icon fixed-width name="file"></wa-icon>
-<wa-icon fixed-width name="skating"></wa-icon>
-<wa-icon fixed-width name="snowplow"></wa-icon>
 ```

 ### Labels
@@ -91,9 +80,335 @@ By default, icons have a 1em height and a variable width. Use the `fixed-width`
 For non-decorative icons, use the `label` attribute to announce it to assistive devices.

 ```html {.example}
-<wa-icon name="star" label="Add to favorites"></wa-icon>
+<wa-icon name="star" label="Favorite" style="font-size: 1.5em;"></wa-icon>
 ```

+### Sizing
+
+Icons are sized relative to the current font size. To change their size, set the `font-size` property on the icon itself or on a parent element as shown below.
+
+```html {.example}
+<div class="wa-cluster" style="font-size: 44px;">
+  <wa-icon name="bell"></wa-icon>
+  <wa-icon name="heart"></wa-icon>
+  <wa-icon name="image"></wa-icon>
+  <wa-icon name="microphone"></wa-icon>
+  <wa-icon name="search"></wa-icon>
+  <wa-icon name="star"></wa-icon>
+</div>
+```
+
+### Auto Width
+
+By default, icons have a `1em` height and a fixed `1.25em` width. Use the `auto-width` attribute to allow the icon to use its natural variable width.
+
+```html {.example}
+Without auto-width<br />
+<div style="font-size: 1.5em; color: #193154;">
+  <wa-icon family="solid" name="exclamation" style="background: lightsalmon;"></wa-icon>
+  <wa-icon family="solid" name="circle-check" style="background: lightsalmon;"></wa-icon>
+  <wa-icon family="solid" name="input-numeric" style="background: lightsalmon;"></wa-icon>
+  <wa-icon family="solid" name="ruler-vertical" style="background: lightsalmon;"></wa-icon>
+  <wa-icon family="solid" name="ruler-horizontal" style="background: lightsalmon;"></wa-icon>
+  <wa-icon family="solid" name="airplay" style="background: lightsalmon;"></wa-icon>
+</div>
+
+<br />
+
+With auto-width<br />
+<div style="font-size: 1.5em; color: #193154;">
+  <wa-icon auto-width family="solid" name="exclamation" style="background: lightsalmon;"></wa-icon>
+  <wa-icon auto-width family="solid" name="circle-check" style="background: lightsalmon;"></wa-icon>
+  <wa-icon auto-width family="solid" name="input-numeric" style="background: lightsalmon;"></wa-icon>
+  <wa-icon auto-width family="solid" name="ruler-vertical" style="background: lightsalmon;"></wa-icon>
+  <wa-icon auto-width family="solid" name="ruler-horizontal" style="background: lightsalmon;"></wa-icon>
+  <wa-icon auto-width family="solid" name="airplay" style="background: lightsalmon;"></wa-icon>
+</div>
+```
+
+### Colors
+
+Icons inherit their color from the current text color. Thus, you can set the `color` property on the `<wa-icon>` element or an ancestor to change the color.
+
+```html {.example}
+<div class="wa-cluster" style="font-size: 1.5em;">
+  <wa-icon name="strawberry" style="color: salmon;"></wa-icon>
+  <wa-icon name="crab" style="color: coral;"></wa-icon>
+  <wa-icon name="sun" style="color: gold;"></wa-icon>
+  <wa-icon name="leaf" style="color: mediumseagreen;"></wa-icon>
+  <wa-icon name="cloud-showers-heavy" style="color: steelblue;"></wa-icon>
+  <wa-icon name="cat-space" style="color: mediumpurple;"></wa-icon>
+</div>
+```
+
+### Duotone
+
+Font Awesome's [Duotone icons](https://docs.fontawesome.com/web/style/duotone) change with the `color` property as well, but you can customize the primary and secondary colors independently using the `--primary-color` and `--secondary-color` custom properties. To change the opacity of either, use `--primary-opacity` and `--secondary-opacity`.
+
+Note that these custom properties will not inherit and _must be applied directly to the icon_.
+
+```html {.example}
+<div class="wa-stack">
+  <div class="wa-cluster" style="font-size: 1.5em;">
+    <wa-icon
+      family="duotone"
+      name="crow"
+      style="--primary-color: dodgerblue; --secondary-color: gold; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      name="campfire"
+      style="--primary-color: sienna; --secondary-color: red; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      name="birthday-cake"
+      style="--primary-color: pink; --secondary-color: palevioletred; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      name="ear"
+      style="--primary-color: sandybrown; --secondary-color: bisque; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      name="corn"
+      style="--primary-color: mediumseagreen; --secondary-color: gold; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      name="cookie-bite"
+      style="--primary-color: saddlebrown; --secondary-color: burlywood; --secondary-opacity: 1.0;"
+    ></wa-icon>
+  </div>
+
+  <div class="wa-cluster" style="font-size: 1.5em;">
+    <wa-icon
+      family="duotone"
+      variant="regular"
+      name="crow"
+      style="--primary-color: dodgerblue; --secondary-color: gold; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="regular"
+      name="campfire"
+      style="--primary-color: sienna; --secondary-color: red; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="regular"
+      name="birthday-cake"
+      style="--primary-color: pink; --secondary-color: palevioletred; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="regular"
+      name="ear"
+      style="--primary-color: sandybrown; --secondary-color: bisque; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="regular"
+      name="corn"
+      style="--primary-color: mediumseagreen; --secondary-color: gold; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="regular"
+      name="cookie-bite"
+      style="--primary-color: saddlebrown; --secondary-color: burlywood; --secondary-opacity: 1.0;"
+    ></wa-icon>
+  </div>
+
+  <div class="wa-cluster" style="font-size: 1.5em;">
+    <wa-icon
+      family="duotone"
+      variant="light"
+      name="crow"
+      style="--primary-color: dodgerblue; --secondary-color: gold; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="light"
+      name="campfire"
+      style="--primary-color: sienna; --secondary-color: red; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="light"
+      name="birthday-cake"
+      style="--primary-color: pink; --secondary-color: palevioletred; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="light"
+      name="ear"
+      style="--primary-color: sandybrown; --secondary-color: bisque; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="light"
+      name="corn"
+      style="--primary-color: mediumseagreen; --secondary-color: gold; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="light"
+      name="cookie-bite"
+      style="--primary-color: saddlebrown; --secondary-color: burlywood; --secondary-opacity: 1.0;"
+    ></wa-icon>
+  </div>
+
+  <div class="wa-cluster" style="font-size: 1.5em;">
+    <wa-icon
+      family="duotone"
+      variant="thin"
+      name="crow"
+      style="--primary-color: dodgerblue; --secondary-color: gold; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="thin"
+      name="campfire"
+      style="--primary-color: sienna; --secondary-color: red; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="thin"
+      name="birthday-cake"
+      style="--primary-color: pink; --secondary-color: palevioletred; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="thin"
+      name="ear"
+      style="--primary-color: sandybrown; --secondary-color: bisque; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="thin"
+      name="corn"
+      style="--primary-color: mediumseagreen; --secondary-color: gold; --secondary-opacity: 1.0;"
+    ></wa-icon>
+    <wa-icon
+      family="duotone"
+      variant="thin"
+      name="cookie-bite"
+      style="--primary-color: saddlebrown; --secondary-color: burlywood; --secondary-opacity: 1.0;"
+    ></wa-icon>
+  </div>
+</div>
+```
+
+:::info
+Duotone icons can be unlocked by [providing a valid Font Awesome kit code](/docs/#using-font-awesome-kit-codes).
+:::
+
+### Swap Duotone Opacity
+
+For duotone icons, you can swap the primary and secondary opacity values using the `swap-opacity` attribute. This is useful when you want to emphasize the secondary layer of the icon.
+
+```html {.example}
+Normal duotone<br />
+<div class="wa-cluster" style="font-size: 1.5em;">
+  <wa-icon family="duotone" name="home"></wa-icon>
+  <wa-icon family="duotone" name="user"></wa-icon>
+  <wa-icon family="duotone" name="envelope"></wa-icon>
+  <wa-icon family="duotone" name="calendar"></wa-icon>
+</div>
+
+<br />
+
+Swapped duotone<br />
+<div class="wa-cluster" style="font-size: 1.5em;">
+  <wa-icon family="duotone" name="home" swap-opacity></wa-icon>
+  <wa-icon family="duotone" name="user" swap-opacity></wa-icon>
+  <wa-icon family="duotone" name="envelope" swap-opacity></wa-icon>
+  <wa-icon family="duotone" name="calendar" swap-opacity></wa-icon>
+</div>
+```
+
+### Font Awesome Pro+
+
+If you're a [Font Awesome Pro+ customer](https://fontawesome.com/), you have access to even more premium icons! Just set the appropriate `family`, `variant`, and `name` on the icon.
+
+```html {.example}
+<div class="wa-stack wa-gap-xl">
+  <div class="wa-flank" style="--flank-size: 10ch;">
+    <a href="https://fontawesome.com/icons/packs/notdog" target="_blank">Notdog</a>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon family="notdog" variant="solid" name="house"></wa-icon>
+      <wa-icon
+        family="notdog"
+        variant="duo-solid"
+        name="house"
+        style="--secondary-color: skyblue; --secondary-opacity: 0.8;"
+      ></wa-icon>
+    </div>
+  </div>
+
+  <div class="wa-flank" style="--flank-size: 10ch;">
+    <a href="https://fontawesome.com/icons/packs/chisel" target="_blank">Chisel</a>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon family="chisel" variant="regular" name="house"></wa-icon>
+    </div>
+  </div>
+
+  <div class="wa-flank" style="--flank-size: 10ch;">
+    <a href="https://fontawesome.com/icons/packs/etch" target="_blank">Etch</a>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon family="etch" variant="solid" name="house"></wa-icon>
+    </div>
+  </div>
+
+  <div class="wa-flank" style="--flank-size: 10ch;">
+    <a href="https://fontawesome.com/icons/packs/jelly" target="_blank">Jelly</a>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon family="jelly" variant="regular" name="house"></wa-icon>
+      <wa-icon
+        family="jelly"
+        variant="duo-regular"
+        name="house"
+        style="--secondary-color: skyblue; --secondary-opacity: 0.8;"
+      ></wa-icon>
+      <wa-icon family="jelly" variant="fill-regular" name="house"></wa-icon>
+    </div>
+  </div>
+
+  <div class="wa-flank" style="--flank-size: 10ch;">
+    <a href="https://fontawesome.com/icons/packs/slab" target="_blank">Slab</a>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon family="slab" variant="regular" name="house"></wa-icon>
+      <wa-icon family="slab" variant="press-regular" name="house"></wa-icon>
+    </div>
+  </div>
+
+  <div class="wa-flank" style="--flank-size: 10ch;">
+    <a href="https://fontawesome.com/icons/packs/thumbprint" target="_blank">Thumbprint</a>
+    <div class="wa-cluster" style="font-size: 1.5em;">
+      <wa-icon
+        family="thumbprint"
+        variant="light"
+        name="house"
+        style="--secondary-color: skyblue; --secondary-opacity: 0.8;"
+      ></wa-icon>
+    </div>
+  </div>
+
+  <div class="wa-flank" style="--flank-size: 10ch;">
+    <a href="https://fontawesome.com/icons/packs/whiteboard" target="_blank">Whiteboard</a>
+    <div class="wa-cluster" style="font-size: 32px;">
+      <wa-icon family="whiteboard" variant="semibold" name="house"></wa-icon>
+    </div>
+  </div>
+</div>
+```
+
+:::info
+Pro+ icons can be unlocked by [providing a valid Font Awesome kit code](/docs/#using-font-awesome-kit-codes).
+:::
+
 ### Custom Icons

 Custom icons can be loaded individually with the `src` attribute. Only SVGs on a local or CORS-enabled endpoint are supported. If you're using more than one custom icon, it might make sense to register a [custom icon library](#icon-libraries).
@@ -287,7 +602,9 @@ Icons in this library are licensed under the [MIT License](https://github.com/lu
  import { registerIconLibrary } from '/dist/webawesome.js';

  registerIconLibrary('iconoir', {
-    resolver: name => `https://cdn.jsdelivr.net/gh/lucaburgio/iconoir@latest/icons/${name}.svg`,
+    resolver: (name, family) => {
+      return `https://cdn.jsdelivr.net/npm/iconoir@7.11.0/icons/regular/${name}.svg`;
+    },
    mutator: svg =>
      svg.querySelectorAll('path').forEach(path => {
        path.setAttribute('fill', 'none');
@@ -297,7 +614,7 @@ Icons in this library are licensed under the [MIT License](https://github.com/lu
 </script>

 <div style="font-size: 24px;">
-  <wa-icon library="iconoir" name="check-circled-outline"></wa-icon>
+  <wa-icon library="iconoir" name="check-circle"></wa-icon>
  <wa-icon library="iconoir" name="drawer"></wa-icon>
  <wa-icon library="iconoir" name="keyframes"></wa-icon>
  <wa-icon library="iconoir" name="headset-help"></wa-icon>
--- a/packages/webawesome/docs/docs/components/input.md
+++ b/packages/webawesome/docs/docs/components/input.md
@@ -60,7 +60,9 @@ Add the `password-toggle` attribute to add a toggle button that will show the pa
 Use the `appearance` attribute to change the input's visual appearance.

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

 ### Disabled
--- a/packages/webawesome/docs/docs/components/intersection-observer.md
+++ b/packages/webawesome/docs/docs/components/intersection-observer.md
@@ -0,0 +1,297 @@
+---
+title: Intersection Observer
+description: Tracks immediate child elements and fires events as they move in and out of view.
+layout: component
+---
+
+This component leverages the [IntersectionObserver API](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver) to track when its direct children enter or leave a designated root element. The `wa-intersect` event fires whenever elements cross the visibility threshold.
+
+```html {.example}
+<div id="intersection__overview">
+  <wa-intersection-observer threshold="1" intersect-class="visible">
+    <div class="box"><wa-icon name="bulb"></wa-icon></div>
+  </wa-intersection-observer>
+</div>
+
+<small>Scroll to see the element intersect at 100% visibility</small>
+
+<style>
+  /* Container styles */
+  #intersection__overview {
+    display: flex;
+    flex-direction: column;
+    gap: 2rem;
+    height: 300px;
+    border: solid 2px var(--wa-color-surface-border);
+    padding: 1rem;
+    overflow-y: auto;
+
+    /* Spacers to demonstrate scrolling */
+    &::before {
+      content: '';
+      height: 260px;
+      flex-shrink: 0;
+    }
+
+    &::after {
+      content: '';
+      height: 260px;
+      flex-shrink: 0;
+    }
+
+    /* Box styles */
+    .box {
+      flex-shrink: 0;
+      width: 120px;
+      height: 120px;
+      background-color: var(--wa-color-neutral-fill-normal);
+      color: var(--wa-color-neutral-10);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-inline: auto;
+      transition: all 50ms cubic-bezier(0.68, -0.55, 0.265, 1.55);
+
+      wa-icon {
+        font-size: 3rem;
+        stroke-width: 1px;
+      }
+
+      &.visible {
+        background-color: var(--wa-color-brand-60);
+        color: white;
+      }
+    }
+
+    + small {
+      display: block;
+      text-align: center;
+      margin-block-start: 1rem;
+    }
+  }
+</style>
+```
+
+:::info
+Keep in mind that only direct children of the host element are monitored. Nested elements won't trigger intersection events.
+:::
+
+## Usage Examples
+
+### Adding Observable Content
+
+The intersection observer tracks only its direct children. The component uses [`display: contents`](https://developer.mozilla.org/en-US/docs/Web/CSS/display#contents) styling, which makes it seamless to integrate with flex and grid layouts from a parent container.
+
+```html
+<div style="display: flex; flex-direction: column;">
+  <wa-intersection-observer>
+    <div class="box">Box 1</div>
+    <div class="box">Box 2</div>
+    <div class="box">Box 3</div>
+  </wa-intersection-observer>
+</div>
+```
+
+The component tracks elements as they enter and exit the root element (viewport by default) and emits the `wa-intersect` event on state changes. The event provides `event.detail.entry`, an [`IntersectionObserverEntry`](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserverEntry) object with intersection details.
+
+You can identify the triggering element through `entry.target`. Check `entry.isIntersecting` to determine if an element is entering or exiting the viewport.
+
+```javascript
+observer.addEventListener('wa-intersect', event => {
+  const entry = event.detail.entry;
+
+  if (entry.isIntersecting) {
+    console.log('Element entered viewport:', entry.target);
+  } else {
+    console.log('Element left viewport:', entry.target);
+  }
+});
+```
+
+### Setting a Custom Root Element
+
+You can observe intersections within a specific container by assigning the `root` attribute to the [root element's](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver/root) ID. Apply [`rootMargin`](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver/rootMargin) with the `root-margin` attribute to expand or contract the observation area.
+
+```html
+<div id="scroll-container">
+  <wa-intersection-observer root="scroll-container" root-margin="50px 0px"> ... </wa-intersection-observer>
+</div>
+```
+
+### Configuring Multiple Thresholds
+
+Track different visibility percentages by providing multiple [`threshold`](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#threshold) values as a space-separated list.
+
+```html
+<wa-intersection-observer threshold="0 0.25 0.5 0.75 1"> ... </wa-intersection-observer>
+```
+
+### Applying Classes on Intersect
+
+The `intersect-class` attribute automatically toggles the specified class on direct children when they become visible. This enables pure CSS styling without JavaScript event handlers.
+
+```html {.example}
+<div id="intersection__classes">
+  <wa-intersection-observer threshold="0.5" intersect-class="visible" root="intersection__classes">
+    <div class="box fade">Fade In</div>
+    <div class="box slide">Slide In</div>
+    <div class="box scale">Scale & Rotate</div>
+    <div class="box bounce">Bounce</div>
+  </wa-intersection-observer>
+</div>
+
+<small>Scroll to see elements transition at 50% visibility</small>
+
+<style>
+  /* Container styles */
+  #intersection__classes {
+    display: flex;
+    flex-direction: column;
+    gap: 2rem;
+    height: 300px;
+    border: solid 2px var(--wa-color-surface-border);
+    padding: 1rem;
+    overflow-y: auto;
+
+    /* Spacers to demonstrate scrolling */
+    &::before {
+      content: '';
+      height: 260px;
+      flex-shrink: 0;
+    }
+
+    &::after {
+      content: '';
+      height: 260px;
+      flex-shrink: 0;
+    }
+
+    + small {
+      display: block;
+      text-align: center;
+      margin-block-start: 1rem;
+    }
+
+    /* Shared box styles */
+    .box {
+      flex-shrink: 0;
+      width: 120px;
+      height: 120px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      text-align: center;
+      color: white;
+      opacity: 0;
+      padding: 2rem;
+      margin-inline: auto;
+
+      /* Fade */
+      &.fade {
+        background: var(--wa-color-brand-fill-loud);
+        color: var(--wa-color-brand-on-loud);
+        transform: translateY(30px);
+        transition: all 0.6s ease;
+
+        &.visible {
+          opacity: 1;
+          transform: translateY(0);
+        }
+      }
+
+      /* Slide */
+      &.slide {
+        background: var(--wa-color-brand-fill-loud);
+        color: var(--wa-color-brand-on-loud);
+        transform: translateX(-50px);
+        transition: all 0.5s ease;
+
+        &.visible {
+          opacity: 1;
+          transform: translateX(0);
+        }
+      }
+
+      /* Scale */
+      &.scale {
+        background: var(--wa-color-brand-fill-loud);
+        color: var(--wa-color-brand-on-loud);
+        transform: scale(0.6) rotate(-15deg);
+        transition: all 0.7s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+
+        &.visible {
+          opacity: 1;
+          transform: scale(1) rotate(0deg);
+        }
+      }
+
+      /* Bounce In and Out */
+      &.bounce {
+        background: var(--wa-color-brand-fill-loud);
+        color: var(--wa-color-brand-on-loud);
+        opacity: 0;
+        transform: scale(0.8);
+        transition: none;
+
+        &.visible {
+          opacity: 1;
+          transform: scale(1);
+          animation: bounceIn 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55) forwards;
+        }
+
+        &:not(.visible) {
+          animation: bounceOut 0.6s cubic-bezier(0.68, -0.55, 0.265, 1.55) forwards;
+        }
+      }
+    }
+  }
+
+  @keyframes bounceIn {
+    0% {
+      transform: scale(0.8);
+    }
+    40% {
+      transform: scale(1.08);
+    }
+    65% {
+      transform: scale(0.98);
+    }
+    80% {
+      transform: scale(1.02);
+    }
+    90% {
+      transform: scale(0.99);
+    }
+    100% {
+      transform: scale(1);
+    }
+  }
+
+  @keyframes bounceOut {
+    0% {
+      transform: scale(1);
+      opacity: 1;
+    }
+    20% {
+      transform: scale(1.02);
+      opacity: 1;
+    }
+    40% {
+      transform: scale(0.98);
+      opacity: 0.8;
+    }
+    60% {
+      transform: scale(1.05);
+      opacity: 0.6;
+    }
+    80% {
+      transform: scale(0.95);
+      opacity: 0.3;
+    }
+    100% {
+      transform: scale(0.8);
+      opacity: 0;
+    }
+  }
+</style>
+```
--- a/packages/webawesome/docs/docs/components/popover.md
+++ b/packages/webawesome/docs/docs/components/popover.md
@@ -91,7 +91,7 @@ Use the `distance` attribute to control how far the popover appears from its anc

 ### Arrow Size

-Use the `--arrow-size` custom property to change the size of the popover's arrow. Set it to `0` to remove the arrow entirely.
+Use the `--arrow-size` custom property to change the size of the popover's arrow. To remove it, use the `without-arrow` attribute.

 ```html {.example}
 <div style="display: flex; gap: 1rem; align-items: center;">
@@ -99,7 +99,7 @@ Use the `--arrow-size` custom property to change the size of the popover's arrow
  <wa-popover for="popover__big-arrow" style="--arrow-size: 8px;">I have a big arrow</wa-popover>

  <wa-button id="popover__no-arrow">No arrow</wa-button>
-  <wa-popover for="popover__no-arrow" style="--arrow-size: 0;">I don't have an arrow</wa-popover>
+  <wa-popover for="popover__no-arrow" without-arrow>I don't have an arrow</wa-popover>
 </div>
 ```

--- a/packages/webawesome/docs/docs/components/popup.md
+++ b/packages/webawesome/docs/docs/components/popup.md
@@ -416,6 +416,8 @@ By default, the arrow will be aligned as close to the center of the _anchor_ as
 </div>
 ```

+{# TODO: this example totally destroys browsers. Needs investigation.
+
 ### Syncing with the Anchor's Dimensions

 Use the `sync` attribute to make the popup the same width or height as the anchor element. This is useful for controls that need the popup to stay the same width or height as the trigger.
@@ -467,6 +469,7 @@ Use the `sync` attribute to make the popup the same width or height as the ancho
  sync.addEventListener('change', () => (popup.sync = sync.value));
 </script>
 ```
+#}

 ### Flip

@@ -848,4 +851,4 @@ This example anchors a popup to the mouse cursor using a virtual element. As suc
 The following classes can be applied to the popup's `popup` part to animate it in or out programmatically. You can control the animation duration with the `--show-duration` and `--hide-duration` custom properties.

 - `show` / `hide` - Shows or hides the popover with a fade
- `show-with-scale` / `hide-with-scale` - Shows or hides the popover with a fade and subtle scale effect
+- `show-with-scale` / `hide-with-scale` - Shows or hides the popover with a fade and subtle scale effect
--- a/packages/webawesome/docs/docs/components/progress-bar.md
+++ b/packages/webawesome/docs/docs/components/progress-bar.md
@@ -21,10 +21,10 @@ Use the `label` attribute to label the progress bar and tell assistive devices h

 ### Custom Height

-Use the `height` CSS property to set the progress bar's height.
+Use the `--track-height` custom property to set the progress bar's height.

 ```html {.example}
-<wa-progress-bar value="50" style="height: 6px;"></wa-progress-bar>
+<wa-progress-bar value="50" style="--track-height: 6px;"></wa-progress-bar>
 ```

 ### Showing Values
--- a/packages/webawesome/docs/docs/components/relative-time.md
+++ b/packages/webawesome/docs/docs/components/relative-time.md
@@ -8,7 +8,7 @@ category: Utilities
 Localization is handled by the browser's [`Intl.RelativeTimeFormat` API](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat). No language packs are required.

 ```html {.example}
-<!-- Web Awesome 2 release date 🎉 -->
+<!-- Shoelace 2 release date 🎉 -->
 <wa-relative-time date="2020-07-15T09:17:00-04:00"></wa-relative-time>
 ```

--- a/packages/webawesome/docs/docs/components/select.md
+++ b/packages/webawesome/docs/docs/components/select.md
@@ -7,7 +7,7 @@ category: Form Controls

 ```html {.example}
 <wa-select>
-  <wa-option value="option-1">Option 1</wa-option>
+  <wa-option value="">Option 1</wa-option>
  <wa-option value="option-2">Option 2</wa-option>
  <wa-option value="option-3">Option 3</wa-option>
  <wa-option value="option-4">Option 4</wa-option>
@@ -80,6 +80,18 @@ Use the `appearance` attribute to change the select's visual appearance.
  <wa-option value="option-2">Option 2</wa-option>
  <wa-option value="option-3">Option 3</wa-option>
 </wa-select>
+<br />
+<wa-select appearance="filled-outlined">
+  <wa-option value="option-1">Option 1</wa-option>
+  <wa-option value="option-2">Option 2</wa-option>
+  <wa-option value="option-3">Option 3</wa-option>
+</wa-select>
+<br />
+<wa-select appearance="outlined">
+  <wa-option value="option-1">Option 1</wa-option>
+  <wa-option value="option-2">Option 2</wa-option>
+  <wa-option value="option-3">Option 3</wa-option>
+</wa-select>
 ```

 ### Pill
@@ -173,7 +185,7 @@ Use `<wa-divider>` to group listbox items visually. You can also use `<small>` t

 ### Sizes

-Use the `size` attribute to change a select's size. Note that size does not apply to listbox options.
+Use the `size` attribute to change a select's size.

 ```html {.example}
 <wa-select placeholder="Small" size="small">
@@ -366,6 +378,7 @@ Here's a comprehensive example showing different lazy loading scenarios:

    const option = document.createElement('wa-option');
    option.setAttribute('value', 'foo');
+    option.selected = true;
    option.innerText = 'Foo';

    // For the multiple select with existing selected options, make the new option selected
--- a/packages/webawesome/docs/docs/components/slider.md
+++ b/packages/webawesome/docs/docs/components/slider.md
@@ -7,8 +7,8 @@ category: Form Controls

 ```html {.example}
 <wa-slider
-  label="Number of cats"
-  hint="Limit six per household"
+  label="Number of users"
+  hint="Limit six per team"
  name="value"
  value="3"
  min="0"
@@ -40,7 +40,7 @@ Use the `label` attribute to give the slider an accessible label. For labels tha
 Add descriptive hint to a slider with the `hint` attribute. For hints that contain HTML, use the `hint` slot instead.

 ```html {.example}
-<wa-slider label="Volume" hint="Controls the volume of the current song." min="0" max="100"></wa-slider>
+<wa-slider label="Volume" hint="Controls the volume of the current song." min="0" max="100" value="50"></wa-slider>
 ```

 ### Showing tooltips
@@ -72,7 +72,15 @@ Use the `with-markers` attribute to display visual indicators at each step incre
 Use the `reference` slot to add contextual labels below the slider. References are automatically spaced using `space-between`, making them easy to align with the start, center, and end positions.

 ```html {.example}
-<wa-slider label="Speed" name="speed" min="1" max="5" value="3" with-markers>
+<wa-slider
+  label="Speed"
+  name="speed"
+  min="1"
+  max="5"
+  value="3"
+  with-markers
+  hint="Controls the speed of the thing you're currently doing."
+>
  <span slot="reference">Slow</span>
  <span slot="reference">Medium</span>
  <span slot="reference">Fast</span>
@@ -249,8 +257,8 @@ By default, the filled indicator extends from the minimum value to the current p

 ```html {.example}
 <wa-slider
-  label="Cat playfulness"
-  hint="Energy level during playtime"
+  label="User Friendliness"
+  hint="Did you find our product easy to use?"
  name="value"
  value="0"
  min="-5"
@@ -259,8 +267,9 @@ By default, the filled indicator extends from the minimum value to the current p
  with-markers
  with-tooltip
 >
-  <span slot="reference">Lazy</span>
-  <span slot="reference">Zoomies</span>
+  <span slot="reference">Easy</span>
+  <span slot="reference">Moderate</span>
+  <span slot="reference">Difficult</span>
 </wa-slider>
 ```

--- a/packages/webawesome/docs/docs/components/tag.md
+++ b/packages/webawesome/docs/docs/components/tag.md
@@ -18,47 +18,42 @@ category: Feedback & Status
 ### Appearance

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

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

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

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

  <p>
-    <wa-tag variant="danger" appearance="outlined accent">Outlined accent</wa-tag>
    <wa-tag variant="danger" appearance="accent">Accent</wa-tag>
-    <wa-tag variant="danger" appearance="outlined">Outlined</wa-tag>
+    <wa-tag variant="danger" appearance="filled-outlined">Filled-Outlined</wa-tag>
    <wa-tag variant="danger" appearance="filled">Filled</wa-tag>
-    <wa-tag variant="danger" appearance="outlined filled">Outlined Filled</wa-tag>
+    <wa-tag variant="danger" appearance="outlined">Outlined</wa-tag>
  </p>
 </div>
 ```
--- a/packages/webawesome/docs/docs/components/textarea.md
+++ b/packages/webawesome/docs/docs/components/textarea.md
@@ -6,7 +6,7 @@ category: Form Controls
 ---

 ```html {.example}
-<wa-textarea label="Type something', will ya"></wa-textarea>
+<wa-textarea label="Type somethin', will ya"></wa-textarea>
 ```

 :::info
@@ -52,7 +52,9 @@ Use the `placeholder` attribute to add a placeholder.
 Use the `appearance` attribute to change the textarea's visual appearance.

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

 ### Disabled
--- a/packages/webawesome/docs/docs/components/tooltip.md
+++ b/packages/webawesome/docs/docs/components/tooltip.md
@@ -113,11 +113,11 @@ Tooltips can be controller programmatically by setting the `trigger` attribute t

 ### Removing Arrows

-You can control the size of tooltip arrows by overriding the `--wa-tooltip-arrow-size` design token. To remove them, set the value to `0` as shown below.
+You can control the size of tooltip arrows by overriding the `--wa-tooltip-arrow-size` design token. To remove the arrow, use the `without-arrow` attribute.

 ```html {.example}
 <wa-button id="no-arrow">No Arrow</wa-button>
-<wa-tooltip for="no-arrow" style="--wa-tooltip-arrow-size: 0;">This is a tooltip with no arrow</wa-tooltip>
+<wa-tooltip for="no-arrow" without-arrow>This is a tooltip with no arrow</wa-tooltip>
 ```

 To override it globally, set it in a root block in your stylesheet after the Web Awesome stylesheet is loaded.
--- a/packages/webawesome/docs/docs/components/zoomable-frame.md
+++ b/packages/webawesome/docs/docs/components/zoomable-frame.md
@@ -6,7 +6,7 @@ category: Imagery
 ---

 ```html {.example}
-<wa-zoomable-frame src="https://backers.webawesome.com/" zoom="0.5"> </wa-zoomable-frame>
+<wa-zoomable-frame src="https://webawesome.com/" zoom="0.5"> </wa-zoomable-frame>
 ```

 ## Examples
@@ -43,7 +43,7 @@ Set the `zoom` attribute to control the frame's zoom level. Use `1` for 100%, `2
 Define specific zoom increments with the `zoom-levels` attribute using space-separated percentages and decimal values like `zoom-levels="0.25 0.5 75% 100%"`.

 ```html {.example}
-<wa-zoomable-frame src="https://backers.webawesome.com/" zoom="0.5" zoom-levels="50% 0.75 100%"> </wa-zoomable-frame>
+<wa-zoomable-frame src="https://webawesome.com/" zoom="0.5" zoom-levels="50% 0.75 100%"> </wa-zoomable-frame>
 ```

 ### Hiding zoom controls
@@ -51,7 +51,7 @@ Define specific zoom increments with the `zoom-levels` attribute using space-sep
 Add the `without-controls` attribute to hide the zoom control interface from the frame.

 ```html {.example}
-<wa-zoomable-frame src="https://backers.webawesome.com/" without-controls zoom="0.5"> </wa-zoomable-frame>
+<wa-zoomable-frame src="https://webawesome.com/" without-controls zoom="0.5"> </wa-zoomable-frame>
 ```

 ### Preventing user interaction
@@ -59,5 +59,5 @@ Add the `without-controls` attribute to hide the zoom control interface from the
 Apply the `without-interaction` attribute to make the frame non-interactive. Note that this prevents keyboard navigation into the frame, which may impact accessibility for some users.

 ```html {.example}
-<wa-zoomable-frame src="https://backers.webawesome.com/" zoom="0.5" without-interaction> </wa-zoomable-frame>
+<wa-zoomable-frame src="https://webawesome.com/" zoom="0.5" without-interaction> </wa-zoomable-frame>
 ```
--- a/packages/webawesome/docs/docs/customizing.md
+++ b/packages/webawesome/docs/docs/customizing.md
@@ -10,17 +10,16 @@ You can customize the look and feel of Web Awesome at a high level with themes.

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

-To use a theme, simply add a link to the theme's stylesheet to the `<head>` of your page. For example, you can replace the link to `default.css` in the [installation code](/docs/#quick-start-autoloading-via-cdn) with this snippet to use the *Awesome* theme:
+To use a theme, simply add a link to the theme's stylesheet to the `<head>` of your page. For example, you can add this snippet alongside th [installation code](/docs/#quick-start-autoloading-via-cdn) to use the _Awesome_ theme:

 ```html
 <link rel="stylesheet" href="{% cdnUrl 'styles/themes/awesome.css' %}" />
 ```

-You can [customize any theme](/docs/themes/creating) just with CSS — no preprocessor required. All design tokens are prefixed with `--wa-` to avoid collisions with other libraries or your own custom properties. Simply override any design token in your own stylesheet by scoping your styles to `:where(:root)`, `:host`, the class for the specific theme you want to override (if needed), and the class for the relevant color scheme (if needed). Here's an example that changes the default brand color to purple in light mode:
+You can customize any theme just with CSS — no preprocessor required. All design tokens are prefixed with `--wa-` to avoid collisions with other libraries and your own custom properties. Simply override any design token in your own stylesheet by scoping your styles to `:root`, the class for the specific theme you want to override (if needed), and the class for the relevant color scheme (if needed). Here's an example that changes the default brand color to purple in light mode:

 ```css
-:where(:root),
-:host,
+:root,
 .wa-light,
 .wa-dark .wa-invert {
  --wa-color-brand-fill-quiet: var(--wa-color-purple-95);
@@ -35,10 +34,6 @@ You can [customize any theme](/docs/themes/creating) just with CSS — no prepro
 }
 ```

-:::info
-Wrapping the `:root` selector in `:where()` gives this selector 0 specificity. This allows us to define our design tokens' default values while ensuring they can be cleanly overridden as needed.
-:::
-
 For a complete list of all custom properties used for theming, refer to `src/styles/themes/default.css` in the project's source code.

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

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

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

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

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

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

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

 <style>
-  wa-checkbox.pinkify,
-  input[type="checkbox"].pinkify {
-    --background-color-checked: hotpink;
-    --border-color-checked: hotpink;
-    --border-width: 3px;
-    --checked-icon-color: lavenderblush;
-  }
-</style>
-```
-
-Or, if using CSS parts, we can give both checkboxes the same custom styles using standard CSS properties:
-```html {.example}
-<wa-checkbox class="purpleify">Web Awesome checkbox</wa-checkbox>
-<br />
-<label>
-  <input type="checkbox" class="purpleify" />
-  HTML checkbox
-</label>
-
-<style>
-  wa-checkbox.purpleify::part(control),
-  input[type="checkbox"].purpleify {
+  wa-checkbox.pinkify::part(control),
+  input[type='checkbox'].pinkify {
    border-width: 3px;
  }

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

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

 If you're using a bundler, make sure it comes _before_ any components are imported.
@@ -26,8 +26,8 @@ If you're using a bundler, make sure it comes _before_ any components are import
 // Make sure this import is first.
 import '@lit-labs/ssr-client/lit-element-hydrate-support.js';

-import 'webawesome/dist/components/button/button.js';
-import 'webawesome/dist/components/input/input.js';
+import '@awesome.me/webawesome/dist/components/button/button.js';
+import '@awesome.me/webawesome/dist/components/input/input.js';
 ```

 ## Enable Server Rendering
@@ -43,7 +43,10 @@ import litPlugin from '@lit-labs/eleventy-plugin-lit';

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

--- a/packages/webawesome/docs/docs/form-controls.md
+++ b/packages/webawesome/docs/docs/form-controls.md
@@ -52,7 +52,7 @@ To make a field required, use the `required` attribute. Required fields will aut
    customElements.whenDefined('wa-input'),
    customElements.whenDefined('wa-option'),
    customElements.whenDefined('wa-select'),
-    customElements.whenDefined('wa-textarea')
+    customElements.whenDefined('wa-textarea'),
  ]).then(() => {
    form.addEventListener('submit', event => {
      event.preventDefault();
@@ -78,10 +78,7 @@ To restrict a value to a specific [pattern](https://developer.mozilla.org/en-US/
  const form = document.querySelector('.input-validation-pattern');

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

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

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

 ## Custom Validation Styles

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

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

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

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

-Welcome to your exclusive early access to Web Awesome Beta! 👋
-
-At this time, we're offering access to Web Awesome Free and Pro through a temporary CDN while we prepare for a public release. This beta is tried, true, and stable, but please be aware that things may change here and there before our production release to the public.
-
-Thank you so much for backing us!
+Welcome to Web Awesome! [Learn more](https://webawesome.com/) about this project and [how to contribute to it](https://webawesome.com/docs/resources/contributing).

 - [Report a bug](https://github.com/shoelace-style/webawesome/issues)
 - [Get help / ask a question](https://github.com/shoelace-style/webawesome/discussions)
 - [See what's new since the last version](/docs/resources/changelog)

-:::warning
-As a Web Awesome backer, this beta release is _just for you_. Please refrain from sharing it for the time being!
-:::
-
 ---

 ## Quick Start (Autoloading via CDN)
@@ -25,15 +17,14 @@ As a Web Awesome backer, this beta release is _just for you_. Please refrain fro
 To get everything included in Web Awesome, add the following code to the `<head>` of your site:

 ```html
-<link rel="stylesheet" href="{% cdnUrl 'styles/themes/default.css' %}" />
 <link rel="stylesheet" href="{% cdnUrl 'styles/webawesome.css' %}" />
 <script type="module" src="{% cdnUrl 'webawesome.loader.js' %}"></script>
 ```

-This snippet includes three parts:
-1. **The default theme**, a stylesheet that gives a cohesive look to Web Awesome components with both light and dark modes
-2. **Web Awesome styles**, an optional stylesheet that [styles native HTML elements](/docs/utilities/native) and includes [utility classes](/docs/utilities) you can use in your project
-3. **The autoloader**, a lightweight script watches the DOM for unregistered Web Awesome elements and lazy loads them for you — even if they're added dynamically
+This snippet adds:
+
+- **Web Awesome styles**, a collection of stylesheets including essential default theme styles, optional [styles for native elements](/docs/utilities/native) and optional [utility classes](/docs/utilities)
+- **The autoloader**, a lightweight script watches the DOM for unregistered Web Awesome elements and lazy loads them for you — even if they're added dynamically

 Now you can [start using Web Awesome!](/docs/usage)

@@ -41,7 +32,7 @@ Now you can [start using Web Awesome!](/docs/usage)

 ## Using Font Awesome Kit Codes

-Font Awesome users can set their kit code to unlock Font Awesome Pro icons. You can provide it by adding the `data-fa-kit-code` attribute to any element on the page, or by calling the `setKitCode()` method.
+Font Awesome users can provide their kit code to unlock premium icon packs. You can provide yours by adding the `data-fa-kit-code` attribute to any element on the page, or by calling the `setKitCode()` method.

 ```html
 <!-- Option 1: the data-fa-kit-code attribute -->
@@ -54,19 +45,31 @@ Font Awesome users can set their kit code to unlock Font Awesome Pro icons. You
 </script>
 ```

+:::info
+Not a Font Awesome user yet? [Learn more about premium icon packs](https://fontawesome.com/) and sign up for an account to unlock them!
+:::
+
 ---

+{# This looks weird, but without it, markdownItAttrs flags the raw calls incorrectly. #}
+
+<div>
+{%- raw -%}
+  {% if currentUser.hasPro %}
+    <div>
+      {% include "server/pro-setup.njk" ignore missing %}
+    </div>
+  {% endif %}
+{% endraw %}
+</div>
+
 ## Advanced Setup

 The autoloader is the easiest way to use Web Awesome, but different projects (or your own preferences!) may require different installation methods.

-### Installing via npm
+### Cherry Picking from CDN

-An npm package isn't yet available, but we'll have one soon! For now, please enjoy [Web Awesome from the CDN](#quick-start-autoloading-via-cdn).
-
-### Cherry Picking
-
-Cherry picking will only load the components you need up front, while limiting the number of files the browser has to download. The disadvantage is that you need to import each individual component on each page it's used. You'll still need to include the default theme (`styles/themes/default.css`) or another theme to style any imported components.
+Cherry picking will only load the components you need up front, while limiting the number of files the browser has to download. The disadvantage is that you need to import each individual component on each page it's used. Additionally, you must include the default theme (`styles/themes/default.css`) to style any imported components. To use a different theme, include your preferred theme _in addition to_ the default theme.

 Here's an example that loads only the button component.

@@ -86,21 +89,47 @@ You can copy and paste the code to import a component from the "Importing" secti
 You will see files named `chunk.[hash].js` in the `chunks` directory. Never import these files directly, as they are generated and change from version to version.
 :::

+### Installing via npm
+
+```bash
+npm install @awesome.me/webawesome
+```
+
+And then in your JavaScript files, import the components you need.
+
+:::warning
+Web Awesome does not a provide a single import with all Web Awesome components. Instead, you must "cherry pick" the components you want to use.
+:::
+
+```js
+// Option 1: import all Web Awesome styles
+import '@awesome.me/webawesome/dist/styles/webawesome.css';
+
+// Option 2: import only the default theme
+import '@awesome.me/webawesome/dist/styles/themes/default.css';
+
+// <wa-button>
+import '@awesome.me/webawesome/dist/components/button/button.js';
+// <wa-input>
+import '@awesome.me/webawesome/dist/components/input/input.js';
+```
+
+Once they've been imported, you can use them in your HTML normally. Component imports are located in the "Importing" section of each component's documentation.

 ### Setting the Base Path

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

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

 ```html
 <!-- Option 1: the data-webawesome attribute -->
-<script src="bundle.js" data-webawesome="/path/to/web-awesome/dist"></script>
+<script src="bundle.js" data-webawesome="/path/to/webawesome/dist"></script>

 <!-- Option 2: the setBasePath() method -->
 <script type="module">
-  import { setBasePath } from '/path/to/web-awesome/dist/webawesome.js';
-  setBasePath('/path/to/web-awesome/dist');
+  import { setBasePath } from '/path/to/webawesome/dist/webawesome.js';
+  setBasePath('/path/to/webawesome/dist');
 </script>
 ```

@@ -110,7 +139,7 @@ Most of the magic behind assets is handled internally by Web Awesome, but if you

 ```html
 <script type="module">
-  import { getBasePath, setBasePath } from '/path/to/web-awesome/dist/webawesome.js';
+  import { getBasePath, setBasePath } from '/path/to/webawesome/dist/webawesome.js';

  setBasePath('/path/to/assets');

@@ -123,3 +152,64 @@ Most of the magic behind assets is handled internally by Web Awesome, but if you
  const assetPath = getBasePath('file.ext');
 </script>
 ```
+
+### The Difference Between `/dist` & `/dist-cdn`
+
+If you have Web Awesome installed locally via npm, you'll notice the following directories in the project's root:
+
+```
+dist/
+dist-cdn/
+```
+
+The `dist-cdn` files come with everything bundled together, so you can use them directly without a build tool. The dist files keep dependencies separate, which lets your bundler optimize and share code more efficiently.
+
+Use `dist-cdn` if you're loading directly in the browser or from a CDN. Use `dist` if you're using a bundler like Webpack or Vite.
+
+## React Users
+
+React 19+ [supports custom elements](https://react.dev/blog/2024/04/25/react-19#support-for-custom-elements), so you can import them and use them as you'd expect. Just make sure you've included your Web Awesome theme into your app first.
+
+```jsx
+import '@awesome.me/webawesome/dist/components/button/button.js';
+
+function App() {
+  return <wa-button variant="brand">Button</wa-button>;
+}
+
+export default App;
+```
+
+If you're using TypeScript, you can add type safety using the types file located at:
+
+```
+node_modules/@awesome.me/webawesome/dist/custom-elements-jsx.d.ts
+```
+
+This gives you inline documentation, autocomplete, and type-safe validation for every component. You can add the types to your project by updating your `tsconfig.json` file as shown below.
+
+```json
+{
+  "compilerOptions": {
+    "types": ["node_modules/@awesome.me/webawesome/dist/custom-elements-jsx.d.ts"]
+  }
+}
+```
+
+Another way is to create a declaration file and extend JSX's `IntrinsicElements`:
+
+```ts
+import type { CustomElements, CustomCssProperties } from '@awesome.me/webawesome/dist/custom-elements-jsx.d.ts';
+
+declare module 'react' {
+  namespace JSX {
+    interface IntrinsicElements extends CustomElements {}
+  }
+  interface CSSProperties extends CustomCssProperties {}
+}
+```
+
+:::details React 18 and below
+React 18 and below have [poor support](https://custom-elements-everywhere.com/#react) for custom elements. For legacy versions of React, we provide React wrappers for every component. You can find the import instructions by selecting the _React_ tab from the _Importing_ section of each
+component's documentation.
+:::
--- a/packages/webawesome/docs/docs/localization.md
+++ b/packages/webawesome/docs/docs/localization.md
@@ -22,43 +22,7 @@ Through the magic of a mutation observer, changing the `lang` attribute will aut

 ## Available Translations

-Web Awesome ships with a number of translations. The default is English (US), which also serves as the fallback locale. As such, you do not need to import the English translation.
-
-Available translations include:
-
-<div style="columns: 3; gap: 1rem; margin-block-end: 1.5rem;">
-
- ar
- cs
- da
- de-ch
- de
- en-gb
- en
- es
- fa
- fi
- fr
- he
- hr
- hu
- id
- it
- ja
- nb
- nl
- nn
- pl
- pt
- ru
- sl
- sv
- tr
- uk
- zh-cn
- zh-tw
-
-</div>
+Web Awesome ships with [a number of translations](https://github.com/shoelace-style/webawesome/tree/next/packages/webawesome/src/translations). The default is English (US), which also serves as the fallback locale. As such, you do not need to import the English translation.

 You can import translations using the following syntax, where `<code>` is replaced with any language code shown above.

@@ -92,7 +56,7 @@ To contribute new translations or improvements to existing translations, please

 Regional translations are welcome! For example, if a German translation (`de`) exists it's perfectly acceptable to submit a German (Switzerland) (`de-CH`) translation.

-If you have any questions, please start a [discussion](https://github.com/shoelace-style/shoelace/discussions) or ask in the [community chat](https://discord.gg/mg8f26C).
+If you have any questions, please start a [discussion](https://github.com/shoelace-style/webawesome/discussions) or ask in the [community chat](https://discord.gg/mg8f26C).

 :::info
 Web Awesome provides a localization mechanism for component internals. This is not designed to be used as localization tool for your entire application. You should use a more appropriate tool such as [i18next](https://www.i18next.com/) if you need to localize content in your app.
--- a/packages/webawesome/docs/docs/resources/accessibility.md
+++ b/packages/webawesome/docs/docs/resources/accessibility.md
@@ -14,7 +14,7 @@ Furthermore, accessibility doesn’t stop at the component level. Using accessib

 My commitment to Web Awesome users is this: Everything we develop will be built with accessibility in mind. We will test and improve every component to the best of our ability and knowledge. We will work around upstream issues, such as browser bugs and limitations, to the best of our ability and within reason.

-We’re fully aware that we may not get it right every time for every user, so we invite the community to participate in this ongoing effort by submitting [issues](https://github.com/shoelace-style/shoelace/issues?q=is%3Aissue+is%3Aopen+label%3Aa11y), [pull requests](https://github.com/shoelace-style/shoelace/pulls?q=is%3Aopen+is%3Apr+label%3Aa11y), and [discussions](https://github.com/shoelace-style/shoelace/discussions). Many accessibility improvements have already been made thanks to contributors submitting code, feedback, and suggestions.
+We’re fully aware that we may not get it right every time for every user, so we invite the community to participate in this ongoing effort by submitting [issues](https://github.com/shoelace-style/shoelace/issues?q=is%3Aissue+is%3Aopen+label%3Aa11y), [pull requests](https://github.com/shoelace-style/shoelace/pulls?q=is%3Aopen+is%3Apr+label%3Aa11y), and [discussions](https://github.com/shoelace-style/webawesome/discussions). Many accessibility improvements have already been made thanks to contributors submitting code, feedback, and suggestions.

 This is the path forward. Together, we will continue to make Web Awesome accessible to as many users as possible.

--- a/packages/webawesome/docs/docs/resources/changelog.md
+++ b/packages/webawesome/docs/docs/resources/changelog.md
@@ -4,10 +4,139 @@ description: Changes to each version of the project are documented here.
 layout: page-outline
 ---

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

 Components with the <wa-badge variant="warning">Experimental</wa-badge> badge should not be used in production. They are made available as release candidates for development and testing purposes. As such, changes to experimental components will not be subject to semantic versioning.

+## Next
+
+- 🚨 BREAKING: Changed `appearance="filled outlined"` to `appearance="filled-outlined"` in the following elements [issue:1127]
+  - `<wa-badge>`
+  - `<wa-button>`
+  - `<wa-callout>`
+  - `<wa-details>`
+  - `<wa-input>`
+  - `<wa-select>`
+  - `<wa-tag>`
+  - `<wa-textarea>`
+- Added the Kazakh translation [pr:1496]
+- Added docs for code completion for VS Code and JetBrains [pr:1550]
+- Added back the missing `form-control-label` part to `<wa-textarea>` for consistency with other form controls [pr:1533]
+- Added focus delegation to `<wa-button>` to ensure tabbing works properly when using `tabindex` [issue:1622]
+- Added [text utilities](/docs/utilities/text/) for longform text, form control text, font sizes, font weights, text color, and truncation [pr:1602]
+- Fixed a bug in `<wa-button>` where slotted badges weren't properly positioned in buttons with an `href` [issue:1377]
+- Fixed focus outline styles in `<wa-details>` and native `<details>` [issue:1456]
+- Fixed focus outline styles in `<wa-scroller>`, `<wa-dialog>`, and `<wa-drawer>` [issue:1484]
+- Fixed a bug in `<wa-checkbox>` where its value would revert to `""` when checked / unchecked [pr:1547]
+- Fixed a bug that caused icon button labels to not render in frameworks [issue:1542]
+- Fixed a bug in `<wa-details>` that caused the `name` property not to reflect [pr:1538]
+- Fixed a bug in `<wa-dialog>` and `<wa-drawer>` that prevented focus from being set on the dialog/drawer when opened [issue:1302]
+- Fixed an overflow style that was causing tab group content to be unnecessarily truncated [issue:1401]
+- Fixed a bug in `<wa-icon>` that caused icon buttons to render when non-text nodes were slotted in [issue:1475]
+- Fixed a bug in `<wa-tooltip>` that prevented tooltips from showing when disconnecting and then reconnecting to the DOM [issue:1595]
+- Fixed a bug that caused the required `*` in form labels to have incorrect spacing in `<wa-checkbox>` and `<wa-switch>` [issue:1472]
+- Fixed a bug in `<wa-dialog>` and `<wa-drawer>` that caused the component to prematurely hide when certain child elements are used [pr:1636]
+- Improved autofill styles in `<wa-input>` so they span the entire width of the visual input [issue:1439]
+- Improved [text utilities](/docs/utilities/text/) so that each size modifier always exactly matches the applied font size [pr:1602]
+- Improved Native Styles to use the `--wa-font-weight-code` design token
+- Modified `<wa-slider>` to only show the tooltip on the handle being dragged when in range mode [issue:1320]
+- Upgraded `<wa-page>` from _experimental_ to _stable_
+
+## 3.0.0-beta.6
+
+- Fixed a bug in `<wa-dropdown>` that closed the dropdown event when preventing `wa-select` [issue:1432]
+- Pin `@ctrl/tinycolor` to `4.1.0` due to malware in `4.1.1` and `4.1.2`. <https://socket.dev/npm/package/@ctrl/tinycolor/overview/4.1.1>
+
+## 3.0.0-beta.5
+
+### Bug Fixes and Improvements {data-no-outline}
+
+- 🚨 BREAKING: Updated `<wa-icon>` to use Font Awesome 7 [pr:1222]
+  - Added the `auto-width` attribute to automatically size icons, since FA7 is fixed-width by default now
+  - Changed the default width of icons to `1.25em` to match FA7's fixed-width proportions
+  - Improved support for duotone icons in `<wa-icon>`, including custom colors, custom opacity, and opacity swapping
+  - Removed the `fixed-width` attribute as it's now the default behavior
+- 🚨 BREAKING: Renamed the `icon-position` attribute to `icon-placement` in `<wa-details>` [discuss:1340]
+- 🚨 BREAKING: Removed the `size` attribute from `<wa-button-group>` as it only set the initial size and gets out of sync when buttons are updated (apply a `size` to each button instead)
+- Added the `<wa-intersection-observer>` component
+- Added the Hindi translation [pr:1307]
+- Added `--show-duration` and `--hide-duration` to `<wa-select>` [issue:1281]
+- Fixed incorrectly named exported tooltip parts in `<wa-slider>` [pr:1277]
+- Fixed a bug in `<wa-dropdown>` that caused menus to overflow the viewport instead of resizing [issue:1267]
+- Fixed a bug in `<wa-dropdown>` that prevented keyboard selection of items when nested in shadow roots [issue:1270]
+- Fixed a bug in `<wa-dropdown>` that prevented items passed in from slots from being detected [issue:1271]
+- Fixed a bug in JSX typings that prevented the types file from being exported [pr:1295]
+- Fixed a bug in JSX typings that generated the incorrect component imports [issue:1303]
+- Fixed a bug in `<wa-slider>` that prevented the thumb from receiving focus when clicking/tapping [issue:1312]
+- Fixed a bug in `<wa-scroller>` that caused the shadow to appear below relatively-positioned elements [issue:1326]
+- Fixed a bug in `<wa-details>` that caused it to expand/collapse when clicking on interactive elements in the summary [issue:1252]
+- Fixed `<wa-button>` to have `static` positioning by default and `relative` positioning only when used with `<wa-badge>` [pr:1346]
+- Fixed spacing in `<wa-input>` when both clear and password toggle icons are present [issue:1325]
+- Fixed a bug in `<wa-radio-group>` and `<wa-radio>` where changing appearances dynamically would render incorrectly [issue:1178]
+- Fixed a bug in `<wa-input>` that prevented the value from changing when assigning non-string values to `value` [issue:1323]
+- Fixed a bug in `<wa-color-picker>` that prevent the picker from staying in the viewport
+- Fixed a bug that in `<wa-icon>` that caused `library`, `family`, `variant` and `name` to not reflect [pr:#1395]
+- Fixed a bug in `<wa-format-date>` and `<wa-relative-time>` that caused spaces to appear before and after the output [#1417]
+- Added horizontal orientation support with `orientation="horizontal"` for `<wa-card>`
+
+## 3.0.0-beta.4
+
+### New Features {data-no-outline}
+
+- Added the `icon-position` attribute to `<wa-details>` [discuss:1099]
+- Added the `animating` custom state to `<wa-details>` [pr:1214]
+- Added `--wa-tooltip-border-color`, `--wa-tooltip-border-style`, and `--wa-tooltip-border-width` tokens [issue:1224]
+- Added the `without-arrow` attribute to `<wa-popover>` and `<wa-tooltip>` to hide arrows without artifacts
+- Added JSX types for use with React and others [pr:1256]
+- Added `<input type="file">` to native styles [pr:1279]
+
+### Bug Fixes and Improvements {data-no-outline}
+
+- Fixed a bug in `<wa-details>` that caused the content to overflow the container when animating [issue:1149]
+- Fixed a bug in `<wa-dialog>` and `<wa-drawer>` that prevented the header from showing when the label was missing [issue:1209]
+- Fixed a missing dependency required for React wrappers
+- Fixed missing `:hover` and `:active` styles on native buttons without an appearance modifier class
+
+## 3.0.0-beta.3
+
+### New Features {data-no-outline}
+
+- Added `--track-height` custom property to `<wa-progress-bar>` [pr:1154]
+- Added `--pulse-color` custom property to `<wa-badge>` [pr:1173]
+
+### Bug Fixes and Improvements {data-no-outline}
+
+- Fixed a bug in `<wa-badge>` where `appearance="pulse"` was not working as expected [pr:1173]
+- Fixed a missing TypeScript type for `<wa-badge>` for its `attention` property missing `bounce` value. [pr:1173]
+- Fixed the missing `nanoid` dependency in `package.json` [discuss:1139]
+- Fixed a bug in `<wa-slider>` that prevented the hint from showing up [discuss:1172]
+- Fixed a bug in `<wa-textarea>` where setting `resize="auto"` caused the height of the textarea to double [issue:1155]
+- Fixed a bug in `<wa-color-picker>`, `<wa-checkbox>`, `<wa-input>`, `<wa-radio-group>`, `<wa-switch>`, and `<wa-textarea>` that prevented screen readers from announcing hints [issue:1186]
+- Fixed a bug in `<wa-card>` that caused slotted media to have incorrectly rounded corners [issue:1107]
+- Fixed a bug in `<wa-button-group>` that prevented pill buttons from rendering corners properly [issue:1165]
+- Fixed a bug in `<wa-button-group>` that caused some vertical groups to appear horizontal [issue:1152]
+- Improved accessibility of `<wa-animated-image>` so keyboard users can focus and toggle the animation [issue:1177]
+
+## 3.0.0-beta.2
+
+### New Features {data-no-outline}
+
+- Added `.wa-hover-rows` to native styles to opt-in to highlighting table rows on hover.
+
+### Bug Fixes and Improvements {data-no-outline}
+
+- Fixed a bug in `<wa-select>` with options that had blank string values. [pr:1136]
+- Added `.wa-hover-rows` to native styles to opt-in to highlighting table rows on hover [pr:1111]
+- Added missing changelog entries for beta.1 [pr:1117]
+- Fixed a bug in `<wa-dropdown>` that prevented the menu from flipping/shifting to keep the menu in the viewport [pr:1122]
+- Fixed the themes page so it shows the correct palette and imports [pr:1125]
+- Fixed `filled` and `outlined` appearance styles in various components [issue:1102]
+- Fixed active state styles in the Awesome theme [pr:1129]
+- Fixed native text styles when applied to certain backgrounds [pr:https://github.com/shoelace-style/webawesome/pull/1130]
+- Improved the organization of essential and optional styles [pr:1113]
+
 ## 3.0.0-beta.1

 We're excited to share the first beta release of Web Awesome, which includes some breaking changes that make the library significantly more intuitive and consistent!
@@ -28,7 +157,8 @@ Many of these changes and improvements were the direct result of feedback from u
 - Renamed the `classic` theme to `shoelace`
 - Removed `:root` selector from all theme, color palette, and semantic color stylesheets except for the default theme and colors. All of these styles are now solely scoped to classes, such as `.wa-theme-awesome`, `.wa-palette-bright`, and `.wa-brand-orange`.
 - Removed most custom properties from components that can otherwise be styled with `::part()` selectors and standard CSS properties.
- Renamed `pulse` attribute in `<wa-badge>` to `attention="pulse"` and added `attention="bounce"` [issue:#940]
+- `<wa-dropdown>` was reworked and simplified to not use menu, menu item, menu label; use `<wa-dropdown-item>` instead
+- Renamed `pulse` attribute in `<wa-badge>` to `attention="pulse"` and added `attention="bounce"` [issue:940]
 - Renamed the `vertical` attribute to `orientation="vertical"` in `<wa-split-panel>` and `<wa-divider>` to align with other components and the platform [issue:674]
 - Renamed certain boolean attributes to be consistent using the `with-*` and `without-*` pattern:
  - `<wa-button caret>` => `<wa-button with-caret>`
@@ -73,6 +203,7 @@ Many of these changes and improvements were the direct result of feedback from u
 - Added a new free component: `<wa-zoomable-frame>` (#3 of 14 per stretch goals)
 - Added a `min-block-size` to `<wa-divider orientation="vertical">` to ensure the divider is visible regardless of container height
 - Added support for `name` in `<wa-details>` for exclusively opening one in a group
+- Added `--wa-content-spacing` to themes to set default spacing between HTML elements in Native Styles
 - Added `--checked-icon-scale` to `<wa-checkbox>`
 - Added `--tag-max-size` to `<wa-select>` when using `multiple`
 - Added support for `data-dialog="open <id>"` to `<wa-dialog>`
@@ -96,6 +227,9 @@ Many of these changes and improvements were the direct result of feedback from u
 ### Removals {data-no-outline}

 - Removed the experimental `<wa-code-demo>` component
+- `<wa-menu>`, `<wa-menu-item>`, `<wa-menu-label>` were dropped; use `<wa-dropdown-item>` instead
+- `<wa-icon-button>` was removed; icon buttons can be added via `<wa-button>` now
+- `<wa-radio-button>` was dropped; use `<wa-radio appearance="button">` instead

 <details>
 <summary>Alpha Changelogs</summary>
@@ -132,7 +266,7 @@ Many of these changes and improvements were the direct result of feedback from u

 ### Bug fixes {data-no-outline}

- Specifying inherited CSS properties on `<wa-tooltip>` now works as expected ([thanks Dennis!](https://github.com/shoelace-style/webawesome-alpha/discussions/203))
+- Specifying inherited CSS properties on `<wa-tooltip>` now works as expected
 - Fixed a bug in `<wa-select>` that made it hard to use with VueJS, Svelte, and many other frameworks
 - Fixed a bug in `<wa-select multiple>` that sometimes resulted in empty `<div>` elements being output
 - Fixed a bug where changing a `<wa-option>` label wouldn't update the display label in `<wa-select>`
@@ -352,4 +486,4 @@ Many of these changes and improvements were the direct result of feedback from u

 </details>

-Did we miss something? [Let us know!](https://github.com/shoelace-style/webawesome-alpha/discussions)
+Did we miss something? [Let us know!](https://github.com/shoelace-style/webawesome/discussions)
--- a/packages/webawesome/docs/docs/resources/community.md
+++ b/packages/webawesome/docs/docs/resources/community.md
@@ -10,14 +10,14 @@ Please be respectful of other users and remember that Web Awesome is an open sou

 ## Discussion Forum

-The [discussion forum](https://github.com/shoelace-style/shoelace/discussions) is open to anyone with a GitHub account. This is the best place to:
+The [discussion forum](https://github.com/shoelace-style/webawesome/discussions) is open to anyone with a GitHub account. This is the best place to:

 - Ask for help
 - Share ideas and get feedback
 - Show the community what you're working on
 - Learn more about the project, its values, and its roadmap

-<wa-button variant="brand" href="https://github.com/shoelace-style/shoelace/discussions" target="_blank" style="margin-block-end: var(--wa-flow-spacing);">
+<wa-button variant="brand" href="https://github.com/shoelace-style/webawesome/discussions" target="_blank" style="margin-block-end: var(--wa-content-spacing);">
  <wa-icon name="github" family="brands" slot="start"></wa-icon>
  Join the Discussion
 </wa-button>
@@ -31,18 +31,32 @@ The [community chat](https://discord.gg/mg8f26C) is open to the public and power
 - Show the community what you're working on
 - Chat live with other designers, developers, and Web Awesome fans

-<wa-button variant="brand" href="https://discord.gg/mg8f26C" target="_blank" style="margin-block-end: var(--wa-flow-spacing);">
+<wa-button variant="brand" href="https://discord.gg/mg8f26C" target="_blank" style="margin-block-end: var(--wa-content-spacing);">
  <wa-icon name="discord" family="brands" slot="start"></wa-icon>
  Join the Chat
 </wa-button>

-## Twitter
+## Social Networks

-Follow [@webawesomer](https://twitter.com/webawesomer) on Twitter for general updates and announcements about Web Awesome. This is a great place to say "hi" or to share something you're working on.
+Follow Web Awesome on [Bluesky](https://bsky.app/profile/webawesome.com), [X (Twitter)](https://x.com/webawesomer), [Mastodon](https://mastodon.social/@webawesome), or [Threads](https://www.threads.com/@web.awesome) for general updates and announcements. This is a great place to say "hi" or to share something you're working on.

-**Please avoid using Twitter for support questions.** The [discussion forum](https://github.com/shoelace-style/shoelace/discussions) is a much better place to share code snippets, screenshots, and other troubleshooting info. You'll have much better luck there, as more users will have a chance to help you.
+**Please avoid using Social Networks for support questions.** The [discussion forum](https://github.com/shoelace-style/webawesome/discussions) is a much better place to share code snippets, screenshots, and other troubleshooting info. You'll have much better luck there, as more users will have a chance to help you.

-<wa-button variant="brand" href="https://twitter.com/webawesomer" target="_blank" style="margin-block-end: var(--wa-flow-spacing);">
-  <wa-icon name="twitter" family="brands" slot="start"></wa-icon>
-  Follow on Twitter
-</wa-button>
+<div class="wa-cluster wa-gap-l">
+  <wa-button variant="brand" href="https://bsky.app/profile/webawesome.com" rel="noopener noreferrer" target="_blank">
+    <wa-icon name="bluesky" family="brands" slot="start"></wa-icon>
+    Bluesky
+  </wa-button>
+  <wa-button variant="brand" href="https://twitter.com/webawesomer" rel="noopener noreferrer" target="_blank">
+    <wa-icon name="x-twitter" family="brands" slot="start"></wa-icon>
+    X (Twitter)
+  </wa-button>
+  <wa-button variant="brand" href="https://mastodon.social/@webawesome" rel="noopener noreferrer" target="_blank">
+    <wa-icon name="mastodon" family="brands" slot="start"></wa-icon>
+    Mastodon
+  </wa-button>
+  <wa-button variant="brand" href="https://www.threads.com/@web.awesome" rel="noopener noreferrer" target="_blank">
+    <wa-icon name="threads" family="brands" slot="start"></wa-icon>
+    Threads
+  </wa-button>
+</div>
--- a/packages/webawesome/docs/docs/resources/contributing.md
+++ b/packages/webawesome/docs/docs/resources/contributing.md
@@ -131,7 +131,7 @@ To link to a GitHub issue, PR, or discussion, use the following syntax.

 ### Frontmatter

-There's a number of frontmatter properties for doing different things in the Web Awesome documention.
+There's a number of frontmatter properties for doing different things in the Web Awesome documentation.

 For example, to only show a page in development, use the `unpublished: true` key / value pair.

@@ -252,22 +252,16 @@ This creates confusion because the part will be documented, but it won't work wh

 ### Emitting Events

-Components must only emit events that start with `wa-` as a namespace. For compatibility with frameworks that utilize DOM templates, events must have lowercase, kebab-style names. For example, use `wa-change` instead of `waChange`.
+Components must only emit events that start with `wa-` as a namespace. For compatibility with frameworks that utilize DOM templates, events must have lowercase, kebab-style names. For example, use `wa-event` instead of `waEvent`.

 This convention avoids the problem of browsers lowercasing attributes, causing some frameworks to be unable to listen to them. This problem isn't specific to one framework, but [Vue's documentation](https://vuejs.org/v2/guide/components-custom-events.html#Event-Names) provides a good explanation of the problem.

-### Change Events
-
-When change events are emitted by Web Awesome components, they should be named `wa-change` and they should only be emitted as a result of user input. Programmatic changes, such as setting `el.value = '…'` _should not_ result in a change event being emitted. This is consistent with how native form controls work.
-
 ### Data Attribute Invokers

 Some components can be controlled using [data attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Global_attributes/data-*) that trigger specific behaviors. These controls must use the following convention:

 ```html
-<button data-component="action id">
-  Button text
-</button>
+<button data-component="action id">Button text</button>
 ```

 The `data-component` portion corresponds to the component's name without the `wa-` prefix. For example, `data-dialog` must control a `<wa-dialog>` component.
@@ -277,13 +271,9 @@ The `action` parameter is required and must be a concise, descriptive term indic
 The `id` parameter must point to the ID of the target component. The ID may be omitted if and only if the target component wraps the element with the `data-` attribute.

 ```html
-<wa-dialog id="my-dialog">
-  Dialog content
-</wa-dialog>
+<wa-dialog id="my-dialog"> Dialog content </wa-dialog>

-<button data-dialog="open my-dialog">
-  Open dialog
-</button>
+<button data-dialog="open my-dialog">Open dialog</button>
 ```

 ### CSS Custom Properties
@@ -306,6 +296,7 @@ Then use the following syntax for comments so they appear in the generated docs.
 * @cssproperty --color: The component's text color.
 * @cssproperty --background-color: The component's background color.
 */
+@customElement('wa-example')
 export default class WaExample {
  // ...
 }
@@ -363,7 +354,7 @@ Form controls should support submission and validation through the following con

 - Form Controls should extend from `WebAwesomeFormAssociatedElement`
 - All form controls must use `name`, `value`, and `disabled` properties in the same manner as `HTMLInputElement`
- All form controls with the `disabled` property *NOT* reflect the `disabled` attribute.
+- All form controls with the `disabled` property _NOT_ reflect the `disabled` attribute.
 - All form controls must have an `invalid` property that reflects their validity
 - All form controls should mirror their native validation attributes such as `required`, `pattern`, `minlength`, `maxlength`, etc. when possible and use the `MirrorValidator`.
 - All form controls must be tested to work with the standard `<form>` element
@@ -406,7 +397,7 @@ Guidelines for writing tests:

 ### Running tests

-Right now, tests run both "hydrated" (SSR -> client hydrated) and "client only". If you're debugging only one specific kind you can set an environment variable. For example, to run only the client tests, you can do:
+Right now, tests run both "hydrated" (SSR → client hydrated) and "client only". If you're debugging only one specific kind you can set an environment variable. For example, to run only the client tests, you can do:

 ```bash
 CSR_ONLY="true" npm run test
@@ -416,4 +407,4 @@ or for hydrated rendering only:

 ```bash
 SSR_ONLY="true" npm run test
-```
+```
--- a/packages/webawesome/docs/docs/resources/visual-tests.md
+++ b/packages/webawesome/docs/docs/resources/visual-tests.md
@@ -6,26 +6,33 @@ wide: true
 ---

 <style>
-  p {
-    max-width: 90ch;
-  }
-  tbody {
-    & .wa-grid {
-      --min-column-size: 5ch;
+  #content {
+    p {
+      max-width: 90ch;
    }
-    & tr th:first-of-type {
-      width: 20ch;
+
+    tbody {
+      & .wa-grid {
+        --min-column-size: 5ch;
+      }
+
+      & tr th:first-of-type {
+        width: 20ch;
+      }
+
+      & th {
+        vertical-align: middle;
+      }
+
+      & tr:hover {
+        background-color: color-mix(in oklch, var(--wa-color-fill-quiet), transparent 60%)
+      }
    }
-    & th {
-      vertical-align: middle;
+
+    wa-divider {
+      --width: var(--wa-border-width-m);
+      --spacing: var(--wa-space-3xl);
    }
-    & tr:hover {
-      background-color: color-mix(in oklch, var(--wa-color-fill-quiet), transparent 60%)
-    }
-  }
-  wa-divider {
-    --width: var(--wa-border-width-m);
-    --spacing: var(--wa-space-3xl);
  }
 </style>

--- a/packages/webawesome/docs/docs/themes.njk
+++ b/packages/webawesome/docs/docs/themes.njk
@@ -1,75 +1,105 @@
 ---
 title: Themes
-description: Themes galore
+description: Style (and restyle) your website at will with any of Web Awesome's pre-built themes.
 layout: page
-isPro: true
 ---

-<div class="wa-stack wa-gap-3xl">
+<h1>{{ title }}</h1>

-  <div class="wa-split">
-    <h1>{{ title }}</h1>
-    <wa-button variant="brand" href="/themer">
-      <wa-icon slot="start" name="plus" variant="regular"></wa-icon>
-      Create a Theme
-    </wa-button>
-  </div>
+<p>Themes are collections of <a href="/docs/tokens">design tokens</a> that give a cohesive look and feel to the entire Web Awesome library. Style and restyle your website at will by loading any pre-built theme.</p>

-  <div id="theme-viewer">
-    <wa-radio-group id="theme-picker" label="Theme Selector" value="default" orientation="horizontal">
-      {% for theme in themer.themes %}
+{% raw %}
+<p>See one you like?&nbsp;
+{%- if not session.isLoggedIn -%}
+  <a href="/login">Log in</a>&nbsp;
+{%- else -%}
+  Head over to <a href="/teams">your teams</a>&nbsp;
+{%- endif -%}
+to create a project with any one of these themes.
+{%- if not currentUser.hasPro -%}
+  &nbsp;(Plus, there are even more themes to love with Web Awesome Pro. <wa-icon name="heart" style="color: var(--wa-color-red-70);"></wa-icon>)
+{%- endif -%}
+</p>
+{% endraw %}
+
+<div id="theme-viewer">
+  <wa-radio-group id="theme-picker" label="Theme Selector" value="default" orientation="horizontal">
+    {% for theme in themer.themes %}
+      {% if not theme.isPro %}
        <wa-radio
          class="theme-card"
          value="{{ theme.filename | stripExtension }}"
          data-description="{{ theme.description }}"
          data-title="{{ theme.name }}"
+          data-palette="{{ theme.palette.filename | stripExtension}}"
+          data-brand="{{ theme.colorBrand.color }}"
          {% if theme.isPro %}data-is-pro{% endif %}
        >
          {{ theme.name }}
        </wa-radio>
-      {% endfor %}
-    </wa-radio-group>
-  </div>
-
-  <div id="theme-preview" class="wa-stack">
-    <header class="wa-stack">
-      <div class="wa-cluster">
-        <h2 data-theme-name="name">Theme</h2>
-        <wa-badge data-free-badge appearance="outlined" variant="neutral" hidden>FREE</wa-badge>
-        <wa-badge data-pro-badge appearance="accent" hidden>PRO</wa-badge>
-      </div>
-      <p data-theme-description>Description</p>
-    </header>
-    <wa-comparison position="80">
-      <wa-zoomable-frame
-        src="/examples/themes/showcase?color-scheme=dark"
-        slot="before"
-        without-controls
-        without-interaction
-      ></wa-zoomable-frame>
-      <wa-zoomable-frame
-        src="/examples/themes/showcase"
-        slot="after"
-        without-controls
-        without-interaction
-      ></wa-zoomable-frame>
-    </wa-comparison>
-  </div>
-
-  <h2>Using This Theme</h2>
-  <div id="import-code">
-    {% for theme in themer.themes %}
-    <div class="theme-instructions" data-theme="{{ theme.filename | stripExtension }}" {% if not loop.first %}hidden{% endif %}>
-      <p>
-        To import this theme, set <code>&lt;html class=&quot;wa-theme-{{ theme.filename | stripExtension }}&quot;&gt;</code> and import the following stylesheet:
-      </p>
-      <pre><code class="language-html">&lt;link rel=&quot;stylesheet&quot; href=&quot;{% cdnUrl %}styles/themes/{{ theme.filename }}&quot; /&gt;</code></pre>
-    </div>
+      {% else %}
+        {% raw %}
+          {% if currentUser.hasPro %}
+        {% endraw %}
+          <wa-radio
+            class="theme-card"
+            value="{{ theme.filename | stripExtension }}"
+            data-description="{{ theme.description }}"
+            data-title="{{ theme.name }}"
+            data-palette="{{ theme.palette.filename | stripExtension}}"
+            data-brand="{{ theme.colorBrand.color }}"
+            {% if theme.isPro %}data-is-pro{% endif %}
+          >
+            {{ theme.name }}
+          </wa-radio>
+        {% raw %}
+          {% endif %}
+        {% endraw %}
+      {% endif %}
    {% endfor %}
-  </div>
-
+  </wa-radio-group>
 </div>

+<div id="theme-preview" class="wa-stack">
+  <header class="wa-stack">
+    <div class="wa-cluster">
+      <h2 data-theme-name="name">Theme</h2>
+      <wa-badge data-free-badge appearance="outlined" variant="neutral" hidden>FREE</wa-badge>
+      <wa-badge data-pro-badge appearance="accent" hidden>PRO</wa-badge>
+    </div>
+    <p data-theme-description>Description</p>
+  </header>
+  <wa-comparison position="80">
+    <wa-zoomable-frame
+      src="/examples/themes/showcase?color-scheme=dark"
+      slot="before"
+      without-controls
+      without-interaction
+    ></wa-zoomable-frame>
+    <wa-zoomable-frame
+      src="/examples/themes/showcase"
+      slot="after"
+      without-controls
+      without-interaction
+    ></wa-zoomable-frame>
+  </wa-comparison>
+</div>
+
+<h2>Using This Theme</h2>
+<div id="import-code">
+  {% for theme in themer.themes %}
+  <div class="theme-instructions" data-theme="{{ theme.filename | stripExtension }}" {% if not loop.first %}hidden{% endif %}>
+    <p>
+      To import this theme, apply the following classes to the <code>&lt;html&gt;</code> element and import the theme's stylesheet.
+    </p>
+<pre><code class="language-html">&lt;html class=&quot;wa-theme-{{ theme.filename | stripExtension }} wa-palette-{{ theme.palette.filename | stripExtension }} wa-brand-{{ theme.colorBrand.color}}&quot;&gt;
+...
+&lt;link rel=&quot;stylesheet&quot; href=&quot;{% cdnUrl %}styles/themes/{{ theme.filename }}&quot; /&gt;</code></pre>
+  </div>
+  {% endfor %}
+</div>
+
+
 <script type="module">
  import { doViewTransition } from '/assets/scripts/view-transitions.js';

@@ -81,23 +111,25 @@ isPro: true
  const freeBadge = document.querySelector('[data-free-badge]');
  const proBadge = document.querySelector('[data-pro-badge]');

-  function updateFrames(selectedValue, title, description, isPro) {
+  function updateFrames(selectedValue, title, description, isPro, palette, brand) {
    // Update theme classes on both frames
    [afterFrame, beforeFrame].forEach(frame => {
      if (frame.contentDocument) {
        const html = frame.contentDocument.documentElement;
        if (!html) return;

-        // Remove all existing wa-theme-* classes
-        html.classList.forEach(className => {
-          if (className.startsWith('wa-theme-')) {
+        // Remove all existing wa-theme-*, wa-palette-*, and wa-brand-* classes
+        [...html.classList].forEach(className => {
+          if (className.startsWith('wa-theme-') || className.startsWith('wa-palette-') || className.startsWith('wa-brand-')) {
            html.classList.remove(className);
          }
        });

-        // Add new theme class if not default
+        // Add new theme, palette, and brand classes
        if (selectedValue !== 'default') {
          html.classList.add(`wa-theme-${selectedValue}`);
+          html.classList.add(`wa-palette-${palette}`);
+          html.classList.add(`wa-brand-${brand}`);
        }
      }
    });
@@ -125,8 +157,10 @@ isPro: true
    defaultRadio.checked = true;
    const title = defaultRadio.getAttribute('data-title');
    const description = defaultRadio.getAttribute('data-description');
+    const palette = defaultRadio.getAttribute('data-palette');
+    const brand = defaultRadio.getAttribute('data-brand');
    const isPro = defaultRadio.hasAttribute('data-is-pro');
-    updateFrames('default', title, description, isPro);
+    updateFrames('default', title, description, isPro, palette, brand);
  }

  // Listen for radio changes
@@ -134,9 +168,11 @@ isPro: true
    const selectedRadio = event.target.querySelector(':state(checked)');
    const title = selectedRadio.getAttribute('data-title');
    const description = selectedRadio.getAttribute('data-description');
+    const palette = selectedRadio.getAttribute('data-palette');
+    const brand = selectedRadio.getAttribute('data-brand');
    const isPro = selectedRadio.hasAttribute('data-is-pro');
    doViewTransition(() => {
-      updateFrames(selectedRadio.value, title, description, isPro);
+      updateFrames(selectedRadio.value, title, description, isPro, palette, brand);
    });
  });
 </script>
@@ -146,6 +182,11 @@ isPro: true
    display: none !important;
  }

+  #theme-preview,
+  #using-this-theme {
+    margin-block-start: var(--wa-space-3xl);
+  }
+
  .title {
    display: none;
  }
@@ -184,13 +225,14 @@ isPro: true
  }

  #theme-viewer {
+    margin-block-start: 2rem;
+
    #theme-picker {

      &::part(form-control-input) {
        display: flex;
        flex-direction: row;
        flex-wrap: wrap;
-        gap: var(--wa-space-s);
      }

      &::part(form-control-label) {
@@ -218,12 +260,15 @@ isPro: true
      border: 1px solid var(--wa-color-surface-border);
      border-radius: var(--border-radius);
      box-shadow: var(--wa-shadow-s);
-      cursor: pointer;
      transition: all 0.2s ease;
      text-align: center;
      font-weight: var(--wa-font-weight-action);
      text-transform: capitalize;

+      &:not(:state(disabled)) {
+        cursor: pointer;
+      }
+
      &:state(checked) {
        border-color: var(--wa-color-brand-border-loud);
        background-color: var(--wa-color-brand-fill-quiet);
--- a/packages/webawesome/docs/docs/tokens/color.md
+++ b/packages/webawesome/docs/docs/tokens/color.md
@@ -55,10 +55,9 @@ Web Awesome's color system is made up of CSS custom properties to help with cons

 Color is organized by three main categories:

- [Color scales](/#color-scales) that gives you a full spectrum of hues to work with
- [Foundational colors](/#foundational-colors) that lay the groundwork for your theme
- [Semantic colors](/#semantic-colors) that draw attention and convey meaning
-
+- [Color scales](#color-scales) that gives you a full spectrum of hues to work with
+- [Foundational colors](#foundational-colors) that lay the groundwork for your theme
+- [Semantic colors](#semantic-colors) that draw attention and convey meaning

 ## Color Scales

@@ -73,6 +72,7 @@ You can use these tints to ensure accessible color contrast per [WCAG 2.1 succes
 You have several hand-crafted [color palettes](/docs/color-palettes) to choose from. Each palette defines 10 hues each with a scale of 11 tints using the format `--wa-color-{hue}-{tint}`.

 {% for hue in ['red', 'orange', 'yellow', 'green', 'cyan', 'blue', 'indigo', 'purple', 'pink', 'gray'] -%}
+
 <div class="color-name">{{ hue | capitalize }}</div>
 <ul class="color-group">
  {% for tint in ['95', '90', '80', '70', '60', '50', '40', '30', '20', '10', '05'] -%}
@@ -91,6 +91,7 @@ You have several hand-crafted [color palettes](/docs/color-palettes) to choose f
 Any hue can be mapped to `brand`, `neutral`, `success`, `warning`, and `danger` scales. Like the tokens in a color scale, each token is identified by its semantic group and a numerical tint using the format `--wa-color-{group}-{tint}`.

 {% for group in ['brand', 'neutral', 'success', 'warning', 'danger'] -%}
+
 <div class="color-name">{{ group | capitalize }}</div>
 <ul class="color-group">
  {% for tint in ['95', '90', '80', '70', '60', '50', '40', '30', '20', '10', '05'] -%}
@@ -112,19 +113,19 @@ Foundational colors lay the groundwork for the content and structure of your pro

 Surfaces are background layers that other content rests on. Surface colors help convey hierarchy through a sense of elevation, where `--wa-color-surface-raised` is the closest to the user (e.g., dialogs and popup menus) and `--wa-color-surface-lowered` is the farthest away (e.g., wells).

-| Custom Property               | Preview                                                                                                                         |
-| ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `--wa-color-surface-raised`   | <div class="swatch" style="background-color: var(--wa-color-surface-raised); box-shadow:var(--wa-shadow-s)"></div>              |
-| `--wa-color-surface-default`  | <div class="swatch" style="background-color: var(--wa-color-surface-default)"></div>                                            |
-| `--wa-color-surface-lowered`  | <div class="swatch" style="background-color: var(--wa-color-surface-lowered); box-shadow: inset var(--wa-shadow-s)"></div>      |
-| `--wa-color-surface-border`   | <div class="swatch" style="border-color: var(--wa-color-surface-border)"></div>                                                 |
+| Custom Property              | Preview                                                                                                                    |
+| ---------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
+| `--wa-color-surface-raised`  | <div class="swatch" style="background-color: var(--wa-color-surface-raised); box-shadow:var(--wa-shadow-s)"></div>         |
+| `--wa-color-surface-default` | <div class="swatch" style="background-color: var(--wa-color-surface-default)"></div>                                       |
+| `--wa-color-surface-lowered` | <div class="swatch" style="background-color: var(--wa-color-surface-lowered); box-shadow: inset var(--wa-shadow-s)"></div> |
+| `--wa-color-surface-border`  | <div class="swatch" style="border-color: var(--wa-color-surface-border)"></div>                                            |

 ### Text

 Text colors are used for standard text elements. We recommend a minimum 4.5:1 contrast ratio between text colors and surface colors.

-| Custom Property          | Preview                                                    |
-| ------------------------ | ---------------------------------------------------------- |
+| Custom Property          | Preview                                                                                                                          |
+| ------------------------ | -------------------------------------------------------------------------------------------------------------------------------- |
 | `--wa-color-text-normal` | <div class="swatch" value="--wa-color-text-normal" style="color: var(--wa-color-text-normal); display: inline-block;">AaBb</div> |
 | `--wa-color-text-quiet`  | <div class="swatch" value="--wa-color-text-normal" style="color: var(--wa-color-text-quiet); display: inline-block;">AaBb</div>  |
 | `--wa-color-text-link`   | <div class="swatch" value="--wa-color-text-normal" style="color: var(--wa-color-text-link); display: inline-block;">AaBb</div>   |
@@ -153,23 +154,23 @@ This is used alongside other [shadow tokens](/docs/tokens/shadows) to construct

 Web Awesome uses a single focus color for predictable keyboard navigation. This is used alongside other [focus tokens](/docs/tokens/focus) to construct `--wa-focus-ring`. We recommend a minimum 3:1 contrast ratio against surface colors and background colors wherever possible.

-| Custom Property    | Preview                                                                                                                 |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------- |
+| Custom Property    | Preview                                                                                                                                          |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------ |
 | `--wa-color-focus` | <div class="swatch" value="--wa-color-focus" style="outline: var(--wa-focus-ring-style) var(--wa-focus-ring-width) var(--wa-color-focus)"></div> |

 #### Hover and Active

 Web Awesome leverages `color-mix()` to achieve consistent hover and active states across components without the need for untold numbers of handpicked colors. Through `color-mix()`, these custom properties contextually generate hover and active colors based on the color of the component.

-| Custom Property         | Preview                                                                                                          |
-| ----------------------- | ---------------------------------------------------------------------------------------------------------------- |
-| `--wa-color-mix-hover`  | <div class="swatch color-mix-example" value="--wa-color-mix-hover" style="--mix-color: var(--wa-color-mix-hover)"><small>mixed</small></div>  |
+| Custom Property         | Preview                                                                                                                                        |
+| ----------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
+| `--wa-color-mix-hover`  | <div class="swatch color-mix-example" value="--wa-color-mix-hover" style="--mix-color: var(--wa-color-mix-hover)"><small>mixed</small></div>   |
 | `--wa-color-mix-active` | <div class="swatch color-mix-example" value="--wa-color-mix-active" style="--mix-color: var(--wa-color-mix-active)"><small>mixed</small></div> |

-
 ## Semantic Colors

 Semantic colors reinforce a specific message, intended usage, or expected results through familiar, meaningful hues. Each color is identified by its semantic group, role, and attention using the format `--wa-color-{group}-{role}-{attention}`. There are five groups of semantic colors:
+
 - **Brand** to emphasize your brand color
 - **Success** for validity or confirmation
 - **Neutral** for ordinary or inactive content
@@ -177,16 +178,19 @@ Semantic colors reinforce a specific message, intended usage, or expected result
 - **Danger** for errors or risk

 Each group defines colors for specific roles so that colors can be easily assembled with predictable results and readable contrast. There are three roles:
+
 - **Fill** for background colors or areas larger than a few pixels
 - **Border** for borders, dividers, and other stroke-width elements
 - **On** for content displayed on a fill (e.g., pair `--wa-color-danger-on-loud` with `--wa-color-danger-fill-loud`)

 Finally, each color is named according to how much attention it draws. Here, we use noise as an analogy: a loud noise draws more attention than a quiet one. There are three levels of attention:
+
 - **Quiet** draws the least attention
 - **Normal** draws some attention
 - **Loud** draws the most attention

 {% set variants = ['brand', 'success', 'neutral', 'warning', 'danger'] %}
+
 <table>
  <thead>
    <tr>
--- a/packages/webawesome/docs/docs/tokens/component-groups.md
+++ b/packages/webawesome/docs/docs/tokens/component-groups.md
@@ -2,6 +2,7 @@
 title: Component Groups
 description: Style groups of components that share similar qualities with these Web Awesome custom properties.
 order: 9999
+layout: page-outline
 ---

 For components that share similar qualities, Web Awesome includes custom properties to change the appearance of these related components all at once.
@@ -84,16 +85,19 @@ Panels consist of components with larger, contained surface areas like [callout]

 ## Tooltips

-Tooltip styles are shared between the [tooltip](/docs/components/tooltip) component and the tooltip implementation in [range](/docs/components/range).
+Tooltip styles are shared between the [tooltip](/docs/components/tooltip) component and the tooltips in [slider](/docs/components/slider) and [copy button](/docs/components/copy-button).

-| Custom Property              | Default Value                       |
-| ---------------------------- | ----------------------------------- |
-| `--wa-tooltip-arrow-size`    | `0.375rem` <small>(6px)</small>     |
-| `--wa-tooltip-background-color`    | `var(--wa-color-neutral-fill-loud)` |
-| `--wa-tooltip-border-radius` | `var(--wa-border-radius-m)`         |
-| `--wa-tooltip-content-color` | `var(--wa-color-neutral-on-loud)`   |
-| `--wa-tooltip-font-size`     | `var(--wa-font-size-s)`             |
-| `--wa-tooltip-line-height`   | `var(--wa-line-height-normal)`      |
+| Custom Property                 | Default Value                        |
+| ------------------------------- | ------------------------------------ |
+| `--wa-tooltip-arrow-size`       | `0.375rem` <small>(6px)</small>      |
+| `--wa-tooltip-background-color` | `var(--wa-color-neutral-fill-loud)`  |
+| `--wa-tooltip-border-color`     | `var(--wa-tooltip-background-color)` |
+| `--wa-tooltip-border-style`     | `var(--wa-border-style)`             |
+| `--wa-tooltip-border-width`     | `var(--wa-border-width-s)`           |
+| `--wa-tooltip-border-radius`    | `var(--wa-border-radius-s)`          |
+| `--wa-tooltip-content-color`    | `var(--wa-color-neutral-on-loud)`    |
+| `--wa-tooltip-font-size`        | `var(--wa-font-size-s)`              |
+| `--wa-tooltip-line-height`      | `var(--wa-line-height-normal)`       |

 ```html {.example}
 <wa-button id="bullseye-example" appearance="plain">
--- a/packages/webawesome/docs/docs/tokens/typography.md
+++ b/packages/webawesome/docs/docs/tokens/typography.md
@@ -59,11 +59,13 @@ Common weights let you easily adjust the full range of weights for your theme.

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

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

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

--- a/packages/webawesome/docs/docs/usage.md
+++ b/packages/webawesome/docs/docs/usage.md
@@ -174,3 +174,54 @@ This time we see an empty string, which means the boolean attribute is now prese
 :::info
 To wait for multiple components to update, you can use `requestAnimationFrame()` instead of awaiting each element.
 :::
+
+## Code Completion
+
+### VS Code
+
+Web Awesome ships with a file called `vscode.html-custom-data.json` that can be used to describe its custom elements to [Visual Studio Code](https://code.visualstudio.com/). This enables code completion for Web Awesome components (also known as “code hinting” or “IntelliSense”). To enable it, you need to tell VS Code where the file is.
+
+1. [Install Web Awesome locally](/docs/#installing-via-npm)
+2. If it doesn’t already exist, create a folder called `.vscode` at the root of your project
+3. If it doesn’t already exist, create a file inside that folder called `settings.json`
+4. Add the following to the file
+
+```json
+{
+  "html.customData": ["./node_modules/@awesome.me/webawesome/dist/vscode.html-custom-data.json"]
+}
+```
+
+If `settings.json` already exists, simply add the above line to the root of the object. Note that you may need to restart VS Code for the changes to take effect.
+
+If you are using WebAwesome through the [CDN](/docs/#quick-start-autoloading-via-cdn) you can manually [download the file]({% cdnUrl 'vscode.html-custom-data.json' %}]({% cdnUrl 'vscode.html-custom-data.json' %}) instead.
+
+### JetBrains IDEs
+If you are using a [JetBrains IDE](https://www.jetbrains.com/) and you are installing Web Awesome from NPM, the editor will automatically detect the web-types.json file from the package and you should immediately see component information in your editor.
+
+If you are installing from the CDN, you can [download a local copy]({% cdnUrl 'web-types.json' %}) and add it to the root of your project. Be sure to add a reference to the web-types.json file in your package.json in order for your editor to properly detect it.
+
+```json
+{
+  ...
+  "web-types": "./web-types.json"
+  ...
+}
+```
+
+If you are using types from multiple projects, you can add an array of references.
+
+```json
+{
+  ...
+  "web-types": [
+    ...,
+    "./web-types.json"
+  ]
+  ...
+}
+```
+
+### Other Editors
+
+Most popular editors support custom code completion with a bit of configuration. Please [submit a feature request](https://github.com/shoelace-style/webawesome/issues/new/choose) for your editor of choice. PRs are also welcome!
--- a/packages/webawesome/docs/docs/utilities/align-items.md
+++ b/packages/webawesome/docs/docs/utilities/align-items.md
@@ -20,7 +20,7 @@ tags: layoutUtilities
  }
 </style>

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

 | Class Name                | `align-items` Value | Preview                                                                                                                                  |
 | ------------------------- | ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
--- a/packages/webawesome/docs/docs/utilities/cluster.md
+++ b/packages/webawesome/docs/docs/utilities/cluster.md
@@ -60,7 +60,7 @@ Clusters are great for inline lists and aligning items of varying sizes.

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

 Often, components are shown before their logic and styles have had a chance to load, also known as a [Flash of Undefined Custom Elements](https://www.abeautifulsite.net/posts/flash-of-undefined-custom-elements/).

-The FOUCE style utility (which is automatically applied if you use our [style utilities](/docs/utilities/)) automatically takes care of hiding custom elements until **both they and their contents** have been registered, up to a maximum of two seconds.
+The FOUCE style utility takes care of hiding custom elements until **both they and their contents** have been registered, up to a maximum of two seconds.

 In many cases, this is not enough, and you may wish to hide a broader wrapper element or even the entire page until all WA elements within it have loaded.
 To do that, you can add the `wa-cloak` class to any element on the page or even apply it to the whole page by placing the class on the `<html>` element:
--- a/packages/webawesome/docs/docs/utilities/frame.md
+++ b/packages/webawesome/docs/docs/utilities/frame.md
@@ -54,7 +54,7 @@ Frames are well-suited for images and image placeholders.
      <img src="https://images.unsplash.com/photo-1533743983669-94fa5c4338ec?q=20" alt="Grey and white tabby kitten" />
    </div>
    <div class="wa-stack wa-gap-xs">
-      <h3 class="wa-heading-s">White-socks</h3>
+      <h3 class="wa-heading-m">White-socks</h3>
      <span class="wa-body-s">Kitten &bull; Male</span>
      <div class="wa-flank:end wa-gap-xs">
        <wa-button size="small" appearance="filled" variant="brand">Adopt this pet</wa-button>
@@ -67,13 +67,13 @@ Frames are well-suited for images and image placeholders.
  </wa-card>
  <wa-card>
    <div class="wa-frame:landscape" slot="header">
-      <div class="wa-stack wa-align-items-center wa-gap-xs wa-caption-m">
+      <div class="wa-stack wa-align-items-center wa-gap-xs wa-caption-s">
        <wa-icon name="paw"></wa-icon>
        <span>Photo coming soon</span>
      </div>
    </div>
    <div class="wa-stack wa-gap-xs">
-      <h3 class="wa-heading-s">Bumpkin</h3>
+      <h3 class="wa-heading-m">Bumpkin</h3>
      <span class="wa-body-s">Adult &bull; Male</span>
      <div class="wa-flank:end wa-gap-xs">
        <wa-button size="small" appearance="filled" variant="brand">Adopt this pet</wa-button>
@@ -89,7 +89,7 @@ Frames are well-suited for images and image placeholders.
      <img src="https://images.unsplash.com/photo-1445499348736-29b6cdfc03b9?q=20" alt="Diluted calico kitten" />
    </div>
    <div class="wa-stack wa-gap-xs">
-      <h3 class="wa-heading-s">Swish-tail</h3>
+      <h3 class="wa-heading-m">Swish-tail</h3>
      <span class="wa-body-s">Kitten &bull; Female</span>
      <div class="wa-flank:end wa-gap-xs">
        <wa-button size="small" appearance="filled" variant="brand">Adopt this pet</wa-button>
@@ -105,7 +105,7 @@ Frames are well-suited for images and image placeholders.
      <img src="https://images.unsplash.com/photo-1517451330947-7809dead78d5?q=20" alt="Short-haired tabby cat" />
    </div>
    <div class="wa-stack wa-gap-xs">
-      <h3 class="wa-heading-s">Sharp-ears</h3>
+      <h3 class="wa-heading-m">Sharp-ears</h3>
      <span class="wa-body-s">Adult &bull; Female</span>
      <div class="wa-flank:end wa-gap-xs">
        <wa-button size="small" appearance="filled" variant="brand">Adopt this pet</wa-button>
--- a/packages/webawesome/docs/docs/utilities/grid.md
+++ b/packages/webawesome/docs/docs/utilities/grid.md
@@ -41,35 +41,35 @@ Grids work especially well for card lists and content designed for browsing.
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1520763185298-1b434c919102?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-s">Tulip</h3>
+    <h3 class="wa-heading-m">Tulip</h3>
    <em>Tulipa gesneriana</em>
  </div>
  <div class="wa-stack wa-gap-s">
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1591767134492-338e62f7b5a2?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-s">Peony</h3>
+    <h3 class="wa-heading-m">Peony</h3>
    <em>Paeonia officinalis</em>
  </div>
  <div class="wa-stack wa-gap-s">
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1590872000386-4348c6393115?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-s">Poppy</h3>
+    <h3 class="wa-heading-m">Poppy</h3>
    <em>Papaver rhoeas</em>
  </div>
  <div class="wa-stack wa-gap-s">
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1516723338795-324c7c33f700?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-s">Sunflower</h3>
+    <h3 class="wa-heading-m">Sunflower</h3>
    <em>Helianthus annuus</em>
  </div>
  <div class="wa-stack wa-gap-s">
    <div class="wa-frame wa-border-radius-l">
      <img src="https://images.unsplash.com/photo-1563601841845-74a0a8ab7c8a?q=20" alt="" />
    </div>
-    <h3 class="wa-heading-s">Daisy</h3>
+    <h3 class="wa-heading-m">Daisy</h3>
    <em>Bellis perennis</em>
  </div>
 </div>
@@ -83,9 +83,9 @@ Grids work especially well for card lists and content designed for browsing.
        <wa-icon slot="icon" name="globe"></wa-icon>
      </wa-avatar>
      <div class="wa-stack wa-gap-3xs">
-        <span class="wa-caption-s">Population (Zion)</span>
+        <span class="wa-caption-xs">Population (Zion)</span>
        <span class="wa-cluster wa-gap-xs">
-          <span class="wa-heading-xl">251,999</span>
+          <span class="wa-heading-2xl">251,999</span>
          <wa-badge variant="danger">-3%&nbsp;<wa-icon name="arrow-trend-down"></wa-icon></wa-badge>
        </span>
      </div>
@@ -97,9 +97,9 @@ Grids work especially well for card lists and content designed for browsing.
        <wa-icon slot="icon" name="brain-circuit"></wa-icon>
      </wa-avatar>
      <div class="wa-stack wa-gap-3xs">
-        <span class="wa-caption-s">Minds Freed</span>
+        <span class="wa-caption-xs">Minds Freed</span>
        <span class="wa-cluster wa-gap-xs">
-          <span class="wa-heading-xl">0.36%</span>
+          <span class="wa-heading-2xl">0.36%</span>
          <wa-badge variant="success">+0.03%&nbsp;<wa-icon name="arrow-trend-up"></wa-icon></wa-badge>
        </span>
      </div>
@@ -111,9 +111,9 @@ Grids work especially well for card lists and content designed for browsing.
        <wa-icon slot="icon" name="robot"></wa-icon>
      </wa-avatar>
      <div class="wa-stack wa-gap-3xs">
-        <span class="wa-caption-s">Agents Discovered</span>
+        <span class="wa-caption-xs">Agents Discovered</span>
        <span class="wa-cluster wa-gap-xs">
-          <span class="wa-heading-xl">3</span>
+          <span class="wa-heading-2xl">3</span>
          <wa-badge variant="neutral">±0%&nbsp;<wa-icon name="wave-triangle"></wa-icon></wa-badge>
        </span>
      </div>
@@ -125,9 +125,9 @@ Grids work especially well for card lists and content designed for browsing.
        <wa-icon slot="icon" name="spaghetti-monster-flying"></wa-icon>
      </wa-avatar>
      <div class="wa-stack wa-gap-3xs">
-        <span class="wa-caption-s">Sentinels Controlled</span>
+        <span class="wa-caption-xs">Sentinels Controlled</span>
        <span class="wa-cluster wa-gap-xs">
-          <span class="wa-heading-xl">208</span>
+          <span class="wa-heading-2xl">208</span>
          <wa-badge variant="success">+1%&nbsp;<wa-icon name="arrow-trend-up"></wa-icon></wa-badge>
        </span>
      </div>
--- a/packages/webawesome/docs/docs/utilities/native.md
+++ b/packages/webawesome/docs/docs/utilities/native.md
@@ -5,27 +5,52 @@ layout: page-outline
 tags: styleUtilities
 ---

-Web Awesome provides optional Native Styles that make native HTML elements look good so you can continue using what you know and gradually adopt Web Awesome as you see fit.
+Native styles use design tokens to spruce up native HTML elements so that they match the look and feel of your theme. While these native styles are completely optional, they're a great starting point for a cohesive design and a huge help when using a combination of native elements and Web Awesome components in your project.

-## Installation
+## Using native styles

-To use all Web Awesome page styles (including [utilities](/docs/utilities/)), include the following stylesheet in your project:
+To use all Web Awesome styles (including [utilities](/docs/utilities/)), include the following stylesheet in your project:

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

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

 ```html
+<link rel="stylesheet" href="{% cdnUrl 'styles/themes/default.css' %}" />
 <link rel="stylesheet" href="{% cdnUrl 'styles/native.css' %}" />
 ```

-## Elements
+You can additionally include any pre-made [theme](/docs/themes/) or [color palette](/docs/color-palettes/) to change the look of native elements.
+
+## Content flow
+
+Native styles set default space between many block-level HTML elements using the `--wa-content-spacing` token from your theme. This helps ensure that your content is readable.
+
+```html {.example}
+<h3>Curabitur odio ligula</h3>
+<p>Fusce mollis quam lorem, et gravida arcu laoreet ut. Pellentesque et malesuada mi. Morbi faucibus nisl nec nulla porta, ac scelerisque elit finibus.</p>
+<blockquote>The Road goes ever on and on<br />
+Out from the door where it began.</blockquote>
+<p>Donec varius, ipsum sit amet lobortis tristique, quam arcu pellentesque turpis, non porta lacus arcu non arcu. Morbi luctus at nisl sit amet faucibus.</p>
+<hr />
+<ul>
+  <li>Aenean imperdiet</li>
+  <li>Vivamus consectetur at est</li>
+  <li>Quisque vel leo in leo semper</li>
+</ul>
+```
+
+To remove this default spacing, you can set `--wa-content-spacing: 0` in your styles.
+
+## Typography
+
+Native styles use [typography design tokens](/docs/tokens/typography/) to style text elements. A number of styles — such as `color`, `font-family`, `font-size`, `font-weight`, and `line-height` — are set on the `<body>` element to be inherited by child elements.

 ### Headings

-Semantic heading elements with proper hierarchy and styling.
+Create headings with `<h1>` through `<h6>`. Headings use tokens with the `-heading` suffix, condensed line height, and `text-wrap: balance` for a prominent yet compact appearance.

 ```html {.example}
 <h1>Heading 1</h1>
@@ -38,7 +63,7 @@ Semantic heading elements with proper hierarchy and styling.

 ### Paragraphs

-Standard paragraph text with optimal spacing and readability.
+Create paragraphs with `<p>`. Paragraphs inherit the default text styles set on the `<body>` element and use `text-wrap: pretty` to prevent orphaned lines in supported browsers.

 ```html {.example}
 <p>
@@ -55,7 +80,7 @@ Standard paragraph text with optimal spacing and readability.

 ### Blockquotes

-Styled quotations that stand out from regular text.
+Emphasize longer quotations with `<blockquote>`. Block quotes use your theme's serif font family and a leading border to stand out.

 ```html {.example}
 <blockquote>
@@ -67,51 +92,51 @@ Styled quotations that stand out from regular text.

 ### Lists

-Organized content in bulleted or numbered format with proper nesting support.
+Create ordered and unordered lists with `<ol>` and `<ul>`, plus `<li>` for list items within.

 ```html {.example}
-<ul>
-  <li>List item 1</li>
-  <li>
-    List item 2
-    <ul>
-      <li>Subitem a</li>
-      <li>Subitem b</li>
-    </ul>
-  </li>
-  <li>List item 3</li>
-</ul>
+<div class="wa-grid">
+  <ol>
+    <li>First item</li>
+    <li>
+      Another item
+      <ol>
+        <li>Nested item</li>
+        <li>Another nested item</li>
+      </ol>
+    </li>
+    <li>Final item</li>
+  </ol>

-<ol>
-  <li>List item 1</li>
-  <li>
-    List item 2
-    <ol>
-      <li>Subitem a</li>
-      <li>Subitem b</li>
-    </ol>
-  </li>
-  <li>List item 3</li>
-</ol>
+  <ul>
+    <li>First item</li>
+    <li>
+      Another item
+      <ul>
+        <li>Nested item</li>
+        <li>Another nested item</li>
+      </ul>
+    </li>
+    <li>Final item</li>
+  </ul>
+</div>
 ```

-### Description Lists
-
-Term and definition pairs for glossaries and descriptions.
+Use `<dl>` to create lists of terms (`<dt>`) and definitions (`<dd>`).

 ```html {.example}
 <dl>
-  <dt>Definition 1</dt>
+  <dt>First term</dt>
  <dd>
    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
    aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
  </dd>
-  <dt>Definition 2</dt>
+  <dt>Second term</dt>
  <dd>
    Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
    sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
  </dd>
-  <dt>Definition 3</dt>
+  <dt>Final term</dt>
  <dd>
    Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam,
    eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.
@@ -119,13 +144,153 @@ Term and definition pairs for glossaries and descriptions.
 </dl>
 ```

+### Code blocks
+
+Create code blocks or other preformatted text with `<pre>`. Preformatted text uses your theme's monospace font family and a subtle background color.
+
+```html {.example}
+<pre>
+// do a thing
+export function thing() {
+  return true;
+}
+</pre>
+```
+
+### Inline text
+
+Use any inline text element like `<strong>`, `<em>`, `<a>`, `<kbd>`, and others to stylize or emphasize text.
+
+```html {.example}
+<div class="wa-grid">
+  <div class="wa-stack wa-align-items-start">
+    <strong>Bold</strong>
+    <em>Italic</em>
+    <u>Underline</u>
+    <s>Strike-through</s>
+    <del>Deleted</del>
+    <ins>Inserted</ins>
+    <small>Small</small>
+  </div>
+  <div class="wa-stack wa-align-items-start">
+    <span>Subscript <sub>Sub</sub></span>
+    <span>Superscript <sup>Sup</sup></span>
+    <abbr title="Abbreviation">Abbr.</abbr>
+    <mark>Highlighted</mark>
+    <a href="#">Link text</a>
+    <code>Inline code</code>
+    <kbd>Keyboard</kbd>
+  </div>
+</div>
+```
+
+## Widgets & media
+
+### Media
+
+Add responsive media with `<img>`, `<svg>`, `<video>`, `<iframe>`, and others. Media takes up 100% width by default and scales according to its container's width.
+
+```html {.example}
+<img 
+  src="https://images.unsplash.com/photo-1620196244888-d31ff5bbf163?q=80&w=1000&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D" 
+  alt="A gray kitten lays next to a toy"
+/>
+```
+
+### Tables
+
+Structure tabular data with `<table>` and related elements like `<caption>`, `<thead>`, `<tbody>`, `<th>`, `<tr>`, and `<td>`.
+
+```html {.example}
+<table>
+  <caption>
+    This <code>&lt;caption&gt;</code> describes the table
+  </caption>
+  <thead>
+    <tr>
+      <th>First column</th>
+      <th>Second column</th>
+      <th>Third column</th>
+      <th>Final column</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+    </tr>
+    <tr>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+    </tr>
+    <tr>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+    </tr>
+    <tr>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+    </tr>
+  </tbody>
+</table>
+```
+
+Add the `wa-hover-rows` class to highlight table rows on hover and the `wa-zebra-rows` class to add alternating row colors to your table.
+
+```html {.example}
+<table class="wa-zebra-rows wa-hover-rows">
+  <thead>
+    <tr>
+      <th>First column</th>
+      <th>Second column</th>
+      <th>Third column</th>
+      <th>Final column</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+    </tr>
+    <tr>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+    </tr>
+    <tr>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+    </tr>
+    <tr>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+      <td>Data</td>
+    </tr>
+  </tbody>
+</table>
+```
+
 ### Details

-Collapsible content sections with expand/collapse functionality.
+Create disclosure widgets with `<details>` and `<summary>`. Details closely match the appearance of [`<wa-details>`](/docs/components/details/).

 ```html {.example}
 <details>
-  <summary>Tincidunt nunc pulvinar</summary>
+  <summary>Summary</summary>
  <p>
    Ut lectus arcu bibendum at varius. Convallis a cras semper auctor neque vitae. Odio pellentesque diam volutpat
    commodo sed egestas. Amet dictum sit amet justo donec enim diam vulputate ut.
@@ -135,7 +300,7 @@ Collapsible content sections with expand/collapse functionality.

 ### Dialog

-Modal dialog windows for alerts, confirmations, and overlays.
+Create modal and non-modal dialog boxes with `<dialog>`. Dialogs closely match the appearance of [`<wa-dialog>`](/docs/components/dialog/).

 ```html {.example}
 <dialog id="dialog-example">
@@ -155,55 +320,9 @@ Modal dialog windows for alerts, confirmations, and overlays.
 </script>
 ```

-### Inline Text
+### Progress

-Various text formatting elements for emphasis and semantic meaning.
-
-```html {.example}
-<div class="two-columns">
-  <p><strong>Bold</strong></p>
-  <p><em>Italic</em></p>
-  <p><u>Underline</u></p>
-  <p><s>Strike-through</s></p>
-  <p><del>Deleted</del></p>
-  <p><ins>Inserted</ins></p>
-  <p><small>Small</small></p>
-  <p>
-    <span>Subscript <sub>Sub</sub></span>
-  </p>
-  <p>
-    <span>Superscript <sup>Sup</sup></span>
-  </p>
-  <p><abbr title="Abbreviation">Abbr.</abbr></p>
-  <p><mark>Highlighted</mark></p>
-  <p><a href="#">Link text</a></p>
-  <p><code>Inline code</code></p>
-  <p><kbd>Keyboard</kbd></p>
-</div>
-```
-
-### Code Blocks
-
-Formatted code snippets with proper syntax styling.
-
-```html {.example}
-<pre>
-// do a thing
-export function thing() {
-  return true;
-}
-</pre>
-```
-
-### Images
-
-Responsive images with proper scaling and styling.
-
-![A gray kitten lays next to a toy](https://images.unsplash.com/photo-1620196244888-d31ff5bbf163?q=80&w=1000&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D)
-
-### Progress Bars
-
-Visual indicators for task completion and loading states.
+Create progress indicators with `<progress>`. Progress indicators closely match the appearance of [`<wa-progress-bar>`](/docs/components/progress-bar/).

 ```html {.example}
 <progress value="40" max="100"></progress>
@@ -211,156 +330,43 @@ Visual indicators for task completion and loading states.
 <progress></progress>
 ```

-### Tables
+## Forms

-Structured data presentation with clean styling and optional zebra striping.
-
-```html {.example}
-<table>
-  <caption>
-    I'm just a table
-  </caption>
-  <thead>
-    <tr>
-      <th>Column 1</th>
-      <th>Column 2</th>
-      <th>Column 3</th>
-      <th>Column 4</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-    </tr>
-    <tr>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-    </tr>
-    <tr>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-    </tr>
-    <tr>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-    </tr>
-  </tbody>
-</table>
-```
-
-You can use the `wa-zebra-rows` class to add alternating row colors to your table:
-
-```html {.example}
-<table class="wa-zebra-rows">
-  <caption>
-    I'm just a table
-  </caption>
-  <thead>
-    <tr>
-      <th>Column 1</th>
-      <th>Column 2</th>
-      <th>Column 3</th>
-      <th>Column 4</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-    </tr>
-    <tr>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-    </tr>
-    <tr>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-    </tr>
-    <tr>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-      <td>Cell</td>
-    </tr>
-  </tbody>
-</table>
-```
-
-## Form Controls
+Native styles use [form control design tokens](/docs/tokens/component-groups/#form-controls) to style form elements like buttons and inputs. Form elements additionally inherit `font-family` from the `<body>` element.

 ### Buttons

-Use the [variant utility classes](../utilities/color.md) to set the button's semantic variant.
+Create buttons with `<button>` or `<input type="button | submit | reset">`. Buttons closely match the appearance of [`<wa-button>`](/docs/components/button/).

 ```html {.example}
-<button class="wa-neutral"><wa-icon name="home"></wa-icon> Neutral</button>
+<button>Button</button>
+<input type="button" value="Input (button)" />
+<input type="submit" value="Input (submit)" />
+<input type="reset" value="Input (reset)" />
+```
+
+Add the `wa-brand`, `wa-neutral`, `wa-success`, `wa-warning`, or `wa-danger` class to specify the button's [color variant](/docs/utilities/color/).
+
+
+```html {.example}
+<button class="wa-neutral">Neutral</button>
 <button class="wa-brand">Brand</button>
 <button class="wa-success">Success</button>
 <button class="wa-warning">Warning</button>
 <button class="wa-danger">Danger</button>
 ```

-Use the [appearance utility classes](/docs/utilities/appearance) to change the button's visual appearance:
+Add the `wa-accent`, `wa-filled`, `wa-outlined`, or `wa-plain` class to specify the button's visual appearance.

 ```html {.example}
-<div style="margin-block-end: 1rem;">
-  <button class="wa-accent wa-outlined wa-neutral">A + O</button>
-  <button class="wa-accent wa-neutral">Accent</button>
-  <button class="wa-outlined wa-neutral">Outlined</button>
-  <button class="wa-filled wa-outlined wa-neutral">F + O</button>
-  <button class="wa-filled wa-neutral">Filled</button>
-  <button class="wa-plain wa-neutral">Plain</button>
-</div>
-<div style="margin-block-end: 1rem;">
-  <button class="wa-accent wa-outlined wa-brand">A + O</button>
-  <button class="wa-accent wa-brand">Accent</button>
-  <button class="wa-outlined wa-brand">Outlined</button>
-  <button class="wa-filled wa-outlined wa-brand">F + O</button>
-  <button class="wa-filled wa-brand">Filled</button>
-  <button class="wa-plain wa-brand">Plain</button>
-</div>
-<div style="margin-block-end: 1rem;">
-  <button class="wa-accent wa-outlined wa-success">A + O</button>
-  <button class="wa-accent wa-success">Accent</button>
-  <button class="wa-outlined wa-success">Outlined</button>
-  <button class="wa-filled wa-outlined wa-success">F + O</button>
-  <button class="wa-filled wa-success">Filled</button>
-  <button class="wa-plain wa-success">Plain</button>
-</div>
-<div style="margin-block-end: 1rem;">
-  <button class="wa-accent wa-outlined wa-warning">A + O</button>
-  <button class="wa-accent wa-warning">Accent</button>
-  <button class="wa-outlined wa-warning">Outlined</button>
-  <button class="wa-filled wa-outlined wa-warning">F + O</button>
-  <button class="wa-filled wa-warning">Filled</button>
-  <button class="wa-plain wa-warning">Plain</button>
-</div>
-<div>
-  <button class="wa-accent wa-outlined wa-danger">A + O</button>
-  <button class="wa-accent wa-danger">Accent</button>
-  <button class="wa-outlined wa-danger">Outlined</button>
-  <button class="wa-filled wa-outlined wa-danger">F + O</button>
-  <button class="wa-filled wa-danger">Filled</button>
-  <button class="wa-plain wa-danger">Plain</button>
-</div>
+<button class="wa-accent wa-neutral">Accent</button>
+<button class="wa-filled wa-outlined wa-neutral">Filled + Outlined</button>
+<button class="wa-filled wa-neutral">Filled</button>
+<button class="wa-outlined wa-neutral">Outlined</button>
+<button class="wa-plain wa-neutral">Plain</button>
 ```

-Use the [size utility classes](../utilities/size.md) to change a button's size.
+Add the `wa-size-s`, `wa-size-m`, or `wa-size-l` class to specify the size of the button.

 ```html {.example}
 <button class="wa-size-s">Small</button>
@@ -368,131 +374,154 @@ Use the [size utility classes](../utilities/size.md) to change a button's size.
 <button class="wa-size-l">Large</button>
 ```

-Use the `wa-pill` class to give buttons rounded edges.
+Add the `wa-pill` class to give buttons rounded edges.

 ```html {.example}
-<button class="wa-size-s wa-pill">Small</button>
-<button class="wa-size-m wa-pill">Medium</button>
-<button class="wa-size-l wa-pill">Large</button>
+<button class="wa-pill">Pill button</button>
 ```

-### Checkboxes
-
-Multi-select form controls with checked, indeterminate, and disabled states.
+When using `<wa-icon>` within a button, wrap adjacent label text in `<span>` or similar to automatically add margin between the icon and the label, just like the `start` and `end` slots of `<wa-button>`.

 ```html {.example}
-<label><input type="checkbox" checked /> Checked</label><br />
-<label><input type="checkbox" class="indeterminate" /> Indeterminate</label><br />
-<label><input type="checkbox" disabled /> Disabled</label>
+<button>
+  <wa-icon name="plane-departure"></wa-icon>
+  <span>Start Icon</span>
+</button>
+<button>
+  <span>End Icon</span>
+  <wa-icon name="plane-arrival"></wa-icon>
+</button>
+```
+
+### Form controls
+
+Create a variety of form controls with `<input type="">`, `<select>`, and `<textarea>`. Each control closely matches the appearance of the corresponding Web Awesome component.
+
+```html {.example}
+<div class="wa-stack">
+  <label>Text <input type="text" placeholder="add some text" /></label>
+  <label>Date <input type="date" /></label>
+  <label>Time <input type="time" /></label>
+  <label>Number <input type="number" placeholder="12345" /></label>
+  <label>Color <input type="color" value="#f36944" /></label>
+  <label>File <input type="file" multiple /></label>
+  <label>Range <input type="range" /></label>
+  <label>Select
+    <select>
+      <option value="option-1">Option 1</option>
+      <option value="option-2">Option 2</option>
+      <option value="option-3">Option 3</option>
+    </select>
+  </label>
+  <label>Textarea <textarea placeholder="add more text"></textarea></label>
+  <div class="wa-cluster">
+    <label><input type="checkbox" checked /> Checked</label>
+    <label><input type="checkbox" class="indeterminate" /> Indeterminate</label>
+    <label><input type="checkbox" /> Unchecked</label>
+  </div>
+  <div class="wa-cluster">
+    <label><input type="radio" name="radio-group" value="1" checked /> First radio</label>
+    <label><input type="radio" name="radio-group" value="2" /> Second radio</label>
+    <label><input type="radio" name="radio-group" value="3" /> Third radio</label>
+  </div>
+</div>

 <script>
  document.querySelector('.indeterminate').indeterminate = true;
 </script>
 ```

-### Radios
-
-Single-select form controls for mutually exclusive choices.
-
-You can wrap native radios in a flex container to give them a horizontal or vertical orientation with even spacing. The convenience [`wa-cluster`](/docs/utilities/cluster) and [`wa-stack`](/docs/utilities/stack) utilities make this easy.
-
+Add the `wa-size-s`, `wa-size-m`, or `wa-size-l` class to any form control or its parent `<label>` to specify its size.
 ```html {.example}
-<div class="wa-cluster">
-  <label><input type="radio" name="b" value="1" checked /> Option 1</label>
-  <label><input type="radio" name="b" value="2" /> Option 2</label>
-  <label><input type="radio" name="b" value="3" /> Option 3</label>
-</div>
-
-<div class="wa-stack" style="margin-block-start: var(--wa-space-2xl);">
-  <label><input type="radio" name="g" value="1" checked /> Option 1</label>
-  <label><input type="radio" name="g" value="2" /> Option 2</label>
-  <label><input type="radio" name="g" value="3" /> Option 3</label>
+<div class="wa-stack">
+  <input type="text" placeholder="Small input" class="wa-size-s" />
+  <div class="wa-cluster">
+    <label class="wa-size-s"><input type="checkbox" checked /> Small checkbox</label>
+    <label class="wa-size-s"><input type="radio" name="radio-small" value="1" checked /> Small radio</label>
+  </div>
+  <input type="text" placeholder="Medium input" class="wa-size-m" />
+  <div class="wa-cluster">
+    <label class="wa-size-m"><input type="checkbox" checked /> Medium checkbox</label>
+    <label class="wa-size-m"><input type="radio" name="radio-medium" value="1" checked /> Medium radio</label>
+  </div>
+  <input type="text" placeholder="Large input" class="wa-size-l" />
+  <div class="wa-cluster">
+    <label class="wa-size-l"><input type="checkbox" checked /> Large checkbox</label>
+    <label class="wa-size-l"><input type="radio" name="radio-large" value="1" checked /> Large radio</label>
+  </div>
 </div>
 ```

-### Selects
-
-Dropdown menus for choosing from a list of options.
+Add the `wa-filled` class to an input to give it a filled background.

 ```html {.example}
-<label
-  >Select
-  <select id="select">
-    <option value="option-1">Option 1</option>
-    <option value="option-2">Option 2</option>
-    <option value="option-3">Option 3</option>
+<div class="wa-stack">
+  <input type="text" placeholder="Filled input" class="wa-filled" />
+  <select class="wa-filled">
+    <option value="filled">Filled select</option>
  </select>
-</label>
+  <textarea placeholder="Filled textarea" class="wa-filled"></textarea>
+</div>
 ```

-### Sliders
-
-Range inputs for selecting numeric values within a specified range.
+Add the `wa-pill` class to an input or select to give it rounded edges.

 ```html {.example}
-<label>Select a value: <input type="range" /></label>
+<div class="wa-stack">
+  <input type="text" placeholder="Pill input" class="wa-pill" />
+  <select class="wa-pill">
+    <option value="pill">Pill select</option>
+  </select>
+</div>
 ```

-### Text Fields
-
-Various input types for collecting user text and data.
+Add any [button](#buttons) modifier class to `<input type="file">` to change the file selector button's color variant, appearance, size, and shape.

 ```html {.example}
-<label>Text <input type="text" placeholder="placeholder" /></label>
-
-<label>Number <input type="number" /></label>
-
-<label>Password <input type="password" required /></label>
-
-<label>Email <input type="email" /></label>
-
-<label>Search <input type="search" /></label>
-
-<label>Telephone <input type="tel" /></label>
-
-<label>URL <input type="url" /></label>
-```
-
-Add the `wa-pill` class to an `<input>` to make it pill-shaped.
-
-```html {.example}
-<label>Input <input type="text" placeholder="placeholder" class="wa-pill" /></label>
-```
-
-### Color Pickers
-
-Visual color selection interface with hex value input.
-
-```html {.example}
-<label>Input (color) <input type="color" value="#ff0066" /></label>
-```
-
-### Date & Time Pickers
-
-Specialized inputs for selecting dates, times, and datetime values.
-
-```html {.example}
-<label>Input (datetime-local) <input type="datetime-local" /></label>
-
-<label>Input (date) <input type="date" /></label>
-
-<label>Input (time) <input type="time" /></label>
-```
-
-### Textareas
-
-Multi-line text input fields for longer content.
-
-```html {.example}
-<label>Textarea <textarea placeholder="Type something"></textarea></label>
+<input type="file" class="wa-filled wa-outlined wa-warning wa-size-s wa-pill" />
 ```

 ### Fieldsets

+Group form controls together with `<fieldset>` and `<legend>`.
+
 ```html {.example}
-<fieldset>
+<fieldset class="wa-stack wa-align-items-start">
  <legend>Legend</legend>
-  Nunc mi ipsum faucibus vitae aliquet nec ullamcorper. Tincidunt id aliquet risus feugiat in ante. Ac turpis egestas
-  integer eget aliquet nibh praesent tristique magna.
+  <label><input type="radio" name="legends" value="1" checked /> King Arthur</label>
+  <label><input type="radio" name="legends" value="2" /> Robin Hood</label>
+  <label><input type="radio" name="legends" value="3" /> Odysseus</label>
 </fieldset>
 ```
+
+### Form layouts
+
+Wrap form controls in a flex container to arrange them horizontally or vertically with even spacing. Layout utility classes like [`wa-cluster`](/docs/utilities/cluster) and [`wa-stack`](/docs/utilities/stack) can be added directly to a `<fieldset>` or `<form>` to make this especially easy.
+
+```html {.example}
+<fieldset class="wa-cluster">
+  <legend>Ducks in a row</legend>
+  <label><input type="checkbox" checked /> Mallard</label>
+  <label><input type="checkbox" /> Common Loon</label>
+  <label><input type="checkbox" /> Least Grebe</label>
+</fieldset>
+
+<br />
+
+<form class="wa-stack">
+  <label>Number of pancakes <input type="number" value="5" /></label>
+  <label>Syrup flavor
+    <select>
+      <option value="maple">Maple</option>
+      <option value="strawberry">Strawberry</option>
+      <option value="blueberry">Blueberry</option>
+      <option value="pecan">Butter pecan</option>
+    </select>
+  </label>
+  <label><input type="checkbox" checked /> Add whipped butter</label>
+  <button>
+    <wa-icon name="pancakes"></wa-icon>
+    Stack 'em up
+  </button>
+</form>
+```
--- a/packages/webawesome/docs/docs/utilities/split.md
+++ b/packages/webawesome/docs/docs/utilities/split.md
@@ -68,7 +68,7 @@ Splits are especially helpful for navigation, header, and footer layouts.
 ```html {.example}
 <div class="wa-stack">
  <div class="wa-split">
-    <wa-icon name="web-awesome" label="Web Awesome" style="font-size: var(--wa-font-size-xl);"></wa-icon>
+    <wa-icon name="web-awesome" label="Web Awesome" class="wa-font-size-xl"></wa-icon>
    <div class="wa-cluster">
      <wa-button>Sign Up</wa-button>
      <wa-button appearance="outlined">Log In</wa-button>
--- a/packages/webawesome/docs/docs/utilities/text.md
+++ b/packages/webawesome/docs/docs/utilities/text.md
@@ -1,66 +1,159 @@
 ---
 title: Text
-description: Text utility classes combine custom properties from your Web Awesome theme to conveniently style text content.
+description: Text utility classes use custom properties from your Web Awesome theme and other standard CSS properties to style text elements on the fly.
 layout: docs
 tags: styleUtilities
 ---

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

 ## Body

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

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

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

 ## Headings

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

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

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

 ## Captions

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

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

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

-| Class Name      | `font-size` Value    | Preview                                                                       |
-| --------------- | -------------------- | ----------------------------------------------------------------------------- |
-| `wa-caption-xs` | `--wa-font-size-2xs` | <div class="wa-caption-xs">The quick brown fox jumps over the lazy dog.</div> |
-| `wa-caption-s`  | `--wa-font-size-xs`  | <div class="wa-caption-s">The quick brown fox jumps over the lazy dog.</div>  |
-| `wa-caption-m`  | `--wa-font-size-s`   | <div class="wa-caption-m">The quick brown fox jumps over the lazy dog.</div>  |
-| `wa-caption-l`  | `--wa-font-size-m`   | <div class="wa-caption-l">The quick brown fox jumps over the lazy dog.</div>  |
-| `wa-caption-xl` | `--wa-font-size-l`   | <div class="wa-caption-xl">The quick brown fox jumps over the lazy dog.</div> |
+## Longform
+
+Use `wa-longform-*` classes to style lengthy content like essays or blog posts. Each class specifies a `font-size` that corresponds to a [font size token](/docs/tokens/typography/#font-size) from your theme.
+
+Alternatively, use `wa-longform` to apply the same styling without an explicit font size.
+
+| Class Name        | Preview                                                |
+| ----------------- | ------------------------------------------------------ |
+| `wa-longform-2xs` | <div class="wa-longform-2xs">Five boxing wizards</div> |
+| `wa-longform-xs`  | <div class="wa-longform-xs">Five boxing wizards</div>  |
+| `wa-longform-s`   | <div class="wa-longform-s">Five boxing wizards</div>   |
+| `wa-longform-m`   | <div class="wa-longform-m">Five boxing wizards</div>   |
+| `wa-longform-l`   | <div class="wa-longform-l">Five boxing wizards</div>   |
+| `wa-longform-xl`  | <div class="wa-longform-xl">Five boxing wizards</div>  |
+| `wa-longform-2xl` | <div class="wa-longform-2xl">Five boxing wizards</div> |
+| `wa-longform-3xl` | <div class="wa-longform-3xl">Five boxing wizards</div> |
+| `wa-longform-4xl` | <div class="wa-longform-4xl">Five boxing wizards</div> |
+
+## Links
+
+Use `wa-link` to give interactive text a link-like appearance. Alternatively, use `wa-link-plain` to remove typical link styles from `<a>` elements.
+
+| Class Name      | Preview                                                  |
+| --------------- | -------------------------------------------------------- |
+| `wa-link`       | <div class="wa-link">Five boxing wizards</div>           |
+| `wa-link-plain` | <a href="" class="wa-link-plain">Five boxing wizards</a> |
+
+## Lists
+
+Ordered (`<ol>`) and unordered (`<ul>`) lists are given default styles by either Web Awesome's [native styles](/docs/utilities/native/) or your browser. Use `wa-list-plain` to clear any built-in list styles.
+
+| Class Name      | Preview                                                                                                  |
+| --------------- | -------------------------------------------------------------------------------------------------------- |
+| `wa-list-plain` | <ol class="wa-list-plain"><li>First list item</li><li>Second list item</li><li>Final list item</li></ol> |
+
+## Form Controls
+
+Use `wa-form-control-*` classes to style labels, values, placeholders, and hints outside of typical form control contexts with [form control tokens](/docs/tokens/component-groups/#form-controls) from your theme.
+
+| Class Name                    | Preview                                                            |
+| ----------------------------- | ------------------------------------------------------------------ |
+| `wa-form-control-label`       | <div class="wa-form-control-label">Five boxing wizards</div>       |
+| `wa-form-control-value`       | <div class="wa-form-control-value">Five boxing wizards</div>       |
+| `wa-form-control-placeholder` | <div class="wa-form-control-placeholder">Five boxing wizards</div> |
+| `wa-form-control-hint`        | <div class="wa-form-control-hint">Five boxing wizards</div>        |
+
+## Font Size
+
+Use single-purpose `wa-font-size-*` classes to apply a given [font size](/docs/tokens/typography/#font-size) from your theme to any element without additional styling.
+
+| Class Name         | Preview                                                 |
+| ------------------ | ------------------------------------------------------- |
+| `wa-font-size-2xs` | <div class="wa-font-size-2xs">Five boxing wizards</div> |
+| `wa-font-size-xs`  | <div class="wa-font-size-xs">Five boxing wizards</div>  |
+| `wa-font-size-s`   | <div class="wa-font-size-s">Five boxing wizards</div>   |
+| `wa-font-size-m`   | <div class="wa-font-size-m">Five boxing wizards</div>   |
+| `wa-font-size-l`   | <div class="wa-font-size-l">Five boxing wizards</div>   |
+| `wa-font-size-xl`  | <div class="wa-font-size-xl">Five boxing wizards</div>  |
+| `wa-font-size-2xl` | <div class="wa-font-size-2xl">Five boxing wizards</div> |
+| `wa-font-size-3xl` | <div class="wa-font-size-3xl">Five boxing wizards</div> |
+| `wa-font-size-4xl` | <div class="wa-font-size-4xl">Five boxing wizards</div> |
+
+## Font Weight
+
+Use single-purpose `wa-font-weight-*` classes to apply a given [font weight](/docs/tokens/typography/#font-weight) from your theme to any element without additional styling.
+
+| Class Name                | Preview                                                        |
+| ------------------------- | -------------------------------------------------------------- |
+| `wa-font-weight-light`    | <div class="wa-font-weight-light">Five boxing wizards</div>    |
+| `wa-font-weight-normal`   | <div class="wa-font-weight-normal">Five boxing wizards</div>   |
+| `wa-font-weight-semibold` | <div class="wa-font-weight-semibold">Five boxing wizards</div> |
+| `wa-font-weight-bold`     | <div class="wa-font-weight-bold">Five boxing wizards</div>     |
+
+## Text Color
+
+Use single-purpose `wa-color-text-*` classes to apply a given [text color](/docs/tokens/color/#text) from your theme to any element without additional styling.
+
+| Class Name             | Preview                                                     |
+| ---------------------- | ----------------------------------------------------------- |
+| `wa-color-text-quiet`  | <div class="wa-color-text-quiet">Five boxing wizards</div>  |
+| `wa-color-text-normal` | <div class="wa-color-text-normal">Five boxing wizards</div> |
+| `wa-color-text-link`   | <div class="wa-color-text-link">Five boxing wizards</div>   |
+
+## Truncation
+
+Use the `wa-text-truncate` class to truncate text with an ellipsis instead of letting it overflow or wrap.
+
+| Class Name         | Preview                                                     |
+| ------------------ | ----------------------------------------------------------- |
+| `wa-text-truncate` | <div class="wa-text-truncate" style="max-width: 40ch;">The five boxing wizards jump quickly. How quickly daft jumping zebras vex!</div>  |
--- a/packages/webawesome/docs/docs/utilities/visually-hidden.md
+++ b/packages/webawesome/docs/docs/utilities/visually-hidden.md
@@ -43,6 +43,63 @@ Adding a label may seem redundant at times, but they're very helpful for unsight
 </wa-card>
 ```

+### Visually Hidden Input Parts
+
+Sometimes you want a form control to have a cleaner, more minimal appearance by hiding the `label` or `hint` visually. However, removing these elements entirely would make the form inaccessible to users with assistive devices.
+
+Instead, you can hide them visually while keeping them available to screen readers by adding the `wa-visually-hidden-label` or `wa-visually-hidden-hint` class.
+
+```html {.example}
+<wa-input
+  label="Search Articles"
+  type="search"
+  placeholder="Search for..."
+  class="wa-visually-hidden-label"
+  style="margin-block-end: 1rem;"
+>
+  <wa-icon slot="start" name="magnifying-glass" variant="regular"></wa-icon>
+</wa-input>
+
+<wa-input
+  label="Phone Number"
+  type="tel"
+  hint="We'll send you a verification code"
+  placeholder="(555) 867-5309"
+  class="wa-visually-hidden-hint"
+  style="margin-block-end: 1rem;"
+>
+  <wa-icon slot="start" name="phone" variant="regular"></wa-icon>
+</wa-input>
+
+<wa-select
+  label="Country"
+  hint="Select your country for shipping calculations"
+  class="wa-visually-hidden-hint"
+  style="margin-block-end: 1rem;"
+>
+  <wa-option value="us">United States</wa-option>
+  <wa-option value="ca">Canada</wa-option>
+  <wa-option value="mx">Mexico</wa-option>
+  <wa-option value="uk">United Kingdom</wa-option>
+  <wa-option value="de">Germany</wa-option>
+  <wa-option value="fr">France</wa-option>
+  <wa-option value="wakanda">Wakanda</wa-option>
+  <wa-option value="genovia">Genovia</wa-option>
+  <wa-option value="elbonia">Elbonia</wa-option>
+  <wa-icon slot="start" name="globe" variant="regular"></wa-icon>
+</wa-select>
+
+<wa-input
+  label="Email Address"
+  type="email"
+  hint="We'll never share your email or secret identity"
+  placeholder="e.g. miles.morales@brooklynvisions.edu"
+  class="wa-visually-hidden-label wa-visually-hidden-hint"
+>
+  <wa-icon slot="start" name="envelope" variant="regular"></wa-icon>
+</wa-input>
+```
+
 ### Force Visually Hidden

 There are cases where you want to _always_ visually hide certain content, even when it's focused.
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Visit our documentation! <https://webawesome.com>`