diff --git a/components/PageSkeleton.tsx b/components/PageSkeleton.tsx
index 55565e4..2814850 100644
--- a/components/PageSkeleton.tsx
+++ b/components/PageSkeleton.tsx
@@ -17,13 +17,13 @@ function DashboardCardSkeleton() {
     <div className="rounded-xl border border-border p-5 h-[100px]">
       <div className="flex justify-between items-start">
         <div className="flex gap-3 items-center">
-          <div className="w-10 h-10 rounded-lg bg-gray-200 animate-pulse" />
+          <div className="w-10 h-10 rounded-lg bg-muted animate-pulse" />
           <div>
-            <div className="w-24 h-5 bg-gray-200 rounded animate-pulse" />
-            <div className="w-32 h-3.5 bg-gray-200 rounded animate-pulse mt-1.5" />
+            <div className="w-24 h-5 bg-muted rounded animate-pulse" />
+            <div className="w-32 h-3.5 bg-muted rounded animate-pulse mt-1.5" />
           </div>
         </div>
-        <div className="w-3 h-3 rounded-full bg-gray-200 animate-pulse" />
+        <div className="w-3 h-3 rounded-full bg-muted animate-pulse" />
       </div>
     </div>
   );
@@ -36,21 +36,21 @@ function ToolPageSkeleton() {
   return (
     <div className="p-5">
       {/* 标题区域 */}
-      <div className="w-44 h-7 bg-gray-200 rounded animate-pulse mb-4" />
+      <div className="w-44 h-7 bg-muted rounded animate-pulse mb-4" />
 
       {/* 输入区域 */}
-      <div className="w-full h-[120px] bg-gray-200 rounded-xl animate-pulse mb-4" />
+      <div className="w-full h-[120px] bg-muted rounded-xl animate-pulse mb-4" />
 
       {/* 控制栏 */}
       <div className="flex gap-2 mb-4">
-        <div className="w-24 h-9 bg-gray-200 rounded-lg animate-pulse" />
-        <div className="w-20 h-9 bg-gray-200 rounded-lg animate-pulse" />
+        <div className="w-24 h-9 bg-muted rounded-lg animate-pulse" />
+        <div className="w-20 h-9 bg-muted rounded-lg animate-pulse" />
         <div className="flex-1" />
-        <div className="w-22 h-9 bg-gray-200 rounded-lg animate-pulse" />
+        <div className="w-22 h-9 bg-muted rounded-lg animate-pulse" />
       </div>
 
       {/* 结果区域 */}
-      <div className="w-full h-[160px] bg-gray-200 rounded-xl animate-pulse" />
+      <div className="w-full h-[160px] bg-muted rounded-xl animate-pulse" />
     </div>
   );
 }
diff --git a/components/TextInputArea.tsx b/components/TextInputArea.tsx
index a7d78c7..8200026 100644
--- a/components/TextInputArea.tsx
+++ b/components/TextInputArea.tsx
@@ -152,7 +152,7 @@ function ActionButton({
     typeof action.disabled === 'function' ? action.disabled(value) : action.disabled || !value;
 
   const typeClasses: Record<string, string> = {
-    primary: 'bg-primary text-white hover:bg-primary/90',
+    primary: 'bg-primary text-primary-foreground hover:bg-primary/90',
     danger: 'text-red-600 hover:bg-red-500/10',
     default: 'text-muted-foreground hover:bg-muted',
   };
diff --git a/components/__tests__/TextInputArea.test.tsx b/components/__tests__/TextInputArea.test.tsx
index 10388a2..9941e42 100644
--- a/components/__tests__/TextInputArea.test.tsx
+++ b/components/__tests__/TextInputArea.test.tsx
@@ -334,7 +334,7 @@ describe('TextInputArea 组件', () => {
       );
 
       const btn = screen.getByText('主要');
-      expect(btn).toHaveClass('bg-primary', 'text-white');
+      expect(btn).toHaveClass('bg-primary', 'text-primary-foreground');
     });
   });
 
