diff --git a/src/forbidden-lands.ts b/src/forbidden-lands.ts
index 396d4d1d..e4fa457d 100644
--- a/src/forbidden-lands.ts
+++ b/src/forbidden-lands.ts
@@ -76,7 +76,10 @@ Hooks.once("init", () => {
 	if (game.settings.get("forbidden-lands", "removeBorders"))
 		$("html").addClass("no-borders");
 
-	if (game.settings.get("forbidden-lands", "darkmode"))
+	if (
+		Number(game.version) < 12 &&
+		game.settings.get("forbidden-lands", "darkmode")
+	)
 		$("body").addClass("theme-dark");
 });
 
diff --git a/src/legacy-styles/components/_chat.scss b/src/legacy-styles/components/_chat.scss
index e0647e46..0231d797 100644
--- a/src/legacy-styles/components/_chat.scss
+++ b/src/legacy-styles/components/_chat.scss
@@ -1,5 +1,5 @@
 .forbidden-lands.chat-item {
-	background: var(--color-background);
+	background: var(--color-theme-background);
 	border-radius: 3px;
 	color: var(--color-theme-text);
 	font-family: var(--font-body);
diff --git a/src/legacy-styles/components/_dialog.scss b/src/legacy-styles/components/_dialog.scss
index ede3faff..a6d66c9c 100644
--- a/src/legacy-styles/components/_dialog.scss
+++ b/src/legacy-styles/components/_dialog.scss
@@ -90,10 +90,10 @@
 		}
 
 		button {
-			background: #eee;
-			padding: 0.3em 2em;
-			font-weight: normal;
-			border: 2px groove #e0e0e0;
+			background: var(--color-theme-gray-400);
+			padding: 0.3em 32px;
+			font-weight: 400;
+			border: 2px solid var(--color-theme-gray-400);
 			width: 100%;
 			display: flex;
 			justify-content: center;
@@ -102,8 +102,7 @@
 			&:hover,
 			&:focus {
 				box-shadow: none;
-				border: 2px groove var(--color-theme-alt-600);
-				background: var(--color-theme-alt-600);
+				background: var(--color-theme-gray-200);
 			}
 
 			&:active {
diff --git a/src/legacy-styles/system/_main.scss b/src/legacy-styles/system/_main.scss
index f688a73e..e4c0a713 100644
--- a/src/legacy-styles/system/_main.scss
+++ b/src/legacy-styles/system/_main.scss
@@ -30,7 +30,7 @@
 	}
 
 	option {
-		background: var(--color-background);
+		background: var(--color-theme-background);
 	}
 
 	details {
@@ -174,14 +174,14 @@
 
 	button:focus,
 	button:hover {
-		background: var(--color-theme-alt-600);
+		background: var(--color-theme-gray-200);
 	}
 
 	input[type="number"],
 	input[type="text"],
 	select,
 	textarea {
-		background: var(--color-background);
+		background: var(--color-theme-background);
 		border: 1px solid var(--color-border);
 		border-radius: 3px;
 		box-shadow: inset 0 0 6px var(--color-theme-gray-200);
@@ -282,8 +282,8 @@
 
 				&:nth-child(odd) button:focus,
 				&:nth-child(odd) button:hover {
-					background: var(--color-background);
-					color: var(--color-theme-gray-600);
+					background: var(--color-theme-background);
+					color: var(--color-theme-text);
 				}
 
 				img {
diff --git a/src/system/core/styles/variables.scss b/src/system/core/styles/variables.scss
index 689a6a4e..3b08d9c6 100644
--- a/src/system/core/styles/variables.scss
+++ b/src/system/core/styles/variables.scss
@@ -5,6 +5,7 @@ body {
 	--color-theme-contrast: var(--color-theme-gray-200);
 	--color-theme-accent: #a00404;
 	--color-theme-gray-200: #dddddd;
+	--color-theme-gray-400: #999999;
 	--color-theme-gray-600: #707070;
 	--color-theme-gray-800: #333333;
 	--color-theme-alt-200: #ffb994;