diff --git a/components/react/sideNav.tsx b/components/react/sideNav.tsx
index 67e4f8e2..e9d1cb62 100644
--- a/components/react/sideNav.tsx
+++ b/components/react/sideNav.tsx
@@ -25,10 +25,8 @@ interface SideNavProps {
 }
 
 export default function SideNav({ isDrawerVisible, setDrawerVisible }: SideNavProps) {
-  const [isdark, setIsdark] = useState(false);
-  const [isContactsOpen, setContactsOpen] = useState(false);
-
   const { toggleTheme, theme } = useTheme();
+  const [isContactsOpen, setContactsOpen] = useState(false);
 
   const toggleDrawer = () => setDrawerVisible(!isDrawerVisible);
   const version = packageInfo.version;
@@ -82,15 +80,21 @@ export default function SideNav({ isDrawerVisible, setDrawerVisible }: SideNavPr
             const modal = document.getElementById('endpoint_selector_modal') as HTMLDialogElement;
             if (modal) modal.showModal();
           }}
-          className="flex justify-center w-full text-[#00000066] dark:text-[#FFFFFF66] hover:text-primary dark:hover:text-primary transition-all duration-300 ease-in-out"
+          className="relative group flex justify-center w-full text-[#00000066] dark:text-[#FFFFFF66] hover:text-primary dark:hover:text-primary transition-all duration-300 ease-in-out"
         >
           <MdOutlineNetworkPing className="w-8 h-8" />
+          <span className="tooltip fixed z-[9999] left-[6.8rem] px-3 py-2 bg-primary text-white text-sm font-medium rounded-lg opacity-0 invisible group-hover:opacity-100 group-hover:visible transition-all duration-200 ease-in-out whitespace-nowrap">
+            Endpoints
+          </span>
         </button>
         <button
           onClick={() => setContactsOpen(true)}
-          className="flex justify-center w-full text-[#00000066] dark:text-[#FFFFFF66] hover:text-primary dark:hover:text-primary transition-all duration-300 ease-in-out"
+          className="relative group flex justify-center w-full text-[#00000066] dark:text-[#FFFFFF66] hover:text-primary dark:hover:text-primary transition-all duration-300 ease-in-out"
         >
           <MdContacts className="w-8 h-8" />
+          <span className="tooltip fixed z-[9999] left-[6.8rem] px-3 py-2 bg-primary text-white text-sm font-medium rounded-lg opacity-0 invisible group-hover:opacity-100 group-hover:visible transition-all duration-200 ease-in-out whitespace-nowrap">
+            Contacts
+          </span>
         </button>
         <div className="flex justify-center w-full text-[#00000066] dark:text-[#FFFFFF66]">
           <IconWallet chainName="manifest" />
