From 5dc65c9cbaa432a56dda3a21c6772707cacd543d Mon Sep 17 00:00:00 2001
From: Montia37 <MTChaoyi@outlook.com>
Date: Mon, 8 Sep 2025 10:04:04 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=89=B2=E9=85=8D=E7=BD=AE=E4=BB=A5=E5=8F=8A=E6=9A=97=E8=89=B2?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=9A=84=E6=96=87=E6=9C=AC=E8=BE=A8=E8=AF=86?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/sections/Footer.tsx            |  4 +--
 src/components/sections/Header.tsx            | 10 +++---
 src/components/sections/NodeCard.tsx          |  8 ++---
 src/components/sections/NodeListHeader.tsx    |  2 +-
 src/components/sections/NodeListItem.tsx      |  4 +--
 src/components/sections/StatsBar.tsx          |  2 +-
 src/components/ui/button.tsx                  | 10 +++---
 src/components/ui/card.tsx                    |  2 +-
 src/components/ui/chart.tsx                   |  2 +-
 src/components/ui/dropdown-menu.tsx           |  4 +--
 src/components/ui/progress-bar.tsx            |  2 +-
 ...ircle-progress.tsx => progress-circle.tsx} |  2 +-
 src/components/ui/progress.tsx                | 25 -------------
 src/components/ui/switch.tsx                  |  4 +--
 src/components/ui/tag.tsx                     |  2 +-
 src/components/ui/tips.tsx                    |  2 +-
 src/components/ui/tooltip.tsx                 |  2 +-
 src/index.css                                 | 22 ++++++++++--
 src/main.tsx                                  |  6 +++-
 src/pages/Home.tsx                            | 35 +++++++++++++++----
 src/pages/instance/Instance.tsx               | 28 +++++++--------
 src/pages/instance/LoadCharts.tsx             | 10 ++++--
 src/pages/instance/PingChart.tsx              |  6 ++--
 src/pages/instance/index.tsx                  |  8 ++---
 24 files changed, 112 insertions(+), 90 deletions(-)
 rename src/components/ui/{circle-progress.tsx => progress-circle.tsx} (96%)
 delete mode 100644 src/components/ui/progress.tsx

