diff --git a/client/src/Components/design-elements/BasePage.tsx b/client/src/Components/design-elements/BasePage.tsx
index 4c04bc78a..fd1ffc40b 100644
--- a/client/src/Components/design-elements/BasePage.tsx
+++ b/client/src/Components/design-elements/BasePage.tsx
@@ -15,7 +15,7 @@ import CircularProgress from "@mui/material/CircularProgress";
 import { HeaderAuthControls } from "@/Pages/Auth/components/HeaderAuthControls";
 
 import type { StackProps } from "@mui/material/Stack";
-import { useTheme } from "@mui/material/styles";
+import { useTheme, alpha } from "@mui/material/styles";
 import { Trans, useTranslation } from "react-i18next";
 import { Link as RouterLink } from "react-router-dom";
 import { Typography } from "@mui/material";
@@ -23,10 +23,9 @@ import { Typography } from "@mui/material";
 export const PageSpeedKeyPriorityFallback = () => {
 	const theme = useTheme();
 	const { t } = useTranslation();
-	const isDark = theme.palette.mode === "dark";
-	const alertBg = isDark ? "rgba(245, 158, 11, 0.08)" : "#FFFAEB";
-	const alertBorder = isDark ? "rgba(245, 158, 11, 0.45)" : "#F59E0B";
-	const alertIcon = isDark ? "#FBBF24" : "#F59E0B";
+	const alertBg = alpha(theme.palette.warning.main, 0.08);
+	const alertBorder = alpha(theme.palette.warning.main, 0.45);
+	const alertIcon = theme.palette.warning.main;
 	return (
 		<EmptyState
 			fullscreen
diff --git a/client/src/Components/inputs/Switch.tsx b/client/src/Components/inputs/Switch.tsx
index 05be73a24..06ed5bc5f 100644
--- a/client/src/Components/inputs/Switch.tsx
+++ b/client/src/Components/inputs/Switch.tsx
@@ -21,24 +21,16 @@ export const SwitchComponent = forwardRef<HTMLInputElement, SwitchComponentProps
 					},
 				}}
 				sx={[
-					{
-						"& .MuiSwitch-switchBase": {
-							"&.Mui-checked": {
-								color: "#E0E0E0",
-								"& + .MuiSwitch-track": {
-									backgroundColor: theme.palette.primary.main,
-									opacity: 1,
-									border: 0,
+					...(dualOption
+						? [
+								{
+									"& .MuiSwitch-track": {
+										backgroundColor: theme.palette.primary.main,
+										opacity: 1,
+									},
 								},
-							},
-						},
-						...(dualOption && {
-							"& .MuiSwitch-track": {
-								backgroundColor: theme.palette.primary.main,
-								opacity: 1,
-							},
-						}),
-					},
+							]
+						: []),
 					...additionalSx,
 				]}
 			/>
diff --git a/client/src/Hooks/useStatusPageForm.ts b/client/src/Hooks/useStatusPageForm.ts
index 0011ea761..2c1adf301 100644
--- a/client/src/Hooks/useStatusPageForm.ts
+++ b/client/src/Hooks/useStatusPageForm.ts
@@ -28,7 +28,7 @@ export const useStatusPageForm = ({
 			url: data?.url || generateDefaultUrl(),
 			timezone: data?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone,
 			type: data?.type || ["uptime"],
-			color: data?.color || "#4169E1",
+			color: data?.color || "#13715B",
 			monitors: data?.monitors || [],
 			isPublished: data?.isPublished ?? false,
 			showCharts: data?.showCharts ?? true,
diff --git a/client/src/Pages/Settings/index.tsx b/client/src/Pages/Settings/index.tsx
index d1040b913..1a9724916 100644
--- a/client/src/Pages/Settings/index.tsx
+++ b/client/src/Pages/Settings/index.tsx
@@ -584,7 +584,7 @@ export const SettingsPage = () => {
 									p: 2,
 									borderRadius: 1,
 									overflow: "auto",
-									backgroundColor: theme.palette.mode === "dark" ? "#1e1e1e" : "#f5f5f5",
+									backgroundColor: theme.palette.action.hover,
 								}}
 							>
 								<code>