diff --git a/src/App.jsx b/src/App.jsx
index fcb09811..a2aabf91 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -5,22 +5,25 @@ import BugReport from "./pages/BugReport";
 import Templates from "./pages/Templates";
 import LandingPage from "./pages/LandingPage";
 import SettingsContextProvider from "./context/SettingsContext";
+import ThemeProvider from "./context/ThemeContext";
 import NotFound from "./pages/NotFound";
 
 export default function App() {
   return (
-    <SettingsContextProvider>
-      <BrowserRouter>
-        <RestoreScroll />
-        <Routes>
-          <Route path="/" element={<LandingPage />} />
-          <Route path="/editor" element={<Editor />} />
-          <Route path="/bug-report" element={<BugReport />} />
-          <Route path="/templates" element={<Templates />} />
-          <Route path="*" element={<NotFound />} />
-        </Routes>
-      </BrowserRouter>
-    </SettingsContextProvider>
+    <ThemeProvider>
+      <SettingsContextProvider>
+        <BrowserRouter>
+          <RestoreScroll />
+          <Routes>
+            <Route path="/" element={<LandingPage />} />
+            <Route path="/editor" element={<Editor />} />
+            <Route path="/bug-report" element={<BugReport />} />
+            <Route path="/templates" element={<Templates />} />
+            <Route path="*" element={<NotFound />} />
+          </Routes>
+        </BrowserRouter>
+      </SettingsContextProvider>
+    </ThemeProvider>
   );
 }
 
diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
index 8ef775d0..363e8889 100644
--- a/src/components/Navbar.jsx
+++ b/src/components/Navbar.jsx
@@ -4,20 +4,23 @@ import logo from "../assets/logo_light_160.png";
 import { SideSheet } from "@douyinfe/semi-ui";
 import { IconMenu } from "@douyinfe/semi-icons";
 import { socials } from "../data/socials";
