diff --git a/.claude/launch.json b/.claude/launch.json
new file mode 100644
index 0000000..20859bb
--- /dev/null
+++ b/.claude/launch.json
@@ -0,0 +1,11 @@
+{
+  "version": "0.0.1",
+  "configurations": [
+    {
+      "name": "static-buffet-dev",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "dev"],
+      "autoPort": true
+    }
+  ]
+}
diff --git a/.env b/.env
deleted file mode 100644
index 961a1e5..0000000
--- a/.env
+++ /dev/null
@@ -1,41 +0,0 @@
-# Static Buffet Environment Configuration
-# Copy this file to .env and configure for your environment
-
-# Database Configuration
-# Required: PostgreSQL database URL for Drizzle ORM
-# Format: postgresql://username:password@hostname:port/database
-DATABASE_URL=sqlite:./local.db
-
-# Server Configuration
-# Optional: Port for the development/production server (default: 5000)
-PORT=3000
-
-# Video Cache Configuration
-# Optional: Directory for cached video files (default: ./video-cache)
-VIDEO_CACHE_DIR=./video-cache
-
-# Development Settings
-# Optional: Node environment (development/production)
-NODE_ENV=development
-
-# Archive.org API Settings
-# No API key required for Archive.org - these are just for reference
-# ARCHIVE_API_BASE=https://archive.org
-# ARCHIVE_SEARCH_ENDPOINT=/advancedsearch.php
-# ARCHIVE_METADATA_ENDPOINT=/metadata
-
-# Performance Tuning (Optional)
-# Maximum concurrent video transcoding jobs
-# MAX_TRANSCODE_JOBS=3
-
-# Cache TTL Settings (Optional)
-# Metadata cache TTL in hours (default: 48)
-# METADATA_CACHE_TTL_HOURS=48
-
-# Search cache TTL in hours (default: 6)  
-# SEARCH_CACHE_TTL_HOURS=6
-
-# Security (Production Only)
-# CORS_ORIGIN=https://yourdomain.com
-# RATE_LIMIT_WINDOW_MS=1000
-# RATE_LIMIT_MAX_REQUESTS=20
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..86647b2
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,21 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+      - run: npm ci
+      - name: Typecheck
+        run: npm run check
+      - name: Build
+        run: npm run build
diff --git a/.gitignore b/.gitignore
index f9ba7f8..d876dd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@ dist
 .DS_Store
 server/public
 vite.config.ts.*
-*.tar.gz
\ No newline at end of file
+*.tar.gz
+.env
+video-cache/
+local.db
\ No newline at end of file
diff --git a/client/src/components/CommandPalette.tsx b/client/src/components/CommandPalette.tsx
index 19d8c5e..acf5f0b 100644
--- a/client/src/components/CommandPalette.tsx
+++ b/client/src/components/CommandPalette.tsx
@@ -5,6 +5,10 @@ import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, Command
 import { Badge } from '@/components/ui/badge';
 import { useStore } from '@/lib/store';
 import { useToast } from '@/hooks/use-toast';
