diff --git a/system.css b/system.css
index a5ab8d2..a02a9ee 100644
--- a/system.css
+++ b/system.css
@@ -77,7 +77,7 @@
 			ButtonBorder
 		); /* ButtonBorder is broken in Safari */
 		--system-button-face: transparent; /* ButtonFace is broken in Safari */
-		--system-button-text: ButtonText; /* ButtonText is broken in Safari */
+		--system-button-text: CanvasText; /* ButtonText is broken in Safari */
 		--system-canvas: Canvas;
 		--system-canvas-text: CanvasText;
 		--system-field: Field;
@@ -134,16 +134,9 @@
 
 	/* MODIFIERS ########################################################################## */
 
-	@media (prefers-color-scheme: light) {
-		:root {
-			--system-cs-is-light: 1; /* OFF */
-			color-scheme: light;
-		}
-	}
 	@media (prefers-color-scheme: dark) {
 		:root {
 			--system-cs-is-light: 0; /* OFF */
-			color-scheme: dark;
 		}
 	}
 
@@ -157,6 +150,7 @@
 	html {
 		font-family: var(--system-font-family-body);
 		line-height: var(--system-line-height);
+		color-scheme: light dark;
 	}
 	body {
 		--viewport-padding: minmax(var(--system-spacing-layout), 1fr);