diff --git a/components/index.tsx b/components/index.tsx
index b400adc..d425e86 100644
--- a/components/index.tsx
+++ b/components/index.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { useState, useEffect } from "react";
 import { useRecoilState } from "recoil";
 import Background from "./background";
 import Search from "./search/search";
@@ -8,16 +9,33 @@ import Time from "./time";
 
 export default function Homepage() {
     const [isFocus, setFocus] = useRecoilState(bgFocusState);
+    const [colorScheme, setColorScheme] = useState('');
+
+    useEffect(() => {
+        const colorSchemeQueryList = window.matchMedia('(prefers-color-scheme: dark)');
+        setColorScheme(colorSchemeQueryList.matches ? 'dark' : 'light');
+
+        const handleChange = () => {
+            setColorScheme(colorSchemeQueryList.matches ? 'dark' : 'light');
+        };
+
+        colorSchemeQueryList.addListener(handleChange);
+
+        return () => {
+            colorSchemeQueryList.removeListener(handleChange);
+        };
+    }, []);
+
     return (
         <div className="h-full fixed overflow-hidden w-full bg-black">
-            <Time showSecond={true} />
-            <Background src="rgb(23,25,29)" isFocus={isFocus} onClick={() => setFocus(false)} />
-            <Search
-                onFocus={() => {
-                    setFocus(true);
-                    console.log("focus");
-                }}
-            />
+            <Time />
+            {colorScheme === 'dark' && (
+                <Background src="rgb(23,25,29)" isFocus={isFocus} onClick={() => setFocus(false)} />
+            )}
+            {colorScheme === 'light' && (
+                <Background src="white" isFocus={isFocus} onClick={() => setFocus(false)} />
+            )}
+            <Search onFocus={() => setFocus(true)} />
         </div>
     );
 }
diff --git a/components/search/search.tsx b/components/search/search.tsx
index 6643cff..d41ff84 100644
--- a/components/search/search.tsx
+++ b/components/search/search.tsx
@@ -16,7 +16,7 @@ export default function Search(props: {
             <div className="absolute w-full top-[8.5rem] lg:top-56 short:top-24 z-1 left-1/2 translate-x-[-50%] ">
                 <input
                     className="absolute z-1 w-11/12 sm:w-[700px] h-10 rounded-lg left-1/2 translate-x-[-50%] 
-                    text-center outline-none border-[1px] focus:border-2 duration-200 pr-2 shadow-lg bg-white dark:bg-[rgb(23,25,29)] 
+                    text-center outline-none border-[1px] focus:border-2 duration-200 pr-2 shadow-md focus:shadow-none dark:shadow-zinc-800 dark:shadow-md bg-white dark:bg-[rgb(23,25,29)] 
                     dark:border-neutral-500 dark:focus:border-neutral-300 placeholder:text-slate-500 
                     dark:placeholder:text-slate-400 text-slate-900 dark:text-white"
                     id="searchBox"
@@ -34,7 +34,7 @@ export default function Search(props: {
                     className={
                         `absolute z-1 w-2/3 sm:w-80 md:w-[400px] focus:w-11/12 focus:sm:w-[700px] hover:w-11/12 
                         hover:sm:w-[700px] h-10 rounded-3xl left-1/2 translate-x-[-50%] text-center outline-none 
-                        border-solid border-0 duration-200 pr-2 shadow-lg` +
+                        border-solid border-0 duration-200 pr-2 shadow-md focus:shadow-none` +
                         (settings.bgBlur
                             ? `bg-[rgba(255,255,255,0.5)] dark:bg-[rgba(24,24,24,0.75)] backdrop-blur-xl 
                         placeholder:text-slate-500 dark:placeholder:text-slate-400 text-slate-900 dark:text-white`
diff --git a/components/state/settings.ts b/components/state/settings.ts
index a750802..5c6e220 100644
--- a/components/state/settings.ts
+++ b/components/state/settings.ts
@@ -5,7 +5,16 @@ const settingsState = atom({
     default: {
         version: 1,
         elementBackdrop: true,
-        bgBlur: true
+        bgBlur: true,
+        timeShowSecond: false,
+        currentSearchEngine: "google",
+        searchEngines: {
+            "google": "https://www.google.com/search?q=%s",
+            "bing": "https://www.bing.com/search?q=%s",
+            "baidu": "https://www.baidu.com/s?wd=%s",
+            "duckduckgo": "https://duckduckgo.com/?q=%s",
+            "yandex": "https://yandex.com/search/?text=%s",
+        }
     }
 });
 
diff --git a/components/time.tsx b/components/time.tsx
index 21becc0..548d410 100644
--- a/components/time.tsx
+++ b/components/time.tsx
@@ -1,11 +1,14 @@
-'use client';
+"use client";
 
-import React, {useState, useEffect} from "react";
+import React, { useState, useEffect } from "react";
+import { useRecoilValue } from "recoil";
+import { settingsState } from "./state/settings";
+import { useFormatter } from "next-intl";
 
-export default function Time(props: {
-    showSecond: boolean;
-}){
+export default function Time() {
     const [currentTime, setCurrentTime] = useState(new Date());
+    const settings = useRecoilValue(settingsState);
+    const format = useFormatter();
 
     useEffect(() => {
         const timer = setInterval(() => {
@@ -22,7 +25,7 @@ export default function Time(props: {
         const minutes = currentTime.getMinutes().toString().padStart(2, "0");
         const seconds = currentTime.getSeconds().toString().padStart(2, "0");
 
-        if (props.showSecond) {
+        if (settings.timeShowSecond) {
             return `${hours}:${minutes}:${seconds}`;
         } else {
             return `${hours}:${minutes}`;
@@ -31,11 +34,18 @@ export default function Time(props: {
 
     return (
         <div
-            className="absolute top-20 lg:top-[9.5rem] short:top-0 translate-x-[-50%] left-1/2 duration-200 
-            text-white text-[40px] text-center text-shadow-lg z-10"
-            style={{textShadow: "0px 0px 5px rgba(30,30,30,0.5)"}}
+            className="absolute top-20 lg:top-44 short:top-0 translate-x-[-50%] 
+            left-1/2 w-11/12 sm:w-[700px] text:black
+            dark:text-white text-3xl text-left text-shadow-lg z-10"
         >
-            {formatTime()}
+            {formatTime()}{" "}
+            <span className="text-lg leading-9 relative">
+                {format.dateTime(currentTime, {
+                    year: "numeric",
+                    month: "short",
+                    day: "numeric"
+                })}
+            </span>
         </div>
     );
-};
+}