diff --git a/Common/StockThemes.js b/Common/StockThemes.js
index 805f415c..f24bd759 100644
--- a/Common/StockThemes.js
+++ b/Common/StockThemes.js
@@ -114,157 +114,156 @@ const StockThemes = {
     DARK: {
         blue: {
             name: "Blue",
-            primary: "#9dcbfb",
-            primaryText: "#003355",
-            primaryContainer: "#124a73",
-            secondary: "#b9c8da",
-            surface: "#101418",
-            surfaceText: "#e0e2e8",
-            surfaceVariant: "#42474e",
-            surfaceVariantText: "#c2c7cf",
-            surfaceTint: "#9dcbfb",
-            background: "#101418",
-            backgroundText: "#e0e2e8",
-            outline: "#8c9199",
-            surfaceContainer: "#1d2024",
-            surfaceContainerHigh: "#272a2f"
+            primary: "#42a5f5",
+            primaryText: "#000000",
+            primaryContainer: "#0d47a1",
+            secondary: "#8ab4f8",
+            surface: "#1a1c1e",
+            surfaceText: "#e3e8ef",
+            surfaceVariant: "#44464f",
+            surfaceVariantText: "#c4c7c5",
+            surfaceTint: "#8ab4f8",
+            background: "#1a1c1e",
+            backgroundText: "#e3e8ef",
+            outline: "#8e918f",
+            surfaceContainer: "#1e2023",
+            surfaceContainerHigh: "#292b2f"
         },
         purple: {
             name: "Purple",
-            primary: "#d0bcfe",
-            primaryText: "#36265d",
-            primaryContainer: "#4d3d75",
-            secondary: "#ccc2db",
-            surface: "#141218",
-            surfaceText: "#e6e0e9",
-            surfaceVariant: "#49454e",
-            surfaceVariantText: "#cac4cf",
-            surfaceTint: "#d0bcfe",
-            background: "#141218",
-            backgroundText: "#e6e0e9",
-            outline: "#948f99",
-            surfaceContainer: "#211f24",
-            surfaceContainerHigh: "#2b292f"
+            primary: "#D0BCFF",
+            primaryText: "#381E72",
+            primaryContainer: "#4F378B",
+            secondary: "#CCC2DC",
+            surface: "#10121E",
+            surfaceText: "#E6E0E9",
+            surfaceVariant: "#49454F",
+            surfaceVariantText: "#CAC4D0",
+            surfaceTint: "#D0BCFF",
+            background: "#10121E",
+            backgroundText: "#E6E0E9",
+            outline: "#938F99",
+            surfaceContainer: "#1D1B20",
+            surfaceContainerHigh: "#2B2930"
         },
         green: {
             name: "Green",
-            primary: "#a1d39a",
-            primaryText: "#0a390f",
-            primaryContainer: "#235024",
-            secondary: "#baccb3",
-            surface: "#10140f",
-            surfaceText: "#e0e4db",
-            surfaceVariant: "#424940",
-            surfaceVariantText: "#c2c9bd",
-            surfaceTint: "#a1d39a",
-            background: "#10140f",
-            backgroundText: "#e0e4db",
-            outline: "#8c9388",
-            surfaceContainer: "#1d211b",
-            surfaceContainerHigh: "#272b25"
+            primary: "#4caf50",
+            primaryText: "#000000",
+            primaryContainer: "#1b5e20",
+            secondary: "#81c995",
+            surface: "#0f1411",
+            surfaceText: "#e1f5e3",
+            surfaceVariant: "#404943",
+            surfaceVariantText: "#c1cbc4",
+            surfaceTint: "#81c995",
+            background: "#0f1411",
+            backgroundText: "#e1f5e3",
+            outline: "#8b938c",
+            surfaceContainer: "#1a1f1b",
+            surfaceContainerHigh: "#252a26"
         },
         orange: {
             name: "Orange",
-            primary: "#ffb692",
-            primaryText: "#542103",
-            primaryContainer: "#703717",
-            secondary: "#e6beac",
-            surface: "#1a120e",
-            surfaceText: "#f0dfd8",
-            surfaceVariant: "#52443d",
-            surfaceVariantText: "#d7c2b9",
-            surfaceTint: "#ffb692",
-            background: "#1a120e",
-            backgroundText: "#f0dfd8",
-            outline: "#a08d85",
-            surfaceContainer: "#271e1a",
-            surfaceContainerHigh: "#322824"
+            primary: "#ff6d00",
+            primaryText: "#000000",
+            primaryContainer: "#3e2723",
+            secondary: "#ffb74d",
+            surface: "#1c1410",
+            surfaceText: "#f5f1ea",
+            surfaceVariant: "#4a453a",
+            surfaceVariantText: "#cbc5b8",
+            surfaceTint: "#ffb74d",
+            background: "#1c1410",
+            backgroundText: "#f5f1ea",
+            outline: "#958f84",
+            surfaceContainer: "#211e17",
+            surfaceContainerHigh: "#2c291f"
         },
         red: {
             name: "Red",
-            primary: "#ffb3ad",
-            primaryText: "#68000a",
-            primaryContainer: "#ce2029",
-            secondary: "#ffb3ad",
-            surface: "#1f0f0e",
-            surfaceText: "#fbdbd9",
-            surfaceVariant: "#5c403d",
-            surfaceVariantText: "#e5bdba",
-            surfaceTint: "#ffb3ad",
-            background: "#1f0f0e",
-            backgroundText: "#fbdbd9",
-            outline: "#ac8885",
-            surfaceContainer: "#2c1b1a",
-            surfaceContainerHigh: "#382524",
-            matugen_type: "scheme-content"
+            primary: "#f44336",
+            primaryText: "#000000",
+            primaryContainer: "#4a0e0e",
+            secondary: "#f28b82",
+            surface: "#1c1011",
+            surfaceText: "#f5e8ea",
+            surfaceVariant: "#4a3f41",
+            surfaceVariantText: "#cbc2c4",
+            surfaceTint: "#f28b82",
+            background: "#1c1011",
+            backgroundText: "#f5e8ea",
+            outline: "#958b8d",
+            surfaceContainer: "#211b1c",
+            surfaceContainerHigh: "#2c2426"
         },
         cyan: {
             name: "Cyan",
-            primary: "#83d3e3",
-            primaryText: "#00363e",
-            primaryContainer: "#004e59",
-            secondary: "#b1cbd1",
-            surface: "#0e1416",
-            surfaceText: "#dee3e5",
-            surfaceVariant: "#3f484a",
-            surfaceVariantText: "#bfc8ca",
-            surfaceTint: "#83d3e3",
-            background: "#0e1416",
-            backgroundText: "#dee3e5",
-            outline: "#899295",
-            surfaceContainer: "#1b2122",
+            primary: "#00bcd4",
+            primaryText: "#000000",
+            primaryContainer: "#004d5c",
+            secondary: "#4dd0e1",
+            surface: "#0f1617",
+            surfaceText: "#e8f4f5",
+            surfaceVariant: "#3f474a",
+            surfaceVariantText: "#c2c9cb",
+            surfaceTint: "#4dd0e1",
+            background: "#0f1617",
+            backgroundText: "#e8f4f5",
+            outline: "#8c9194",
+            surfaceContainer: "#1a1f20",
             surfaceContainerHigh: "#252b2c"
         },
         pink: {
             name: "Pink",
-            primary: "#ffb0ca",
-            primaryText: "#541d34",
-            primaryContainer: "#6f334a",
-            secondary: "#e2bdc7",
-            surface: "#191114",
-            surfaceText: "#efdfe2",
-            surfaceVariant: "#514347",
-            surfaceVariantText: "#d5c2c6",
-            surfaceTint: "#ffb0ca",
-            background: "#191114",
-            backgroundText: "#efdfe2",
-            outline: "#9e8c91",
-            surfaceContainer: "#261d20",
-            surfaceContainerHigh: "#31282a"
+            primary: "#e91e63",
+            primaryText: "#000000",
+            primaryContainer: "#4a0e2f",
+            secondary: "#f8bbd9",
+            surface: "#1a1014",
+            surfaceText: "#f3e8ee",
+            surfaceVariant: "#483f45",
+            surfaceVariantText: "#c9c2c7",
+            surfaceTint: "#f8bbd9",
+            background: "#1a1014",
+            backgroundText: "#f3e8ee",
+            outline: "#938a90",
+            surfaceContainer: "#1f1b1e",
+            surfaceContainerHigh: "#2a2428"
         },
         amber: {
             name: "Amber",
-            primary: "#e9c16c",
-            primaryText: "#3f2e00",
-            primaryContainer: "#5b4300",
-            secondary: "#d8c4a0",
-            surface: "#17130b",
-            surfaceText: "#ebe1d4",
-            surfaceVariant: "#4d4639",
-            surfaceVariantText: "#d0c5b4",
-            surfaceTint: "#e9c16c",
-            background: "#17130b",
-            backgroundText: "#ebe1d4",
-            outline: "#998f80",
-            surfaceContainer: "#231f17",
-            surfaceContainerHigh: "#2e2921"
+            primary: "#ffc107",
+            primaryText: "#000000",
+            primaryContainer: "#4a3c00",
+            secondary: "#ffd54f",
+            surface: "#1a1710",
+            surfaceText: "#f3f0e8",
+            surfaceVariant: "#49453a",
+            surfaceVariantText: "#cac5b8",
+            surfaceTint: "#ffd54f",
+            background: "#1a1710",
+            backgroundText: "#f3f0e8",
+            outline: "#949084",
+            surfaceContainer: "#1f1e17",
+            surfaceContainerHigh: "#2a281f"
         },
         coral: {
             name: "Coral",
-            primary: "#ffb59c",
-            primaryText: "#55200b",
-            primaryContainer: "#72351f",
-            secondary: "#e7bdb0",
-            surface: "#1a110f",
-            surfaceText: "#f1dfd9",
-            surfaceVariant: "#53433e",
-            surfaceVariantText: "#d8c2bb",
-            surfaceTint: "#ffb59c",
-            background: "#1a110f",
-            backgroundText: "#f1dfd9",
-            outline: "#a08d86",
-            surfaceContainer: "#271d1a",
-            surfaceContainerHigh: "#322824"
+            primary: "#ffb4ab",
+            primaryText: "#000000",
+            primaryContainer: "#8c1d18",
+            secondary: "#f9dedc",
+            surface: "#1a1110",
+            surfaceText: "#f1e8e7",
+            surfaceVariant: "#4a4142",
+            surfaceVariantText: "#cdc2c1",
+            surfaceTint: "#ffb4ab",
+            background: "#1a1110",
+            backgroundText: "#f1e8e7",
+            outline: "#968b8a",
+            surfaceContainer: "#201a19",
+            surfaceContainerHigh: "#2b2221"
         },
         monochrome: {
             name: "Monochrome",
@@ -288,157 +287,156 @@ const StockThemes = {
     LIGHT: {
         blue: {
             name: "Blue Light",
-            primary: "#31628d",
+            primary: "#1976d2",
             primaryText: "#ffffff",
-            primaryContainer: "#cfe5ff",
-            secondary: "#526070",
-            surface: "#f7f9ff",
-            surfaceText: "#181c20",
-            surfaceVariant: "#dee3eb",
-            surfaceVariantText: "#42474e",
-            surfaceTint: "#31628d",
-            background: "#f7f9ff",
-            backgroundText: "#181c20",
-            outline: "#72777f",
-            surfaceContainer: "#eceef4",
-            surfaceContainerHigh: "#e6e8ee"
+            primaryContainer: "#e3f2fd",
+            secondary: "#42a5f5",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
+            surfaceTint: "#1976d2",
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec"
         },
         purple: {
             name: "Purple Light",
-            primary: "#66558f",
+            primary: "#6750A4",
             primaryText: "#ffffff",
-            primaryContainer: "#e9ddff",
-            secondary: "#625b70",
-            surface: "#fef7ff",
-            surfaceText: "#1d1b20",
-            surfaceVariant: "#e7e0eb",
-            surfaceVariantText: "#49454e",
-            surfaceTint: "#66558f",
-            background: "#fef7ff",
-            backgroundText: "#1d1b20",
-            outline: "#7a757f",
-            surfaceContainer: "#f2ecf4",
-            surfaceContainerHigh: "#ece6ee"
+            primaryContainer: "#EADDFF",
+            secondary: "#625B71",
+            surface: "#FFFBFE",
+            surfaceText: "#1C1B1F",
+            surfaceVariant: "#E7E0EC",
+            surfaceVariantText: "#49454F",
+            surfaceTint: "#6750A4",
+            background: "#FFFBFE",
+            backgroundText: "#1C1B1F",
+            outline: "#79747E",
+            surfaceContainer: "#F3EDF7",
+            surfaceContainerHigh: "#ECE6F0"
         },
         green: {
             name: "Green Light",
-            primary: "#3b6939",
+            primary: "#2e7d32",
             primaryText: "#ffffff",
-            primaryContainer: "#bcf0b4",
-            secondary: "#52634f",
-            surface: "#f7fbf1",
-            surfaceText: "#191d17",
-            surfaceVariant: "#dee5d8",
-            surfaceVariantText: "#424940",
-            surfaceTint: "#3b6939",
-            background: "#f7fbf1",
-            backgroundText: "#191d17",
-            outline: "#72796f",
-            surfaceContainer: "#ecefe6",
-            surfaceContainerHigh: "#e6e9e0"
+            primaryContainer: "#e8f5e8",
+            secondary: "#4caf50",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
+            surfaceTint: "#2e7d32",
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec"
         },
         orange: {
             name: "Orange Light",
-            primary: "#8d4e2c",
+            primary: "#e65100",
             primaryText: "#ffffff",
-            primaryContainer: "#ffdbcb",
-            secondary: "#765849",
-            surface: "#fff8f6",
-            surfaceText: "#221a16",
-            surfaceVariant: "#f4ded5",
-            surfaceVariantText: "#52443d",
-            surfaceTint: "#8d4e2c",
-            background: "#fff8f6",
-            backgroundText: "#221a16",
-            outline: "#85736c",
-            surfaceContainer: "#fceae3",
-            surfaceContainerHigh: "#f6e5de"
+            primaryContainer: "#ffecb3",
+            secondary: "#ff9800",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
+            surfaceTint: "#e65100",
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec"
         },
         red: {
             name: "Red Light",
-            primary: "#a80017",
+            primary: "#d32f2f",
             primaryText: "#ffffff",
-            primaryContainer: "#ce2029",
-            secondary: "#a43b37",
-            surface: "#fff8f7",
-            surfaceText: "#281716",
-            surfaceVariant: "#ffdad7",
-            surfaceVariantText: "#5c403d",
-            surfaceTint: "#bd0f1f",
-            background: "#fff8f7",
-            backgroundText: "#281716",
-            outline: "#906f6c",
-            surfaceContainer: "#ffe9e7",
-            surfaceContainerHigh: "#ffe2df",
-            matugen_type: "scheme-content"
+            primaryContainer: "#ffebee",
+            secondary: "#f44336",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
+            surfaceTint: "#d32f2f",
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec"
         },
         cyan: {
             name: "Cyan Light",
-            primary: "#006876",
+            primary: "#0097a7",
             primaryText: "#ffffff",
-            primaryContainer: "#a1efff",
-            secondary: "#4a6268",
-            surface: "#f5fafc",
-            surfaceText: "#171d1e",
-            surfaceVariant: "#dbe4e6",
-            surfaceVariantText: "#3f484a",
-            surfaceTint: "#006876",
-            background: "#f5fafc",
-            backgroundText: "#171d1e",
-            outline: "#6f797b",
-            surfaceContainer: "#e9eff0",
-            surfaceContainerHigh: "#e3e9eb"
+            primaryContainer: "#e0f2f1",
+            secondary: "#00bcd4",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
+            surfaceTint: "#0097a7",
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec"
         },
         pink: {
             name: "Pink Light",
-            primary: "#8b4a62",
+            primary: "#c2185b",
             primaryText: "#ffffff",
-            primaryContainer: "#ffd9e3",
-            secondary: "#74565f",
-            surface: "#fff8f8",
-            surfaceText: "#22191c",
-            surfaceVariant: "#f2dde2",
-            surfaceVariantText: "#514347",
-            surfaceTint: "#8b4a62",
-            background: "#fff8f8",
-            backgroundText: "#22191c",
-            outline: "#837377",
-            surfaceContainer: "#faeaed",
-            surfaceContainerHigh: "#f4e4e7"
+            primaryContainer: "#fce4ec",
+            secondary: "#e91e63",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
+            surfaceTint: "#c2185b",
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec"
         },
         amber: {
             name: "Amber Light",
-            primary: "#775a0b",
-            primaryText: "#ffffff",
-            primaryContainer: "#ffdf9e",
-            secondary: "#6b5d3f",
-            surface: "#fff8f2",
-            surfaceText: "#1f1b13",
-            surfaceVariant: "#ede1cf",
-            surfaceVariantText: "#4d4639",
-            surfaceTint: "#775a0b",
-            background: "#fff8f2",
-            backgroundText: "#1f1b13",
-            outline: "#7f7667",
-            surfaceContainer: "#f6ecdf",
-            surfaceContainerHigh: "#f1e7d9"
+            primary: "#ff8f00",
+            primaryText: "#000000",
+            primaryContainer: "#fff8e1",
+            secondary: "#ffc107",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
+            surfaceTint: "#ff8f00",
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec"
         },
         coral: {
             name: "Coral Light",
-            primary: "#8f4c34",
+            primary: "#8c1d18",
             primaryText: "#ffffff",
-            primaryContainer: "#ffdbcf",
-            secondary: "#77574c",
-            surface: "#fff8f6",
-            surfaceText: "#231a17",
-            surfaceVariant: "#f5ded7",
-            surfaceVariantText: "#53433e",
-            surfaceTint: "#8f4c34",
-            background: "#fff8f6",
-            backgroundText: "#231a17",
-            outline: "#85736d",
-            surfaceContainer: "#fceae5",
-            surfaceContainerHigh: "#f7e4df"
+            primaryContainer: "#ffdad6",
+            secondary: "#ff5449",
+            surface: "#fefefe",
+            surfaceText: "#1a1c1e",
+            surfaceVariant: "#e7e0ec",
+            surfaceVariantText: "#49454f",
+            surfaceTint: "#8c1d18",
+            background: "#fefefe",
+            backgroundText: "#1a1c1e",
+            outline: "#79747e",
+            surfaceContainer: "#f3f3f3",
+            surfaceContainerHigh: "#ececec"
         },
         monochrome: {
             name: "Monochrome Light",