diff --git a/src/App.tsx b/src/App.tsx
index b2c715d..0920bce 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -5,6 +5,7 @@ import { TooltipProvider } from "@/components/ui/tooltip";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 import { UserProvider } from "@/contexts/UserContext";
+import { ThemeProvider } from "@/contexts/ThemeContext";
 import AppRoutes from "./routes";
 
 const queryClient = new QueryClient({
@@ -20,15 +21,17 @@ const queryClient = new QueryClient({
 const App = () => (
   <BrowserRouter>
     <QueryClientProvider client={queryClient}>
-      <UserProvider>
-        <TooltipProvider>
-        <div className="min-h-screen flex flex-col">
-          <AppRoutes />
-          <Toaster />
-          <Sonner />
-        </div>
-        </TooltipProvider>
-      </UserProvider>
+      <ThemeProvider>
+        <UserProvider>
+          <TooltipProvider>
+          <div className="min-h-screen flex flex-col">
+            <AppRoutes />
+            <Toaster />
+            <Sonner />
+          </div>
+          </TooltipProvider>
+        </UserProvider>
+      </ThemeProvider>
     </QueryClientProvider>
   </BrowserRouter>
 );
diff --git a/src/components/ThemeToggle.tsx b/src/components/ThemeToggle.tsx
new file mode 100644
index 0000000..8b17e5f
--- /dev/null
+++ b/src/components/ThemeToggle.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { useTheme as useNextTheme } from 'next-themes';
+import { Sun, Moon, Monitor } from 'lucide-react';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { Button } from "@/components/ui/button";
+import { Theme } from '@/contexts/ThemeContext';
+
+export const ThemeToggle = () => {
+  const { theme, setTheme } = useNextTheme();
+
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <Button variant="ghost" size="icon" className="w-9 h-9">
+          {theme === 'light' ? (
+            <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all" />
+          ) : theme === 'dark' ? (
+            <Moon className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all" />
+          ) : (
+            <Monitor className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all" />
+          )}
+          <span className="sr-only">Toggle theme</span>
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end">
+        <DropdownMenuItem onClick={() => setTheme('light')}>
+          <Sun className="h-4 w-4 mr-2" />
+          Light
+        </DropdownMenuItem>
+        <DropdownMenuItem onClick={() => setTheme('dark')}>
+          <Moon className="h-4 w-4 mr-2" />
+          Dark
+        </DropdownMenuItem>
+        <DropdownMenuItem onClick={() => setTheme('system')}>
+          <Monitor className="h-4 w-4 mr-2" />
+          System
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+};
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index f8a792b..5540e5a 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -14,6 +14,7 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { BookFormDialog } from './BookFormDialog';
+import { ThemeToggle } from './ThemeToggle';
 
 const TopBar = () => {
   const [searchQuery, setSearchQuery] = useState('');
@@ -46,7 +47,7 @@ const handleSearch = (e: React.FormEvent) => {
 
   return (
     <>
-      <div className="sticky top-0 z-10 w-full bg-white/90 backdrop-blur-sm border-b border-gray-100 py-3">
+      <div className="sticky top-0 z-10 w-full bg-background/90 backdrop-blur-sm border-b border-border py-3">
         <div className="container mx-auto flex items-center justify-between px-4">
           <div className="flex-shrink-0">
             <a href="/" className="flex items-center gap-2">
@@ -88,7 +89,8 @@ const handleSearch = (e: React.FormEvent) => {
             )}
           </div>
 
-          <div className="flex items-center">
+          <div className="flex items-center gap-2">
+            <ThemeToggle />
             
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
diff --git a/src/contexts/ThemeContext.tsx b/src/contexts/ThemeContext.tsx
new file mode 100644
index 0000000..ff8d25e
--- /dev/null
+++ b/src/contexts/ThemeContext.tsx
@@ -0,0 +1,26 @@
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { ThemeProvider as NextThemesProvider } from 'next-themes';
+
+// Define the theme options
+export type Theme = 'light' | 'dark' | 'system';
+
+// Create a context for theme-related functionality
+export const ThemeContext = createContext<{
+  theme: Theme;
+  setTheme: (theme: Theme) => void;
+}>({
+  theme: 'system',
+  setTheme: () => {},
+});
+
+// Custom hook to use the theme context
+export const useTheme = () => useContext(ThemeContext);
+
+// Theme provider component
+export const ThemeProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+  return (
+    <NextThemesProvider attribute="class" defaultTheme="system" enableSystem>
+      {children}
+    </NextThemesProvider>
+  );
+};