diff --git a/pages/Base64Converter/FileMode.tsx b/pages/Base64Converter/FileMode.tsx
index c0da7cc..685bdda 100644
--- a/pages/Base64Converter/FileMode.tsx
+++ b/pages/Base64Converter/FileMode.tsx
@@ -195,7 +195,7 @@ export default function FileMode() {
               }}
             />
             {isLoading ? (
-              <div className="w-10 h-10 border-4 border-primary/30 border-t-blue-600 rounded-full animate-spin" />
+              <div className="w-10 h-10 border-4 border-primary/30 border-t-primary rounded-full animate-spin" />
             ) : info ? (
               <div className="flex flex-col items-center gap-1">
                 <Upload className="w-10 h-10 text-primary" />
diff --git a/pages/Base64Converter/ImageMode.tsx b/pages/Base64Converter/ImageMode.tsx
index 87a3d05..1f68cef 100644
--- a/pages/Base64Converter/ImageMode.tsx
+++ b/pages/Base64Converter/ImageMode.tsx
@@ -202,7 +202,7 @@ export default function ImageMode() {
               }}
             />
             {isLoading ? (
-              <div className="w-10 h-10 border-4 border-primary/30 border-t-blue-600 rounded-full animate-spin" />
+              <div className="w-10 h-10 border-4 border-primary/30 border-t-primary rounded-full animate-spin" />
             ) : info ? (
               <div className="flex flex-col items-center gap-1">
                 {result && (
diff --git a/pages/JsonTools/JsonFormatSection.tsx b/pages/JsonTools/JsonFormatSection.tsx
index aa036bd..437b199 100644
--- a/pages/JsonTools/JsonFormatSection.tsx
+++ b/pages/JsonTools/JsonFormatSection.tsx
@@ -90,7 +90,7 @@ export default function JsonFormatSection() {
               type="checkbox"
               checked={sortKeys}
               onChange={(e) => setSortKeys(e.target.checked)}
-              className="h-4 w-4 rounded border-input text-blue-500 focus:ring-primary"
+              className="h-4 w-4 rounded border-input text-primary focus:ring-primary"
             />
             <span className="text-xs font-bold">{t('jsonFormat:sortKeys')}</span>
           </label>
diff --git a/pages/StorageCleaner/AutoRefreshToggle.tsx b/pages/StorageCleaner/AutoRefreshToggle.tsx
index c8c9d40..3b49c8a 100644
--- a/pages/StorageCleaner/AutoRefreshToggle.tsx
+++ b/pages/StorageCleaner/AutoRefreshToggle.tsx
@@ -19,7 +19,7 @@ export default function AutoRefreshToggle({ autoRefresh, onChange }: AutoRefresh
           onChange={(e) => onChange(e.target.checked)}
           className="sr-only peer"
         />
-        <div className="w-9 h-5 bg-gray-200 peer-focus:outline-none peer-focus:ring-2 peer-focus:ring-amber-300 rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-background after:border-input after:border after:rounded-full after:h-4 after:w-4 after:transition-all peer-checked:bg-amber-500" />
+        <div className="w-9 h-5 bg-muted peer-focus:outline-none peer-focus:ring-2 peer-focus:ring-amber-300 rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-background after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-background after:border-input after:border after:rounded-full after:h-4 after:w-4 after:transition-all peer-checked:bg-amber-500" />
       </label>
     </div>
   );
diff --git a/pages/Timestamp/LiveClock.tsx b/pages/Timestamp/LiveClock.tsx
index d74e134..fc9b43b 100644
--- a/pages/Timestamp/LiveClock.tsx
+++ b/pages/Timestamp/LiveClock.tsx
@@ -47,7 +47,7 @@ const LiveClock = React.memo(({ unit, onUseNow }: LiveClockProps) => {
       <button
         onClick={handleUseNow}
         title={t('timestamp:useNowTooltip')}
-        className="p-1.5 rounded-md bg-background text-primary shadow-sm hover:bg-blue-700 hover:text-white transition-colors"
+        className="p-1.5 rounded-md bg-background text-primary shadow-sm hover:bg-primary hover:text-primary-foreground transition-colors"
       >
         <Clock className="w-4 h-4" />
       </button>
diff --git a/pages/Timestamp/index.tsx b/pages/Timestamp/index.tsx
index 714167b..469002b 100644
--- a/pages/Timestamp/index.tsx
+++ b/pages/Timestamp/index.tsx
@@ -98,7 +98,7 @@ export default function Index() {
             {/* 立即转换 */}
             <button
               onClick={convert}
-              className="block mx-auto mt-4 mb-1 max-w-[240px] w-full py-2.5 text-sm font-semibold rounded-lg bg-primary text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-primary focus:ring-offset-2 transition-all"
+              className="block mx-auto mt-4 mb-1 max-w-[240px] w-full py-2.5 text-sm font-semibold rounded-lg bg-primary text-primary-foreground hover:bg-primary/90 focus:outline-none focus:ring-2 focus:ring-primary focus:ring-offset-2 transition-all"
             >
               {t('timestamp:convertButton')}
             </button>
diff --git a/src/index.css b/src/index.css
index 110f4d6..e7e4950 100644
--- a/src/index.css
+++ b/src/index.css
@@ -4,6 +4,7 @@
 
 @layer base {
   :root {
+    color-scheme: light;
     --background: 0 0% 100%;
     --foreground: 222.2 84% 4.9%;
 
@@ -36,6 +37,7 @@
   }
 
   .dark {
+    color-scheme: dark;
     --background: 222.2 84% 4.9%;
     --foreground: 210 40% 98%;
 
@@ -74,4 +76,9 @@
     background-color: hsl(var(--background));
     color: hsl(var(--foreground));
   }
+  input,
+  textarea,
+  select {
+    color: hsl(var(--foreground));
+  }
 }