diff --git a/web/ui/mantine-ui/src/pages/query/Graph.tsx b/web/ui/mantine-ui/src/pages/query/Graph.tsx
index 5325982378..b2309c448b 100644
--- a/web/ui/mantine-ui/src/pages/query/Graph.tsx
+++ b/web/ui/mantine-ui/src/pages/query/Graph.tsx
@@ -143,7 +143,7 @@ const Graph: FC<GraphProps> = ({
         zIndex={1000}
         h={570}
         overlayProps={{ radius: "sm", blur: 0.5 }}
-        loaderProps={{ type: "dots", color: "gray" }}
+        loaderProps={{ type: "dots", color: "gray.6" }}
         // loaderProps={{
         //   children: <Skeleton m={0} w="100%" h="100%" />,
         // }}
diff --git a/web/ui/mantine-ui/src/pages/query/UPlotChart.tsx b/web/ui/mantine-ui/src/pages/query/UPlotChart.tsx
index 407cda12bd..d6c37881da 100644
--- a/web/ui/mantine-ui/src/pages/query/UPlotChart.tsx
+++ b/web/ui/mantine-ui/src/pages/query/UPlotChart.tsx
@@ -11,6 +11,8 @@ import { formatTimestamp } from "../../lib/formatTime";
 import { computePosition, shift, flip, offset } from "@floating-ui/dom";
 import { colorPool } from "./ColorPool";
 import { useSettings } from "../../state/settingsSlice";
+import { useComputedColorScheme } from "@mantine/core";
+import { fill } from "lodash";
 
 const formatYAxisTickValue = (y: number | null): string => {
   if (y === null) {
@@ -236,6 +238,7 @@ const getOptions = (
   width: number,
   result: RangeSamples[],
   useLocalTime: boolean,
+  light: boolean,
   onSelectRange: (_start: number, _end: number) => void
 ): uPlot.Options => ({
   width: width - 30,
@@ -264,7 +267,7 @@ const getOptions = (
         _u: uPlot,
         seriesIdx: number
       ): CSSStyleDeclaration["borderColor"] => {
-        return colorPool[seriesIdx % colorPool.length];
+        return colorPool[(seriesIdx - 1) % colorPool.length];
       },
     },
   },
@@ -278,10 +281,13 @@ const getOptions = (
     // X axis (time).
     {
       labelSize: 20,
-      stroke: "#333",
+      stroke: light ? "#333" : "#eee",
+      ticks: {
+        stroke: light ? "#333" : "#eee",
+      },
       grid: {
         show: false,
-        stroke: "#eee",
+        stroke: light ? "#eee" : "#333",
         width: 2,
         dash: [],
       },
@@ -289,14 +295,23 @@ const getOptions = (
     // Y axis (sample value).
     {
       values: (_u: uPlot, splits: number[]) => splits.map(formatYAxisTickValue),
-      border: {
+      // border: {
+      //   show: true,
+      //   stroke: light ? "#00000010" : "#ffffff10",
+      //   width: 2,
+      // },
+      ticks: {
+        stroke: light ? "#00000010" : "#ffffff10",
+      },
+      grid: {
         show: true,
-        stroke: "#333",
-        width: 1,
+        stroke: light ? "#00000010" : "#ffffff10",
+        width: 2,
+        dash: [],
       },
       labelGap: 8,
       labelSize: 8 + 12 + 8,
-      stroke: "#333",
+      stroke: light ? "#333" : "#eee",
       size: autoPadLeft,
     },
   ],
@@ -396,14 +411,17 @@ const UPlotChart: FC<UPlotChartProps> = ({
 }) => {
   const [options, setOptions] = useState<uPlot.Options | null>(null);
   const { useLocalTime } = useSettings();
+  const theme = useComputedColorScheme();
 
   useEffect(() => {
     if (width === 0) {
       return;
     }
 
-    setOptions(getOptions(width, data, useLocalTime, onSelectRange));
-  }, [width, data, useLocalTime, onSelectRange]);
+    setOptions(
+      getOptions(width, data, useLocalTime, theme === "light", onSelectRange)
+    );
+  }, [width, data, useLocalTime, theme, onSelectRange]);
 
   const seriesData: uPlot.AlignedData = normalizeData(
     data,
diff --git a/web/ui/mantine-ui/src/pages/query/uplot.css b/web/ui/mantine-ui/src/pages/query/uplot.css
index 2b9c01d21c..1768b38750 100644
--- a/web/ui/mantine-ui/src/pages/query/uplot.css
+++ b/web/ui/mantine-ui/src/pages/query/uplot.css
@@ -31,6 +31,10 @@
   width: min-content;
 }
 
+.u-under {
+  background-color: light-dark(unset, #1f1f1f);
+}
+
 .u-over {
   box-shadow: 0px 0px 0px 0.5px #ccc;
   cursor: crosshair;
@@ -57,9 +61,10 @@
   color: var(--mantine-color-gray-1); */
   /* background: rgba(0, 0, 0, 0.8); */
   /* color: #fff; */
-  background: rgba(255, 255, 255, 0.95);
-  border: 2px solid var(--mantine-color-gray-6);
-  color: var(--mantine-color-gray-9);
+  background: light-dark(rgba(255, 255, 255, 0.95), rgba(25, 25, 25, 0.95));
+  color: light-dark(var(--mantine-color-gray-9), var(--mantine-color-gray-5));
+  border: 2px solid
+    light-dark(var(--mantine-color-gray-6), var(--mantine-color-gray-6));
   border-radius: 4px;
   position: absolute;
   padding: 0.8em 1.5em;