@@ -99,15 +103,11 @@ export default function SideNav({ isDrawerVisible, setDrawerVisible }: SideNavPr
           <input
             type="checkbox"
             className="theme-controller hidden"
-            value="light"
-            checked={isdark}
-            onChange={() => {
-              setIsdark(!isdark);
-              toggleTheme();
-            }}
+            checked={theme === 'dark'}
+            onChange={toggleTheme}
           />
-          <DarkIcon className="swap-on fill-current w-9 h-9 duration-300" />
-          <LightIcon className="swap-off fill-current w-9 h-9 duration-300" />
+          <LightIcon className="swap-on fill-current w-9 h-9 duration-300" />
+          <DarkIcon className="swap-off fill-current w-9 h-9 duration-300" />
         </label>
       </div>
     </div>
@@ -128,7 +128,7 @@ export default function SideNav({ isDrawerVisible, setDrawerVisible }: SideNavPr
             className={`flex items-center p-2 text-base font-normal rounded-lg transition duration-300 ease-in-out ${
               isActive
                 ? 'bg-primary text-white'
-                : 'text-[#00000066] dark:text-[#FFFFFF66]  hover:bg-base-300 hover:text-primary dark:hover:text-primary dark:hover:bg-base-300'
+                : 'text-[#00000066] dark:text-[#FFFFFF66]  hover:bg-[#0000000A] hover:text-primary dark:hover:text-primary dark:hover:bg-base-300'
             }`}
           >
             <Icon className="w-8 h-8 mr-6" />
@@ -160,7 +160,7 @@ export default function SideNav({ isDrawerVisible, setDrawerVisible }: SideNavPr
               const modal = document.getElementById('endpoint_selector_modal') as HTMLDialogElement;
               if (modal) modal.showModal();
             }}
-            className="flex items-center p-2 text-base font-normal rounded-lg text-[#00000066] dark:text-[#FFFFFF66] hover:bg-base-300 hover:text-primary dark:hover:text-primary dark:hover:bg-base-300 transition duration-300 ease-in-out"
+            className="flex items-center p-2 text-base font-normal rounded-lg text-[#00000066] dark:text-[#FFFFFF66] hover:bg-[#0000000A] hover:text-primary dark:hover:text-primary dark:hover:bg-base-300 transition duration-300 ease-in-out"
           >
             <MdOutlineNetworkPing className="w-8 h-8 mr-6" />
             <span className="text-xl">Endpoints</span>
@@ -168,7 +168,7 @@ export default function SideNav({ isDrawerVisible, setDrawerVisible }: SideNavPr
 
           <button
             onClick={() => setContactsOpen(true)}
-            className="flex items-center p-2 text-base font-normal rounded-lg text-[#00000066] dark:text-[#FFFFFF66] hover:bg-base-300 hover:text-primary dark:hover:text-primary dark:hover:bg-base-300 transition duration-300 ease-in-out"
+            className="flex items-center p-2 text-base font-normal rounded-lg text-[#00000066] dark:text-[#FFFFFF66] hover:bg-[#0000000A] hover:text-primary dark:hover:text-primary dark:hover:bg-base-300 transition duration-300 ease-in-out"
           >
             <MdContacts className="w-8 h-8 mr-6" />
             <span className="text-xl">Contacts</span>
@@ -182,24 +182,24 @@ export default function SideNav({ isDrawerVisible, setDrawerVisible }: SideNavPr
               <input
                 type="checkbox"
                 className="sr-only peer"
-                checked={isdark}
-                onChange={() => {
-                  setIsdark(!isdark);
-                  toggleTheme();
-                }}
+                checked={theme === 'dark'}
+                onChange={toggleTheme}
               />
-
               <div className="flex items-center justify-center w-1/2 h-full z-10">
-                <DarkIcon
-                  className={`w-8 h-8 ${theme === 'dark' ? 'text-white' : 'text-gray-500'} transition-colors duration-300`}
+                <LightIcon
+                  className={`w-8 h-8 ${theme === 'light' ? 'text-white' : 'text-gray-500'} transition-colors duration-300`}
                 />
               </div>
               <div className="flex items-center justify-center w-1/2 h-full z-10">
-                <LightIcon
-                  className={`w-8 h-8 ${theme === 'light' ? 'text-white' : 'text-gray-500'} transition-colors duration-300`}
+                <DarkIcon
+                  className={`w-8 h-8 ${theme === 'dark' ? 'text-white' : 'text-gray-500'} transition-colors duration-300`}
                 />
               </div>
-              <span className="absolute left-1 w-[calc(50%-0.5rem)] h-12 bg-primary rounded-xl transition-all duration-300 ease-in-out transform peer-checked:translate-x-[calc(100%+0.5rem)]" />
+              <span
+                className={`absolute left-1 w-[calc(50%-0.5rem)] h-12 bg-primary rounded-xl transition-all duration-300 ease-in-out transform ${
+                  theme === 'dark' ? 'translate-x-[calc(100%+0.5rem)]' : ''
+                }`}
+              />
             </label>
           </div>
         </div>
diff --git a/components/wallet.tsx b/components/wallet.tsx
index 4521f5fb..19358276 100644
--- a/components/wallet.tsx
+++ b/components/wallet.tsx
@@ -35,6 +35,7 @@ interface WalletSectionProps {
 
 export const WalletSection: React.FC<WalletSectionProps> = ({ chainName }) => {
   const { connect, openView, status, username, address } = useChain(chainName);
+
   const [localStatus, setLocalStatus] = useState(status);
 
   useEffect(() => {
diff --git a/contexts/theme.tsx b/contexts/theme.tsx
index e53f0c99..554f296f 100644
--- a/contexts/theme.tsx
+++ b/contexts/theme.tsx
@@ -1,4 +1,4 @@
-import { createContext, ReactNode, useContext, useState, useEffect, useCallback } from 'react';
+import { createContext, ReactNode, useContext, useState, useEffect } from 'react';
 
 export interface ThemeContext {
   theme: 'light' | 'dark';
@@ -10,51 +10,45 @@ export const Theme = createContext<ThemeContext>({
   toggleTheme: () => {},
 });
 
+const getInitialTheme = (): 'light' | 'dark' => {
+  if (typeof window === 'undefined') return 'light';
+
+  // Move localStorage and system preference check to client-side only
+  return 'light'; // Default for initial render
+};
+
 export const ThemeProvider = ({ children }: { children: ReactNode }) => {
-  const [theme, setTheme] = useState<'dark' | 'light'>('light');
+  const [theme, setTheme] = useState<'light' | 'dark'>(getInitialTheme);
+  const [isInitialized, setIsInitialized] = useState(false);
 
+  // New effect to handle client-side initialization
   useEffect(() => {
-    if (window.matchMedia('(prefers-color-scheme: light)').matches) {
-      document.documentElement.classList.add('light');
-      setTheme('light');
+    const stored = localStorage.getItem('theme');
+    if (stored === 'dark' || stored === 'light') {
+      setTheme(stored);
     } else {
-      document.documentElement.classList.remove('light');
-      setTheme('dark');
+      const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+      setTheme(isDark ? 'dark' : 'light');
     }
+    setIsInitialized(true);
   }, []);
 
+  // Only apply theme changes after initialization
   useEffect(() => {
-    switch (theme) {
-      case 'light':
-        document.documentElement.classList.remove('dark');
-        break;
-      case 'dark':
-        document.documentElement.classList.add('dark');
-        break;
-    }
-  }, [theme]);
-
-  const toggleTheme = useCallback(() => {
-    switch (theme) {
-      case 'light':
-        setTheme('dark');
-        break;
-      case 'dark':
-        setTheme('light');
-        break;
-    }
-  }, [theme]);
-
-  return (
-    <Theme.Provider
-      value={{
-        theme,
-        toggleTheme,
-      }}
-    >
-      {children}
-    </Theme.Provider>
-  );
+    if (!isInitialized) return;
+
+    const root = document.documentElement;
+    root.classList.remove('light', 'dark');
+    root.classList.add(theme);
+    root.setAttribute('data-theme', theme);
+    localStorage.setItem('theme', theme);
+  }, [theme, isInitialized]);
+
+  const toggleTheme = () => {
+    setTheme(current => (current === 'light' ? 'dark' : 'light'));
+  };
+
+  return <Theme.Provider value={{ theme, toggleTheme }}>{children}</Theme.Provider>;
 };
 
 export const useTheme = (): ThemeContext => useContext(Theme);
diff --git a/tailwind.config.js b/tailwind.config.js
index 96d286d8..64c6b62e 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -63,7 +63,6 @@ module.exports = {
           '100%': { opacity: 1, transform: 'translateX(0%)' },
         },
       },
-
       fontFamily: {
         sans: ['Manrope', 'sans-serif'],
         body: ['Manrope', 'sans-serif'],
@@ -76,14 +75,6 @@ module.exports = {
     },
   },
   daisyui: {
-    themes: false,
-    darkTheme: 'dark',
-    base: true,
-    styled: true,
-    utils: true,
-    prefix: '',
-    logs: true,
-    themeRoot: ':root',
     themes: [
       {
         light: {
@@ -108,8 +99,6 @@ module.exports = {
           error: '#E53935',
           '--shadow-color-light': 'rgba(0, 0, 0, 0.1)',
         },
-      },
-      {
         dark: {
           primary: '#A087FF',
           'primary-content': '#FFFFFF',
@@ -134,6 +123,13 @@ module.exports = {
         },
       },
     ],
+    darkTheme: 'dark',
+    base: true,
+    styled: true,
+    utils: true,
+    prefix: '',
+    logs: false,
+    themeRoot: ':root',
   },
   plugins: [
     require('@tailwindcss/typography'),