diff --git a/src/components/sections/Footer.tsx b/src/components/sections/Footer.tsx
index b377c84..8c0d9e8 100644
--- a/src/components/sections/Footer.tsx
+++ b/src/components/sections/Footer.tsx
@@ -2,8 +2,8 @@ import React from "react";
 
 const Footer: React.FC = () => {
   return (
-    <footer className="fixed inset-shadow-sm inset-shadow-(color:--accent-a4) bottom-0 left-0 right-0 p-2 text-center purcarte-blur z-50">
-      <p className="flex justify-center text-sm text-second-foreground text-shadow-lg text-shadow-(color:--accent-a4) whitespace-pre">
+    <footer className="fixed inset-shadow-sm inset-shadow-(color:--accent-4)/50 bottom-0 left-0 right-0 p-2 text-center purcarte-blur z-50">
+      <p className="flex justify-center text-sm text-secondary-foreground theme-text-shadow whitespace-pre">
         Powered by{" "}
         <a
           href="https://github.com/komari-monitor/komari"
diff --git a/src/components/sections/Header.tsx b/src/components/sections/Header.tsx
index a54401e..037373a 100644
--- a/src/components/sections/Header.tsx
+++ b/src/components/sections/Header.tsx
@@ -57,9 +57,9 @@ export const Header = ({
   };
 
   return (
-    <header className="purcarte-blur border-b border-(--accent-a4) sticky top-0 flex items-center justify-center shadow-sm shadow-(color:--accent-a4) z-10">
+    <header className="purcarte-blur border-b border-(--accent-4)/50 sticky top-0 flex items-center justify-center shadow-sm shadow-(color:--accent-4)/50 z-10">
       <div className="w-[90%] max-w-screen-2xl px-4 py-2 flex items-center justify-between">
-        <div className="flex items-center text-shadow-lg text-shadow-(color:--accent-a4) text-accent-foreground">
+        <div className="flex items-center theme-text-shadow text-accent-foreground">
           <a href="/" className="flex items-center gap-2 text-2xl font-bold">
             {enableLogo && logoUrl && (
               <img src={logoUrl} alt="logo" className="h-8" />
@@ -87,7 +87,7 @@ export const Header = ({
                       </DropdownMenuTrigger>
                       <DropdownMenuContent
                         align="end"
-                        className="purcarte-blur border-(--accent-a4) rounded-xl w-[90vw] translate-x-[5vw] mt-[.5rem] max-w-screen-2xl">
+                        className="purcarte-blur border-(--accent-4)/50 rounded-xl w-[90vw] translate-x-[5vw] mt-[.5rem] max-w-screen-2xl">
                         <div className="p-2">
                           <Input
                             type="search"
@@ -114,7 +114,7 @@ export const Header = ({
                     </DropdownMenuTrigger>
                     <DropdownMenuContent
                       align="end"
-                      className="purcarte-blur mt-[.5rem] border-(--accent-a4) rounded-xl">
+                      className="purcarte-blur mt-[.5rem] border-(--accent-4)/50 rounded-xl">
                       <DropdownMenuItem
                         onClick={() =>
                           setViewMode(viewMode === "grid" ? "table" : "grid")
@@ -231,7 +231,7 @@ export const Header = ({
                   </DropdownMenuTrigger>
                   <DropdownMenuContent
                     align="end"
-                    className="animate-in slide-in-from-top-5 duration-300 purcarte-blur border-(--accent-a4) rounded-xl">
+                    className="animate-in slide-in-from-top-5 duration-300 purcarte-blur border-(--accent-4)/50 rounded-xl">
                     <DropdownMenuItem onClick={toggleAppearance}>
                       {appearance === "dark" ? (
                         <Sun className="size-4 mr-2 text-primary" />
diff --git a/src/components/sections/NodeCard.tsx b/src/components/sections/NodeCard.tsx
index d5f27ec..fb18811 100644
--- a/src/components/sections/NodeCard.tsx
+++ b/src/components/sections/NodeCard.tsx
@@ -12,7 +12,7 @@ import Flag from "./Flag";
 import { Tag } from "../ui/tag";
 import { useNodeCommons } from "@/hooks/useNodeCommons";
 import { ProgressBar } from "../ui/progress-bar";
-import { CircleProgress } from "../ui/circle-progress";
+import { CircleProgress } from "../ui/progress-circle";
 
 interface NodeCardProps {
   node: NodeWithStatus;
@@ -58,7 +58,7 @@ export const NodeCard = ({ node, enableSwap }: NodeCardProps) => {
         <div className="flex flex-wrap gap-1">
           <Tag tags={tagList} />
         </div>
-        <div className="border-t border-(--accent-a4) my-2"></div>
+        <div className="border-t border-(--accent-4)/50 my-2"></div>
         <div className="flex items-center justify-around whitespace-nowrap">
           <div className="flex items-center gap-1">
             <CpuIcon className="size-4 text-blue-600 flex-shrink-0" />
@@ -113,7 +113,7 @@ export const NodeCard = ({ node, enableSwap }: NodeCardProps) => {
             <span className="w-12 text-right">{diskUsage.toFixed(0)}%</span>
           </div>
         </div>
-        <div className="border-t border-(--accent-a4) my-2"></div>
+        <div className="border-t border-(--accent-4)/50 my-2"></div>
         <div className="flex justify-between text-xs">
           <span className="text-secondary-foreground">网络：</span>
           <div>
@@ -167,7 +167,7 @@ export const NodeCard = ({ node, enableSwap }: NodeCardProps) => {
               到期：{expired_at}
             </span>
           </div>
-          <div className="border-l border-(--accent-a4) mx-2"></div>
+          <div className="border-l border-(--accent-4)/50 mx-2"></div>
           <div className="flex justify-end w-full">
             <span className="text-secondary-foreground">
               {isOnline && stats
diff --git a/src/components/sections/NodeListHeader.tsx b/src/components/sections/NodeListHeader.tsx
index d2203cc..43d091d 100644
--- a/src/components/sections/NodeListHeader.tsx
+++ b/src/components/sections/NodeListHeader.tsx
@@ -6,7 +6,7 @@ export const NodeListHeader = ({ enableSwap }: NodeListHeaderProps) => {
   const gridCols = enableSwap ? "grid-cols-10" : "grid-cols-9";
   return (
     <div
-      className={`text-primary font-bold grid ${gridCols} text-center shadow-sm shadow-(color:--accent-a4) gap-4 p-2 items-center rounded-lg bg-card transition-colors duration-200`}>
+      className={`text-primary font-bold grid ${gridCols} text-center shadow-sm shadow-(color:--accent-4)/50 gap-4 p-2 items-center rounded-lg bg-card transition-colors duration-200`}>
       <div className="col-span-2">节点名称</div>
       <div className="col-span-1">CPU</div>
       <div className="col-span-1">内存</div>
diff --git a/src/components/sections/NodeListItem.tsx b/src/components/sections/NodeListItem.tsx
index 3718314..a9c29df 100644
--- a/src/components/sections/NodeListItem.tsx
+++ b/src/components/sections/NodeListItem.tsx
@@ -5,7 +5,7 @@ import { CpuIcon, MemoryStickIcon, HardDriveIcon } from "lucide-react";
 import Flag from "./Flag";
 import { Tag } from "../ui/tag";
 import { useNodeCommons } from "@/hooks/useNodeCommons";
-import { CircleProgress } from "../ui/circle-progress";
+import { CircleProgress } from "../ui/progress-circle";
 import { ProgressBar } from "../ui/progress-bar";
 
 interface NodeListItemProps {
@@ -36,7 +36,7 @@ export const NodeListItem = ({
 
   return (
     <div
-      className={`grid ${gridCols} text-center shadow-sm shadow-(color:--accent-a4) gap-4 p-2 text-nowrap items-center rounded-lg ${
+      className={`grid ${gridCols} text-center shadow-sm shadow-(color:--accent-4)/50 gap-4 p-2 text-nowrap items-center rounded-lg ${
         isOnline
           ? ""
           : "striped-bg-red-translucent-diagonal ring-2 ring-red-500/50"
diff --git a/src/components/sections/StatsBar.tsx b/src/components/sections/StatsBar.tsx
index fb4010b..335dd93 100644
--- a/src/components/sections/StatsBar.tsx
+++ b/src/components/sections/StatsBar.tsx
@@ -156,7 +156,7 @@ export const StatsBar = ({
     }
   };
   return (
-    <div className="purcarte-blur min-w-[300px] rounded-lg text-secondary-foreground my-6 mx-4 px-4 box-border border border-(--accent-a4) text-sm relative flex items-center min-h-[5rem]">
+    <div className="purcarte-blur min-w-[300px] text-secondary-foreground my-6 mx-4 px-4 theme-card-style text-sm relative flex items-center min-h-[5rem]">
       <div className="absolute top-2 right-2">
         <DropdownMenu modal={false}>
           <DropdownMenuTrigger asChild>
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 49393f4..1d9b47f 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -10,14 +10,14 @@ const buttonVariants = cva(
     variants: {
       variant: {
         default:
-          "bg-(--accent-a5) text-primary-foreground shadow-sm shadow-(color:--accent-a4) hover:bg-(--accent-a6)",
+          "bg-(--accent-5)/50 text-primary shadow-sm shadow-(color:--accent-4)/50 hover:bg-(--accent-6)/50",
         destructive:
-          "bg-(--accent-a5) text-white shadow-sm shadow-(color:--accent-a4) hover:bg-(--accent-a6) focus-visible:ring-destructive/20",
+          "bg-(--accent-5)/50 text-white shadow-sm shadow-(color:--accent-4)/50 hover:bg-(--accent-6)/50 focus-visible:ring-destructive/20",
         outline:
-          "border border-(--accent-a6) bg-(--accent-a5) shadow-sm shadow-(color:--accent-a4) hover:bg-(--accent-a6) hover:text-accent-foreground",
+          "bg-(--accent-5)/50 theme-card-style hover:bg-(--accent-6)/50 hover:text-accent-foreground",
         secondary:
-          "bg-(--accent-a5) text-secondary-foreground shadow-sm shadow-(color:--accent-a4) hover:bg-(--accent-a6)",
-        ghost: "hover:bg-(--accent-a5) hover:bg-(--accent-a6)",
+          "bg-(--accent-5)/50 text-secondary-foreground shadow-sm shadow-(color:--accent-4)/50 hover:bg-(--accent-6)/50",
+        ghost: "hover:bg-(--accent-5)/50 hover:bg-(--accent-6)/50",
         link: "text-primary underline-offset-4 hover:underline",
       },
       size: {
diff --git a/src/components/ui/card.tsx b/src/components/ui/card.tsx
index 6db703f..aa4c512 100644
--- a/src/components/ui/card.tsx
+++ b/src/components/ui/card.tsx
@@ -9,7 +9,7 @@ const Card = React.forwardRef<
   <div
     ref={ref}
     className={cn(
-      "rounded-xl purcarte-blur text-card-foreground shadow-sm shadow-(color:--accent-a4) box-border border border-(--accent-a4)",
+      "purcarte-blur theme-card-style text-card-foreground",
       className
     )}
     {...props}
diff --git a/src/components/ui/chart.tsx b/src/components/ui/chart.tsx
index e98aa3a..9c11532 100644
--- a/src/components/ui/chart.tsx
+++ b/src/components/ui/chart.tsx
@@ -177,7 +177,7 @@ function ChartTooltipContent({
   return (
     <div
       className={cn(
-        "border-(--accent-a4) bg-background grid min-w-[8rem] items-start gap-1.5 rounded-lg border px-2.5 py-1.5 text-xs shadow-xl",
+        "border-(--accent-4)/50 bg-background grid min-w-[8rem] items-start gap-1.5 rounded-lg border px-2.5 py-1.5 text-xs shadow-xl",
         className
       )}>
       {!nestLabel ? tooltipLabel : null}
diff --git a/src/components/ui/dropdown-menu.tsx b/src/components/ui/dropdown-menu.tsx
index d238b5d..bdb3aba 100644
--- a/src/components/ui/dropdown-menu.tsx
+++ b/src/components/ui/dropdown-menu.tsx
@@ -45,7 +45,7 @@ const DropdownMenuSubContent = React.forwardRef<
   <DropdownMenuPrimitive.SubContent
     ref={ref}
     className={cn(
-      "z-50 min-w-[8rem] purcarte-blur overflow-hidden rounded-md border border-(--accent-a4) bg-popover p-1 text-popover-foreground shadow-md",
+      "z-50 min-w-[8rem] purcarte-blur overflow-hidden theme-card-style bg-popover p-1 text-popover-foreground",
       className
     )}
     {...props}
@@ -64,7 +64,7 @@ const DropdownMenuContent = React.forwardRef<
         ref={ref}
         sideOffset={sideOffset}
         className={cn(
-          "z-50 min-w-[8rem] purcarte-blur overflow-hidden rounded-md border border-(--accent-a4) bg-popover p-1 text-popover-foreground shadow-md",
+          "z-50 min-w-[8rem] purcarte-blur overflow-hidden theme-card-style bg-popover p-1 text-popover-foreground",
           className
         )}
         {...props}
diff --git a/src/components/ui/progress-bar.tsx b/src/components/ui/progress-bar.tsx
index e2cba09..ef5e446 100644
--- a/src/components/ui/progress-bar.tsx
+++ b/src/components/ui/progress-bar.tsx
@@ -9,7 +9,7 @@ export const ProgressBar = ({
   h?: string;
   className?: string;
 }) => (
-  <div className={`w-full bg-gray-200 rounded-full ${h} dark:bg-gray-700`}>
+  <div className={`w-full bg-(--accent-4)/50 rounded-full ${h}`}>
     <div
       className={`${h} rounded-full transition-all duration-500 ${getProgressBarClass(
         value
diff --git a/src/components/ui/circle-progress.tsx b/src/components/ui/progress-circle.tsx
similarity index 96%
rename from src/components/ui/circle-progress.tsx
rename to src/components/ui/progress-circle.tsx
index 9ad097b..85cf3ae 100644
--- a/src/components/ui/circle-progress.tsx
+++ b/src/components/ui/progress-circle.tsx
@@ -39,7 +39,7 @@ export const CircleProgress: React.FC<CircleProgressProps> = ({
           cx={size / 2}
           cy={size / 2}
           r={radius}
-          className="stroke-gray-200 dark:stroke-gray-700"
+          className="stroke-(--accent-4)/50"
           strokeWidth={strokeWidth}
           fill="none"
         />
diff --git a/src/components/ui/progress.tsx b/src/components/ui/progress.tsx
deleted file mode 100644
index fb7bd37..0000000
--- a/src/components/ui/progress.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import * as React from "react";
-import * as ProgressPrimitive from "@radix-ui/react-progress";
-
-import { cn } from "@/utils";
-
-const Progress = React.forwardRef<
-  React.ElementRef<typeof ProgressPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root>
->(({ className, value, ...props }, ref) => (
-  <ProgressPrimitive.Root
-    ref={ref}
-    className={cn(
-      "relative h-4 w-full overflow-hidden rounded-full bg-secondary",
-      className
-    )}
-    {...props}>
-    <ProgressPrimitive.Indicator
-      className="h-full w-full flex-1 bg-primary transition-all"
-      style={{ transform: `translateX(-${100 - (value || 0)}%)` }}
-    />
-  </ProgressPrimitive.Root>
-));
-Progress.displayName = ProgressPrimitive.Root.displayName;
-
-export { Progress };
diff --git a/src/components/ui/switch.tsx b/src/components/ui/switch.tsx
index a20f561..1041f53 100644
--- a/src/components/ui/switch.tsx
+++ b/src/components/ui/switch.tsx
@@ -11,14 +11,14 @@ const Switch = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <SwitchPrimitives.Root
     className={cn(
-      "peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-(--accent-a8) data-[state=unchecked]:bg-(--accent-a4)",
+      "peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border border-(--accent-5) transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-(--accent-8)/50 data-[state=unchecked]:bg-(--accent-4)/50",
       className
     )}
     {...props}
     ref={ref}>
     <SwitchPrimitives.Thumb
       className={cn(
-        "pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0"
+        "pointer-events-none block h-5 w-5 rounded-full bg-(--accent-9) dark:bg-(--accent-5) shadow-sm ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0"
       )}
     />
   </SwitchPrimitives.Root>
diff --git a/src/components/ui/tag.tsx b/src/components/ui/tag.tsx
index 56d4d5d..cc90a00 100644
--- a/src/components/ui/tag.tsx
+++ b/src/components/ui/tag.tsx
@@ -89,7 +89,7 @@ const Tag = React.forwardRef<HTMLDivElement, TagProps>(
             <Badge
               key={index}
               color={badgeColor as ColorType}
-              variant="soft"
+              variant="surface"
               className="text-sm">
               <label className="text-xs">{text}</label>
             </Badge>
diff --git a/src/components/ui/tips.tsx b/src/components/ui/tips.tsx
index d212e7f..7415dda 100644
--- a/src/components/ui/tips.tsx
+++ b/src/components/ui/tips.tsx
@@ -68,7 +68,7 @@ const Tips: React.FC<TipsProps & React.HTMLAttributes<HTMLDivElement>> = ({
             sideOffset={5}
             onMouseEnter={!isMobile ? () => setIsOpen(true) : undefined}
             onMouseLeave={!isMobile ? () => setIsOpen(false) : undefined}
-            className="purcarte-blur border border-(--accent-a4) shadow-md rounded-md z-50 text-muted-foreground"
+            className="purcarte-blur theme-card-style z-50 text-muted-foreground"
             style={{
               minWidth: isMobile ? "12rem" : "16rem",
               maxWidth: isMobile ? "80vw" : "16rem",
diff --git a/src/components/ui/tooltip.tsx b/src/components/ui/tooltip.tsx
index 80bf304..bebab3c 100644
--- a/src/components/ui/tooltip.tsx
+++ b/src/components/ui/tooltip.tsx
@@ -28,7 +28,7 @@ export const CustomTooltip = ({
 
   if (active && payload && payload.length) {
     return (
-      <div className="bg-background/80 p-3 border border-(--accent-a4) rounded-lg shadow-lg max-w-xs">
+      <div className="bg-background/80 p-3 theme-card-style max-w-xs">
         <p className="text-xs font-medium text-muted-foreground mb-2">
           {labelFormatter
             ? labelFormatter(label)
diff --git a/src/index.css b/src/index.css
index a0e1095..2643b0f 100644
--- a/src/index.css
+++ b/src/index.css
@@ -79,9 +79,7 @@
   --sidebar-ring: #a1a1a1;
 
   --purcarte-blur: 10px;
-
   --body-background-url: url("");
-  /* --body-background-transition: background-image 0.8s ease-in-out; */
 }
 
 .dark {
@@ -121,7 +119,7 @@
 
 @layer base {
   * {
-    @apply border-(--accent-a4) outline-ring/50;
+    @apply border-(--accent-4)/50 outline-ring/50;
   }
   body {
     @apply bg-background;
@@ -131,6 +129,24 @@
   }
 }
 
+@layer utilities {
+  .radix-themes {
+    --theme-text-muted-color: rgb(from var(--accent-4) r g b / 0.7);
+  }
+
+  .theme-text-shadow {
+    @apply text-shadow-sm text-shadow-(color:--accent-8)/50;
+  }
+
+  .theme-card-style {
+    @apply rounded-lg shadow-sm shadow-(color:--accent-4)/50 box-border border border-(--accent-4)/50;
+  }
+
+  .theme-text-muted {
+    @apply text-(--theme-text-muted-color) text-shadow-sm text-shadow-(color:--accent-foreground)/20;
+  }
+}
+
 /* 背景图片伪元素 */
 body::before {
   content: "";
diff --git a/src/main.tsx b/src/main.tsx
index 8c6b8c7..1f12b5b 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -73,7 +73,11 @@ export const AppContent = () => {
               <Route
                 path="/"
                 element={
-                  <HomePage viewMode={viewMode} searchTerm={searchTerm} />
+                  <HomePage
+                    viewMode={viewMode}
+                    searchTerm={searchTerm}
+                    setSearchTerm={setSearchTerm}
+                  />
                 }
               />
               <Route path="/instance/:uuid" element={<InstancePage />} />
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index ae836a7..aa1101b 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -9,10 +9,18 @@ import type { NodeWithStatus } from "@/types/node";
 import { useNodeData } from "@/contexts/NodeDataContext";
 import { useLiveData } from "@/contexts/LiveDataContext";
 import { useAppConfig } from "@/config";
+import {
+  Card,
+  CardDescription,
+  CardFooter,
+  CardHeader,
+  CardTitle,
+} from "@/components/ui/card";
 
 interface HomePageProps {
   viewMode: "grid" | "table";
   searchTerm: string;
+  setSearchTerm: (term: string) => void;
 }
 
 const homeStateCache = {
@@ -20,7 +28,11 @@ const homeStateCache = {
   scrollPosition: 0,
 };
 
-const HomePage: React.FC<HomePageProps> = ({ viewMode, searchTerm }) => {
+const HomePage: React.FC<HomePageProps> = ({
+  viewMode,
+  searchTerm,
+  setSearchTerm,
+}) => {
   const { nodes: staticNodes, loading, getGroups } = useNodeData();
   const { liveData } = useLiveData();
   const [selectedGroup, setSelectedGroup] = useState(
@@ -133,7 +145,7 @@ const HomePage: React.FC<HomePageProps> = ({ viewMode, searchTerm }) => {
 
       <main className="flex-1 px-4 pb-4">
         {enableGroupedBar && (
-          <div className="flex overflow-auto whitespace-nowrap overflow-x-auto items-center min-w-[300px] text-secondary-foreground box-border border border-(--accent-a4) space-x-4 px-4 rounded-lg mb-4 purcarte-blur">
+          <div className="flex purcarte-blur theme-card-style overflow-auto whitespace-nowrap overflow-x-auto items-center min-w-[300px] text-secondary-foreground space-x-4 px-4 mb-4">
             <span>分组</span>
             {groups.map((group: string) => (
               <Button
@@ -155,7 +167,7 @@ const HomePage: React.FC<HomePageProps> = ({ viewMode, searchTerm }) => {
               className={
                 viewMode === "grid"
                   ? ""
-                  : "space-y-2 overflow-auto box-border border border-(--accent-a4) purcarte-blur rounded-lg p-2"
+                  : "space-y-2 overflow-auto purcarte-blur theme-card-style p-2"
               }>
               <div
                 className={
@@ -185,9 +197,20 @@ const HomePage: React.FC<HomePageProps> = ({ viewMode, searchTerm }) => {
               </div>
             </div>
           ) : (
-            <div className="text-center py-12">
-              <p className="text-lg font-bold">没有结果</p>
-              <p className="text-muted-foreground">请尝试更改筛选条件</p>
+            <div className="flex flex-grow items-center justify-center">
+              <Card className="w-full max-w-md">
+                <CardHeader>
+                  <CardTitle className="text-2xl font-bold">
+                    Not Found
+                  </CardTitle>
+                  <CardDescription>请尝试更改筛选条件</CardDescription>
+                </CardHeader>
+                <CardFooter>
+                  <Button onClick={() => setSearchTerm("")} className="w-full">
+                    清空搜索
+                  </Button>
+                </CardFooter>
+              </Card>
             </div>
           )}
         </div>
diff --git a/src/pages/instance/Instance.tsx b/src/pages/instance/Instance.tsx
index 98ada1d..89e2c31 100644
--- a/src/pages/instance/Instance.tsx
+++ b/src/pages/instance/Instance.tsx
@@ -2,7 +2,7 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import type { NodeWithStatus } from "@/types/node";
 import { useMemo, memo } from "react";
 import { formatBytes, formatUptime, formatTrafficLimit } from "@/utils";
-import { CircleProgress } from "@/components/ui/circle-progress";
+import { CircleProgress } from "@/components/ui/progress-circle";
 
 interface InstanceProps {
   node: NodeWithStatus;
@@ -50,27 +50,27 @@ const Instance = memo(({ node }: InstanceProps) => {
       </CardHeader>
       <CardContent className="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-4 gap-3">
         <div className="md:col-span-2">
-          <p className="text-muted-foreground">CPU</p>
+          <p className="theme-text-muted">CPU</p>
           <p>{`${node.cpu_name} (x${node.cpu_cores})`}</p>
         </div>
         <div>
-          <p className="text-muted-foreground">架构</p>
+          <p className="theme-text-muted">架构</p>
           <p>{node.arch}</p>
         </div>
         <div>
-          <p className="text-muted-foreground">虚拟化</p>
+          <p className="theme-text-muted">虚拟化</p>
           <p>{node.virtualization}</p>
         </div>
         <div>
-          <p className="text-muted-foreground">GPU</p>
+          <p className="theme-text-muted">GPU</p>
           <p>{node.gpu_name || "N/A"}</p>
         </div>
         <div>
-          <p className="text-muted-foreground">操作系统</p>
+          <p className="theme-text-muted">操作系统</p>
           <p>{node.os}</p>
         </div>
         <div>
-          <p className="text-muted-foreground">内存</p>
+          <p className="theme-text-muted">内存</p>
           <p>
             {stats && isOnline
               ? `${formatBytes(stats.ram.used)} / ${formatBytes(
@@ -80,7 +80,7 @@ const Instance = memo(({ node }: InstanceProps) => {
           </p>
         </div>
         <div>
-          <p className="text-muted-foreground">交换</p>
+          <p className="theme-text-muted">交换</p>
           <p>
             {stats && isOnline
               ? `${formatBytes(stats.swap.used)} / ${formatBytes(
@@ -90,7 +90,7 @@ const Instance = memo(({ node }: InstanceProps) => {
           </p>
         </div>
         <div>
-          <p className="text-muted-foreground">磁盘</p>
+          <p className="theme-text-muted">磁盘</p>
           <p>
             {stats && isOnline
               ? `${formatBytes(stats.disk.used)} / ${formatBytes(
@@ -100,11 +100,11 @@ const Instance = memo(({ node }: InstanceProps) => {
           </p>
         </div>
         <div>
-          <p className="text-muted-foreground">运行时间</p>
+          <p className="theme-text-muted">运行时间</p>
           <p>{formatUptime(stats?.uptime || 0)}</p>
         </div>
         <div>
-          <p className="text-muted-foreground">实时网络</p>
+          <p className="theme-text-muted">实时网络</p>
           <p>
             {stats && isOnline
               ? `↑ ${formatBytes(stats.network.up, true)} ↓ ${formatBytes(
@@ -115,7 +115,7 @@ const Instance = memo(({ node }: InstanceProps) => {
           </p>
         </div>
         <div>
-          <p className="text-muted-foreground">总流量</p>
+          <p className="theme-text-muted">总流量</p>
           <div className="flex items-center gap-2">
             {node.traffic_limit !== 0 && isOnline && stats && (
               <CircleProgress
@@ -144,7 +144,7 @@ const Instance = memo(({ node }: InstanceProps) => {
           </div>
         </div>
         <div>
-          <p className="text-muted-foreground">负载</p>
+          <p className="theme-text-muted">负载</p>
           <p>
             {stats && isOnline
               ? `${stats.load.load1.toFixed(2)} | ${stats.load.load5.toFixed(
@@ -154,7 +154,7 @@ const Instance = memo(({ node }: InstanceProps) => {
           </p>
         </div>
         <div>
-          <p className="text-muted-foreground">最后上报</p>
+          <p className="theme-text-muted">最后上报</p>
           <p>
             {stats && isOnline
               ? new Date(stats.updated_at).toLocaleString()
diff --git a/src/pages/instance/LoadCharts.tsx b/src/pages/instance/LoadCharts.tsx
index a7764b5..04bab4c 100644
--- a/src/pages/instance/LoadCharts.tsx
+++ b/src/pages/instance/LoadCharts.tsx
@@ -264,8 +264,12 @@ const LoadCharts = memo(({ node, hours, liveData }: LoadChartsProps) => {
               <XAxis
                 dataKey="time"
                 tickLine={false}
-                axisLine={{ stroke: "var(--muted-foreground)" }}
-                tick={{ fill: "var(--muted-foreground)" }}
+                axisLine={{
+                  stroke: "var(--theme-text-muted-color) !important",
+                }}
+                tick={{
+                  fill: "var(--theme-text-muted-color) !important",
+                }}
                 tickFormatter={timeFormatter}
                 interval={0}
                 height={20}
@@ -279,7 +283,7 @@ const LoadCharts = memo(({ node, hours, liveData }: LoadChartsProps) => {
                 type="number"
                 tick={{
                   dx: -8,
-                  fill: "var(--muted-foreground)",
+                  fill: "var(--theme-text-muted-color) !important",
                 }}
                 width={200}
                 mirror={true}
diff --git a/src/pages/instance/PingChart.tsx b/src/pages/instance/PingChart.tsx
index d3e0d4e..cc7a7f6 100644
--- a/src/pages/instance/PingChart.tsx
+++ b/src/pages/instance/PingChart.tsx
@@ -356,13 +356,13 @@ const PingChart = memo(({ node, hours }: PingChartProps) => {
                       minute: "2-digit",
                     });
                   }}
-                  tick={{ fill: "var(--muted-foreground)" }}
+                  tick={{ fill: "var(--theme-text-muted-color)" }}
                   scale="time"
                 />
                 <YAxis
                   mirror={true}
                   width={30}
-                  tick={{ fill: "var(--muted-foreground)" }}
+                  tick={{ fill: "var(--theme-text-muted-color)" }}
                 />
                 <Tooltip
                   cursor={false}
@@ -395,7 +395,7 @@ const PingChart = memo(({ node, hours }: PingChartProps) => {
                   dataKey="time"
                   height={30}
                   stroke="var(--accent-track)"
-                  fill="transparent"
+                  fill="var(--accent-4)"
                   alwaysShowText
                   tickFormatter={(time) => {
                     const date = new Date(time);
diff --git a/src/pages/instance/index.tsx b/src/pages/instance/index.tsx
index 397f7bd..bca3944 100644
--- a/src/pages/instance/index.tsx
+++ b/src/pages/instance/index.tsx
@@ -107,8 +107,8 @@ const InstancePage = () => {
   }
 
   return (
-    <div className="w-[90%] max-w-screen-2xl mx-auto flex-1 flex flex-col pb-15 p-4 space-y-4">
-      <div className="flex items-center justify-between purcarte-blur box-border border border-(--accent-a4) rounded-lg p-4 mb-4 text-secondary-foreground">
+    <div className="w-[90%] max-w-screen-2xl text-card-foreground mx-auto flex-1 flex flex-col pb-15 p-4 space-y-4">
+      <div className="flex items-center justify-between purcarte-blur theme-card-style p-4 mb-4 text-secondary-foreground">
         <div className="flex items-center gap-2 min-w-0">
           <Button
             className="flex-shrink-0"
@@ -130,7 +130,7 @@ const InstancePage = () => {
       {enableInstanceDetail && <Instance node={node as NodeWithStatus} />}
 
       <div className="flex flex-col items-center w-full space-y-4">
-        <div className="purcarte-blur box-border border border-(--accent-a4) rounded-lg p-2">
+        <div className="purcarte-blur theme-card-style p-2">
           <div className="flex justify-center space-x-2">
             <Button
               variant={chartType === "load" ? "secondary" : "ghost"}
@@ -149,7 +149,7 @@ const InstancePage = () => {
           </div>
         </div>
         <div
-          className={`purcarte-blur box-border border border-(--accent-a4) justify-center rounded-lg p-2 ${
+          className={`purcarte-blur theme-card-style justify-center p-2 ${
             isMobile ? "w-full" : ""
           }`}>
           {chartType === "load" ? (