diff --git a/docs/pages/tokens/typography.md b/docs/pages/tokens/typography.md
index d412c81e8..fe7118f4b 100644
--- a/docs/pages/tokens/typography.md
+++ b/docs/pages/tokens/typography.md
@@ -23,16 +23,18 @@ The default font stack is designed to be simple and highly available on as many
 
 Font sizes use `rem` units so they scale with the base font size. The pixel values displayed are based on a 16px font size.
 
-| Token                 | Value           | Example                                                     |
-| --------------------- | --------------- | ----------------------------------------------------------- |
-| `--wa-font-size-root` | 16px            | <span style="font-size: var(--wa-font-size-root)">Aa</span> |
-| `--wa-font-size-2xs`  | 0.625rem (10px) | <span style="font-size: var(--wa-font-size-2xs)">Aa</span>  |
-| `--wa-font-size-xs`   | 0.75rem (12px)  | <span style="font-size: var(--wa-font-size-xs)">Aa</span>   |
-| `--wa-font-size-s`    | 0.875rem (14px) | <span style="font-size: var(--wa-font-size-s)">Aa</span>    |
-| `--wa-font-size-m`    | 1rem (16px)     | <span style="font-size: var(--wa-font-size-m)">Aa</span>    |
-| `--wa-font-size-l`    | 1.375rem (22px) | <span style="font-size: var(--wa-font-size-l)">Aa</span>    |
-| `--wa-font-size-xl`   | 1.875rem (30px) | <span style="font-size: var(--wa-font-size-xl)">Aa</span>   |
-| `--wa-font-size-2xl`  | 2.625rem (42px) | <span style="font-size: var(--wa-font-size-2xl)">Aa</span>  |
+| Token                 | Value            | Example                                                       |
+| --------------------- | ---------------- | ------------------------------------------------------------- |
+| `--wa-font-size-root` | 16px             | <span style="font-size: var(--wa-font-size-root)">AaBb</span> |
+| `--wa-font-size-2xs`  | 0.6875rem (11px) | <span style="font-size: var(--wa-font-size-xs)">AaBb</span>   |
+| `--wa-font-size-xs`   | 0.75rem (12px)   | <span style="font-size: var(--wa-font-size-xs)">AaBb</span>   |
+| `--wa-font-size-s`    | 0.875rem (14px)  | <span style="font-size: var(--wa-font-size-s)">AaBb</span>    |
+| `--wa-font-size-m`    | 1rem (16px)      | <span style="font-size: var(--wa-font-size-m)">AaBb</span>    |
+| `--wa-font-size-l`    | 1.25rem (20px)   | <span style="font-size: var(--wa-font-size-l)">AaBb</span>    |
+| `--wa-font-size-xl`   | 1.625rem (26px)  | <span style="font-size: var(--wa-font-size-xl)">AaBb</span>   |
+| `--wa-font-size-2xl`  | 2rem (32px)      | <span style="font-size: var(--wa-font-size-2xl)">AaBb</span>  |
+| `--wa-font-size-3xl`  | 2.5625rem (41px) | <span style="font-size: var(--wa-font-size-3xl)">AaBb</span>  |
+| `--wa-font-size-4xl`  | 3.25rem (52px)   | <span style="font-size: var(--wa-font-size-4xl)">AaBb</span>  |
 
 ## Font Weight
 
@@ -47,8 +49,8 @@ Font sizes use `rem` units so they scale with the base font size. The pixel valu
 
 ## Line Height
 