+import { getVideoMetadata } from '@/lib/archive-api';
+import { type BrandSkin } from '@/lib/types';
+
+const BRAND_SKINS: BrandSkin[] = ['testcard', 'waffle', 'ebn', 'ozzy', 'hogan', 'dx', 'maxheadroom', 'mario', 'dakota', 'blondie', 'diner'];
 
 export interface CommandPaletteProps {
   isOpen: boolean;
@@ -24,9 +28,9 @@ interface CommandAction {
 }
 
 export function CommandPalette({ isOpen, onClose }: CommandPaletteProps) {
-  const { 
-    setSearchQuery, 
-    searchState, 
+  const {
+    setSearchState,
+    searchState,
     queueItems, 
     clearQueue, 
     setDetailDrawerOpen, 
@@ -68,7 +72,7 @@ export function CommandPalette({ isOpen, onClose }: CommandPaletteProps) {
       icon: <Search className="w-4 h-4" />,
       keywords: ['clear', 'reset', 'empty', 'search'],
       action: () => {
-        setSearchQuery('');
+        setSearchState({ query: '', page: 1 });
         onClose();
         toast({ title: 'Search cleared' });
       },
@@ -120,10 +124,18 @@ export function CommandPalette({ isOpen, onClose }: CommandPaletteProps) {
       description: selectedVideo ? `Add "${selectedVideo.title}" to queue` : 'No video selected',
       icon: <Plus className="w-4 h-4" />,
       keywords: ['add', 'queue', 'current', 'video', 'plus'],
-      action: () => {
+      action: async () => {
         if (selectedVideo) {
-          addToQueue(selectedVideo);
-          toast({ title: 'Added to queue', description: selectedVideo.title });
+          try {
+            const metadata = await getVideoMetadata(selectedVideo.identifier);
+            if (!metadata.streamUrl) {
+              throw new Error('No playable stream URL');
+            }
+            addToQueue(selectedVideo, metadata.streamUrl);
+            toast({ title: 'Added to queue', description: selectedVideo.title });
+          } catch {
+            toast({ title: 'Could not add video', description: 'No playable stream found', variant: 'destructive' });
+          }
         } else {
           toast({ title: 'No video selected', variant: 'destructive' });
         }
@@ -157,7 +169,7 @@ export function CommandPalette({ isOpen, onClose }: CommandPaletteProps) {
       icon: <Video className="w-4 h-4" />,
       keywords: ['public', 'domain', 'free', 'creative', 'commons'],
       action: () => {
-        setSearchQuery('collection:(prelinger OR communitytexts OR opensource_movies)');
+        setSearchState({ query: 'collection:(prelinger OR communitytexts OR opensource_movies)', page: 1 });
         onClose();
         toast({ title: 'Searching public domain videos' });
       },
@@ -170,7 +182,7 @@ export function CommandPalette({ isOpen, onClose }: CommandPaletteProps) {
       icon: <Music className="w-4 h-4" />,
       keywords: ['music', 'audio', 'sound', 'songs'],
       action: () => {
-        setSearchQuery('mediatype:audio');
+        setSearchState({ query: 'mediatype:audio', page: 1 });
         onClose();
         toast({ title: 'Searching audio content' });
       },
@@ -180,21 +192,21 @@ export function CommandPalette({ isOpen, onClose }: CommandPaletteProps) {
     // Theme & UI
     {
       id: 'toggle-theme',
-      title: 'Toggle Brand Skin',
-      description: `Switch to ${brandSkin === 'trashteam' ? 'NULLTONE.TV' : 'Trash Team'} theme`,
+      title: 'Cycle Brand Skin',
+      description: 'Switch to the next theme',
       icon: <Palette className="w-4 h-4" />,
-      keywords: ['theme', 'skin', 'brand', 'toggle', 'switch'],
+      keywords: ['theme', 'skin', 'brand', 'toggle', 'switch', 'cycle'],
       action: () => {
-        const newSkin = brandSkin === 'trashteam' ? 'nulltone' : 'trashteam';
-        setBrandSkin(newSkin);
+        const nextSkin = BRAND_SKINS[(BRAND_SKINS.indexOf(brandSkin) + 1) % BRAND_SKINS.length];
+        setBrandSkin(nextSkin);
         onClose();
-        toast({ 
-          title: 'Theme changed', 
-          description: `Switched to ${newSkin === 'trashteam' ? 'Trash Team' : 'NULLTONE.TV'} theme` 
+        toast({
+          title: 'Theme changed',
+          description: `Switched to ${nextSkin} theme`
         });
       },
       group: 'Appearance',
-      badge: brandSkin === 'trashteam' ? 'Trash Team' : 'NULLTONE.TV',
+      badge: brandSkin,
     },
 
     // Export & Tools
@@ -276,7 +288,7 @@ export function CommandPalette({ isOpen, onClose }: CommandPaletteProps) {
       group: 'Tools',
       badge: searchResults.length > 0 ? `${searchResults.length} results` : 'No results',
     },
-  ], [queueItems, selectedVideo, searchResults, brandSkin, onClose, setSearchQuery, clearQueue, addToQueue, setDetailDrawerOpen, setBrandSkin, toast]);
+  ], [queueItems, selectedVideo, searchResults, brandSkin, onClose, setSearchState, clearQueue, addToQueue, setDetailDrawerOpen, setBrandSkin, toast]);
 
   // Filter commands based on search
   const filteredCommands = useMemo(() => {
diff --git a/client/src/components/Filters.tsx b/client/src/components/Filters.tsx
index 47e2da1..47e6d24 100644
--- a/client/src/components/Filters.tsx
+++ b/client/src/components/Filters.tsx
@@ -42,7 +42,7 @@ export function Filters({ onFiltersChange }: FiltersProps) {
   return (
     <div className="flex items-center space-x-3 text-xs">
       <div className="flex items-center space-x-1">
-        <Calendar className="h-3 w-3 text-gray-300" title="Year Range" />
+        <span title="Year Range"><Calendar className="h-3 w-3 text-gray-300" /></span>
         <Select 
           value={searchState.yearFrom || '1950'} 
           onValueChange={(value) => handleFilterChange('yearFrom', value)}
@@ -88,7 +88,7 @@ export function Filters({ onFiltersChange }: FiltersProps) {
       
 
       <div className="flex items-center space-x-1">
-        <Shield className="h-3 w-3 text-gray-300" title="License" />
+        <span title="License"><Shield className="h-3 w-3 text-gray-300" /></span>
         <Select 
           value={searchState.license || 'all'} 
           onValueChange={(value) => handleFilterChange('license', value)}
diff --git a/client/src/components/LicenseGuardrail.tsx b/client/src/components/LicenseGuardrail.tsx
index bcedfad..9ee1818 100644
--- a/client/src/components/LicenseGuardrail.tsx
+++ b/client/src/components/LicenseGuardrail.tsx
@@ -134,9 +134,9 @@ export function LicenseGuardrail({ onLicenseChange }: LicenseGuardrailProps) {
     <div className="flex items-center space-x-2">
       <div className="flex items-center space-x-1">
         {searchState.allowRestrictedLicenses ? (
-          <ShieldOff size={16} className="text-orange-400" title="License Guardrail Off - Restricted licenses allowed" />
+          <span title="License Guardrail Off - Restricted licenses allowed"><ShieldOff size={16} className="text-orange-400" /></span>
         ) : (
-          <Shield size={16} className={theme.text} title="License Guardrail On - Safe licenses only" />
+          <span title="License Guardrail On - Safe licenses only"><Shield size={16} className={theme.text} /></span>
         )}
         <Switch
           id="license-guardrail"
diff --git a/client/src/components/MarioPipeEffect.tsx b/client/src/components/MarioPipeEffect.tsx
deleted file mode 100644
index 7991355..0000000
--- a/client/src/components/MarioPipeEffect.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useStore } from '@/lib/store';
-
-export function MarioPipeEffect() {
-  const { brandSkin, isMarioMode } = useStore();
-
-  // Only show when Mario theme is active and SEXY mode is enabled
-  if (brandSkin !== 'mario' || !isMarioMode) return null;
-
-  return (
-    <div className="fixed inset-0 pointer-events-none z-[999] mario-pipe-effect">
-      {/* Floating Mario Elements */}
-      <div className="absolute top-1/4 left-1/4 text-2xl animate-bounce opacity-20">
-        🍄
-      </div>
-      <div className="absolute top-3/4 right-1/4 text-lg animate-pulse opacity-15">
-        ⭐
-      </div>
-      <div className="absolute top-1/2 left-1/3 text-xl opacity-10 animate-spin" style={{animationDuration: '8s'}}>
-        🌶️
-      </div>
-      
-      {/* Sexy Mario Watermark */}
-      <div className="absolute bottom-4 right-4 text-xs text-yellow-200/20 font-mono rotate-12">
-        SEXY MARIO MODE ACTIVE
-      </div>
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/client/src/components/PreviewPanel.tsx b/client/src/components/PreviewPanel.tsx
index 7c5da27..fc4eded 100644
--- a/client/src/components/PreviewPanel.tsx
+++ b/client/src/components/PreviewPanel.tsx
@@ -136,7 +136,7 @@ export function PreviewPanel() {
 
       {isExpanded && (
         <PreviewWindow
-          videoUrl={previewVideo?.videoUrl}
+          videoUrl={previewVideo?.videoUrl ?? undefined}
           video={previewVideo}
           className="w-full"
         />
diff --git a/client/src/components/PreviewWindow.tsx b/client/src/components/PreviewWindow.tsx
index 6b661b8..542ba00 100644
--- a/client/src/components/PreviewWindow.tsx
+++ b/client/src/components/PreviewWindow.tsx
@@ -41,7 +41,7 @@ export function PreviewWindow({ videoUrl, video, className = '' }: PreviewWindow
       setIsVideoLoading(true);
       setVideoLoadError(false);
       
-      const video = videoRef.current;
+      const videoEl = videoRef.current;
       
       const handleLoadStart = () => {
         setIsVideoLoading(true);
@@ -50,39 +50,39 @@ export function PreviewWindow({ videoUrl, video, className = '' }: PreviewWindow
 
       const handleLoadedData = () => {
         setIsVideoLoading(false);
-        setDuration(video.duration || 0);
+        setDuration(videoEl.duration || 0);
       };
 
       const handleError = (e: any) => {
         console.error('❌ PreviewWindow: Video load error:', {
           error: e,
           videoUrl: videoUrl?.substring(0, 100) + '...',
-          errorCode: video.error?.code,
-          errorMessage: video.error?.message,
-          networkState: video.networkState,
-          readyState: video.readyState
+          errorCode: videoEl.error?.code,
+          errorMessage: videoEl.error?.message,
+          networkState: videoEl.networkState,
+          readyState: videoEl.readyState
         });
         setIsVideoLoading(false);
         setVideoLoadError(true);
       };
 
       const handleTimeUpdate = () => {
-        setCurrentTime(video.currentTime);
+        setCurrentTime(videoEl.currentTime);
       };
 
-      video.addEventListener('loadstart', handleLoadStart);
-      video.addEventListener('loadeddata', handleLoadedData);
-      video.addEventListener('error', handleError);
-      video.addEventListener('timeupdate', handleTimeUpdate);
+      videoEl.addEventListener('loadstart', handleLoadStart);
+      videoEl.addEventListener('loadeddata', handleLoadedData);
+      videoEl.addEventListener('error', handleError);
+      videoEl.addEventListener('timeupdate', handleTimeUpdate);
       
-      video.src = videoUrl;
-      video.load();
+      videoEl.src = videoUrl;
+      videoEl.load();
 
       return () => {
-        video.removeEventListener('loadstart', handleLoadStart);
-        video.removeEventListener('loadeddata', handleLoadedData);
-        video.removeEventListener('error', handleError);
-        video.removeEventListener('timeupdate', handleTimeUpdate);
+        videoEl.removeEventListener('loadstart', handleLoadStart);
+        videoEl.removeEventListener('loadeddata', handleLoadedData);
+        videoEl.removeEventListener('error', handleError);
+        videoEl.removeEventListener('timeupdate', handleTimeUpdate);
       };
     } else if (isStaticImage) {
       // For static content, immediately set as loaded
diff --git a/client/src/components/ResponsiveLayoutManager.tsx b/client/src/components/ResponsiveLayoutManager.tsx
index 3ad2be4..d031043 100644
--- a/client/src/components/ResponsiveLayoutManager.tsx
+++ b/client/src/components/ResponsiveLayoutManager.tsx
@@ -8,7 +8,7 @@ interface ResponsiveLayoutManagerProps {
 
 export function ResponsiveLayoutManager({ children }: ResponsiveLayoutManagerProps) {
   const { currentLayout, panelConfig, isTransitioning } = useResponsiveLayout();
-  const { setResizableMode, panelStates } = useStore();
+  const { setResizableMode } = useStore();
 
   // Automatically adjust resizable mode based on layout
   useEffect(() => {
diff --git a/client/src/components/ResultsGrid.tsx b/client/src/components/ResultsGrid.tsx
index 1296be8..29c3656 100644
--- a/client/src/components/ResultsGrid.tsx
+++ b/client/src/components/ResultsGrid.tsx
@@ -1,9 +1,9 @@
-import { useEffect, useRef, useCallback } from 'react';
-import { useQuery } from '@tanstack/react-query';
+import { useRef, useCallback } from 'react';
 import { Loader2 } from 'lucide-react';
 import { ResultCard } from './ResultCard';
 import { useStore } from '@/lib/store';
-import { searchVideos, getVideoMetadata, cancelCurrentSearch } from '@/lib/archive-api';
+import { getVideoMetadata } from '@/lib/archive-api';
+import { useVideoSearch } from '@/hooks/use-video-search';
 import { type VideoResult } from '@/lib/types';
 import { SearchResultsSkeleton } from './SkeletonLoader';
 import { StaggerContainer, StaggerItem } from './AnimatedTransitions';
@@ -16,9 +16,6 @@ export function ResultsGrid({ onVideoSelect }: ResultsGridProps) {
   const {
     searchState,
     searchResults,
-    setSearchResults,
-    setTotalResults,
-    setLoading,
     addToQueue,
     isLoading,
     totalResults,
@@ -37,40 +34,7 @@ export function ResultsGrid({ onVideoSelect }: ResultsGridProps) {
     if (node) observerRef.current.observe(node);
   }, [isLoading, searchResults.length, totalResults]);
 
-  const { data: searchData, error, isLoading: isQueryLoading } = useQuery({
-    queryKey: ['/api/search', searchState],
-    enabled: !!searchState.query,
-    refetchOnWindowFocus: false,
-    staleTime: 5 * 60 * 1000, // 5 minutes
-    queryFn: () => searchVideos(searchState),
-  });
-
-  // Cancel search on unmount
-  useEffect(() => {
-    return () => {
-      cancelCurrentSearch();
-    };
-  }, []);
-
-  useEffect(() => {
-    if (searchData) {
-      const newResults = (searchData as any).docs || [];
-      if (searchState.page === 1) {
-        setSearchResults(newResults);
-      } else {
-        setSearchResults([...searchResults, ...newResults]);
-      }
-      setTotalResults((searchData as any).numFound || 0);
-      setLoading(false);
-    }
-  }, [searchData]);
-
-  useEffect(() => {
-    if (error) {
-      setLoading(false);
-      console.error('Search error:', error);
-    }
-  }, [error]);
+  const { error, isLoading: isQueryLoading } = useVideoSearch();
 
   const handleAddToQueue = async (video: VideoResult) => {
     try {
diff --git a/client/src/components/ToolsPanel.tsx b/client/src/components/ToolsPanel.tsx
index bf73466..12fb8fd 100644
--- a/client/src/components/ToolsPanel.tsx
+++ b/client/src/components/ToolsPanel.tsx
@@ -223,7 +223,7 @@ export function ToolsPanel() {
 
       const emergencyMixSettings = {
         duration: 150,
-        segmentLength: [2, 5],
+        segmentLength: [2, 5] as [number, number],
         crossfadeDuration: 0.5,
         maxClips: 10,
       };
diff --git a/client/src/hooks/use-video-search.ts b/client/src/hooks/use-video-search.ts
new file mode 100644
index 0000000..3a1cfd1
--- /dev/null
+++ b/client/src/hooks/use-video-search.ts
@@ -0,0 +1,60 @@
+import { useEffect } from 'react';
+import { useQuery } from '@tanstack/react-query';
+import { useStore } from '@/lib/store';
+import { searchVideos } from '@/lib/archive-api';
+
+// Single owner of the search query. Every component that needs search data uses
+// this hook with the same query key, so React Query dedupes to one request and
+// one component tree can't cancel another's fetch.
+export function useVideoSearch() {
+  const { searchState, setSearchResults, setTotalResults, setLoading } = useStore();
+
+  const query = useQuery({
+    queryKey: [
+      'video-search',
+      searchState.query,
+      searchState.yearFrom,
+      searchState.yearTo,
+      searchState.duration,
+      searchState.license,
+      searchState.sort,
+      searchState.page,
+      searchState.sources.join(','),
+      searchState.allowRestrictedLicenses,
+    ],
+    queryFn: ({ signal }) => searchVideos(searchState, signal),
+    enabled: !!searchState.query && searchState.query.trim().length > 0,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 10 * 60 * 1000,
+    refetchOnWindowFocus: false,
+    retry: (failureCount, error) => {
+      if (error instanceof Error && error.name === 'AbortError') return false;
+      return failureCount < 2;
+    },
+    retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000),
+  });
+
+  const { data, error } = query;
+
+  // Sync results into the store: replace on page 1, append on later pages
+  useEffect(() => {
+    if (!data) return;
+    const docs = (data as any).docs || [];
+    if ((searchState.page || 1) > 1) {
+      setSearchResults([...useStore.getState().searchResults, ...docs]);
+    } else {
+      setSearchResults(docs);
+    }
+    setTotalResults((data as any).numFound || 0);
+    setLoading(false);
+  }, [data]);
+
+  useEffect(() => {
+    if (error) {
+      setLoading(false);
+      console.error('Search error:', error);
+    }
+  }, [error]);
+
+  return query;
+}
diff --git a/client/src/lib/archive-api.ts b/client/src/lib/archive-api.ts
index ccb468c..888ab50 100644
--- a/client/src/lib/archive-api.ts
+++ b/client/src/lib/archive-api.ts
@@ -2,31 +2,7 @@ import { type SearchFilters, type Video } from "@shared/schema";
 import { type SearchState } from "./types";
 import { metadataCache } from './metadata-cache';
 
-// Global abort controller for cancelling requests
-let currentSearchController: AbortController | null = null;
-let searchDebounceTimer: NodeJS.Timeout | null = null;
-
-// Debounced search function
-export function searchVideosDebounced(filters: SearchState, delay: number = 300): Promise<any> {
-  return new Promise((resolve, reject) => {
-    // Clear existing timer
-    if (searchDebounceTimer) {
-      clearTimeout(searchDebounceTimer);
-    }
-    
-    // Set new timer
-    searchDebounceTimer = setTimeout(async () => {
-      try {
-        const result = await searchVideos(filters);
-        resolve(result);
-      } catch (error) {
-        reject(error);
-      }
-    }, delay);
-  });
-}
-
-export async function searchVideos(filters: SearchState) {
+export async function searchVideos(filters: SearchState, signal?: AbortSignal) {
   console.log('searchVideos called with filters:', filters);
   
   // Validate and clean query
@@ -48,14 +24,6 @@ export async function searchVideos(filters: SearchState) {
     throw new Error('Search query contains only invalid characters');
   }
   
-  // Cancel any existing search
-  if (currentSearchController) {
-    currentSearchController.abort();
-  }
-
-  // Create new abort controller
-  currentSearchController = new AbortController();
-
   // Check cache first
   const cacheKey = JSON.stringify(filters);
   const cached = metadataCache.get(cacheKey, filters.page || 1);
@@ -96,11 +64,6 @@ export async function searchVideos(filters: SearchState) {
   // Set default rows if not specified (reduced for faster loading)
   params.set('rows', '25');
 
-  // Pre-cache popular queries when user is idle
-  if (cleanQuery.length > 0) {
-    queuePopularQueryPrecache(cleanQuery);
-  }
-
   // Enhanced client-side retry logic with intelligent backoff
   let lastError;
   let result;
@@ -113,8 +76,16 @@ export async function searchVideos(filters: SearchState) {
       // Add timeout to prevent hanging requests
       const timeoutMs = 15000 + (attempt * 5000); // Progressive timeout: 15s, 20s, 25s
       const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
-      
+      let timedOut = false;
+      const timeoutId = setTimeout(() => {
+        timedOut = true;
+        controller.abort();
+      }, timeoutMs);
+      // Propagate caller cancellation (e.g. React Query) into this attempt's fetch
+      const onCallerAbort = () => controller.abort();
+      signal?.addEventListener('abort', onCallerAbort);
+      if (signal?.aborted) controller.abort();
+
       try {
         const response = await fetch(`/api/search?${params.toString()}`, {
           signal: controller.signal,
@@ -124,9 +95,7 @@ export async function searchVideos(filters: SearchState) {
             'X-Client-Version': '2.0'
           },
         });
-        
-        clearTimeout(timeoutId);
-        
+
         if (!response.ok) {
           let errorData: any = {};
           try {
@@ -170,15 +139,21 @@ export async function searchVideos(filters: SearchState) {
         break; // Success, exit retry loop
         
       } catch (fetchError) {
-        clearTimeout(timeoutId);
+        // Convert a timeout abort into a retryable error; let real cancellation propagate
+        if (fetchError instanceof Error && fetchError.name === 'AbortError' && timedOut) {
+          throw new Error(`Search request timeout after ${timeoutMs}ms`);
+        }
         throw fetchError;
+      } finally {
+        clearTimeout(timeoutId);
+        signal?.removeEventListener('abort', onCallerAbort);
       }
-      
+
     } catch (error) {
       lastError = error;
-      
-      // Don't retry if the request was aborted by user (not timeout)
-      if (error instanceof Error && error.name === 'AbortError' && !error.message.includes('timeout')) {
+
+      // Caller cancelled (not a timeout) - stop immediately, React Query ignores cancellations
+      if (error instanceof Error && error.name === 'AbortError') {
         throw error;
       }
       
@@ -318,14 +293,6 @@ export function generateThumbnailUrl(identifier: string): string {
   return `https://archive.org/services/img/${identifier}`;
 }
 
-// Cancel current search
-export function cancelCurrentSearch(): void {
-  if (currentSearchController) {
-    currentSearchController.abort();
-    currentSearchController = null;
-  }
-}
-
 // Poll job status until completion
 export async function pollJobStatus(
   jobId: string, 
@@ -414,93 +381,3 @@ export async function preloadThumbnail(identifier: string, signal?: AbortSignal)
   });
 }
 
-// Popular search queries for pre-caching
-const POPULAR_QUERIES = [
-  'nature documentary',
-  'vintage commercial',
-  'educational film',
-  'newsreel',
-  'cartoon animation',
-  'music performance',
-  'travel footage',
-  'science experiment',
-  'historical events',
-  'space exploration'
-];
-
-// Pre-cache popular queries to improve search performance
-let precacheTimer: NodeJS.Timeout | null = null;
-let precacheIndex = 0;
-
-export function queuePopularQueryPrecache(userQuery: string): void {
-  // Clear existing precache timer
-  if (precacheTimer) {
-    clearTimeout(precacheTimer);
-  }
-  
-  // Wait 5 seconds after user stops typing to start precaching
-  precacheTimer = setTimeout(() => {
-    precachePopularQueries(userQuery);
-  }, 5000);
-}
-
-async function precachePopularQueries(excludeQuery?: string): Promise<void> {
-  try {
-    // Find queries similar to user's search or use popular ones
-    const querySet = new Set(POPULAR_QUERIES);
-    
-    // Add variations of the user's query
-    if (excludeQuery && excludeQuery.length > 3) {
-      const words = excludeQuery.toLowerCase().split(' ');
-      if (words.length === 1) {
-        // Add common combinations with single words
-        querySet.add(`${words[0]} documentary`);
-        querySet.add(`vintage ${words[0]}`);
-        querySet.add(`${words[0]} history`);
-      }
-    }
-    
-    const queries = Array.from(querySet).filter(q => q !== excludeQuery);
-    
-    // Precache 3 queries maximum to avoid overwhelming Archive.org
-    for (let i = 0; i < Math.min(3, queries.length); i++) {
-      const queryIndex = (precacheIndex + i) % queries.length;
-      const query = queries[queryIndex];
-      
-      // Check if already cached
-      const cacheKey = JSON.stringify({ query, page: 1 });
-      const cached = metadataCache.get(cacheKey, 1);
-      
-      if (!cached) {
-        console.log(`🔮 Pre-caching popular query: "${query}"`);
-        
-        try {
-          // Use a minimal search to warm the cache
-          await searchVideos({
-            query,
-            page: 1,
-            yearFrom: '',
-            yearTo: '',
-            duration: 'all',
-            license: 'all',
-            sort: 'relevance',
-            sources: [],
-            allowRestrictedLicenses: false
-          });
-          
-          // Small delay between precache requests
-          await new Promise(resolve => setTimeout(resolve, 2000));
-        } catch (error) {
-          // Don't log precache errors as they're not user-facing
-          console.debug(`Precache failed for "${query}":`, error);
-        }
-      }
-    }
-    
-    // Update index for next precache cycle
-    precacheIndex = (precacheIndex + 3) % queries.length;
-    
-  } catch (error) {
-    console.debug('Precache operation failed:', error);
-  }
-}
diff --git a/client/src/lib/error-handler.ts b/client/src/lib/error-handler.tsx
similarity index 93%
rename from client/src/lib/error-handler.ts
rename to client/src/lib/error-handler.tsx
index e5f83fc..24fa7cd 100644
--- a/client/src/lib/error-handler.ts
+++ b/client/src/lib/error-handler.tsx
@@ -1,4 +1,5 @@
 import { useToast } from '@/hooks/use-toast';
+import { ToastAction } from '@/components/ui/toast';
 
 export interface SearchErrorInfo {
   type: 'network' | 'api' | 'rate-limit' | 'validation' | 'service-unavailable' | 'unknown';
@@ -157,14 +158,18 @@ export function useSmartErrorToast() {
       description,
       variant: errorInfo.type === 'rate-limit' ? 'default' : 'destructive',
       duration: errorInfo.type === 'rate-limit' ? 8000 : 6000,
-      action: options.allowRetry && SearchErrorAnalyzer.shouldShowRetryButton(errorInfo) ? {
-        altText: "Retry search",
-        onClick: () => {
-          if (options.onRetry) {
-            setTimeout(options.onRetry, 1000); // Brief delay before retry
-          }
-        }
-      } : undefined
+      action: options.allowRetry && SearchErrorAnalyzer.shouldShowRetryButton(errorInfo) ? (
+        <ToastAction
+          altText="Retry search"
+          onClick={() => {
+            if (options.onRetry) {
+              setTimeout(options.onRetry, 1000); // Brief delay before retry
+            }
+          }}
+        >
+          Retry
+        </ToastAction>
+      ) : undefined
     });
 
     // Return error info for further handling if needed
diff --git a/client/src/pages/home.tsx b/client/src/pages/home.tsx
index 23a9d86..546a4ec 100644
--- a/client/src/pages/home.tsx
+++ b/client/src/pages/home.tsx
@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
 import { Tv, Info, Move, HelpCircle } from 'lucide-react';
-import { useQuery } from '@tanstack/react-query';
 import { Button } from '@/components/ui/button';
 import { SearchBar } from '@/components/SearchBar';
 import { Filters } from '@/components/Filters';
@@ -18,7 +17,7 @@ import { ToolsPanel } from '@/components/ToolsPanel';
 import { AboutDialog } from '@/components/AboutDialog';
 import { useStore } from '@/lib/store';
 import { getTextClasses, getThemeClasses } from '@/lib/theme-utils';
-import { searchVideos } from '@/lib/archive-api';
+import { useVideoSearch } from '@/hooks/use-video-search';
 import { type VideoResult } from '@/lib/types';
 import { FirstRunTour } from '@/components/FirstRunTour';
 import { ResponsiveLayoutManager } from '@/components/ResponsiveLayoutManager';
@@ -33,8 +32,6 @@ export default function Home() {
     setSelectedVideo,
     setDetailDrawerOpen,
     queueItems,
-    setSearchResults,
-    setTotalResults,
     addToQueue,
     
     // Effects modes
@@ -45,45 +42,8 @@ export default function Home() {
   const [isDragging, setIsDragging] = useState(false);
   const [dragPosition, setDragPosition] = useState({ x: 0, y: 0 });
 
-  // Search functionality with improved reliability
-  const { data: searchData, isLoading, error, refetch } = useQuery({
-    queryKey: ['search', searchState.query, searchState.yearFrom, searchState.yearTo, searchState.duration, searchState.license, searchState.sort, searchState.page, searchState.sources],
-    queryFn: () => searchVideos(searchState),
-    enabled: !!searchState.query && searchState.query.trim().length > 0,
-    staleTime: 2 * 60 * 1000, // 2 minutes (reduced from 5)
-    gcTime: 10 * 60 * 1000, // 10 minutes garbage collection
-    retry: (failureCount, error) => {
-      // Don't retry on specific errors
-      if (error instanceof Error) {
-        if (error.message.includes('Rate limited') || 
-            error.message.includes('AbortError') ||
-            error.message.includes('empty')) {
-          return false;
-        }
-      }
-      // Retry up to 2 times for other errors
-      return failureCount < 2;
-    },
-    retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000), // Exponential backoff, max 30s
-  });
-
-  const searchResults = searchData ? (searchData as any).docs || [] : [];
-  const totalResults = searchData ? (searchData as any).numFound || 0 : 0;
-
-  // Update store with search results and handle errors
-  useEffect(() => {
-    if (searchResults.length > 0) {
-      setSearchResults(searchResults);
-      setTotalResults(totalResults);
-    }
-  }, [searchResults, totalResults, setSearchResults, setTotalResults]);
-
-  // Log search errors for debugging
-  useEffect(() => {
-    if (error) {
-      console.error('Search error:', error);
-    }
-  }, [error]);
+  // Search is owned by useVideoSearch; it dedupes with ResultsGrid and syncs the store
+  const { isLoading, error, refetch } = useVideoSearch();
 
   // Preload local video on first visit
   useEffect(() => {
@@ -135,9 +95,6 @@ export default function Home() {
   }, []);
 
 
-  // Responsive layout hook
-  const { isMobile } = useResponsiveLayout();
-
   return (
     <ResponsiveLayoutManager>
     <div className={`h-screen w-screen flex flex-col transition-all duration-500 overflow-hidden ${
diff --git a/package-lock.json b/package-lock.json
index aeac813..79038cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,7 +77,6 @@
         "recharts": "^2.15.2",
         "tailwind-merge": "^2.6.0",
         "tailwindcss-animate": "^1.0.7",
-        "tw-animate-css": "^1.2.5",
         "vaul": "^1.1.2",
         "wouter": "^3.3.5",
         "ws": "^8.18.0",
@@ -86,10 +85,7 @@
         "zustand": "^5.0.7"
       },
       "devDependencies": {
-        "@replit/vite-plugin-cartographer": "^0.2.8",
-        "@replit/vite-plugin-runtime-error-modal": "^0.0.3",
         "@tailwindcss/typography": "^0.5.15",
-        "@tailwindcss/vite": "^4.1.3",
         "@types/connect-pg-simple": "^7.0.3",
         "@types/express": "4.17.21",
         "@types/express-session": "^1.18.0",
@@ -170,6 +166,7 @@
       "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.26.0",
@@ -1536,6 +1533,7 @@
       "resolved": "https://registry.npmjs.org/@neondatabase/serverless/-/serverless-0.10.4.tgz",
       "integrity": "sha512-2nZuh3VUO9voBauuh+IGYRhGU/MskWHt1IuZvHcJw6GLjDgtqj/KViKo7SIrLdGLdot7vFbiRRw+BgEy3wT9HA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/pg": "8.11.6"
       }
@@ -2849,28 +2847,6 @@
       "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz",
       "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw=="
     },
-    "node_modules/@replit/vite-plugin-cartographer": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/@replit/vite-plugin-cartographer/-/vite-plugin-cartographer-0.2.8.tgz",
-      "integrity": "sha512-eNr3OAhJFv5b6tbDZ0Bc7DR4O0jxBN17LtBhHagf6FWdpOStNw8Pxsnd8pood7veHRDFbMB9+nsKsWKcB/j1xw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.26.9",
-        "@babel/traverse": "^7.26.9",
-        "@babel/types": "^7.26.9",
-        "magic-string": "^0.30.12",
-        "modern-screenshot": "^4.6.0"
-      }
-    },
-    "node_modules/@replit/vite-plugin-runtime-error-modal": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@replit/vite-plugin-runtime-error-modal/-/vite-plugin-runtime-error-modal-0.0.3.tgz",
-      "integrity": "sha512-4wZHGuI9W4o9p8g4Ma/qj++7SP015+FMDGYobj7iap5oEsxXMm0B02TO5Y5PW8eqBPd4wX5l3UGco/hlC0qapw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25"
-      }
-    },
     "node_modules/@rollup/rollup-android-arm-eabi": {
       "version": "4.24.4",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.4.tgz",
@@ -3123,231 +3099,6 @@
         "win32"
       ]
     },
-    "node_modules/@tailwindcss/node": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.3.tgz",
-      "integrity": "sha512-H/6r6IPFJkCfBJZ2dKZiPJ7Ueb2wbL592+9bQEl2r73qbX6yGnmQVIfiUvDRB2YI0a3PWDrzUwkvQx1XW1bNkA==",
-      "dev": true,
-      "dependencies": {
-        "enhanced-resolve": "^5.18.1",
-        "jiti": "^2.4.2",
-        "lightningcss": "1.29.2",
-        "tailwindcss": "4.1.3"
-      }
-    },
-    "node_modules/@tailwindcss/node/node_modules/jiti": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
-      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
-      "dev": true,
-      "bin": {
-        "jiti": "lib/jiti-cli.mjs"
-      }
-    },
-    "node_modules/@tailwindcss/node/node_modules/tailwindcss": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.3.tgz",
-      "integrity": "sha512-2Q+rw9vy1WFXu5cIxlvsabCwhU2qUwodGq03ODhLJ0jW4ek5BUtoCsnLB0qG+m8AHgEsSJcJGDSDe06FXlP74g==",
-      "dev": true
-    },
-    "node_modules/@tailwindcss/oxide": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.3.tgz",
-      "integrity": "sha512-t16lpHCU7LBxDe/8dCj9ntyNpXaSTAgxWm1u2XQP5NiIu4KGSyrDJJRlK9hJ4U9yJxx0UKCVI67MJWFNll5mOQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      },
-      "optionalDependencies": {
-        "@tailwindcss/oxide-android-arm64": "4.1.3",
-        "@tailwindcss/oxide-darwin-arm64": "4.1.3",
-        "@tailwindcss/oxide-darwin-x64": "4.1.3",
-        "@tailwindcss/oxide-freebsd-x64": "4.1.3",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.3",
-        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.3",
-        "@tailwindcss/oxide-linux-arm64-musl": "4.1.3",
-        "@tailwindcss/oxide-linux-x64-gnu": "4.1.3",
-        "@tailwindcss/oxide-linux-x64-musl": "4.1.3",
-        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.3",
-        "@tailwindcss/oxide-win32-x64-msvc": "4.1.3"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-android-arm64": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.3.tgz",
-      "integrity": "sha512-cxklKjtNLwFl3mDYw4XpEfBY+G8ssSg9ADL4Wm6//5woi3XGqlxFsnV5Zb6v07dxw1NvEX2uoqsxO/zWQsgR+g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-darwin-arm64": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.3.tgz",
-      "integrity": "sha512-mqkf2tLR5VCrjBvuRDwzKNShRu99gCAVMkVsaEOFvv6cCjlEKXRecPu9DEnxp6STk5z+Vlbh1M5zY3nQCXMXhw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-darwin-x64": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.3.tgz",
-      "integrity": "sha512-7sGraGaWzXvCLyxrc7d+CCpUN3fYnkkcso3rCzwUmo/LteAl2ZGCDlGvDD8Y/1D3ngxT8KgDj1DSwOnNewKhmg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-freebsd-x64": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.3.tgz",
-      "integrity": "sha512-E2+PbcbzIReaAYZe997wb9rId246yDkCwAakllAWSGqe6VTg9hHle67hfH6ExjpV2LSK/siRzBUs5wVff3RW9w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.3.tgz",
-      "integrity": "sha512-GvfbJ8wjSSjbLFFE3UYz4Eh8i4L6GiEYqCtA8j2Zd2oXriPuom/Ah/64pg/szWycQpzRnbDiJozoxFU2oJZyfg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.3.tgz",
-      "integrity": "sha512-35UkuCWQTeG9BHcBQXndDOrpsnt3Pj9NVIB4CgNiKmpG8GnCNXeMczkUpOoqcOhO6Cc/mM2W7kaQ/MTEENDDXg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.3.tgz",
-      "integrity": "sha512-dm18aQiML5QCj9DQo7wMbt1Z2tl3Giht54uVR87a84X8qRtuXxUqnKQkRDK5B4bCOmcZ580lF9YcoMkbDYTXHQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.3.tgz",
-      "integrity": "sha512-LMdTmGe/NPtGOaOfV2HuO7w07jI3cflPrVq5CXl+2O93DCewADK0uW1ORNAcfu2YxDUS035eY2W38TxrsqngxA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-linux-x64-musl": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.3.tgz",
-      "integrity": "sha512-aalNWwIi54bbFEizwl1/XpmdDrOaCjRFQRgtbv9slWjmNPuJJTIKPHf5/XXDARc9CneW9FkSTqTbyvNecYAEGw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.3.tgz",
-      "integrity": "sha512-PEj7XR4OGTGoboTIAdXicKuWl4EQIjKHKuR+bFy9oYN7CFZo0eu74+70O4XuERX4yjqVZGAkCdglBODlgqcCXg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.3.tgz",
-      "integrity": "sha512-T8gfxECWDBENotpw3HR9SmNiHC9AOJdxs+woasRZ8Q/J4VHN0OMs7F+4yVNZ9EVN26Wv6mZbK0jv7eHYuLJLwA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@tailwindcss/typography": {
       "version": "0.5.15",
       "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.15.tgz",
@@ -3378,26 +3129,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/@tailwindcss/vite": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.3.tgz",
-      "integrity": "sha512-lUI/QaDxLtlV52Lho6pu07CG9pSnRYLOPmKGIQjyHdTBagemc6HmgZxyjGAQ/5HMPrNeWBfTVIpQl0/jLXvWHQ==",
-      "dev": true,
-      "dependencies": {
-        "@tailwindcss/node": "4.1.3",
-        "@tailwindcss/oxide": "4.1.3",
-        "tailwindcss": "4.1.3"
-      },
-      "peerDependencies": {
-        "vite": "^5.2.0 || ^6"
-      }
-    },
-    "node_modules/@tailwindcss/vite/node_modules/tailwindcss": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.3.tgz",
-      "integrity": "sha512-2Q+rw9vy1WFXu5cIxlvsabCwhU2qUwodGq03ODhLJ0jW4ek5BUtoCsnLB0qG+m8AHgEsSJcJGDSDe06FXlP74g==",
-      "dev": true
-    },
     "node_modules/@tanstack/query-core": {
       "version": "5.60.5",
       "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.60.5.tgz",
@@ -3723,6 +3454,7 @@
       "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -3734,6 +3466,7 @@
       "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/react": "*"
       }
@@ -3879,6 +3612,7 @@
       "resolved": "https://registry.npmjs.org/@uppy/core/-/core-4.5.2.tgz",
       "integrity": "sha512-5XoPJNcqEXtxtw+vg8EyqUFe11JSbG3/aln83Y7+CLbs7WOovYdfwwKEt1aTbfg1+ijsxudLchya5yh72jaLqw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@transloadit/prettier-bytes": "^0.3.4",
         "@uppy/store-default": "^4.3.2",
@@ -3953,6 +3687,7 @@
       "resolved": "https://registry.npmjs.org/@uppy/drag-drop/-/drag-drop-4.2.2.tgz",
       "integrity": "sha512-SlVl+lHC8TvCKW4B9L4pdb0n8mEVgACHjKXGWcy7EUsTrRphv3ugmkbIFL57XpmFR+AFMuPblOsKq/9nkPkHOQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@uppy/utils": "^6.2.2",
         "preact": "^10.5.13"
@@ -3996,6 +3731,7 @@
       "resolved": "https://registry.npmjs.org/@uppy/file-input/-/file-input-4.2.2.tgz",
       "integrity": "sha512-tQklK5C1slZWQlMQYQPBJuhfs0e5w1sRb0VwYMt8P297rB1BUcyOjkVH79DAYHkkgXo9aQKUiZSuVoN89tlLjQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@uppy/utils": "^6.2.2",
         "preact": "^10.5.13"
@@ -4081,6 +3817,7 @@
       "resolved": "https://registry.npmjs.org/@uppy/progress-bar/-/progress-bar-4.3.2.tgz",
       "integrity": "sha512-5BOhq49xPpBTlEVsEIRLkV+Hgb0qTuey8XKyrmrSetcgtolKLwtlDjrOWmUcxGYI3bkMbdeJulF9aiR8sSqQ6A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@uppy/utils": "^6.2.2",
         "preact": "^10.5.13"
@@ -4635,6 +4372,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001669",
         "electron-to-chromium": "^1.5.41",
@@ -4661,20 +4399,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/bufferutil": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz",
-      "integrity": "sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "node-gyp-build": "^4.3.0"
-      },
-      "engines": {
-        "node": ">=6.14.2"
-      }
-    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -5097,6 +4821,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
       "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/kossnocorp"
@@ -5184,6 +4909,7 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
       "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -5665,6 +5391,7 @@
       "resolved": "https://registry.npmjs.org/drizzle-orm/-/drizzle-orm-0.39.1.tgz",
       "integrity": "sha512-2bDHlzTY31IDmrYn8i+ZZrxK8IyBD4mPZ7JmZdVDQj2tpBZXs/gxB/1kK5pSvkjxPUMNOVsTnoGkSltgjuJwcA==",
       "license": "Apache-2.0",
+      "peer": true,
       "peerDependencies": {
         "@aws-sdk/client-rds-data": ">=3",
         "@cloudflare/workers-types": ">=4",
@@ -5852,7 +5579,8 @@
     "node_modules/embla-carousel": {
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.6.0.tgz",
-      "integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA=="
+      "integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==",
+      "peer": true
     },
     "node_modules/embla-carousel-react": {
       "version": "8.6.0",
@@ -5898,19 +5626,6 @@
         "once": "^1.4.0"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -5963,6 +5678,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -6704,12 +6420,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
     "node_modules/gtoken": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz",
@@ -7119,34 +6829,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/lightningcss": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.2.tgz",
-      "integrity": "sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA==",
-      "dev": true,
-      "dependencies": {
-        "detect-libc": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.29.2",
-        "lightningcss-darwin-x64": "1.29.2",
-        "lightningcss-freebsd-x64": "1.29.2",
-        "lightningcss-linux-arm-gnueabihf": "1.29.2",
-        "lightningcss-linux-arm64-gnu": "1.29.2",
-        "lightningcss-linux-arm64-musl": "1.29.2",
-        "lightningcss-linux-x64-gnu": "1.29.2",
-        "lightningcss-linux-x64-musl": "1.29.2",
-        "lightningcss-win32-arm64-msvc": "1.29.2",
-        "lightningcss-win32-x64-msvc": "1.29.2"
-      }
-    },
     "node_modules/lightningcss-darwin-arm64": {
       "version": "1.29.2",
       "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.29.2.tgz",
@@ -7421,15 +7103,6 @@
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
       }
     },
-    "node_modules/magic-string": {
-      "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
-      }
-    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -7589,12 +7262,6 @@
       "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
       "license": "MIT"
     },
-    "node_modules/modern-screenshot": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/modern-screenshot/-/modern-screenshot-4.6.0.tgz",
-      "integrity": "sha512-L7osQAWpJiWY1ST1elhLRSGD5i7og5uoICqiXs38whAjWtIayp3cBMJmyML4iyJcBhRfHOyciq1g1Ft5G0QvSg==",
-      "dev": true
-    },
     "node_modules/motion-dom": {
       "version": "11.18.1",
       "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-11.18.1.tgz",
@@ -7983,6 +7650,7 @@
       "resolved": "https://registry.npmjs.org/pg/-/pg-8.13.1.tgz",
       "integrity": "sha512-OUir1A0rPNZlX//c7ksiu7crsGZTKSOXJPgtNiHGIlC9H0lO+NC6ZDYksSgBYY/thSWhnSRBv8w1lieNNGATNQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "pg-connection-string": "^2.7.0",
         "pg-pool": "^3.7.0",
@@ -8188,6 +7856,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.1.0",
@@ -8492,6 +8161,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -8517,6 +8187,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
@@ -8529,6 +8200,7 @@
       "version": "7.55.0",
       "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.55.0.tgz",
       "integrity": "sha512-XRnjsH3GVMQz1moZTW53MxfoWN7aDpUg/GpVNc4A3eXRVNdGXfbzJ4vM4aLQ8g6XCUh1nIbx70aaNCl7kxnjog==",
+      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
@@ -8763,7 +8435,8 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
       "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/regenerator-runtime": {
       "version": "0.14.1",
@@ -9321,6 +8994,7 @@
       "version": "3.4.17",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
       "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
+      "peer": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -9361,15 +9035,6 @@
         "tailwindcss": ">=3.0.0 || insiders"
       }
     },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/teeny-request": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
@@ -9958,14 +9623,6 @@
         "@esbuild/win32-x64": "0.23.1"
       }
     },
-    "node_modules/tw-animate-css": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/tw-animate-css/-/tw-animate-css-1.2.5.tgz",
-      "integrity": "sha512-ABzjfgVo+fDbhRREGL4KQZUqqdPgvc5zVrLyeW9/6mVqvaDepXc7EvedA+pYmMnIOsUAQMwcWzNvom26J2qYvQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/Wombosvideo"
-      }
-    },
     "node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -10174,6 +9831,7 @@
       "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.43",
@@ -10880,6 +10538,7 @@
       "version": "3.24.2",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz",
       "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/package.json b/package.json
index 0fb13c6..0fc9cce 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,6 @@
     "recharts": "^2.15.2",
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
-    "tw-animate-css": "^1.2.5",
     "vaul": "^1.1.2",
     "wouter": "^3.3.5",
     "ws": "^8.18.0",
@@ -92,10 +91,7 @@
     "zustand": "^5.0.7"
   },
   "devDependencies": {
-    "@replit/vite-plugin-cartographer": "^0.2.8",
-    "@replit/vite-plugin-runtime-error-modal": "^0.0.3",
     "@tailwindcss/typography": "^0.5.15",
-    "@tailwindcss/vite": "^4.1.3",
     "@types/connect-pg-simple": "^7.0.3",
     "@types/express": "4.17.21",
     "@types/express-session": "^1.18.0",
diff --git a/server/index.ts b/server/index.ts
index 83ff1ef..99c6d93 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -3,7 +3,9 @@ import { registerRoutes } from "./routes";
 import { setupVite, serveStatic, log } from "./vite";
 
 const app = express();
-app.set('trust proxy', true); // Fix for X-Forwarded-For header warning
+// Trust only the first proxy hop; 'true' would let clients spoof
+// X-Forwarded-For and bypass IP-based rate limiting
+app.set('trust proxy', 1);
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 
diff --git a/server/metadata-service.ts b/server/metadata-service.ts
index f385ad4..e4397da 100644
--- a/server/metadata-service.ts
+++ b/server/metadata-service.ts
@@ -157,6 +157,9 @@ export class MetadataService {
     }
 
     // Check database cache
+    if (!isDatabaseAvailable || !db) {
+      return null;
+    }
     try {
       const dbResult = await db
         .select()
@@ -221,6 +224,9 @@ export class MetadataService {
     console.log(`💾 Saved ${identifier} to memory cache`);
 
     // Save to database
+    if (!isDatabaseAvailable || !db) {
+      return;
+    }
     try {
       const expiresAt = new Date();
       expiresAt.setHours(expiresAt.getHours() + CACHE_TTL_HOURS);
@@ -256,25 +262,6 @@ export class MetadataService {
     }
   }
 
-  /**
-   * Clean up expired cache entries from database
-   */
-  async cleanupExpiredCache(): Promise<void> {
-    if (isDatabaseAvailable && db) {
-      try {
-        const result = await db
-          .delete(metadataCacheTable)
-          .where(lt(metadataCacheTable.expiresAt, new Date()));
-        
-        console.log(`🧹 Cleaned up expired metadata cache entries from database`);
-      } catch (error) {
-        console.error('Error cleaning up expired metadata cache:', error);
-      }
-    } else {
-      console.log(`🧹 Skipping database cleanup - database not available`);
-    }
-  }
-
   /**
    * Fetch and cache metadata from Internet Archive
    */
@@ -396,11 +383,9 @@ export class MetadataService {
   }
 
   /**
-   * Clean up expired cache entries
+   * Clean up expired cache entries (memory and database)
    */
   async cleanupExpiredCache(): Promise<void> {
-    const now = new Date();
-    
     // Clean memory cache
     const entries = Array.from(this.cacheStore.entries());
     for (const [identifier, cache] of entries) {
@@ -410,8 +395,18 @@ export class MetadataService {
       }
     }
 
-    // Clean database cache (when implemented)
-    // In production, you'd run a DELETE query for expired entries
+    // Clean database cache
+    if (isDatabaseAvailable && db) {
+      try {
+        await db
+          .delete(metadataCacheTable)
+          .where(lt(metadataCacheTable.expiresAt, new Date()));
+
+        console.log(`🧹 Cleaned up expired metadata cache entries from database`);
+      } catch (error) {
+        console.error('Error cleaning up expired metadata cache:', error);
+      }
+    }
   }
 }
 
diff --git a/tsconfig.json b/tsconfig.json
index a0203ee..f549e2c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,6 +5,7 @@
     "incremental": true,
     "tsBuildInfoFile": "./node_modules/typescript/tsbuildinfo",
     "noEmit": true,
+    "target": "ES2022",
     "module": "ESNext",
     "strict": true,
     "lib": ["esnext", "dom", "dom.iterable"],
diff --git a/video-cache/mp4/BigBuckBunny_124.mp4 b/video-cache/mp4/BigBuckBunny_124.mp4
deleted file mode 100644
index 40e7171..0000000
Binary files a/video-cache/mp4/BigBuckBunny_124.mp4 and /dev/null differ
diff --git a/video-cache/mp4/ElephantsDream.mp4 b/video-cache/mp4/ElephantsDream.mp4
deleted file mode 100644
index 3efa361..0000000
Binary files a/video-cache/mp4/ElephantsDream.mp4 and /dev/null differ