diff --git a/.gitignore b/.gitignore
index 707050daa..fdac2c6aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ tsconfig.tsbuildinfo
 
 # compiled
 **/tailwind-output.css
+
+.pnpm-store
diff --git a/packages/storage/lib/base/base.ts b/packages/storage/lib/base/base.ts
index 8b2610faa..59e441469 100644
--- a/packages/storage/lib/base/base.ts
+++ b/packages/storage/lib/base/base.ts
@@ -149,10 +149,15 @@ export const createStorage = <D = string>(key: string, fallback: D, config?: Sto
     chrome?.storage[storageEnum].onChanged.addListener(_updateFromStorageOnChanged);
   }
 
+  const onChanged = (callback: (changes: { oldValue?: D; newValue?: D }) => void) => {
+    chrome.storage[storageEnum].onChanged.addListener(storageChange => callback(storageChange[key]));
+  };
+
   return {
     get,
     set,
     getSnapshot,
     subscribe,
+    onChanged,
   };
 };
diff --git a/packages/storage/lib/types.ts b/packages/storage/lib/types.ts
index 32a84049b..ebfd80b9f 100644
--- a/packages/storage/lib/types.ts
+++ b/packages/storage/lib/types.ts
@@ -7,6 +7,7 @@ export type BaseStorage<D> = {
   set: (value: ValueOrUpdate<D>) => Promise<void>;
   getSnapshot: () => D | null;
   subscribe: (listener: () => void) => () => void;
+  onChanged: (callback: (changes: { oldValue?: D; newValue?: D }) => void) => void;
 };
 
 export type StorageConfig<D = string> = {
diff --git a/packages/tailwind-config/tailwind.config.ts b/packages/tailwind-config/tailwind.config.ts
index 865587972..62e9376b2 100644
--- a/packages/tailwind-config/tailwind.config.ts
+++ b/packages/tailwind-config/tailwind.config.ts
@@ -5,4 +5,5 @@ export default {
     extend: {},
   },
   plugins: [],
+  darkMode: 'selector',
 } as Omit<Config, 'content'>;
diff --git a/packages/ui/lib/components/ToggleButton.tsx b/packages/ui/lib/components/ToggleButton.tsx
index 4ec66cc52..7fd9a4ee7 100644
--- a/packages/ui/lib/components/ToggleButton.tsx
+++ b/packages/ui/lib/components/ToggleButton.tsx
@@ -1,18 +1,15 @@
 import { cn } from '@/lib/utils';