-| Token                          | Value | Example                                                                                                                                                                                                            |
-| ------------------------------ | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `--wa-line-height-compact`     | 1.25  | <div style="line-height: var(--wa-line-height-compact);">The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.</div>     |
-| `--wa-line-height-regular`     | 1.625 | <div style="line-height: var(--wa-line-height-regular);">The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.</div>     |
-| `--wa-line-height-comfortable` | 2     | <div style="line-height: var(--wa-line-height-comfortable);">The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.</div> |
+| Token                          | Value | Example                                                                                                                                                                                                                 |
+| ------------------------------ | ----- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `--wa-line-height-compact`     | 1.25  | <div style="line-height: var(--wa-font-line-height-compact);">The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.</div>     |
+| `--wa-line-height-regular`     | 1.6   | <div style="line-height: var(--wa-font-line-height-regular);">The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.</div>     |
+| `--wa-line-height-comfortable` | 2     | <div style="line-height: var(--wa-font-line-height-comfortable);">The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.<br>The quick brown fox jumped over the lazy dog.</div> |
diff --git a/src/components/tag/tag.styles.ts b/src/components/tag/tag.styles.ts
index 325cc74b0..67e9a1087 100644
--- a/src/components/tag/tag.styles.ts
+++ b/src/components/tag/tag.styles.ts
@@ -100,7 +100,7 @@ export default css`
   }
 
   .tag--small {
-    font-size: var(--wa-font-size-s);
+    font-size: var(--wa-font-size-xs);
     height: calc(var(--wa-form-controls-height-s) * 0.8);
     line-height: calc(var(--wa-form-controls-height-s) - var(--wa-form-controls-border-width) * 2);
     border-radius: var(--wa-corners-s);
@@ -108,7 +108,7 @@ export default css`
   }
 
   .tag--medium {
-    font-size: var(--wa-font-size-m);
+    font-size: var(--wa-font-size-s);
     height: calc(var(--wa-form-controls-height-m) * 0.8);
     line-height: calc(var(--wa-form-controls-height-m) - var(--wa-form-controls-border-width) * 2);
     border-radius: var(--wa-corners-s);
@@ -116,7 +116,7 @@ export default css`
   }
 
   .tag--large {
-    font-size: var(--wa-font-size-l);
+    font-size: var(--wa-font-size-m);
     height: calc(var(--wa-form-controls-height-l) * 0.8);
     line-height: calc(var(--wa-form-controls-height-l) - var(--wa-form-controls-border-width) * 2);
     border-radius: var(--wa-corners-s);
diff --git a/src/themes/applied.css b/src/themes/applied.css
index 6c449f878..a60f129cb 100644
--- a/src/themes/applied.css
+++ b/src/themes/applied.css
@@ -88,27 +88,27 @@ h6 {
 }
 
 h1 {
-  font-size: var(--wa-font-size-2xl);
+  font-size: var(--wa-font-size-3xl);
 }
 
 h2 {
-  font-size: var(--wa-font-size-xl);
+  font-size: var(--wa-font-size-2xl);
 }
 
 h3 {
-  font-size: var(--wa-font-size-l);
+  font-size: var(--wa-font-size-xl);
 }
 
 h4 {
-  font-size: var(--wa-font-size-m);
+  font-size: var(--wa-font-size-l);
 }
 
 h5 {
-  font-size: var(--wa-font-size-s);
+  font-size: var(--wa-font-size-m);
 }
 
 h6 {
-  font-size: var(--wa-font-size-xs);
+  font-size: var(--wa-font-size-s);
 }
 
 hr {
diff --git a/src/themes/chic.css b/src/themes/chic.css
index 286b27940..6d1ecc7d1 100644
--- a/src/themes/chic.css
+++ b/src/themes/chic.css
@@ -193,17 +193,21 @@
   --wa-font-weight-body: var(--wa-font-weight-normal);
   --wa-font-weight-action: var(--wa-font-weight-heavy);
 
+  /* The default typescale is based on the Major Second scale (x1.125). 
+   * Every other step on the scale is skipped for larger sizes in order to maximize variation. */
   --wa-font-size-root: 16px;
-  --wa-font-size-2xs: 0.625rem; /* 10px */
+  --wa-font-size-2xs: 0.6875rem; /* 11px */
   --wa-font-size-xs: 0.75rem; /* 12px */
   --wa-font-size-s: 0.875rem; /* 14px */
   --wa-font-size-m: 1rem; /* 16px */
   --wa-font-size-l: 1.25rem; /* 20px */
-  --wa-font-size-xl: 1.75rem; /* 28px */
-  --wa-font-size-2xl: 2.5rem; /* 40px */
+  --wa-font-size-xl: 1.625rem; /* 26px */
+  --wa-font-size-2xl: 2rem; /* 32px */
+  --wa-font-size-3xl: 2.5625rem; /* 41px */
+  --wa-font-size-4xl: 3.25rem; /* 52px */
 
   --wa-font-line-height-compact: 1.25;
-  --wa-font-line-height-regular: 1.625;
+  --wa-font-line-height-regular: 1.6;
   --wa-font-line-height-comfortable: 2;
 
   /**
diff --git a/src/themes/classic.css b/src/themes/classic.css
index 970cb3422..1aa0b8a2c 100644
--- a/src/themes/classic.css
+++ b/src/themes/classic.css
@@ -199,17 +199,21 @@
   --wa-font-weight-body: var(--wa-font-weight-normal);
   --wa-font-weight-action: var(--wa-font-weight-medium);
 
+  /* The default typescale is based on the Major Second scale (x1.125). 
+   * Every other step on the scale is skipped for larger sizes in order to maximize variation. */
   --wa-font-size-root: 16px;
-  --wa-font-size-2xs: 0.625rem; /* 10px */
+  --wa-font-size-2xs: 0.6875rem; /* 11px */
   --wa-font-size-xs: 0.75rem; /* 12px */
   --wa-font-size-s: 0.875rem; /* 14px */
   --wa-font-size-m: 1rem; /* 16px */
   --wa-font-size-l: 1.25rem; /* 20px */
-  --wa-font-size-xl: 1.75rem; /* 28px */
-  --wa-font-size-2xl: 2.5rem; /* 40px */
+  --wa-font-size-xl: 1.625rem; /* 26px */
+  --wa-font-size-2xl: 2rem; /* 32px */
+  --wa-font-size-3xl: 2.5625rem; /* 41px */
+  --wa-font-size-4xl: 3.25rem; /* 52px */
 
   --wa-font-line-height-compact: 1.25;
-  --wa-font-line-height-regular: 1.625;
+  --wa-font-line-height-regular: 1.6;
   --wa-font-line-height-comfortable: 2;
 
   /**
diff --git a/src/themes/default.css b/src/themes/default.css
index 1dd1b63b6..c0c7ce10c 100644
--- a/src/themes/default.css
+++ b/src/themes/default.css
@@ -197,17 +197,21 @@
   --wa-font-weight-body: var(--wa-font-weight-normal);
   --wa-font-weight-action: var(--wa-font-weight-medium);
 
+  /* The default typescale is based on the Major Second scale (x1.125). 
+   * Every other step on the scale is skipped for larger sizes in order to maximize variation. */
   --wa-font-size-root: 16px;
-  --wa-font-size-2xs: 0.625rem; /* 10px */
+  --wa-font-size-2xs: 0.6875rem; /* 11px */
   --wa-font-size-xs: 0.75rem; /* 12px */
   --wa-font-size-s: 0.875rem; /* 14px */
   --wa-font-size-m: 1rem; /* 16px */
   --wa-font-size-l: 1.25rem; /* 20px */
-  --wa-font-size-xl: 1.75rem; /* 28px */
-  --wa-font-size-2xl: 2.5rem; /* 40px */
+  --wa-font-size-xl: 1.625rem; /* 26px */
+  --wa-font-size-2xl: 2rem; /* 32px */
+  --wa-font-size-3xl: 2.5625rem; /* 41px */
+  --wa-font-size-4xl: 3.25rem; /* 52px */
 
   --wa-font-line-height-compact: 1.25;
-  --wa-font-line-height-regular: 1.75;
+  --wa-font-line-height-regular: 1.6;
   --wa-font-line-height-comfortable: 2;
 
   /**
diff --git a/src/themes/glassy.css b/src/themes/glassy.css
index cc460f653..dd89a86cc 100644
--- a/src/themes/glassy.css
+++ b/src/themes/glassy.css
@@ -197,17 +197,21 @@
   --wa-font-weight-body: var(--wa-font-weight-normal);
   --wa-font-weight-action: var(--wa-font-weight-medium);
 
+  /* The default typescale is based on the Major Second scale (x1.125). 
+   * Every other step on the scale is skipped for larger sizes in order to maximize variation. */
   --wa-font-size-root: 16px;
-  --wa-font-size-2xs: 0.625rem; /* 10px */
+  --wa-font-size-2xs: 0.6875rem; /* 11px */
   --wa-font-size-xs: 0.75rem; /* 12px */
   --wa-font-size-s: 0.875rem; /* 14px */
   --wa-font-size-m: 1rem; /* 16px */
   --wa-font-size-l: 1.25rem; /* 20px */
-  --wa-font-size-xl: 1.75rem; /* 28px */
-  --wa-font-size-2xl: 2.5rem; /* 40px */
+  --wa-font-size-xl: 1.625rem; /* 26px */
+  --wa-font-size-2xl: 2rem; /* 32px */
+  --wa-font-size-3xl: 2.5625rem; /* 41px */
+  --wa-font-size-4xl: 3.25rem; /* 52px */
 
   --wa-font-line-height-compact: 1.25;
-  --wa-font-line-height-regular: 1.625;
+  --wa-font-line-height-regular: 1.6;
   --wa-font-line-height-comfortable: 2;
 
   /**
diff --git a/src/themes/mellow.css b/src/themes/mellow.css
index 772e5acc2..88d10c69d 100644
--- a/src/themes/mellow.css
+++ b/src/themes/mellow.css
@@ -197,17 +197,21 @@
   --wa-font-weight-body: var(--wa-font-weight-normal);
   --wa-font-weight-action: var(--wa-font-weight-medium);
 
+  /* The default typescale is based on the Major Second scale (x1.125). 
+   * Every other step on the scale is skipped for larger sizes in order to maximize variation. */
   --wa-font-size-root: 16px;
-  --wa-font-size-2xs: 0.625rem; /* 10px */
+  --wa-font-size-2xs: 0.6875rem; /* 11px */
   --wa-font-size-xs: 0.75rem; /* 12px */
   --wa-font-size-s: 0.875rem; /* 14px */
   --wa-font-size-m: 1rem; /* 16px */
   --wa-font-size-l: 1.25rem; /* 20px */
-  --wa-font-size-xl: 1.75rem; /* 28px */
-  --wa-font-size-2xl: 2.5rem; /* 40px */
+  --wa-font-size-xl: 1.625rem; /* 26px */
+  --wa-font-size-2xl: 2rem; /* 32px */
+  --wa-font-size-3xl: 2.5625rem; /* 41px */
+  --wa-font-size-4xl: 3.25rem; /* 52px */
 
   --wa-font-line-height-compact: 1.25;
-  --wa-font-line-height-regular: 1.625;
+  --wa-font-line-height-regular: 1.6;
   --wa-font-line-height-comfortable: 2;
 
   /**
diff --git a/src/themes/playful.css b/src/themes/playful.css
index 3eabe38d0..36cbe50e8 100644
--- a/src/themes/playful.css
+++ b/src/themes/playful.css
@@ -197,17 +197,21 @@
   --wa-font-weight-body: var(--wa-font-weight-normal);
   --wa-font-weight-action: var(--wa-font-weight-heavy);
 
+  /* The default typescale is based on the Major Second scale (x1.125). 
+   * Every other step on the scale is skipped for larger sizes in order to maximize variation. */
   --wa-font-size-root: 16px;
-  --wa-font-size-2xs: 0.625rem; /* 10px */
+  --wa-font-size-2xs: 0.6875rem; /* 11px */
   --wa-font-size-xs: 0.75rem; /* 12px */
   --wa-font-size-s: 0.875rem; /* 14px */
   --wa-font-size-m: 1rem; /* 16px */
   --wa-font-size-l: 1.25rem; /* 20px */
-  --wa-font-size-xl: 1.75rem; /* 28px */
-  --wa-font-size-2xl: 2.5rem; /* 40px */
+  --wa-font-size-xl: 1.625rem; /* 26px */
+  --wa-font-size-2xl: 2rem; /* 32px */
+  --wa-font-size-3xl: 2.5625rem; /* 41px */
+  --wa-font-size-4xl: 3.25rem; /* 52px */
 
   --wa-font-line-height-compact: 1.25;
-  --wa-font-line-height-regular: 1.625;
+  --wa-font-line-height-regular: 1.6;
   --wa-font-line-height-comfortable: 2;
 
   /**