diff --git a/src/themes/applied.css b/src/themes/applied.css
index 5bb283ee1..fea258b50 100644
--- a/src/themes/applied.css
+++ b/src/themes/applied.css
@@ -403,10 +403,14 @@ iframe {
 /* Links */
 a {
   color: var(--wa-color-text-link);
+  text-decoration: var(--wa-link-decoration-default);
+  -webkit-text-decoration: var(--wa-link-decoration-default);
 }
 
 a:hover {
   color: color-mix(in oklab, var(--wa-color-text-link) 100%, var(--wa-color-mix-hover));
+  text-decoration: var(--wa-link-decoration-hover);
+  -webkit-text-decoration: var(--wa-link-decoration-hover);
 }
 
 a:focus,
diff --git a/src/themes/chic.css b/src/themes/chic.css
index 25d97ee27..29fdb6d92 100644
--- a/src/themes/chic.css
+++ b/src/themes/chic.css
@@ -261,6 +261,12 @@
   --wa-focus-ring: var(--wa-focus-ring-style) var(--wa-focus-ring-width) var(--wa-color-focus);
   --wa-focus-ring-offset: 0.0625rem; /* 1px */
 
+  /**
+   * Links
+   */
+  --wa-link-decoration-default: underline var(--wa-color-brand-border-highlight) dotted;
+  --wa-link-decoration-hover: underline;
+
   /**
    * Z-index
    */
@@ -316,8 +322,8 @@
   --wa-flow-spacing: 1.5rem;
 
   /**
-  * From 2.x
-  */
+   * From 2.x
+   */
   --wa-form-control-toggle-size-s: 0.875rem;
   --wa-form-control-toggle-size-m: 1.125rem;
   --wa-form-control-toggle-size-l: 1.375rem;
@@ -335,7 +341,7 @@
   --wa-color-surface-raised: var(--wa-color-base-10);
   --wa-color-surface-default: var(--wa-color-base-05);
   --wa-color-surface-lowered: black;
-  --wa-color-surface-border: var(--wa-color-base-10);
+  --wa-color-surface-border: var(--wa-color-base-20);
 
   --wa-color-text-normal: var(--wa-color-base-95);
   --wa-color-text-quiet: var(--wa-color-base-60);
@@ -354,8 +360,8 @@
   --wa-color-mix-active: black 16%;
 
   /**
-    * Semantic theme colors
-    */
+   * Semantic theme colors
+   */
   --wa-color-brand-spot: var(--wa-color-lime-80);
   --wa-color-brand-spot-darker: var(--wa-color-lime-70);
   --wa-color-brand-fill-subtle: var(--wa-color-lime-10);
diff --git a/src/themes/classic.css b/src/themes/classic.css
index 837c579af..7ae3b372e 100644
--- a/src/themes/classic.css
+++ b/src/themes/classic.css
@@ -265,6 +265,12 @@
     color-mix(in oklab, var(--wa-color-focus) 60%, transparent);
   --wa-focus-ring-offset: 0.0625rem; /* 1px */
 
+  /**
+   * Links
+   */
+  --wa-link-decoration-default: underline;
+  --wa-link-decoration-hover: underline;
+
   /**
    * Z-index
    */
@@ -314,8 +320,8 @@
   --wa-flow-spacing: 1.5rem;
 
   /**
-  * From 2.x
-  */
+   * From 2.x
+   */
   --wa-form-control-toggle-size-s: 0.875rem;
   --wa-form-control-toggle-size-m: 1.125rem;
   --wa-form-control-toggle-size-l: 1.375rem;
@@ -333,7 +339,7 @@
   --wa-color-surface-raised: var(--wa-color-base-10);
   --wa-color-surface-default: var(--wa-color-base-05);
   --wa-color-surface-lowered: black;
-  --wa-color-surface-border: var(--wa-color-base-10);
+  --wa-color-surface-border: var(--wa-color-base-20);
 
   --wa-color-text-normal: var(--wa-color-base-95);
   --wa-color-text-quiet: var(--wa-color-base-60);
@@ -352,8 +358,8 @@
   --wa-color-mix-active: black 16%;
 
   /**
-    * Semantic theme colors
-    */
+   * Semantic theme colors
+   */
   --wa-color-brand-spot: var(--wa-color-blue-50);
   --wa-color-brand-spot-darker: var(--wa-color-blue-40);
   --wa-color-brand-fill-subtle: var(--wa-color-blue-10);
diff --git a/src/themes/default.css b/src/themes/default.css
index 53f35880e..1c59d0489 100644
--- a/src/themes/default.css
+++ b/src/themes/default.css
@@ -237,6 +237,7 @@
   --wa-space-xl: calc(var(--wa-space-base) * 1.5rem); /* 24px */
   --wa-space-2xl: calc(var(--wa-space-base) * 2rem); /* 32px */
   --wa-space-3xl: calc(var(--wa-space-base) * 3rem); /* 48px */
+
   /**
    * Corners
    */
@@ -262,6 +263,12 @@
     color-mix(in oklab, var(--wa-color-focus) 98%, transparent);
   --wa-focus-ring-offset: 0.0625rem; /* 1px */
 
+  /**
+   * Links
+   */
+  --wa-link-decoration-default: underline var(--wa-color-brand-border-highlight) dotted;
+  --wa-link-decoration-hover: underline;
+
   /**
    * Z-index
    */
@@ -317,8 +324,8 @@
   --wa-flow-spacing: 1.5rem;
 
   /**
-  * From 2.x
-  */
+   * From 2.x
+   */
   --wa-form-control-toggle-size-s: 0.875rem;
   --wa-form-control-toggle-size-m: 1.125rem;
   --wa-form-control-toggle-size-l: 1.375rem;
@@ -336,7 +343,7 @@
   --wa-color-surface-raised: var(--wa-color-base-10);
   --wa-color-surface-default: var(--wa-color-base-05);
   --wa-color-surface-lowered: black;
-  --wa-color-surface-border: var(--wa-color-base-10);
+  --wa-color-surface-border: var(--wa-color-base-20);
 
   --wa-color-text-normal: var(--wa-color-base-95);
   --wa-color-text-quiet: var(--wa-color-base-60);
@@ -355,8 +362,8 @@
   --wa-color-mix-active: black 16%;
 
   /**
-    * Semantic theme colors
-    */
+   * Semantic theme colors
+   */
   --wa-color-brand-spot: var(--wa-color-blue-50);
   --wa-color-brand-spot-darker: var(--wa-color-blue-40);
   --wa-color-brand-fill-subtle: var(--wa-color-blue-10);
diff --git a/src/themes/glassy.css b/src/themes/glassy.css
index d782f4a15..540058157 100644
--- a/src/themes/glassy.css
+++ b/src/themes/glassy.css
@@ -261,6 +261,12 @@
   --wa-focus-ring: var(--wa-focus-ring-style) var(--wa-focus-ring-width) var(--wa-color-focus);
   --wa-focus-ring-offset: 0.0625rem; /* 1px */
 
+  /**
+   * Links
+   */
+  --wa-link-decoration-default: underline var(--wa-color-brand-border-highlight) dotted;
+  --wa-link-decoration-hover: underline;
+
   /**
    * Z-index
    */
@@ -316,8 +322,8 @@
   --wa-flow-spacing: 1.5rem;
 
   /**
-  * From 2.x
-  */
+   * From 2.x
+   */
   --wa-form-control-toggle-size-s: 0.875rem;
   --wa-form-control-toggle-size-m: 1.125rem;
   --wa-form-control-toggle-size-l: 1.375rem;
@@ -335,7 +341,7 @@
   --wa-color-surface-raised: var(--wa-color-base-10);
   --wa-color-surface-default: var(--wa-color-base-05);
   --wa-color-surface-lowered: black;
-  --wa-color-surface-border: var(--wa-color-base-10);
+  --wa-color-surface-border: var(--wa-color-base-20);
 
   --wa-color-text-normal: var(--wa-color-base-95);
   --wa-color-text-quiet: var(--wa-color-base-60);
@@ -354,8 +360,8 @@
   --wa-color-mix-active: black 12%;
 
   /**
-    * Semantic theme colors
-    */
+   * Semantic theme colors
+   */
   --wa-color-brand-spot: var(--wa-color-orchid-50);
   --wa-color-brand-spot-darker: var(--wa-color-orchid-40);
   --wa-color-brand-fill-subtle: var(--wa-color-orchid-10);
diff --git a/src/themes/mellow.css b/src/themes/mellow.css
index d608f0a31..a7a549b33 100644
--- a/src/themes/mellow.css
+++ b/src/themes/mellow.css
@@ -261,6 +261,12 @@
   --wa-focus-ring: var(--wa-focus-ring-style) var(--wa-focus-ring-width) var(--wa-color-focus);
   --wa-focus-ring-offset: 0.0625rem; /* 1px */
 
+  /**
+   * Links
+   */
+  --wa-link-decoration-default: underline var(--wa-color-brand-border-highlight) dotted;
+  --wa-link-decoration-hover: underline;
+
   /**
    * Z-index
    */
@@ -316,8 +322,8 @@
   --wa-flow-spacing: 1.5rem;
 
   /**
-  * From 2.x
-  */
+   * From 2.x
+   */
   --wa-form-control-toggle-size-s: 0.875rem;
   --wa-form-control-toggle-size-m: 1.125rem;
   --wa-form-control-toggle-size-l: 1.375rem;
@@ -335,7 +341,7 @@
   --wa-color-surface-raised: var(--wa-color-base-10);
   --wa-color-surface-default: var(--wa-color-base-05);
   --wa-color-surface-lowered: black;
-  --wa-color-surface-border: var(--wa-color-base-10);
+  --wa-color-surface-border: var(--wa-color-base-20);
 
   --wa-color-text-normal: var(--wa-color-base-80);
   --wa-color-text-quiet: var(--wa-color-base-60);
@@ -354,8 +360,8 @@
   --wa-color-mix-active: black 16%;
 
   /**
-    * Semantic theme colors
-    */
+   * Semantic theme colors
+   */
   --wa-color-brand-spot: var(--wa-color-green-50);
   --wa-color-brand-spot-darker: var(--wa-color-green-40);
   --wa-color-brand-fill-subtle: var(--wa-color-green-10);
diff --git a/src/themes/playful.css b/src/themes/playful.css
index 5c27d5e4f..a4b6e50bf 100644
--- a/src/themes/playful.css
+++ b/src/themes/playful.css
@@ -261,6 +261,12 @@
   --wa-focus-ring: var(--wa-focus-ring-style) var(--wa-focus-ring-width) var(--wa-color-focus);
   --wa-focus-ring-offset: 0.0625rem; /* 1px */
 
+  /**
+   * Links
+   */
+  --wa-link-decoration-default: underline;
+  --wa-link-decoration-hover: underline;
+
   /**
    * Z-index
    */
@@ -316,8 +322,8 @@
   --wa-flow-spacing: 1.5rem;
 
   /**
-  * From 2.x
-  */
+   * From 2.x
+   */
   --wa-form-control-toggle-size-s: 0.875rem;
   --wa-form-control-toggle-size-m: 1.125rem;
   --wa-form-control-toggle-size-l: 1.375rem;
@@ -335,7 +341,7 @@
   --wa-color-surface-raised: var(--wa-color-base-10);
   --wa-color-surface-default: var(--wa-color-base-05);
   --wa-color-surface-lowered: black;
-  --wa-color-surface-border: var(--wa-color-base-10);
+  --wa-color-surface-border: var(--wa-color-base-20);
 
   --wa-color-text-normal: var(--wa-color-base-95);
   --wa-color-text-quiet: var(--wa-color-base-60);
@@ -354,8 +360,8 @@
   --wa-color-mix-active: black 16%;
 
   /**
-    * Semantic theme colors
-    */
+   * Semantic theme colors
+   */
   --wa-color-brand-spot: var(--wa-color-rose-50);
   --wa-color-brand-spot-darker: var(--wa-color-rose-40);
   --wa-color-brand-fill-subtle: var(--wa-color-rose-10);