diff --git a/client/src/Components/Check/Check.jsx b/client/src/Components/Check/Check.jsx
index 557414146..7f37a4dc1 100644
--- a/client/src/Components/Check/Check.jsx
+++ b/client/src/Components/Check/Check.jsx
@@ -51,9 +51,10 @@ const Check = ({ text, noHighlightText, variant = "info", outlined = false }) =>
 				sx={{
 					color:
 						variant === "info"
-							? theme.palette.primary.contrastTextTertiary
+							? theme.palette.primary.contrastTextSecondary
 							: colors[variant],
-					opacity: 0.8,
+					opacity: 0.9,
+					fontWeight: 450,
 				}}
 			>
 				{noHighlightText && <Typography component="span">{noHighlightText}</Typography>}{" "}
diff --git a/client/src/Components/ConfigBox/index.jsx b/client/src/Components/ConfigBox/index.jsx
index e26e49e8d..01b35729e 100644
--- a/client/src/Components/ConfigBox/index.jsx
+++ b/client/src/Components/ConfigBox/index.jsx
@@ -20,6 +20,11 @@ const ConfigBox = styled(Stack)(({ theme }) => ({
 		borderRightColor: theme.palette.primary.lowContrast,
 		paddingRight: theme.spacing(15),
 		paddingLeft: theme.spacing(15),
+		backgroundColor: theme.palette.tertiary.background,
+		"& :is(h1, h2):first-of-type": {
+			fontWeight: 600,
+			marginBottom: theme.spacing(4),
+		},
 	},
 	"& > div:last-of-type": {
 		flex: 1,
diff --git a/client/src/Components/Fallback/FallbackBackground.jsx b/client/src/Components/Fallback/FallbackBackground.jsx
index e01659f49..8767837dc 100644
--- a/client/src/Components/Fallback/FallbackBackground.jsx
+++ b/client/src/Components/Fallback/FallbackBackground.jsx
@@ -1,19 +1,27 @@
 import { useTheme } from "@emotion/react";
 import Box from "@mui/material/Box";
-import Skeleton from "../../assets/Images/create-placeholder.svg?react";
 import Background from "../../assets/Images/background-grid.svg?react";
 import SkeletonDark from "../../assets/Images/create-placeholder-dark.svg?react";
+import OutputAnimation from "../../assets/Animations/output.gif";
+import DarkmodeOutput from "../../assets/Animations/darkmodeOutput.gif";
 import { useSelector } from "react-redux";
 const FallbackBackground = () => {
 	const theme = useTheme();
 	const mode = useSelector((state) => state.ui.mode);
 	return (
 		<>
-			{mode === "light" ? (
-				<Skeleton style={{ zIndex: 1 }} />
-			) : (
-				<SkeletonDark style={{ zIndex: 1 }} />
-			)}
+			<Box
+				component="img"
+				src={mode === "light" ? OutputAnimation : DarkmodeOutput}
+				Background="transparent"
+				alt="Loading animation"
+				sx={{
+					zIndex: 1,
+					border: "none",
+					borderRadius: theme.spacing(8),
+					width: "100%",
+				}}
+			/>
 			<Box
 				className="background-pattern-svg"
 				sx={{
diff --git a/client/src/Components/Fallback/FallbackContainer.jsx b/client/src/Components/Fallback/FallbackContainer.jsx
index 65d927190..7a2ec5fe0 100644
--- a/client/src/Components/Fallback/FallbackContainer.jsx
+++ b/client/src/Components/Fallback/FallbackContainer.jsx
@@ -7,9 +7,9 @@ const FallbackContainer = ({ children, type }) => {
 	return (
 		<Box
 			border={1}
-			borderColor={theme.palette.primary.lowContrast}
+			borderColor={theme.palette.tertiary.border}
 			borderRadius={theme.shape.borderRadius}
-			backgroundColor={theme.palette.primary.main}
+			backgroundColor={theme.palette.tertiary.background}
 			overflow="hidden"
 			sx={{
 				display: "flex",
diff --git a/client/src/Components/Fallback/FallbackTitle.jsx b/client/src/Components/Fallback/FallbackTitle.jsx
index f7f42f2ca..69fee05c6 100644
--- a/client/src/Components/Fallback/FallbackTitle.jsx
+++ b/client/src/Components/Fallback/FallbackTitle.jsx
@@ -9,7 +9,7 @@ const FallbackTitle = ({ title }) => {
 			alignSelf="center"
 			component="h1"
 			marginY={theme.spacing(4)}
-			color={theme.palette.primary.contrastTextTertiary}
+			color={theme.palette.primary.contrastText}
 		>
 			{title}
 		</Typography>
diff --git a/client/src/Pages/Infrastructure/Create/index.jsx b/client/src/Pages/Infrastructure/Create/index.jsx
index 0800bb500..c406b6b40 100644
--- a/client/src/Pages/Infrastructure/Create/index.jsx
+++ b/client/src/Pages/Infrastructure/Create/index.jsx
@@ -265,7 +265,7 @@ const CreateInfrastructureMonitor = () => {
 					</Typography>
 				</Typography>
 				<ConfigBox>
-					<Stack gap={theme.spacing(6)}>
+					<Stack>
 						<Typography
 							component="h2"
 							variant="h2"
@@ -347,7 +347,12 @@ const CreateInfrastructureMonitor = () => {
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
-						<Typography component="h2">{t("notificationConfig.title")}</Typography>
+						<Typography
+							component="h2"
+							variant="h2"
+						>
+							{t("notificationConfig.title")}
+						</Typography>
 						<Typography component="p">{t("notificationConfig.description")}</Typography>
 					</Box>
 					<NotificationsConfig
diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index b78f9a40a..10c280efb 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -170,7 +170,10 @@ const CreateNotifications = () => {
 			>
 				<ConfigBox>
 					<Box>
-						<Typography component="h2">
+						<Typography
+							component="h2"
+							variant="h2"
+						>
 							{t("createNotifications.nameSettings.title")}
 						</Typography>
 						<Typography component="p">
@@ -191,7 +194,10 @@ const CreateNotifications = () => {
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
-						<Typography component="h2">
+						<Typography
+							component="h2"
+							variant="h2"
+						>
 							{t("createNotifications.typeSettings.title")}
 						</Typography>
 						<Typography component="p">
@@ -210,7 +216,12 @@ const CreateNotifications = () => {
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
-						<Typography component="h2">{t(TITLE_MAP[type])}</Typography>
+						<Typography
+							component="h2"
+							variant="h2"
+						>
+							{t(TITLE_MAP[type])}
+						</Typography>
 						<Typography component="p">{t(DESCRIPTION_MAP[type])}</Typography>
 					</Box>
 					<Stack gap={theme.spacing(12)}>
diff --git a/client/src/Pages/Settings/SettingsURL.jsx b/client/src/Pages/Settings/SettingsURL.jsx
index 298dfa821..1ce2e8c73 100644
--- a/client/src/Pages/Settings/SettingsURL.jsx
+++ b/client/src/Pages/Settings/SettingsURL.jsx
@@ -15,7 +15,12 @@ const SettingsURL = ({ HEADING_SX, handleChange, showURL = false }) => {
 	return (
 		<ConfigBox>
 			<Box>
-				<Typography component="h1">{t("settingsPage.urlSettings.title")}</Typography>
+				<Typography
+					component="h1"
+					variant="h2"
+				>
+					{t("settingsPage.urlSettings.title")}
+				</Typography>
 				<Typography sx={HEADING_SX}>
 					{t("settingsPage.urlSettings.description")}
 				</Typography>
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index 761fd6346..2416d2120 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -357,7 +357,12 @@ const CreateMonitor = () => {
 				</ConfigBox>
 				<ConfigBox>
 					<Box>
-						<Typography component="h2">{t("notificationConfig.title")}</Typography>
+						<Typography
+							component="h2"
+							variant="h2"
+						>
+							{t("notificationConfig.title")}
+						</Typography>
 						<Typography component="p">{t("notificationConfig.description")}</Typography>
 					</Box>
 					<NotificationsConfig
diff --git a/client/src/Utils/Theme/constants.js b/client/src/Utils/Theme/constants.js
index 1b905bb79..69c8839be 100644
--- a/client/src/Utils/Theme/constants.js
+++ b/client/src/Utils/Theme/constants.js
@@ -87,8 +87,10 @@ const newColors = {
 	offBlack: "#131315",
 	gray0: "#FDFDFD",
 	gray10: "#F4F4FF",
+	gray50: "#F9F9F9",
 	gray100: "#F3F3F3",
 	gray200: "#EFEFEF",
+	gray250: "#DADADA",
 	gray500: "#A2A3A3",
 	gray900: "#1c1c1c",
 	blueGray50: "#E8F0FE",
@@ -173,7 +175,7 @@ const newSemanticColors = {
 			dark: newColors.blueGray800,
 		},
 		lowContrast: {
-			light: newColors.gray200,
+			light: newColors.gray250,
 			dark: newColors.blueGray600,
 		},
 	},
@@ -206,6 +208,14 @@ const newSemanticColors = {
 			light: newColors.blueGray800,
 			dark: newColors.gray100,
 		},
+		background: {
+			light: newColors.gray50,
+			dark: newColors.offBlack,
+		},
+		border: {
+			light: newColors.gray500,
+			dark: newColors.blueGray600,
+		},
 	},
 	success: {
 		main: {
diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js
index 5866e517f..ec292142d 100644
--- a/client/src/Utils/Theme/globalTheme.js
+++ b/client/src/Utils/Theme/globalTheme.js
@@ -1,5 +1,6 @@
 import { typographyLevels } from "./constants";
 const fontFamilyPrimary = '"Inter" , sans-serif';
+import { darken } from "@mui/material/styles";
 // const fontFamilySecondary = '"Avenir", sans-serif';
 
 /* TODO take the color out from here */
@@ -55,6 +56,21 @@ const baseTheme = (palette) => ({
 			styleOverrides: {
 				root: ({ theme }) => ({
 					variants: [
+						{
+							props: (props) => props.variant === "contained" && props.color === "accent",
+							style: {
+								backgroundColor: theme.palette.accent.main,
+								color: theme.palette.primary.contrastTextSecondaryDarkBg,
+								fontWeight: 700,
+								letterSpacing: "0.5px",
+								textShadow: "0 0 1px rgba(0, 0, 0, 0.15)",
+								"&:hover": {
+									backgroundColor: darken(theme.palette.accent.darker, 0.05),
+									boxShadow: `0 2px 6px rgba(0, 0, 0, 0.1)`,
+									transition: "all 0.2s ease-in-out",
+								},
+							},
+						},
 						{
 							props: (props) => props.color === "accent",
 							style: {
@@ -566,7 +582,7 @@ const baseTheme = (palette) => ({
 				root: ({ theme }) => ({
 					ml: "auto",
 					"& .MuiButtonBase-root, & .MuiButtonBase-root:hover": {
-						borderColor: theme.palette.primary.contrastBorder,
+						borderColor: theme.palette.primary.lowContrast,
 						width: "auto",
 						whiteSpace: "nowrap",
 					},
diff --git a/client/src/assets/Animations/darkmodeOutput.gif b/client/src/assets/Animations/darkmodeOutput.gif
new file mode 100644
index 000000000..7629e30b4
Binary files /dev/null and b/client/src/assets/Animations/darkmodeOutput.gif differ
diff --git a/client/src/assets/Animations/output.gif b/client/src/assets/Animations/output.gif
new file mode 100644
index 000000000..c7823227a
Binary files /dev/null and b/client/src/assets/Animations/output.gif differ