-import { useStorage } from '@extension/shared';
-import { exampleThemeStorage } from '@extension/storage';
+import { exampleThemeStorage } from '@extension/storage/lib';
 import type { ComponentPropsWithoutRef } from 'react';
 
 type ToggleButtonProps = ComponentPropsWithoutRef<'button'>;
 
 export const ToggleButton = ({ className, children, ...props }: ToggleButtonProps) => {
-  const { isLight } = useStorage(exampleThemeStorage);
-
   return (
     <button
       className={cn(
-        'py-1 px-4 rounded shadow hover:scale-105 mt-4 border-2 font-bold',
-        isLight ? 'bg-white border-black text-black' : 'bg-black text-white border-white',
+        'py-1 px-4 rounded shadow hover:scale-105 bg-white text-black border-black mt-4 border-2 font-bold',
+        'dark:bg-black dark:text-white dark:border-white',
         className,
       )}
       onClick={exampleThemeStorage.toggle}
diff --git a/pages/devtools-panel/src/Panel.tsx b/pages/devtools-panel/src/Panel.tsx
index d38af4e62..4fcf3e53b 100644
--- a/pages/devtools-panel/src/Panel.tsx
+++ b/pages/devtools-panel/src/Panel.tsx
@@ -1,41 +1,45 @@
 import '@src/Panel.css';
 import { t } from '@extension/i18n';
-import { useStorage, withErrorBoundary, withSuspense } from '@extension/shared';
-import { exampleThemeStorage } from '@extension/storage';
+import { withErrorBoundary, withSuspense } from '@extension/shared';
+import { exampleThemeStorage } from '@extension/storage/lib';
 import { cn, ErrorDisplay, LoadingSpinner } from '@extension/ui';
 import type { ComponentPropsWithoutRef } from 'react';
 
 const Panel = () => {
-  const { isLight } = useStorage(exampleThemeStorage);
-  const logo = isLight ? 'devtools-panel/logo_horizontal.svg' : 'devtools-panel/logo_horizontal_dark.svg';
-
   const goGithubSite = () =>
     chrome.tabs.create({ url: 'https://github.com/Jonghakseo/chrome-extension-boilerplate-react-vite' });
 
   return (
-    <div className={cn('App', isLight ? 'bg-slate-50' : 'bg-gray-800')}>
-      <header className={cn('App-header', isLight ? 'text-gray-900' : 'text-gray-100')}>
+    <div className="App bg-slate-50 dark:bg-gray-800">
+      <header className="App-header text-gray-900 dark:text-gray-100">
         <button onClick={goGithubSite}>
-          <img src={chrome.runtime.getURL(logo)} className="App-logo" alt="logo" />
+          <img
+            src={chrome.runtime.getURL('devtools-panel/logo_horizontal.svg')}
+            className="App-logo dark:hidden"
+            alt="logo"
+          />
+          <img
+            src={chrome.runtime.getURL('devtools-panel/logo_horizontal_dark.svg')}
+            className="App-logo hidden dark:block"
+            alt="logo"
+          />
         </button>
         <p>
           Edit <code>pages/devtools-panel/src/Panel.tsx</code>
         </p>
-        <ToggleButton onClick={exampleThemeStorage.toggle}>{t('toggleTheme')}</ToggleButton>
+        <ToggleButton>{t('toggleTheme')}</ToggleButton>
       </header>
     </div>
   );
 };
 
 const ToggleButton = (props: ComponentPropsWithoutRef<'button'>) => {
-  const { isLight } = useStorage(exampleThemeStorage);
-
   return (
     <button
       className={cn(
         props.className,
         'font-bold mt-4 py-1 px-4 rounded shadow hover:scale-105 ',
-        isLight ? 'bg-white text-black' : 'bg-black text-white',
+        'bg-white text-black dark:bg-black dark:text-white',
       )}
       onClick={exampleThemeStorage.toggle}>
       {props.children}
diff --git a/pages/devtools-panel/src/index.tsx b/pages/devtools-panel/src/index.tsx
index b4e1ed558..a5f94de86 100644
--- a/pages/devtools-panel/src/index.tsx
+++ b/pages/devtools-panel/src/index.tsx
@@ -1,8 +1,24 @@
 import '@src/index.css';
+import { exampleThemeStorage } from '@extension/storage/lib';
 import Panel from '@src/Panel';
 import { createRoot } from 'react-dom/client';
+import type { ThemeState } from '@extension/storage/lib/types';
 
 const init = () => {
+  const toggleTheme = (theme?: ThemeState['theme']) => {
+    if (!theme) {
+      return;
+    }
+
+    document.querySelector('html')?.classList.toggle('dark', theme === 'dark');
+  };
+
+  exampleThemeStorage.get().then(themeState => toggleTheme(themeState.theme));
+
+  exampleThemeStorage.onChanged(changes => {
+    toggleTheme(changes.newValue?.theme);
+  });
+
   const appContainer = document.querySelector('#app-container');
   if (!appContainer) {
     throw new Error('Can not find #app-container');
diff --git a/pages/new-tab/src/NewTab.tsx b/pages/new-tab/src/NewTab.tsx
index 963ab0c5b..89ea76f7d 100644
--- a/pages/new-tab/src/NewTab.tsx
+++ b/pages/new-tab/src/NewTab.tsx
@@ -1,29 +1,30 @@
 import '@src/NewTab.css';
 import '@src/NewTab.scss';
+import { ErrorDisplay, LoadingSpinner, ToggleButton } from '@extension/ui';
+import { withErrorBoundary, withSuspense } from '@extension/shared';
 import { t } from '@extension/i18n';
-import { useStorage, withErrorBoundary, withSuspense } from '@extension/shared';
-import { exampleThemeStorage } from '@extension/storage';
-import { cn, ErrorDisplay, LoadingSpinner, ToggleButton } from '@extension/ui';
 
 const NewTab = () => {
-  const { isLight } = useStorage(exampleThemeStorage);
-  const logo = isLight ? 'new-tab/logo_horizontal.svg' : 'new-tab/logo_horizontal_dark.svg';
-
   const goGithubSite = () =>
     chrome.tabs.create({ url: 'https://github.com/Jonghakseo/chrome-extension-boilerplate-react-vite' });
 
   console.log(t('hello', 'World'));
   return (
-    <div className={cn('App', isLight ? 'bg-slate-50' : 'bg-gray-800')}>
-      <header className={cn('App-header', isLight ? 'text-gray-900' : 'text-gray-100')}>
+    <div className="App bg-slate-50 dark:bg-gray-800">
+      <header className="App-header text-gray-900 dark:text-gray-100">
         <button onClick={goGithubSite}>
-          <img src={chrome.runtime.getURL(logo)} className="App-logo" alt="logo" />
+          <img src={chrome.runtime.getURL('new-tab/logo_horizontal.svg')} className="App-logo dark:hidden" alt="logo" />
+          <img
+            src={chrome.runtime.getURL('new-tab/logo_horizontal_dark.svg')}
+            className="App-logo hidden dark:block"
+            alt="logo"
+          />
         </button>
         <p>
           Edit <code>pages/new-tab/src/NewTab.tsx</code>
         </p>
         <h6>The color of this paragraph is defined using SASS.</h6>
-        <ToggleButton onClick={exampleThemeStorage.toggle}>{t('toggleTheme')}</ToggleButton>
+        <ToggleButton>{t('toggleTheme')}</ToggleButton>
       </header>
     </div>
   );
diff --git a/pages/new-tab/src/index.tsx b/pages/new-tab/src/index.tsx
index 49b8150e6..4b4ed70b4 100644
--- a/pages/new-tab/src/index.tsx
+++ b/pages/new-tab/src/index.tsx
@@ -1,8 +1,24 @@
 import '@src/index.css';
+import { exampleThemeStorage } from '@extension/storage/lib';
 import NewTab from '@src/NewTab';
 import { createRoot } from 'react-dom/client';
+import type { ThemeState } from '@extension/storage/lib/types';
 
 const init = () => {
+  const toggleTheme = (theme?: ThemeState['theme']) => {
+    if (!theme) {
+      return;
+    }
+
+    document.querySelector('html')?.classList.toggle('dark', theme === 'dark');
+  };
+
+  exampleThemeStorage.get().then(themeState => toggleTheme(themeState.theme));
+
+  exampleThemeStorage.onChanged(changes => {
+    toggleTheme(changes.newValue?.theme);
+  });
+
   const appContainer = document.querySelector('#app-container');
   if (!appContainer) {
     throw new Error('Can not find #app-container');
diff --git a/pages/options/src/Options.tsx b/pages/options/src/Options.tsx
index 834091db4..b2dbb87ec 100644
--- a/pages/options/src/Options.tsx
+++ b/pages/options/src/Options.tsx
@@ -1,25 +1,26 @@
 import '@src/Options.css';
 import { t } from '@extension/i18n';
-import { useStorage, withErrorBoundary, withSuspense } from '@extension/shared';
-import { exampleThemeStorage } from '@extension/storage';
-import { cn, ErrorDisplay, LoadingSpinner, ToggleButton } from '@extension/ui';
+import { withErrorBoundary, withSuspense } from '@extension/shared';
+import { ErrorDisplay, LoadingSpinner, ToggleButton } from '@extension/ui';
 
 const Options = () => {
-  const { isLight } = useStorage(exampleThemeStorage);
-  const logo = isLight ? 'options/logo_horizontal.svg' : 'options/logo_horizontal_dark.svg';
-
   const goGithubSite = () =>
     chrome.tabs.create({ url: 'https://github.com/Jonghakseo/chrome-extension-boilerplate-react-vite' });
 
   return (
-    <div className={cn('App', isLight ? 'bg-slate-50 text-gray-900' : 'bg-gray-800 text-gray-100')}>
+    <div className="App bg-slate-50 text-gray-900 dark:bg-gray-800 dark:text-gray-100">
       <button onClick={goGithubSite}>
-        <img src={chrome.runtime.getURL(logo)} className="App-logo" alt="logo" />
+        <img src={chrome.runtime.getURL('options/logo_horizontal.svg')} className="App-logo dark:hidden" alt="logo" />
+        <img
+          src={chrome.runtime.getURL('options/logo_horizontal_dark.svg')}
+          className="App-logo hidden dark:block"
+          alt="logo"
+        />
       </button>
       <p>
         Edit <code>pages/options/src/Options.tsx</code>
       </p>
-      <ToggleButton onClick={exampleThemeStorage.toggle}>{t('toggleTheme')}</ToggleButton>
+      <ToggleButton>{t('toggleTheme')}</ToggleButton>
     </div>
   );
 };
diff --git a/pages/options/src/index.tsx b/pages/options/src/index.tsx
index a0b576cd1..eab919656 100644
--- a/pages/options/src/index.tsx
+++ b/pages/options/src/index.tsx
@@ -1,13 +1,30 @@
 import '@src/index.css';
+import { exampleThemeStorage } from '@extension/storage/lib';
 import Options from '@src/Options';
 import { createRoot } from 'react-dom/client';
+import type { ThemeState } from '@extension/storage/lib/types';
 
 const init = () => {
+  const toggleTheme = (theme?: ThemeState['theme']) => {
+    if (!theme) {
+      return;
+    }
+
+    document.querySelector('html')?.classList.toggle('dark', theme === 'dark');
+  };
+
+  exampleThemeStorage.get().then(themeState => toggleTheme(themeState.theme));
+
+  exampleThemeStorage.onChanged(changes => {
+    toggleTheme(changes.newValue?.theme);
+  });
+
   const appContainer = document.querySelector('#app-container');
   if (!appContainer) {
     throw new Error('Can not find #app-container');
   }
   const root = createRoot(appContainer);
+
   root.render(<Options />);
 };
 
diff --git a/pages/popup/src/Popup.tsx b/pages/popup/src/Popup.tsx
index 18134d39f..b5693132c 100644
--- a/pages/popup/src/Popup.tsx
+++ b/pages/popup/src/Popup.tsx
@@ -1,8 +1,7 @@
 import '@src/Popup.css';
 import { t } from '@extension/i18n';
-import { useStorage, withErrorBoundary, withSuspense } from '@extension/shared';
-import { exampleThemeStorage } from '@extension/storage';
-import { cn, ErrorDisplay, LoadingSpinner, ToggleButton } from '@extension/ui';
+import { withErrorBoundary, withSuspense } from '@extension/shared';
+import { ErrorDisplay, LoadingSpinner, ToggleButton } from '@extension/ui';
 
 const notificationOptions = {
   type: 'basic',
@@ -12,9 +11,6 @@ const notificationOptions = {
 } as const;
 
 const Popup = () => {
-  const { isLight } = useStorage(exampleThemeStorage);
-  const logo = isLight ? 'popup/logo_vertical.svg' : 'popup/logo_vertical_dark.svg';
-
   const goGithubSite = () =>
     chrome.tabs.create({ url: 'https://github.com/Jonghakseo/chrome-extension-boilerplate-react-vite' });
 
@@ -39,19 +35,23 @@ const Popup = () => {
   };
 
   return (
-    <div className={cn('App', isLight ? 'bg-slate-50' : 'bg-gray-800')}>
-      <header className={cn('App-header', isLight ? 'text-gray-900' : 'text-gray-100')}>
+    <div className="App bg-slate-50 dark:bg-gray-800">
+      <header className="App-header text-gray-900 dark:text-gray-100">
         <button onClick={goGithubSite}>
-          <img src={chrome.runtime.getURL(logo)} className="App-logo" alt="logo" />
+          <img src={chrome.runtime.getURL('popup/logo_vertical.svg')} className="App-logo dark:hidden" alt="logo" />
+          <img
+            src={chrome.runtime.getURL('popup/logo_vertical_dark.svg')}
+            className="App-logo hidden dark:block"
+            alt="logo"
+          />
         </button>
         <p>
           Edit <code>pages/popup/src/Popup.tsx</code>
         </p>
         <button
-          className={cn(
-            'font-bold mt-4 py-1 px-4 rounded shadow hover:scale-105',
-            isLight ? 'bg-blue-200 text-black' : 'bg-gray-700 text-white',
-          )}
+          className="
+          font-bold mt-4 py-1 px-4 rounded shadow hover:scale-105 bg-blue-200 text-black
+          dark:bg-gray-700 dark:text-white"
           onClick={injectContentScript}>
           Click to inject Content Script
         </button>
diff --git a/pages/popup/src/index.tsx b/pages/popup/src/index.tsx
index afd2e44ed..c75d4ad89 100644
--- a/pages/popup/src/index.tsx
+++ b/pages/popup/src/index.tsx
@@ -1,8 +1,24 @@
 import '@src/index.css';
+import { exampleThemeStorage } from '@extension/storage/lib';
 import Popup from '@src/Popup';
 import { createRoot } from 'react-dom/client';
+import type { ThemeState } from '@extension/storage/lib/types';
 
 const init = () => {
+  const toggleTheme = (theme?: ThemeState['theme']) => {
+    if (!theme) {
+      return;
+    }
+
+    document.querySelector('html')?.classList.toggle('dark', theme === 'dark');
+  };
+
+  exampleThemeStorage.get().then(themeState => toggleTheme(themeState.theme));
+
+  exampleThemeStorage.onChanged(changes => {
+    toggleTheme(changes.newValue?.theme);
+  });
+
   const appContainer = document.querySelector('#app-container');
   if (!appContainer) {
     throw new Error('Can not find #app-container');
diff --git a/pages/side-panel/src/index.tsx b/pages/side-panel/src/index.tsx
index 350ac23b8..644f0ebaa 100644
--- a/pages/side-panel/src/index.tsx
+++ b/pages/side-panel/src/index.tsx
@@ -1,13 +1,30 @@
 import '@src/index.css';
+import { exampleThemeStorage } from '@extension/storage/lib';
 import SidePanel from '@src/SidePanel';
 import { createRoot } from 'react-dom/client';
+import type { ThemeState } from '@extension/storage/lib/types';
 
 const init = () => {
+  const toggleTheme = (theme?: ThemeState['theme']) => {
+    if (!theme) {
+      return;
+    }
+
+    document.querySelector('html')?.classList.toggle('dark', theme === 'dark');
+  };
+
+  exampleThemeStorage.get().then(themeState => toggleTheme(themeState.theme));
+
+  exampleThemeStorage.onChanged(changes => {
+    toggleTheme(changes.newValue?.theme);
+  });
+
   const appContainer = document.querySelector('#app-container');
   if (!appContainer) {
     throw new Error('Can not find #app-container');
   }
   const root = createRoot(appContainer);
+
   root.render(<SidePanel />);
 };