diff --git a/src/popup/__tests__/App.integration.test.tsx b/src/popup/__tests__/App.integration.test.tsx
index 48c9adf..dafba4c 100644
--- a/src/popup/__tests__/App.integration.test.tsx
+++ b/src/popup/__tests__/App.integration.test.tsx
@@ -127,11 +127,14 @@ describe('Popup App Integration', () => {
 
   const renderPopup = async () => {
     const { SessionProvider } = await import('../../contexts/SessionContext');
+    const { ThemeProvider } = await import('../../contexts/ThemeContext');
     await act(async () => {
       render(
-        <SessionProvider>
-          <App />
-        </SessionProvider>
+        <ThemeProvider>
+          <SessionProvider>
+            <App />
+          </SessionProvider>
+        </ThemeProvider>
       );
     });
   };
diff --git a/src/sidepanel/__tests__/App.integration.test.tsx b/src/sidepanel/__tests__/App.integration.test.tsx
index a811cfb..4b8a834 100644
--- a/src/sidepanel/__tests__/App.integration.test.tsx
+++ b/src/sidepanel/__tests__/App.integration.test.tsx
@@ -175,11 +175,14 @@ describe('Sidepanel App Integration', () => {
 
   const renderSidepanel = async () => {
     const { SessionProvider } = await import('../../contexts/SessionContext');
+    const { ThemeProvider } = await import('../../contexts/ThemeContext');
     await act(async () => {
       render(
-        <SessionProvider>
-          <App />
-        </SessionProvider>
+        <ThemeProvider>
+          <SessionProvider>
+            <App />
+          </SessionProvider>
+        </ThemeProvider>
       );
     });
   };
diff --git a/vite.config.ts b/vite.config.ts
index 1bdb0f5..749028e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -39,7 +39,7 @@ export default defineConfig({
   plugins: [react(), copyStaticFiles()],
   build: {
     outDir: 'dist',
-    sourcemap: true,
+    sourcemap: process.env.NODE_ENV !== 'production',
     minify: 'esbuild',
     target: 'es2020',
     rollupOptions: {
diff --git a/vite.content.config.ts b/vite.content.config.ts
index bab8f72..dae5bf7 100644
--- a/vite.content.config.ts
+++ b/vite.content.config.ts
@@ -5,7 +5,7 @@ import { resolve } from 'path';
 export default defineConfig({
   build: {
     outDir: 'dist',
-    sourcemap: true,
+    sourcemap: process.env.NODE_ENV !== 'production',
     minify: 'esbuild',
     target: 'es2020',
     emptyOutDir: false, // Don't clear the dist folder (main build already created it)