+import ThemeToggle from "./ThemeToggle";
+import { useTheme } from "../context/ThemeContext";
 
 export default function Navbar() {
   const [openMenu, setOpenMenu] = useState(false);
+  const { theme } = useTheme();
 
   return (
     <>
-      <div className="py-4 px-12 sm:px-4 flex justify-between items-center">
-        <div className="flex items-center justify-between w-full">
+      <div className="py-4 px-12 sm:px-4 flex justify-between items-center dark:bg-gray-800">
+        <div className="flex items-center justify-between w-full relative">
           <Link to="/">
             <img src={logo} alt="logo" className="h-[48px] sm:h-[32px]" />
           </Link>
           <div className="md:hidden flex gap-12">
             <Link
-              className="text-lg font-semibold hover:text-sky-800 transition-colors duration-300"
+              className="text-lg font-semibold hover:text-sky-800 dark:text-gray-200 dark:hover:text-sky-400 transition-colors duration-300"
               onClick={() =>
                 document
                   .getElementById("features")
@@ -28,24 +31,25 @@ export default function Navbar() {
             </Link>
             <Link
               to="/editor"
-              className="text-lg font-semibold hover:text-sky-800 transition-colors duration-300"
+              className="text-lg font-semibold hover:text-sky-800 dark:text-gray-200 dark:hover:text-sky-400 transition-colors duration-300"
             >
               Editor
             </Link>
             <Link
               to="/templates"
-              className="text-lg font-semibold hover:text-sky-800 transition-colors duration-300"
+              className="text-lg font-semibold hover:text-sky-800 dark:text-gray-200 dark:hover:text-sky-400 transition-colors duration-300"
             >
               Templates
             </Link>
             <Link
               to={socials.docs}
-              className="text-lg font-semibold hover:text-sky-800 transition-colors duration-300"
+              className="text-lg font-semibold hover:text-sky-800 dark:text-gray-200 dark:hover:text-sky-400 transition-colors duration-300"
             >
               Docs
             </Link>
           </div>
-          <div className="md:hidden block space-x-3 ms-12">
+          <div className="md:hidden flex items-center space-x-3 ms-12">
+            <ThemeToggle className="mr-2" />
             <a
               title="Jump to Github"
               className="px-2 py-2 hover:opacity-60 transition-all duration-300 rounded-full text-2xl"
@@ -53,7 +57,7 @@ export default function Navbar() {
               target="_blank"
               rel="noreferrer"
             >
-              <i className="opacity-70 bi bi-github" />
+              <i className="opacity-70 bi bi-github dark:text-gray-200" />
             </a>
             <a
               title="Follow us on X"
@@ -62,7 +66,7 @@ export default function Navbar() {
               target="_blank"
               rel="noreferrer"
             >
-              <i className="opacity-70 bi bi-twitter-x" />
+              <i className="opacity-70 bi bi-twitter-x dark:text-gray-200" />
             </a>
             <a
               title="Join the community on Discord"
@@ -71,13 +75,13 @@ export default function Navbar() {
               target="_blank"
               rel="noreferrer"
             >
-              <i className="opacity-70 bi bi-discord" />
+              <i className="opacity-70 bi bi-discord dark:text-gray-200" />
             </a>
           </div>
         </div>
         <button
           onClick={() => setOpenMenu((prev) => !prev)}
-          className="hidden md:inline-block h-[24px]"
+          className="hidden md:inline-block h-[24px] dark:text-gray-200"
         >
           <IconMenu size="extra-large" />
         </button>
@@ -92,7 +96,7 @@ export default function Navbar() {
         width={window.innerWidth}
       >
         <Link
-          className="hover:bg-zinc-100 block p-3 text-base font-semibold"
+          className="hover:bg-zinc-100 dark:hover:bg-gray-700 block p-3 text-base font-semibold dark:text-gray-200"
           onClick={() => {
             document
               .getElementById("features")
@@ -105,24 +109,29 @@ export default function Navbar() {
         <hr />
         <Link
           to="/editor"
-          className="hover:bg-zinc-100 block p-3 text-base font-semibold"
+          className="hover:bg-zinc-100 dark:hover:bg-gray-700 block p-3 text-base font-semibold dark:text-gray-200"
         >
           Editor
         </Link>
         <hr />
         <Link
           to="/templates"
-          className="hover:bg-zinc-100 block p-3 text-base font-semibold"
+          className="hover:bg-zinc-100 dark:hover:bg-gray-700 block p-3 text-base font-semibold dark:text-gray-200"
         >
           Templates
         </Link>
         <hr />
         <Link
           to={socials.docs}
-          className="hover:bg-zinc-100 block p-3 text-base font-semibold"
+          className="hover:bg-zinc-100 dark:hover:bg-gray-700 block p-3 text-base font-semibold dark:text-gray-200"
         >
           Docs
         </Link>
+        <hr className="dark:border-gray-700" />
+        <div className="p-3 flex items-center">
+          <span className="text-base font-semibold mr-3 dark:text-gray-200">Theme:</span>
+          <ThemeToggle />
+        </div>
       </SideSheet>
     </>
   );
diff --git a/src/components/ThemeToggle.jsx b/src/components/ThemeToggle.jsx
new file mode 100644
index 00000000..a35e40ff
--- /dev/null
+++ b/src/components/ThemeToggle.jsx
@@ -0,0 +1,24 @@
+import { useTheme } from "../context/ThemeContext";
+
+export default function ThemeToggle({ className = "" }) {
+  const { theme, toggleTheme } = useTheme();
+
+  return (
+    <button
+      onClick={toggleTheme}
+      className={`p-2 rounded-full transition-colors duration-300 ${
+        theme === "dark" 
+          ? "bg-gray-700 hover:bg-gray-600 text-yellow-300" 
+          : "bg-gray-200 hover:bg-gray-300 text-gray-700"
+      } ${className}`}
+      aria-label={`Switch to ${theme === "light" ? "dark" : "light"} mode`}
+      title={`Switch to ${theme === "light" ? "dark" : "light"} mode`}
+    >
+      {theme === "dark" ? (
+        <i className="bi bi-sun-fill text-xl"></i>
+      ) : (
+        <i className="bi bi-moon-fill text-xl"></i>
+      )}
+    </button>
+  );
+}
diff --git a/src/context/ThemeContext.jsx b/src/context/ThemeContext.jsx
new file mode 100644
index 00000000..13f686f1
--- /dev/null
+++ b/src/context/ThemeContext.jsx
@@ -0,0 +1,83 @@
+import { createContext, useContext, useEffect, useState } from "react";
+
+// Create context
+export const ThemeContext = createContext();
+
+// Theme provider component
+export default function ThemeProvider({ children }) {
+  // Check for system preference and stored preference
+  const getInitialTheme = () => {
+    // Check if we're in the browser
+    if (typeof window !== "undefined") {
+      // Check localStorage first
+      const storedTheme = localStorage.getItem("theme");
+      if (storedTheme) {
+        return storedTheme;
+      }
+
+      // Check system preference
+      const userPrefersDark = window.matchMedia("(prefers-color-scheme: dark)").matches;
+      return userPrefersDark ? "dark" : "light";
+    }
+
+    // Default to light if not in browser
+    return "light";
+  };
+
+  const [theme, setTheme] = useState(getInitialTheme);
+
+  // Toggle theme function
+  const toggleTheme = () => {
+    setTheme(prevTheme => prevTheme === "light" ? "dark" : "light");
+  };
+
+  // Update localStorage and apply theme class to html element
+  useEffect(() => {
+    // Save to localStorage
+    localStorage.setItem("theme", theme);
+
+    // Apply class to html element
+    const htmlElement = document.documentElement;
+    if (theme === "dark") {
+      htmlElement.classList.add("dark");
+    } else {
+      htmlElement.classList.remove("dark");
+    }
+
+    // Also update the theme-mode attribute for semi-ui components
+    document.body.setAttribute("theme-mode", theme);
+  }, [theme]);
+
+  // Listen for system preference changes
+  useEffect(() => {
+    const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
+    const handleChange = () => {
+      // Only update if user hasn't manually set a preference
+      if (!localStorage.getItem("theme")) {
+        setTheme(mediaQuery.matches ? "dark" : "light");
+      }
+    };
+
+    // Add listener
+    mediaQuery.addEventListener("change", handleChange);
+
+    // Clean up
+    return () => mediaQuery.removeEventListener("change", handleChange);
+  }, []);
+
+  // Provide theme context to children
+  return (
+    <ThemeContext.Provider value={{ theme, toggleTheme }}>
+      {children}
+    </ThemeContext.Provider>
+  );
+}
+
+// Custom hook for using theme
+export const useTheme = () => {
+  const context = useContext(ThemeContext);
+  if (context === undefined) {
+    throw new Error("useTheme must be used within a ThemeProvider");
+  }
+  return context;
+};
diff --git a/src/pages/LandingPage.jsx b/src/pages/LandingPage.jsx
index 2638d733..031e4dbd 100644
--- a/src/pages/LandingPage.jsx
+++ b/src/pages/LandingPage.jsx
@@ -18,6 +18,7 @@ import axios from "axios";
 import { languages } from "../i18n/i18n";
 import { Tweet } from "react-tweet";
 import { socials } from "../data/socials";
+import { useTheme } from "../context/ThemeContext";
 
 function shortenNumber(number) {
   if (number < 1000) return number;
@@ -29,6 +30,8 @@ function shortenNumber(number) {
 export default function LandingPage() {
   const [stats, setStats] = useState({ stars: 18000, forks: 1200 });
 
+  const { theme } = useTheme();
+
   useEffect(() => {
     const fetchStats = async () => {
       await axios
@@ -36,7 +39,6 @@ export default function LandingPage() {
         .then((res) => setStats(res.data));
     };
 
-    document.body.setAttribute("theme-mode", "light");
     document.title =
       "drawDB | Online database diagram editor and SQL generator";
 
@@ -44,36 +46,36 @@ export default function LandingPage() {
   }, []);
 
   return (
-    <div>
-      <div className="flex flex-col h-screen bg-zinc-100">
-        <div className="text-white font-semibold py-1 text-sm text-center bg-linear-to-r from-[#12495e] from-10% via-slate-500 to-[#12495e]" />
+    <div className="dark:text-white">
+      <div className="flex flex-col h-screen bg-zinc-100 dark:bg-gray-900">
+        <div className="text-white font-semibold py-1 text-sm text-center bg-linear-to-r from-[#12495e] from-10% via-slate-500 to-[#12495e] dark:from-sky-900 dark:via-slate-700 dark:to-sky-900" />
 
         <FadeIn duration={0.6}>
           <Navbar />
         </FadeIn>
 
         {/* Hero section */}
-        <div className="flex-1 flex-col relative mx-4 md:mx-0 mb-4 rounded-3xl bg-white">
+        <div className="flex-1 flex-col relative mx-4 md:mx-0 mb-4 rounded-3xl bg-white dark:bg-gray-800">
           <div className="h-full md:hidden">
             <SimpleCanvas diagram={diagram} zoom={0.85} />
           </div>
-          <div className="hidden md:block h-full bg-dots" />
-          <div className="absolute left-12 w-[45%] top-[50%] translate-y-[-54%] md:left-[50%] md:translate-x-[-50%] p-8 md:p-3 md:w-full text-zinc-800">
+          <div className="hidden md:block h-full bg-dots dark:opacity-30" />
+          <div className="absolute left-12 w-[45%] top-[50%] translate-y-[-54%] md:left-[50%] md:translate-x-[-50%] p-8 md:p-3 md:w-full text-zinc-800 dark:text-gray-100">
             <FadeIn duration={0.75}>
               <div className="md:px-3">
-                <h1 className="text-[42px] md:text-3xl font-bold tracking-wide bg-linear-to-r from-sky-900 from-10% via-slate-500 to-[#12495e] inline-block text-transparent bg-clip-text">
+                <h1 className="text-[42px] md:text-3xl font-bold tracking-wide bg-linear-to-r from-sky-900 from-10% via-slate-500 to-[#12495e] dark:from-sky-400 dark:via-blue-300 dark:to-sky-200 inline-block text-transparent bg-clip-text">
                   Draw, Copy, and Paste
                 </h1>
                 <div className="text-lg font-medium mt-1 sliding-vertical">
                   Free and open source, simple, and intuitive database design
                   editor, data-modeler, and SQL generator.{" "}
-                  <span className="ms-2 sm:block sm:ms-0 text-slate-500 bg-white font-bold whitespace-nowrap">
+                  <span className="ms-2 sm:block sm:ms-0 text-slate-500 dark:text-slate-300 bg-white dark:bg-gray-800 font-bold whitespace-nowrap">
                     No sign up
                   </span>
-                  <span className="ms-2 sm:block sm:ms-0 text-slate-500 bg-white font-bold whitespace-nowrap">
+                  <span className="ms-2 sm:block sm:ms-0 text-slate-500 dark:text-slate-300 bg-white dark:bg-gray-800 font-bold whitespace-nowrap">
                     Free of charge
                   </span>
-                  <span className="ms-2 sm:block sm:ms-0 text-slate-500 bg-white font-bold whitespace-nowrap">
+                  <span className="ms-2 sm:block sm:ms-0 text-slate-500 dark:text-slate-300 bg-white dark:bg-gray-800 font-bold whitespace-nowrap">
                     Quick and easy
                   </span>
                 </div>
@@ -81,7 +83,7 @@ export default function LandingPage() {
             </FadeIn>
             <div className="mt-4 font-semibold md:mt-12">
               <button
-                className="py-3 mb-4 xl:mb-0 mr-4 transition-all duration-300 bg-white border rounded-full shadow-lg px-9 border-zinc-200 hover:bg-zinc-100"
+                className="py-3 mb-4 xl:mb-0 mr-4 transition-all duration-300 bg-white dark:bg-gray-700 border rounded-full shadow-lg px-9 border-zinc-200 dark:border-gray-600 hover:bg-zinc-100 dark:hover:bg-gray-600 dark:text-white"
                 onClick={() =>
                   document
                     .getElementById("learn-more")
@@ -92,7 +94,7 @@ export default function LandingPage() {
               </button>
               <Link
                 to="/editor"
-                className="inline-block py-3 text-white transition-all duration-300 rounded-full shadow-lg bg-sky-900 ps-7 pe-6 hover:bg-sky-800"
+                className="inline-block py-3 text-white transition-all duration-300 rounded-full shadow-lg bg-sky-900 dark:bg-sky-700 ps-7 pe-6 hover:bg-sky-800 dark:hover:bg-sky-600"
               >
                 Try it for yourself <i className="bi bi-arrow-right ms-1"></i>
               </Link>
@@ -103,10 +105,10 @@ export default function LandingPage() {
 
       {/* Learn more */}
       <div id="learn-more">
-        <div className="bg-zinc-100 py-10 px-28 md:px-8">
+        <div className="bg-zinc-100 dark:bg-gray-900 py-10 px-28 md:px-8">
           {/* Supported by */}
           <div className="text-center mb-16">
-            <div className="text-2xl md:text-xl font-bold text-sky-800 mb-8">
+            <div className="text-2xl md:text-xl font-bold text-sky-800 dark:text-sky-400 mb-8">
               Supported by
             </div>
             <div>
@@ -121,13 +123,13 @@ export default function LandingPage() {
                   width={260}
                   className="m-auto mb-4"
                 />
-                <div className="font-semibold text-lg md:text-base">
+                <div className="font-semibold text-lg md:text-base dark:text-gray-200">
                   Next-gen AI-powered intelligent terminal for all platforms
                 </div>
               </a>
             </div>
           </div>
-          <div className="mt-16 w-[75%] text-center sm:w-full mx-auto shadow-xs rounded-2xl border p-6 bg-white space-y-3 mb-12">
+          <div className="mt-16 w-[75%] text-center sm:w-full mx-auto shadow-xs rounded-2xl border p-6 bg-white dark:bg-gray-800 dark:border-gray-700 space-y-3 mb-12">
             <div className="text-lg font-medium">
               Build diagrams with a few clicks, see the full picture, export SQL
               scripts, customize your editor, and more.
@@ -160,7 +162,7 @@ export default function LandingPage() {
               </div>
             </div>
           </div>
-          <div className="text-lg font-medium text-center mt-12 mb-6">
+          <div className="text-lg font-medium text-center mt-12 mb-6 dark:text-gray-200">
             Design for your database
           </div>
           <div className="grid grid-cols-3 place-items-center sm:grid-cols-1 sm:gap-10">
@@ -183,31 +185,30 @@ export default function LandingPage() {
         >
           <path
             d="M0 54C0 54 320 0 720 0C1080 0 1440 54 1440 54V0H0V100Z"
-            fill="#f4f4f5"
+            fill="#f4f4f5" className="dark:fill-gray-900"
           />
         </svg>
       </div>
 
       {/* Features */}
-      <div id="features" className="py-8 px-36 md:px-8">
+      <div id="features" className="py-8 px-36 md:px-8 dark:bg-gray-800">
         <FadeIn duration={1}>
-          <div className="text-base font-medium text-center text-sky-900">
+          <div className="text-base font-medium text-center text-sky-900 dark:text-sky-400">
             More than just an editor
           </div>
-          <div className="text-2xl mt-1 font-medium text-center">
+          <div className="text-2xl mt-1 font-medium text-center dark:text-white">
             What drawDB has to offer
           </div>
           <div className="grid grid-cols-3 gap-8 mt-10 md:grid-cols-2 sm:grid-cols-1">
             {features.map((f, i) => (
               <div
                 key={"feature" + i}
-                className="flex rounded-xl hover:bg-zinc-100 border border-zinc-100 shadow-xs hover:-translate-y-2 transition-all duration-300"
-              >
-                <div className="bg-sky-700 px-0.5 rounded-l-xl" />
+                className="flex rounded-xl hover:bg-zinc-100 dark:hover:bg-gray-700 border border-zinc-100 dark:border-gray-700 shadow-xs hover:-translate-y-2 transition-all duration-300 dark:bg-gray-800">
+                <div className="bg-sky-700 dark:bg-sky-500 px-0.5 rounded-l-xl" />
                 <div className="px-8 py-4 ">
-                  <div className="text-lg font-semibold mb-3">{f.title}</div>
+                  <div className="text-lg font-semibold mb-3 dark:text-white">{f.title}</div>
                   {f.content}
-                  <div className="mt-2 text-xs opacity-60">{f.footer}</div>
+                  <div className="mt-2 text-xs opacity-60 dark:text-gray-300">{f.footer}</div>
                 </div>
               </div>
             ))}
@@ -216,12 +217,12 @@ export default function LandingPage() {
       </div>
 
       {/* Tweets */}
-      <div className="px-40 mt-6 md:px-8">
-        <div className="text-center text-2xl md:text-xl font-medium">
+      <div className="px-40 mt-6 md:px-8 dark:bg-gray-800">
+        <div className="text-center text-2xl md:text-xl font-medium dark:text-white">
           What the internet says about us
         </div>
         <div
-          data-theme="light"
+          data-theme={theme}
           className="grid grid-cols-2 place-items-center md:grid-cols-1"
         >
           <Tweet id="1816111365125218343" />
@@ -244,11 +245,11 @@ export default function LandingPage() {
           fill="#f4f4f5"
         />
       </svg>
-      <div className="bg-zinc-100 py-8 px-32 md:px-8">
-        <div className="mt-4 mb-2 text-2xl font-bold text-center">
+      <div className="bg-zinc-100 dark:bg-gray-900 py-8 px-32 md:px-8">
+        <div className="mt-4 mb-2 text-2xl font-bold text-center dark:text-white">
           Reach out to us
         </div>
-        <div className="text-lg text-center mb-4">
+        <div className="text-lg text-center mb-4 dark:text-gray-300">
           We love hearing from you. Join our community on Discord, GitHub, and
           X.
         </div>
@@ -295,12 +296,12 @@ export default function LandingPage() {
         </div>
       </div>
 
-      <div className="bg-red-700 py-1 text-center text-white text-xs font-semibold px-3">
+      <div className="bg-red-700 dark:bg-red-800 py-1 text-center text-white text-xs font-semibold px-3">
         Attention! The diagrams are saved in your browser. Before clearing the
         browser make sure to back up your data.
       </div>
-      <hr className="border-zinc-300" />
-      <div className="text-center text-sm py-3">
+      <hr className="border-zinc-300 dark:border-gray-700" />
+      <div className="text-center text-sm py-3 dark:bg-gray-800 dark:text-white">
         &copy; {new Date().getFullYear()} <strong>drawDB</strong> - All rights reserved.
       </div>
     </div>
diff --git a/tailwind.config.js b/tailwind.config.js
index 619a0f9f..269b905f 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -3,6 +3,7 @@ export default {
   content: [
     "./src/**/*.{js,jsx,ts,tsx}",
   ],
+  darkMode: 'class',
   theme: {
     screens: {
       '3xl': {'max': '2047px'},