diff --git a/src/system-custom-colors.css b/src/system-custom-colors.css
index d164853..7fd3f4d 100644
--- a/src/system-custom-colors.css
+++ b/src/system-custom-colors.css
@@ -3,7 +3,11 @@
 	:root{
 
 		/* These are only mixed with system colors */
-		--system-surface-color: color-mix(in oklab, Canvas 95%, CanvasText);
+		--system-surface-color: color-mix(
+				in oklab,
+				color-mix(in oklab, Canvas 95%, CanvasText) var(--system-cs-state),
+				color-mix(in oklab, Canvas 85%, CanvasText)
+		);
 		--system-stroke-color: color-mix(in oklab, Canvas 55%, CanvasText);
 		--system-invalid-color: color-mix(in oklab, var(--system-active-text) 90%, CanvasText);
 		--system-content-color-light: color-mix(
diff --git a/src/system-selectors.css b/src/system-selectors.css
index 3caa8d8..461d442 100644
--- a/src/system-selectors.css
+++ b/src/system-selectors.css
@@ -208,6 +208,7 @@
 
 		&:is(:focus, :focus-visible, :enabled:hover) {
 			color: var(--system-content-color-light);
+			border-color: color-mix(in oklab, var(--system-accent-color) 85%, var(--system-canvas-text));
 			background: color-mix(in oklab, var(--system-accent-color) 85%, var(--system-canvas-text));
 		}
 	}