From 23793333f0f53c9449691112be05c2eae492e3d0 Mon Sep 17 00:00:00 2001
From: Lindsay M <126139086+lindsaym-fa@users.noreply.github.com>
Date: Tue, 21 Oct 2025 11:34:20 -0400
Subject: [PATCH] Improve and document text utility classes (#1602)

* initial take on text utility improvements

* re-introduce `.wa-caption-*`

* reorg stylesheet

* remove font weight classes

* gimme the font weights

* add `.wa-text-truncate`, `.wa-list-plain`

* add longform, color-text-link, and placeholder classes

* document utilities

* document missing font weight tokens

* use proper longform font weight

* find and replace outdated text utilities

* use new font size utilities

* missed a spot!

* add changelog
---
 packages/webawesome/docs/503.md               |  34 +--
 .../webawesome/docs/_includes/sidebar.njk     |  10 +-
 .../webawesome/docs/docs/components/card.md   |   2 +-
 .../docs/docs/resources/changelog.md          |   4 +-
 .../webawesome/docs/docs/tokens/typography.md |  12 +-
 .../webawesome/docs/docs/utilities/cluster.md |   4 +-
 .../webawesome/docs/docs/utilities/frame.md   |  10 +-
 .../webawesome/docs/docs/utilities/grid.md    |  26 +-
 .../webawesome/docs/docs/utilities/split.md   |   2 +-
 .../webawesome/docs/docs/utilities/text.md    | 181 ++++++++++----
 .../docs/examples/themes/showcase.njk         |  76 +++---
 packages/webawesome/docs/index.md             |   4 +-
 .../webawesome/src/styles/utilities/text.css  | 222 ++++++++++++------
 13 files changed, 378 insertions(+), 209 deletions(-)

diff --git a/packages/webawesome/docs/503.md b/packages/webawesome/docs/503.md
index 812b1e96b..fa3e728d7 100644
--- a/packages/webawesome/docs/503.md
+++ b/packages/webawesome/docs/503.md
@@ -224,7 +224,7 @@ unlisted: true
   <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-m heading-stacked-subtitle">
+        <span class="wa-heading-l heading-stacked-subtitle">
           under 
           <span class="wa-visually-hidden">maintenance</span>
           <span aria-hidden="true">
@@ -235,7 +235,7 @@ unlisted: true
             nce
           </span>
         </span>
-        <span class="wa-heading-3xl heading-stacked-title">Hey! We're Workin&apos; Here</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">
@@ -278,32 +278,32 @@ unlisted: true
       <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" style="font-size: var(--wa-font-size-2xl);"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="toilet-portable" style="font-size: var(--wa-font-size-2xl);"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="toilet-portable" style="font-size: var(--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>
+          <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" style="font-size: var(--wa-font-size-3xl);"></wa-icon>
+        <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" style="font-size: var(--wa-font-size-2xl);"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" style="font-size: var(--wa-font-size-2xl);"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" style="font-size: var(--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 class="blocks-bottom wa-cluster wa-gap-0">
-          <wa-icon family="duotone" variant="regular" name="block-brick" style="font-size: var(--wa-font-size-2xl);"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" style="font-size: var(--wa-font-size-2xl);"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" style="font-size: var(--wa-font-size-2xl);"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" style="font-size: var(--wa-font-size-2xl);"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" style="font-size: var(--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>
+          <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" style="font-size: var(--wa-font-size-3xl); opacity: 0;"></wa-icon>
+        <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" style="font-size: var(--wa-font-size-3xl);"></wa-icon>
-          <wa-icon family="duotone" variant="regular" name="block-brick" style="font-size: var(--wa-font-size-2xl); position: relative; inset-inline-start: calc(var(--wa-space-2xs) * -1);"></wa-icon>
+          <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>
diff --git a/packages/webawesome/docs/_includes/sidebar.njk b/packages/webawesome/docs/_includes/sidebar.njk
index 137010927..b83da39d7 100644
--- a/packages/webawesome/docs/_includes/sidebar.njk
+++ b/packages/webawesome/docs/_includes/sidebar.njk
@@ -416,16 +416,16 @@
 <div class="wa-stack wa-gap-xl" id="colophon">
   <div class="wa-stack wa-gap-xs">
     {% include "logo-simple.njk" %}
-    <h2 class="wa-heading-xs">Web Awesome</h2>
-    <p class="wa-caption-s wa-cluster wa-gap-xs">
+    <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" style="font-size: var(--wa-font-size-xs);">Here be freshly launched Awesome and no wa-dragons</wa-tooltip>
+      <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-s">&copy; Fonticons, Inc.</p>
+    <p class="wa-caption-xs">&copy; Fonticons, Inc.</p>
   </div>
 
-  <div class="wa-cluster wa-gap-0 wa-caption-s the-socials">
+  <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>
diff --git a/packages/webawesome/docs/docs/components/card.md b/packages/webawesome/docs/docs/components/card.md
index 5869aa2f6..bbca071f4 100644
--- a/packages/webawesome/docs/docs/components/card.md
+++ b/packages/webawesome/docs/docs/components/card.md
@@ -15,7 +15,7 @@ category: Organization
 
   <strong>Mittens</strong><br />
   This kitten is as cute as he is playful. Bring him home today!<br />
-  <small class="wa-caption-m">6 weeks old</small>
+  <small class="wa-caption-s">6 weeks old</small>
 
   <wa-button slot="footer" variant="brand" pill>More Info</wa-button>
   <wa-rating slot="footer-actions" label="Rating"></wa-rating>
diff --git a/packages/webawesome/docs/docs/resources/changelog.md b/packages/webawesome/docs/docs/resources/changelog.md
index c2bb7f77a..3ec9fd600 100644
--- a/packages/webawesome/docs/docs/resources/changelog.md
+++ b/packages/webawesome/docs/docs/resources/changelog.md
@@ -4,7 +4,7 @@ description: Changes to each version of the project are documented here.
 layout: page-outline
 ---
 
-<p class="wa-caption-m">Last updated: <wa-format-date month="long" day="numeric" year="numeric" date="{{ lastUpdatedISO }}"></wa-format-date></p>
+<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.
 
@@ -37,6 +37,8 @@ Components with the <wa-badge variant="warning">Experimental</wa-badge> badge sh
 - Fixed a bug that caused the required `*` in form labels to have incorrect spacing in `<wa-checkbox>` and `<wa-switch>` [issue:1472]
 - Improved autofill styles in `<wa-input>` so they span the entire width of the visual input [issue:1439]
 - Modified `<wa-slider>` to only show the tooltip on the handle being dragged when in range mode [issue:1320]
+- Improved [text utilities](/docs/utilities/text/) so that each size modifier always exactly matches the applied font size [pr:1602]
+- Added [text utilities](/docs/utilities/text/) for longform text, form control text, font sizes, font weights, text color, and truncation [pr:1602]
 - Upgraded `<wa-page>` from _experimental_ to _stable_
 
 ## 3.0.0-beta.6
diff --git a/packages/webawesome/docs/docs/tokens/typography.md b/packages/webawesome/docs/docs/tokens/typography.md
index e9613ef1e..8eaaa2e87 100644
--- 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.
 
diff --git a/packages/webawesome/docs/docs/utilities/cluster.md b/packages/webawesome/docs/docs/utilities/cluster.md
index bf3d5ff8a..0a8adc013 100644
--- 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>
diff --git a/packages/webawesome/docs/docs/utilities/frame.md b/packages/webawesome/docs/docs/utilities/frame.md
index 24e85390d..4ee7f99fa 100644
--- 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>
diff --git a/packages/webawesome/docs/docs/utilities/grid.md b/packages/webawesome/docs/docs/utilities/grid.md
index 35c754bf6..356ab2128 100644
--- 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>
diff --git a/packages/webawesome/docs/docs/utilities/split.md b/packages/webawesome/docs/docs/utilities/split.md
index 962751ef5..1b23680a3 100644
--- 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>
diff --git a/packages/webawesome/docs/docs/utilities/text.md b/packages/webawesome/docs/docs/utilities/text.md
index 35fcdd77e..ba06a5cff 100644
--- 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>  |
\ No newline at end of file
diff --git a/packages/webawesome/docs/examples/themes/showcase.njk b/packages/webawesome/docs/examples/themes/showcase.njk
index 3bbd9d374..e3604544c 100644
--- a/packages/webawesome/docs/examples/themes/showcase.njk
+++ b/packages/webawesome/docs/examples/themes/showcase.njk
@@ -91,7 +91,7 @@ layout: false
       <div class="showcase-examples">
         <wa-card>
           <div slot="header" class="wa-split">
-            <h3 class="wa-heading-m">Your Cart</h3>
+            <h3 class="wa-heading-l">Your Cart</h3>
             <wa-button appearance="plain" size="small" tabindex="-1">
               <wa-icon name="xmark" label="Close"></wa-icon>
             </wa-button>
@@ -109,7 +109,7 @@ layout: false
                   <strong>Initiate Saber</strong>
                   <strong>$179.99</strong>
                 </div>
-                <div class="wa-split wa-gap-2xs wa-caption-m">
+                <div class="wa-split wa-gap-2xs wa-caption-s">
                   <span>Green</span>
                   <a href="#" tabindex="-1">Remove</a>
                 </div>
@@ -128,7 +128,7 @@ layout: false
                   <strong>Repair Droid</strong>
                   <strong>$3,049.99</strong>
                 </div>
-                <div class="wa-split wa-gap-2xs wa-caption-m">
+                <div class="wa-split wa-gap-2xs wa-caption-s">
                   <span>R-series</span>
                   <a href="#" tabindex="-1">Remove</a>
                 </div>
@@ -140,7 +140,7 @@ layout: false
               <strong>Subtotal</strong>
               <strong>$3,229.98</strong>
             </div>
-            <span class="wa-caption-m">Shipping and taxes calculated at checkout.</span>
+            <span class="wa-caption-s">Shipping and taxes calculated at checkout.</span>
             <wa-button tabindex="-1" variant="brand">
               <wa-icon slot="start" name="shopping-bag"></wa-icon>
               Checkout
@@ -158,7 +158,7 @@ layout: false
         </wa-card>
         <wa-card>
           <div class="wa-stack">
-            <h3 class="wa-heading-m">Sign In</h3>
+            <h3 class="wa-heading-l">Sign In</h3>
             <wa-input tabindex="-1" label="Email" placeholder="ddjarin@mandalore.gov" inert>
               <wa-icon slot="start" name="envelope" variant="regular"></wa-icon>
             </wa-input>
@@ -172,7 +172,7 @@ layout: false
         <wa-card>
           <div class="wa-stack">
             <div class="wa-split">
-              <h3 class="wa-heading-m">To-Do</h3>
+              <h3 class="wa-heading-l">To-Do</h3>
               <wa-button appearance="plain" size="small" tabindex="-1">
                 <wa-icon name="plus" label="Add task"></wa-icon>
               </wa-button>
@@ -198,7 +198,7 @@ layout: false
                   <strong>The Stone Troll</strong>
                   <small><wa-badge variant="neutral" appearance="filled">E</wa-badge></small>
                 </div>
-                <span class="wa-caption-m">Samwise G</span>
+                <span class="wa-caption-s">Samwise G</span>
               </div>
               <wa-button appearance="plain" size="small" tabindex="-1">
                 <wa-icon name="ellipsis" label="Options"></wa-icon>
@@ -207,8 +207,8 @@ layout: false
             <div class="wa-stack wa-gap-2xs">
               <wa-progress-bar value="34"></wa-progress-bar>
               <div class="wa-split">
-                <span class="wa-caption-xs">1:01</span>
-                <span class="wa-caption-xs">-1:58</span>
+                <span class="wa-caption-2xs">1:01</span>
+                <span class="wa-caption-2xs">-1:58</span>
               </div>
             </div>
             <div class="wa-grid wa-align-items-center" style="--min-column-size: 1em; justify-items: center">
@@ -226,7 +226,7 @@ layout: false
         </wa-card>
         <wa-card>
           <div class="wa-stack">
-            <h3 class="wa-heading-m">Chalmun's Spaceport Cantina</h3>
+            <h3 class="wa-heading-l">Chalmun's Spaceport Cantina</h3>
             <div class="wa-cluster wa-gap-xs">
               <wa-rating value="4.6" readonly tabindex="-1"></wa-rating>
               <strong>4.6</strong>
@@ -238,14 +238,14 @@ layout: false
                 <wa-icon name="dollar" style="color: var(--wa-color-green-60)"></wa-icon>
                 <wa-icon name="dollar" style="color: var(--wa-color-green-60)"></wa-icon>
               </div>
-              <span class="wa-caption-m">&bull;</span>
+              <span class="wa-caption-s">&bull;</span>
               <wa-tag size="small">Cocktail Bar</wa-tag>
               <wa-tag size="small">Gastropub</wa-tag>
               <wa-tag size="small">Local Fare</wa-tag>
             </div>
             <div class="wa-flank wa-gap-xs">
               <wa-icon name="location-dot"></wa-icon>
-              <a href="#" class="wa-caption-m" tabindex="-1">Mos Eisley, Tatooine</a>
+              <a href="#" class="wa-caption-s" tabindex="-1">Mos Eisley, Tatooine</a>
             </div>
           </div>
         </wa-card>
@@ -283,7 +283,7 @@ layout: false
         <wa-card>
           <div class="wa-stack">
             <div class="wa-flank:end">
-              <h3 id="odds-label" class="wa-heading-m">Tell Me the Odds</h3>
+              <h3 id="odds-label" class="wa-heading-l">Tell Me the Odds</h3>
               <wa-switch size="large" aria-labelledby="odds-label" tabindex="-1"></wa-switch>
             </div>
             <p class="wa-body-s">
@@ -296,8 +296,8 @@ layout: false
           <div class="wa-stack">
             <div class="wa-split wa-align-items-start">
               <dl class="wa-stack wa-gap-2xs">
-                <dt class="wa-heading-s">Amount</dt>
-                <dd class="wa-heading-l">$5,610.00</dd>
+                <dt class="wa-heading-m">Amount</dt>
+                <dd class="wa-heading-xl">$5,610.00</dd>
               </dl>
               <wa-badge appearance="filled-outlined" variant="success">Paid</wa-badge>
             </div>
@@ -327,37 +327,37 @@ layout: false
         <wa-card>
           <div class="wa-stack">
             <div class="wa-split">
-              <div class="wa-cluster wa-heading-l">
+              <div class="wa-cluster wa-heading-xl">
                 <wa-icon name="book-sparkles"></wa-icon>
                 <h3>Fellowship</h3>
               </div>
               <wa-badge>Most Popular</wa-badge>
             </div>
             <span class="wa-flank wa-align-items-baseline wa-gap-2xs">
-              <span class="wa-heading-2xl">$120</span>
-              <span class="wa-caption-l">per year</span>
+              <span class="wa-heading-3xl">$120</span>
+              <span class="wa-caption-m">per year</span>
             </span>
-            <p class="wa-caption-l">Carry great power (and great responsibility).</p>
+            <p class="wa-caption-m">Carry great power (and great responsibility).</p>
             <wa-button variant="brand" tabindex="-1">Get this Plan</wa-button>
           </div>
           <div slot="footer" class="wa-stack wap-gap-s">
-            <h4 class="wa-heading-s">What You Get</h4>
+            <h4 class="wa-heading-m">What You Get</h4>
             <div class="wa-stack">
               <div class="wa-flank">
                 <wa-icon name="user"></wa-icon>
-                <span class="wa-caption-m">9 users</span>
+                <span class="wa-caption-s">9 users</span>
               </div>
               <div class="wa-flank">
                 <wa-icon name="ring"></wa-icon>
-                <span class="wa-caption-m">1 ring</span>
+                <span class="wa-caption-s">1 ring</span>
               </div>
               <div class="wa-flank">
                 <wa-icon name="chess-rook"></wa-icon>
-                <span class="wa-caption-m">API access to Isengard</span>
+                <span class="wa-caption-s">API access to Isengard</span>
               </div>
               <div class="wa-flank">
                 <wa-icon name="feather"></wa-icon>
-                <span class="wa-caption-m">Priority eagle support</span>
+                <span class="wa-caption-s">Priority eagle support</span>
               </div>
             </div>
           </div>
@@ -377,10 +377,10 @@ layout: false
           <div class="wa-flank:end">
             <div class="wa-stack wa-gap-xs">
               <div class="wa-cluster wa-gap-xs">
-                <h3 class="wa-heading-s">Migs Mayfeld</h3>
+                <h3 class="wa-heading-m">Migs Mayfeld</h3>
                 <wa-badge pill>Admin</wa-badge>
               </div>
-              <span class="wa-caption-m">Imperial Sharpshooter</span>
+              <span class="wa-caption-s">Imperial Sharpshooter</span>
             </div>
             <wa-avatar
               image="https://images.unsplash.com/photo-1633268335280-a41fbde58707?q=80&w=3348&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D"
@@ -408,8 +408,8 @@ layout: false
                 <wa-icon slot="icon" name="egg-fried"></wa-icon>
               </wa-avatar>
               <div class="wa-gap-2xs wa-stack">
-                <span class="wa-heading-s">Second Breakfast</span>
-                <span class="wa-caption-m">19 Items</span>
+                <span class="wa-heading-m">Second Breakfast</span>
+                <span class="wa-caption-s">19 Items</span>
               </div>
             </a>
             <wa-dropdown>
@@ -425,10 +425,10 @@ layout: false
         </wa-card>
         <wa-card with-header with-footer>
           <div slot="header" class="wa-stack wa-gap-xs">
-            <h2 class="wa-heading-m">Decks</h2>
+            <h2 class="wa-heading-l">Decks</h2>
           </div>
           <div class="wa-stack wa-gap-xl">
-            <p class="wa-caption-m">
+            <p class="wa-caption-s">
               You haven't created any decks yet. Get started by selecting an aspect that matches your play style.
             </p>
             <div class="wa-grid wa-gap-xl" style="--min-column-size: 30ch">
@@ -440,10 +440,10 @@ layout: false
                   <wa-icon slot="icon" name="shield"></wa-icon>
                 </wa-avatar>
                 <div class="wa-stack wa-gap-2xs">
-                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-s">
+                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-m">
                     Vigilance <wa-icon name="arrow-right"></wa-icon>
                   </span>
-                  <p class="wa-caption-m">Protect, defend, and restore as you ready heavy-hitters.</p>
+                  <p class="wa-caption-s">Protect, defend, and restore as you ready heavy-hitters.</p>
                 </div>
               </a>
               <a href="" class="wa-flank wa-align-items-start wa-link-plain" tabindex="-1">
@@ -454,10 +454,10 @@ layout: false
                   <wa-icon slot="icon" name="chevrons-up"></wa-icon>
                 </wa-avatar>
                 <div class="wa-stack wa-gap-2xs">
-                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-s">
+                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-m">
                     Command <wa-icon name="arrow-right"></wa-icon>
                   </span>
-                  <p class="wa-caption-m">Build imposing armies and stockpile resources.</p>
+                  <p class="wa-caption-s">Build imposing armies and stockpile resources.</p>
                 </div>
               </a>
               <a href="" class="wa-flank wa-align-items-start wa-link-plain" tabindex="-1">
@@ -468,10 +468,10 @@ layout: false
                   <wa-icon slot="icon" name="explosion"></wa-icon>
                 </wa-avatar>
                 <div class="wa-stack wa-gap-2xs">
-                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-s">
+                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-m">
                     Aggression <wa-icon name="arrow-right"></wa-icon>
                   </span>
-                  <p class="wa-caption-m">Relentlessly deal damage and apply pressure to your opponent.</p>
+                  <p class="wa-caption-s">Relentlessly deal damage and apply pressure to your opponent.</p>
                 </div>
               </a>
               <a href="" class="wa-flank wa-align-items-start wa-link-plain" tabindex="-1">
@@ -482,10 +482,10 @@ layout: false
                   <wa-icon slot="icon" name="moon-stars"></wa-icon>
                 </wa-avatar>
                 <div class="wa-stack wa-gap-2xs">
-                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-s">
+                  <span class="wa-align-items-center wa-cluster wa-gap-xs wa-heading-m">
                     Cunning <wa-icon name="arrow-right"></wa-icon>
                   </span>
-                  <p class="wa-caption-m">Disrupt and frustrate your opponent with dastardly tricks.</p>
+                  <p class="wa-caption-s">Disrupt and frustrate your opponent with dastardly tricks.</p>
                 </div>
               </a>
             </div>
diff --git a/packages/webawesome/docs/index.md b/packages/webawesome/docs/index.md
index 560e134ea..82cae3778 100644
--- a/packages/webawesome/docs/index.md
+++ b/packages/webawesome/docs/index.md
@@ -236,11 +236,11 @@ layout: page
     <div class="hero-cta">
       {%- raw -%}
         {% if currentUser.hasPro %}
-          <span style="text-align: center; width: 100%; font-size: var(--wa-font-size-l);">Thanks for being a Web Awesome Pro subscriber!</span>
+          <span class="wa-font-size-l" style="text-align: center; width: 100%;">Thanks for being a Web Awesome Pro subscriber!</span>
         {% else %}
           {% if App.flags.stripeEnabled %}
             <div class="wa-stack wa-gap-xs">
-              <h3 class="wa-heading-s">Get More with Web Awesome Pro!</h3>
+              <h3 class="wa-heading-m">Get More with Web Awesome Pro!</h3>
               <p>Unlock Pro-only themes, components, patterns, and great services like the Theme Builder.</p>
             </div>
             <wa-button class="wa-dark" size="small" href="/purchase">
diff --git a/packages/webawesome/src/styles/utilities/text.css b/packages/webawesome/src/styles/utilities/text.css
index 059a85269..d0cc5ba37 100644
--- a/packages/webawesome/src/styles/utilities/text.css
+++ b/packages/webawesome/src/styles/utilities/text.css
@@ -1,106 +1,139 @@
 @layer wa-utilities {
-  .wa-heading-xs,
-  .wa-heading-s,
-  .wa-heading-m,
-  .wa-heading-l,
-  .wa-heading-xl,
-  .wa-heading-2xl,
-  .wa-heading-3xl {
+  /* #region General ~~~~~ */
+  [class*='wa-body'] {
+    font-family: var(--wa-font-family-body);
+    font-weight: var(--wa-font-weight-body);
+    line-height: var(--wa-line-height-normal);
+  }
+
+  [class*='wa-heading'] {
     font-family: var(--wa-font-family-heading);
     font-weight: var(--wa-font-weight-heading);
     line-height: var(--wa-line-height-condensed);
     text-wrap: balance;
   }
 
-  .wa-heading-xs {
-    font-size: var(--wa-font-size-s);
-  }
-
-  .wa-heading-s {
-    font-size: var(--wa-font-size-m);
-  }
-
-  .wa-heading-m {
-    font-size: var(--wa-font-size-l);
-  }
-
-  .wa-heading-l {
-    font-size: var(--wa-font-size-xl);
-  }
-
-  .wa-heading-xl {
-    font-size: var(--wa-font-size-2xl);
-  }
-
-  .wa-heading-2xl {
-    font-size: var(--wa-font-size-3xl);
-  }
-
-  .wa-heading-3xl {
-    font-size: var(--wa-font-size-4xl);
-  }
-
-  .wa-body-xs,
-  .wa-body-s,
-  .wa-body-m,
-  .wa-body-l,
-  .wa-body-xl {
-    font-family: var(--wa-font-family-body);
-    font-weight: var(--wa-font-weight-body);
-    line-height: var(--wa-line-height-normal);
-  }
-
-  .wa-body-xs {
-    font-size: var(--wa-font-size-xs);
-  }
-
-  .wa-body-s {
-    font-size: var(--wa-font-size-s);
-  }
-
-  .wa-body-m {
-    font-size: var(--wa-font-size-m);
-  }
-
-  .wa-body-l {
-    font-size: var(--wa-font-size-l);
-  }
-
-  .wa-body-xl {
-    font-size: var(--wa-font-size-xl);
-  }
-
-  .wa-caption-xs,
-  .wa-caption-s,
-  .wa-caption-m,
-  .wa-caption-l,
-  .wa-caption-xl {
+  [class*='wa-caption'] {
     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);
   }
 
-  .wa-caption-xs {
+  [class*='wa-longform'] {
+    font-family: var(--wa-font-family-longform);
+    font-weight: var(--wa-font-weight-longform);
+    line-height: var(--wa-line-height-normal);
+  }
+
+  .wa-font-size-2xs,
+  .wa-body-2xs,
+  .wa-heading-2xs,
+  .wa-caption-2xs,
+  .wa-longform-2xs {
     font-size: var(--wa-font-size-2xs);
   }
 
-  .wa-caption-s {
+  .wa-font-size-xs,
+  .wa-body-xs,
+  .wa-heading-xs,
+  .wa-caption-xs,
+  .wa-longform-xs {
     font-size: var(--wa-font-size-xs);
   }
 
-  .wa-caption-m {
+  .wa-font-size-s,
+  .wa-body-s,
+  .wa-heading-s,
+  .wa-caption-s,
+  .wa-longform-s {
     font-size: var(--wa-font-size-s);
   }
 
-  .wa-caption-l {
+  .wa-font-size-m,
+  .wa-body-m,
+  .wa-heading-m,
+  .wa-caption-m,
+  .wa-longform-m {
     font-size: var(--wa-font-size-m);
   }
 
-  .wa-caption-xl {
+  .wa-font-size-l,
+  .wa-body-l,
+  .wa-heading-l,
+  .wa-caption-l,
+  .wa-longform-l {
     font-size: var(--wa-font-size-l);
   }
 
+  .wa-font-size-xl,
+  .wa-body-xl,
+  .wa-heading-xl,
+  .wa-caption-xl,
+  .wa-longform-xl {
+    font-size: var(--wa-font-size-xl);
+  }
+
+  .wa-font-size-2xl,
+  .wa-body-2xl,
+  .wa-heading-2xl,
+  .wa-caption-2xl,
+  .wa-longform-2xl {
+    font-size: var(--wa-font-size-2xl);
+  }
+
+  .wa-font-size-3xl,
+  .wa-body-3xl,
+  .wa-heading-3xl,
+  .wa-caption-3xl,
+  .wa-longform-3xl {
+    font-size: var(--wa-font-size-3xl);
+  }
+
+  .wa-font-size-4xl,
+  .wa-body-4xl,
+  .wa-heading-4xl,
+  .wa-caption-4xl,
+  .wa-longform-4xl {
+    font-size: var(--wa-font-size-4xl);
+  }
+
+  .wa-font-weight-light {
+    font-weight: var(--wa-font-weight-light);
+  }
+
+  .wa-font-weight-normal {
+    font-weight: var(--wa-font-weight-normal);
+  }
+
+  .wa-font-weight-semibold {
+    font-weight: var(--wa-font-weight-semibold);
+  }
+
+  .wa-font-weight-bold {
+    font-weight: var(--wa-font-weight-bold);
+  }
+
+  .wa-color-text-normal {
+    color: var(--wa-color-text-normal);
+  }
+
+  .wa-color-text-quiet {
+    color: var(--wa-color-text-quiet);
+  }
+
+  .wa-color-text-link {
+    color: var(--wa-color-text-link);
+  }
+
+  .wa-text-truncate {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  /* #endregion */
+
+  /* #region Links ~~~~~~~ */
   .wa-link {
     color: var(--wa-color-text-link);
     text-decoration: var(--wa-link-decoration-default);
@@ -126,4 +159,43 @@
       }
     }
   }
+  /* #endregion */
+
+  /* #region Lists ~~~~~~~ */
+  .wa-list-plain:is(ol, ul) {
+    list-style: none;
+    padding-inline-start: 0;
+
+    > li {
+      margin-inline-start: 0;
+    }
+  }
+  /* #endregion */
+
+  /* #region Form Controls */
+  .wa-form-control-label {
+    color: var(--wa-form-control-label-color);
+    font-weight: var(--wa-form-control-label-font-weight);
+    line-height: var(--wa-form-control-label-line-height);
+  }
+
+  .wa-form-control-value {
+    color: var(--wa-form-control-value-color);
+    font-weight: var(--wa-form-control-value-font-weight);
+    line-height: var(--wa-form-control-value-line-height);
+  }
+
+  .wa-form-control-placeholder {
+    color: var(--wa-form-control-placeholder-color);
+    font-weight: var(--wa-form-control-value-font-weight);
+    line-height: var(--wa-form-control-value-line-height);
+  }
+
+  .wa-form-control-hint {
+    color: var(--wa-form-control-hint-color);
+    font-weight: var(--wa-form-control-hint-font-weight);
+    font-size: var(--wa-font-size-smaller);
+    line-height: var(--wa-form-control-hint-line-height);
+  }
+  /* #endregion */
 }