From 1049596bbe0685e137600d579d4d6ea2f071f0fa Mon Sep 17 00:00:00 2001
From: snackman <samgold24@gmail.com>
Date: Mon, 4 May 2026 08:50:41 -0400
Subject: [PATCH 1/8] feat: GA4 analytics dashboard at /admin/analytics

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/app/admin/analytics/page.tsx     | 596 +++++++++++++++++++++++++++
 src/app/api/admin/analytics/route.ts | 232 +++++++++++
 2 files changed, 828 insertions(+)
 create mode 100644 src/app/admin/analytics/page.tsx
 create mode 100644 src/app/api/admin/analytics/route.ts

diff --git a/src/app/admin/analytics/page.tsx b/src/app/admin/analytics/page.tsx
new file mode 100644
index 00000000..8bc99101
--- /dev/null
+++ b/src/app/admin/analytics/page.tsx
@@ -0,0 +1,596 @@
+'use client';
+
+import { useState, useEffect, useRef, useCallback } from 'react';
+import Script from 'next/script';
+import Link from 'next/link';
+
+const SESSION_KEY = 'sheeets-admin-auth';
+
+interface Audience {
+  displayName?: string;
+  description?: string;
+}
+
+interface AnalyticsData {
+  totals: {
+    activeUsers: string;
+    sessions: string;
+    pageViews: string;
+    avgSessionDuration: string;
+    bounceRate: string;
+  };
+  traffic: string[][];
+  events: string[][];
+  funnels: string[][];
+  conversions: string[][];
+  timeSeries: string[][];
+  pages: string[][];
+  devices: string[][];
+  audiences: Audience[];
+}
+
+const FUNNEL_ORDER = [
+  'session_start',
+  'onboarding_start',
+  'onboarding_complete',
+  'auth_prompt',
+  'auth_success',
+  'itinerary',
+  'check_in',
+  'submit_event_open',
+  'submit_event_success',
+];
+
+function formatDuration(seconds: number): string {
+  const m = Math.floor(seconds / 60);
+  const s = Math.round(seconds % 60);
+  return `${m}:${s.toString().padStart(2, '0')}`;
+}
+
+function formatPercent(rate: number): string {
+  return `${(rate * 100).toFixed(1)}%`;
+}
+
+export default function AnalyticsPage() {
+  const [authed, setAuthed] = useState(false);
+  const [password, setPassword] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [data, setData] = useState<AnalyticsData | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [chartReady, setChartReady] = useState(false);
+  const [lastUpdated, setLastUpdated] = useState<Date | null>(null);
+
+  const timeSeriesCanvasRef = useRef<HTMLCanvasElement>(null);
+  const devicesCanvasRef = useRef<HTMLCanvasElement>(null);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const timeSeriesChartRef = useRef<any>(null);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const devicesChartRef = useRef<any>(null);
+
+  useEffect(() => {
+    if (sessionStorage.getItem(SESSION_KEY) === 'true') {
+      setAuthed(true);
+      setPassword('trusttheplan');
+    }
+  }, []);
+
+  const fetchData = useCallback(async () => {
+    setLoading(true);
+    setError(null);
+    try {
+      const res = await fetch('/api/admin/analytics?password=trusttheplan');
+      if (!res.ok) {
+        const err = await res.json();
+        throw new Error(err.error || `HTTP ${res.status}`);
+      }
+      const json = await res.json();
+      setData(json);
+      setLastUpdated(new Date());
+    } catch (err) {
+      setError(err instanceof Error ? err.message : 'Unknown error');
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    if (authed) {
+      fetchData();
+    }
+  }, [authed, fetchData]);
+
+  // Time series chart
+  useEffect(() => {
+    if (!chartReady || !data?.timeSeries || !timeSeriesCanvasRef.current) return;
+
+    // Destroy previous chart
+    if (timeSeriesChartRef.current) {
+      timeSeriesChartRef.current.destroy();
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const Chart = (window as any).Chart;
+    if (!Chart) return;
+
+    const labels = data.timeSeries.map((row) => {
+      const d = row[0];
+      return `${d.slice(4, 6)}/${d.slice(6, 8)}`;
+    });
+    const users = data.timeSeries.map((row) => parseInt(row[1], 10));
+    const sessions = data.timeSeries.map((row) => parseInt(row[2], 10));
+
+    timeSeriesChartRef.current = new Chart(timeSeriesCanvasRef.current, {
+      type: 'line',
+      data: {
+        labels,
+        datasets: [
+          {
+            label: 'Users',
+            data: users,
+            borderColor: '#3b82f6',
+            backgroundColor: 'rgba(59,130,246,0.1)',
+            fill: true,
+            tension: 0.3,
+          },
+          {
+            label: 'Sessions',
+            data: sessions,
+            borderColor: '#10b981',
+            backgroundColor: 'rgba(16,185,129,0.1)',
+            fill: true,
+            tension: 0.3,
+          },
+        ],
+      },
+      options: {
+        responsive: true,
+        maintainAspectRatio: false,
+        plugins: {
+          legend: { labels: { color: '#fff' } },
+        },
+        scales: {
+          x: {
+            grid: { color: 'rgba(255,255,255,0.1)' },
+            ticks: { color: '#fff' },
+          },
+          y: {
+            grid: { color: 'rgba(255,255,255,0.1)' },
+            ticks: { color: '#fff' },
+          },
+        },
+      },
+    });
+
+    return () => {
+      if (timeSeriesChartRef.current) {
+        timeSeriesChartRef.current.destroy();
+        timeSeriesChartRef.current = null;
+      }
+    };
+  }, [chartReady, data?.timeSeries]);
+
+  // Devices chart
+  useEffect(() => {
+    if (!chartReady || !data?.devices || !devicesCanvasRef.current) return;
+
+    if (devicesChartRef.current) {
+      devicesChartRef.current.destroy();
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const Chart = (window as any).Chart;
+    if (!Chart) return;
+
+    const labels = data.devices.map((row) => row[0]);
+    const sessions = data.devices.map((row) => parseInt(row[1], 10));
+    const colors = ['#3b82f6', '#10b981', '#f59e0b', '#ef4444', '#8b5cf6'];
+
+    devicesChartRef.current = new Chart(devicesCanvasRef.current, {
+      type: 'bar',
+      data: {
+        labels,
+        datasets: [
+          {
+            label: 'Sessions',
+            data: sessions,
+            backgroundColor: colors.slice(0, labels.length),
+          },
+        ],
+      },
+      options: {
+        responsive: true,
+        maintainAspectRatio: false,
+        plugins: {
+          legend: { display: false },
+        },
+        scales: {
+          x: {
+            grid: { color: 'rgba(255,255,255,0.1)' },
+            ticks: { color: '#fff' },
+          },
+          y: {
+            grid: { color: 'rgba(255,255,255,0.1)' },
+            ticks: { color: '#fff' },
+          },
+        },
+      },
+    });
+
+    return () => {
+      if (devicesChartRef.current) {
+        devicesChartRef.current.destroy();
+        devicesChartRef.current = null;
+      }
+    };
+  }, [chartReady, data?.devices]);
+
+  function handleLogin(e: React.FormEvent) {
+    e.preventDefault();
+    if (password === 'trusttheplan') {
+      setAuthed(true);
+      sessionStorage.setItem(SESSION_KEY, 'true');
+    }
+  }
+
+  // Login form
+  if (!authed) {
+    return (
+      <div className="min-h-screen bg-stone-950 flex items-center justify-center p-4">
+        <form
+          onSubmit={handleLogin}
+          className="bg-stone-900 border border-stone-700 rounded-xl p-6 w-full max-w-sm"
+        >
+          <h1 className="text-lg font-bold text-white mb-4">
+            Analytics Dashboard
+          </h1>
+          <input
+            type="password"
+            value={password}
+            onChange={(e) => setPassword(e.target.value)}
+            placeholder="Password"
+            className="w-full px-3 py-2 rounded-lg bg-stone-800 border border-stone-600 text-white placeholder-stone-400 mb-3 focus:outline-none focus:ring-2 focus:ring-blue-500"
+          />
+          <button
+            type="submit"
+            className="w-full py-2 rounded-lg bg-blue-600 text-white font-medium hover:bg-blue-500 transition-colors"
+          >
+            Login
+          </button>
+        </form>
+      </div>
+    );
+  }
+
+  // Loading state
+  if (loading && !data) {
+    return (
+      <div className="min-h-screen bg-stone-950 flex items-center justify-center">
+        <div className="flex flex-col items-center gap-3">
+          <div className="w-8 h-8 border-2 border-blue-500 border-t-transparent rounded-full animate-spin" />
+          <p className="text-stone-400 text-sm">Loading analytics...</p>
+        </div>
+      </div>
+    );
+  }
+
+  // Error state
+  if (error && !data) {
+    return (
+      <div className="min-h-screen bg-stone-950 flex items-center justify-center p-4">
+        <div className="bg-stone-900 border border-red-700 rounded-xl p-6 w-full max-w-md text-center">
+          <p className="text-red-400 mb-4">{error}</p>
+          <button
+            onClick={fetchData}
+            className="px-4 py-2 rounded-lg bg-blue-600 text-white font-medium hover:bg-blue-500 transition-colors"
+          >
+            Retry
+          </button>
+        </div>
+      </div>
+    );
+  }
+
+  if (!data) return null;
+
+  // Build sorted funnel data
+  const funnelMap = new Map(
+    data.funnels.map((row) => [row[0], { count: row[1], users: row[2] }])
+  );
+  const sortedFunnel = FUNNEL_ORDER.filter((name) => funnelMap.has(name)).map(
+    (name) => ({
+      name,
+      ...funnelMap.get(name)!,
+    })
+  );
+  const maxFunnelCount = Math.max(
+    ...sortedFunnel.map((f) => parseInt(f.count, 10)),
+    1
+  );
+
+  return (
+    <div className="min-h-screen bg-stone-950 text-white">
+      <Script
+        src="https://cdn.jsdelivr.net/npm/chart.js"
+        onLoad={() => setChartReady(true)}
+      />
+
+      <div className="max-w-7xl mx-auto px-4 py-8">
+        {/* Header */}
+        <div className="flex items-center justify-between mb-8">
+          <div>
+            <div className="flex items-center gap-3 mb-1">
+              <Link
+                href="/admin"
+                className="text-stone-400 hover:text-white transition-colors text-sm"
+              >
+                &larr; Admin
+              </Link>
+            </div>
+            <h1 className="text-2xl font-bold">GA4 Analytics Dashboard</h1>
+          </div>
+          {lastUpdated && (
+            <p className="text-stone-400 text-sm">
+              Updated {lastUpdated.toLocaleTimeString()}
+            </p>
+          )}
+        </div>
+
+        {/* Scorecards */}
+        <div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-5 gap-4 mb-8">
+          <div className="bg-stone-900 border border-stone-700 rounded-xl p-4">
+            <p className="text-stone-400 text-xs uppercase tracking-wide mb-1">
+              Active Users
+            </p>
+            <p className="text-2xl font-bold">
+              {parseInt(data.totals.activeUsers, 10).toLocaleString()}
+            </p>
+          </div>
+          <div className="bg-stone-900 border border-stone-700 rounded-xl p-4">
+            <p className="text-stone-400 text-xs uppercase tracking-wide mb-1">
+              Sessions
+            </p>
+            <p className="text-2xl font-bold">
+              {parseInt(data.totals.sessions, 10).toLocaleString()}
+            </p>
+          </div>
+          <div className="bg-stone-900 border border-stone-700 rounded-xl p-4">
+            <p className="text-stone-400 text-xs uppercase tracking-wide mb-1">
+              Page Views
+            </p>
+            <p className="text-2xl font-bold">
+              {parseInt(data.totals.pageViews, 10).toLocaleString()}
+            </p>
+          </div>
+          <div className="bg-stone-900 border border-stone-700 rounded-xl p-4">
+            <p className="text-stone-400 text-xs uppercase tracking-wide mb-1">
+              Avg Session
+            </p>
+            <p className="text-2xl font-bold">
+              {formatDuration(parseFloat(data.totals.avgSessionDuration))}
+            </p>
+          </div>
+          <div className="bg-stone-900 border border-stone-700 rounded-xl p-4">
+            <p className="text-stone-400 text-xs uppercase tracking-wide mb-1">
+              Bounce Rate
+            </p>
+            <p className="text-2xl font-bold">
+              {formatPercent(parseFloat(data.totals.bounceRate))}
+            </p>
+          </div>
+        </div>
+
+        {/* Traffic Sources */}
+        <div className="bg-stone-900 rounded-xl overflow-hidden mb-8">
+          <h2 className="text-lg font-semibold px-4 py-3 border-b border-stone-700">
+            Traffic Sources
+          </h2>
+          <div className="overflow-x-auto">
+            <table className="w-full text-sm">
+              <thead>
+                <tr className="bg-stone-800 text-stone-400 text-left">
+                  <th className="px-4 py-2">Source / Medium</th>
+                  <th className="px-4 py-2 text-right">Sessions</th>
+                  <th className="px-4 py-2 text-right">Users</th>
+                  <th className="px-4 py-2 text-right">Bounce Rate</th>
+                </tr>
+              </thead>
+              <tbody>
+                {data.traffic.map((row, i) => (
+                  <tr
+                    key={i}
+                    className={
+                      i % 2 === 0 ? 'bg-stone-900' : 'bg-stone-900/50'
+                    }
+                  >
+                    <td className="px-4 py-2 font-mono text-xs">{row[0]}</td>
+                    <td className="px-4 py-2 text-right">
+                      {parseInt(row[1], 10).toLocaleString()}
+                    </td>
+                    <td className="px-4 py-2 text-right">
+                      {parseInt(row[2], 10).toLocaleString()}
+                    </td>
+                    <td className="px-4 py-2 text-right">
+                      {formatPercent(parseFloat(row[3]))}
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </div>
+
+        {/* Time Series Chart */}
+        <div className="bg-stone-900 border border-stone-700 rounded-xl p-4 mb-8">
+          <h2 className="text-lg font-semibold mb-4">
+            Users &amp; Sessions (30 days)
+          </h2>
+          <div className="h-72">
+            <canvas ref={timeSeriesCanvasRef} />
+          </div>
+        </div>
+
+        {/* Funnel */}
+        <div className="bg-stone-900 border border-stone-700 rounded-xl p-4 mb-8">
+          <h2 className="text-lg font-semibold mb-4">Funnel</h2>
+          <div className="space-y-2">
+            {sortedFunnel.map((step, i) => {
+              const count = parseInt(step.count, 10);
+              const prevCount =
+                i > 0 ? parseInt(sortedFunnel[i - 1].count, 10) : count;
+              const conversionRate =
+                i > 0 && prevCount > 0 ? count / prevCount : 1;
+              const barWidth = (count / maxFunnelCount) * 100;
+
+              return (
+                <div key={step.name}>
+                  <div className="flex items-center justify-between text-sm mb-1">
+                    <span className="font-mono text-xs">{step.name}</span>
+                    <span className="text-stone-400 text-xs">
+                      {count.toLocaleString()} events &middot;{' '}
+                      {parseInt(step.users, 10).toLocaleString()} users
+                      {i > 0 && (
+                        <span className="ml-2 text-yellow-400">
+                          {formatPercent(conversionRate)} from prev
+                        </span>
+                      )}
+                    </span>
+                  </div>
+                  <div className="w-full bg-stone-800 rounded-full h-3">
+                    <div
+                      className="bg-blue-500 h-3 rounded-full transition-all"
+                      style={{ width: `${barWidth}%` }}
+                    />
+                  </div>
+                </div>
+              );
+            })}
+          </div>
+        </div>
+
+        {/* Events Table */}
+        <div className="bg-stone-900 rounded-xl overflow-hidden mb-8">
+          <h2 className="text-lg font-semibold px-4 py-3 border-b border-stone-700">
+            Top Events
+          </h2>
+          <div className="overflow-x-auto">
+            <table className="w-full text-sm">
+              <thead>
+                <tr className="bg-stone-800 text-stone-400 text-left">
+                  <th className="px-4 py-2">Event Name</th>
+                  <th className="px-4 py-2 text-right">Count</th>
+                  <th className="px-4 py-2 text-right">Users</th>
+                </tr>
+              </thead>
+              <tbody>
+                {data.events.map((row, i) => (
+                  <tr
+                    key={i}
+                    className={
+                      i % 2 === 0 ? 'bg-stone-900' : 'bg-stone-900/50'
+                    }
+                  >
+                    <td className="px-4 py-2 font-mono text-xs">{row[0]}</td>
+                    <td className="px-4 py-2 text-right">
+                      {parseInt(row[1], 10).toLocaleString()}
+                    </td>
+                    <td className="px-4 py-2 text-right">
+                      {parseInt(row[2], 10).toLocaleString()}
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </div>
+
+        {/* Top Pages */}
+        <div className="bg-stone-900 rounded-xl overflow-hidden mb-8">
+          <h2 className="text-lg font-semibold px-4 py-3 border-b border-stone-700">
+            Top Pages
+          </h2>
+          <div className="overflow-x-auto">
+            <table className="w-full text-sm">
+              <thead>
+                <tr className="bg-stone-800 text-stone-400 text-left">
+                  <th className="px-4 py-2">Page Path</th>
+                  <th className="px-4 py-2 text-right">Views</th>
+                  <th className="px-4 py-2 text-right">Users</th>
+                </tr>
+              </thead>
+              <tbody>
+                {data.pages.map((row, i) => (
+                  <tr
+                    key={i}
+                    className={
+                      i % 2 === 0 ? 'bg-stone-900' : 'bg-stone-900/50'
+                    }
+                  >
+                    <td className="px-4 py-2 font-mono text-xs">{row[0]}</td>
+                    <td className="px-4 py-2 text-right">
+                      {parseInt(row[1], 10).toLocaleString()}
+                    </td>
+                    <td className="px-4 py-2 text-right">
+                      {parseInt(row[2], 10).toLocaleString()}
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </div>
+
+        {/* Conversions */}
+        <div className="bg-stone-900 border border-stone-700 rounded-xl p-4 mb-8">
+          <h2 className="text-lg font-semibold mb-4">Conversions</h2>
+          <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3">
+            {data.conversions.map((row, i) => (
+              <div
+                key={i}
+                className="bg-stone-800 rounded-lg p-3 flex items-center justify-between"
+              >
+                <span className="font-mono text-xs">{row[0]}</span>
+                <div className="text-right">
+                  <p className="text-sm font-bold">
+                    {parseInt(row[1], 10).toLocaleString()}
+                  </p>
+                  <p className="text-xs text-stone-400">
+                    {parseInt(row[2], 10).toLocaleString()} users
+                  </p>
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+
+        {/* Devices */}
+        <div className="bg-stone-900 border border-stone-700 rounded-xl p-4 mb-8">
+          <h2 className="text-lg font-semibold mb-4">Devices</h2>
+          <div className="h-48">
+            <canvas ref={devicesCanvasRef} />
+          </div>
+        </div>
+
+        {/* Audiences */}
+        {data.audiences.length > 0 && (
+          <div className="bg-stone-900 border border-stone-700 rounded-xl p-4 mb-8">
+            <h2 className="text-lg font-semibold mb-4">Audiences</h2>
+            <div className="space-y-3">
+              {data.audiences.map((audience, i) => (
+                <div key={i} className="bg-stone-800 rounded-lg p-3">
+                  <p className="font-medium text-sm">
+                    {audience.displayName ?? 'Unnamed audience'}
+                  </p>
+                  {audience.description && (
+                    <p className="text-xs text-stone-400 mt-1">
+                      {audience.description}
+                    </p>
+                  )}
+                </div>
+              ))}
+            </div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/app/api/admin/analytics/route.ts b/src/app/api/admin/analytics/route.ts
new file mode 100644
index 00000000..72daf684
--- /dev/null
+++ b/src/app/api/admin/analytics/route.ts
@@ -0,0 +1,232 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+const PROPERTY_ID = '524531628';
+const DATA_API = `https://analyticsdata.googleapis.com/v1beta/properties/${PROPERTY_ID}`;
+const ADMIN_API = `https://analyticsadmin.googleapis.com/v1alpha/properties/${PROPERTY_ID}`;
+
+async function refreshAccessToken(): Promise<string> {
+  const res = await fetch('https://oauth2.googleapis.com/token', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    body: new URLSearchParams({
+      client_id: process.env.GA4_CLIENT_ID!,
+      client_secret: process.env.GA4_CLIENT_SECRET!,
+      refresh_token: process.env.GA4_REFRESH_TOKEN!,
+      grant_type: 'refresh_token',
+    }),
+  });
+  if (!res.ok) {
+    const err = await res.text();
+    throw new Error(`Token refresh failed: ${res.status} ${err}`);
+  }
+  const data = await res.json();
+  return data.access_token;
+}
+
+async function runReport(accessToken: string, body: Record<string, unknown>) {
+  const res = await fetch(`${DATA_API}:runReport`, {
+    method: 'POST',
+    headers: {
+      Authorization: `Bearer ${accessToken}`,
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify(body),
+  });
+  if (!res.ok) {
+    const err = await res.text();
+    throw new Error(`runReport failed: ${res.status} ${err}`);
+  }
+  return res.json();
+}
+
+interface DimensionValue {
+  value: string;
+}
+
+interface MetricValue {
+  value: string;
+}
+
+interface ReportRow {
+  dimensionValues?: DimensionValue[];
+  metricValues?: MetricValue[];
+}
+
+interface Report {
+  rows?: ReportRow[];
+}
+
+function extractRows(report: Report): string[][] {
+  if (!report.rows) return [];
+  return report.rows.map((row) => [
+    ...(row.dimensionValues ?? []).map((d) => d.value),
+    ...(row.metricValues ?? []).map((m) => m.value),
+  ]);
+}
+
+const dateRange = {
+  dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
+};
+
+export async function GET(req: NextRequest) {
+  const password = req.nextUrl.searchParams.get('password');
+  if (password !== 'trusttheplan') {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+  }
+
+  try {
+    const accessToken = await refreshAccessToken();
+
+    const [
+      totalsReport,
+      trafficReport,
+      eventsReport,
+      funnelsReport,
+      conversionsReport,
+      timeSeriesReport,
+      pagesReport,
+      devicesReport,
+      audiencesRes,
+    ] = await Promise.all([
+      // a. Totals
+      runReport(accessToken, {
+        ...dateRange,
+        metrics: [
+          { name: 'activeUsers' },
+          { name: 'sessions' },
+          { name: 'screenPageViews' },
+          { name: 'averageSessionDuration' },
+          { name: 'bounceRate' },
+        ],
+      }),
+      // b. Traffic
+      runReport(accessToken, {
+        ...dateRange,
+        dimensions: [{ name: 'sessionSourceMedium' }],
+        metrics: [
+          { name: 'sessions' },
+          { name: 'activeUsers' },
+          { name: 'bounceRate' },
+        ],
+        orderBys: [{ metric: { metricName: 'sessions' }, desc: true }],
+        limit: 20,
+      }),
+      // c. Events
+      runReport(accessToken, {
+        ...dateRange,
+        dimensions: [{ name: 'eventName' }],
+        metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
+        orderBys: [{ metric: { metricName: 'eventCount' }, desc: true }],
+        limit: 50,
+      }),
+      // d. Funnels
+      runReport(accessToken, {
+        ...dateRange,
+        dimensions: [{ name: 'eventName' }],
+        metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
+        dimensionFilter: {
+          filter: {
+            fieldName: 'eventName',
+            inListFilter: {
+              values: [
+                'session_start',
+                'onboarding_start',
+                'onboarding_complete',
+                'auth_prompt',
+                'auth_success',
+                'itinerary',
+                'check_in',
+                'submit_event_open',
+                'submit_event_success',
+              ],
+            },
+          },
+        },
+      }),
+      // e. Conversions
+      runReport(accessToken, {
+        ...dateRange,
+        dimensions: [{ name: 'eventName' }],
+        metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
+        dimensionFilter: {
+          filter: {
+            fieldName: 'eventName',
+            inListFilter: {
+              values: [
+                'auth_success',
+                'itinerary',
+                'check_in',
+                'submit_event_success',
+                'onboarding_complete',
+                'ad_click',
+                'rsvp_confirm',
+              ],
+            },
+          },
+        },
+      }),
+      // f. Time Series
+      runReport(accessToken, {
+        ...dateRange,
+        dimensions: [{ name: 'date' }],
+        metrics: [{ name: 'activeUsers' }, { name: 'sessions' }],
+        orderBys: [{ dimension: { dimensionName: 'date' } }],
+      }),
+      // g. Pages
+      runReport(accessToken, {
+        ...dateRange,
+        dimensions: [{ name: 'pagePath' }],
+        metrics: [{ name: 'screenPageViews' }, { name: 'activeUsers' }],
+        orderBys: [
+          { metric: { metricName: 'screenPageViews' }, desc: true },
+        ],
+        limit: 20,
+      }),
+      // h. Devices
+      runReport(accessToken, {
+        ...dateRange,
+        dimensions: [{ name: 'deviceCategory' }],
+        metrics: [{ name: 'sessions' }, { name: 'activeUsers' }],
+      }),
+      // i. Audiences (Admin API)
+      fetch(`${ADMIN_API}/audiences`, {
+        headers: { Authorization: `Bearer ${accessToken}` },
+      }),
+    ]);
+
+    // Process audiences
+    let audiences = [];
+    if (audiencesRes.ok) {
+      const audiencesData = await audiencesRes.json();
+      audiences = audiencesData.audiences ?? [];
+    }
+
+    // Extract totals from first row
+    const totalsRow = totalsReport.rows?.[0]?.metricValues ?? [];
+    const totals = {
+      activeUsers: totalsRow[0]?.value ?? '0',
+      sessions: totalsRow[1]?.value ?? '0',
+      pageViews: totalsRow[2]?.value ?? '0',
+      avgSessionDuration: totalsRow[3]?.value ?? '0',
+      bounceRate: totalsRow[4]?.value ?? '0',
+    };
+
+    return NextResponse.json({
+      totals,
+      traffic: extractRows(trafficReport),
+      events: extractRows(eventsReport),
+      funnels: extractRows(funnelsReport),
+      conversions: extractRows(conversionsReport),
+      timeSeries: extractRows(timeSeriesReport),
+      pages: extractRows(pagesReport),
+      devices: extractRows(devicesReport),
+      audiences,
+    });
+  } catch (err) {
+    console.error('GA4 analytics error:', err);
+    return NextResponse.json(
+      { error: err instanceof Error ? err.message : 'Unknown error' },
+      { status: 500 }
+    );
+  }
+}

From 928ec4bb74517c3b6ac1842c163392dd12ced664 Mon Sep 17 00:00:00 2001
From: snackman <samgold24@gmail.com>
Date: Mon, 4 May 2026 20:14:26 -0400
Subject: [PATCH 2/8] feat: /plan page overhaul with itinerary FAB

Rebased itinerary overhaul (PR #123) onto current master:
- Rename /itinerary to /plan with conference selector
- EventCard integration, drag reorder, table/map views
- Share card with flyer gallery, Google Calendar export
- Distance from event, friend avatars on cards
- Added floating action button (lower-right) to access /plan

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .gitignore                                    |   4 -
 handoff.md                                    | 632 +++++++++---
 package-lock.json                             |  10 -
 package.json                                  |   1 -
 plans/ad-placements.md                        | 236 +++++
 plans/submit-form-improvements.md             |  58 ++
 plans/tomato-46571-theme-toggle.md            | 935 ++++++++++++++++++
 scripts/ga4-audiences.mjs                     | 181 ----
 scripts/ga4-bigquery.mjs                      | 135 ---
 scripts/ga4-dashboard.mjs                     | 718 --------------
 scripts/ga4-looker-setup.md                   |  50 -
 scripts/ga4-metrics.mjs                       | 126 ---
 scripts/ga4-report.mjs                        | 365 -------
 scripts/ga4-setup.mjs                         | 189 ----
 src/app/admin/page.tsx                        |  11 +-
 src/app/api/admin/submissions/route.ts        | 212 ----
 src/app/api/image-proxy/route.ts              |  39 +
 src/app/api/submit-event/route.ts             |  33 +-
 src/app/error.tsx                             |  29 -
 src/app/globals.css                           | 129 +--
 src/app/itinerary/page.tsx                    | 554 +----------
 src/app/itinerary/s/[code]/page.tsx           | 352 +------
 src/app/layout.tsx                            |   5 +-
 src/app/page.tsx                              |  22 +-
 src/app/plan/page.tsx                         | 507 ++++++++++
 src/app/plan/s/[code]/page.tsx                | 351 +++++++
 src/app/robots.ts                             |   2 +-
 src/components/AuthModal.tsx                  | 233 +----
 src/components/CommentSection.tsx             |   4 +-
 src/components/EmojiReactions.tsx             |  21 +-
 src/components/EventApp.tsx                   | 157 +--
 src/components/EventCard.tsx                  | 125 ++-
 src/components/EventPopup.tsx                 | 105 +-
 src/components/FilterBar.tsx                  | 133 ++-
 src/components/GalleryView.tsx                | 393 --------
 src/components/GoogleCalendarButton.tsx       |  48 +-
 src/components/Header.tsx                     |  17 +-
 src/components/ItineraryFAB.tsx               |  23 +
 src/components/ItineraryPanel.tsx             |  16 +-
 src/components/ListView.tsx                   | 111 +--
 src/components/LockScreenModal.tsx            | 490 ---------
 src/components/LockScreenTemplate.tsx         | 288 ------
 src/components/MapMarker.tsx                  |  23 +-
 src/components/MapView.tsx                    |  19 +-
 src/components/MapViewWrapper.tsx             |  14 +-
 src/components/NativeAdCard.tsx               |   6 +-
 src/components/OGImage.tsx                    | 118 +--
 src/components/OnboardingWizard.tsx           |   4 +-
 src/components/RsvpButton.tsx                 |  37 -
 src/components/RsvpOverlay.tsx                | 198 ----
 src/components/SearchBar.tsx                  |   6 +-
 src/components/ShareCardModal.tsx             | 101 +-
 src/components/ShareCardTemplate.tsx          | 230 ++---
 src/components/SponsorsTicker.tsx             |   8 +-
 src/components/StarButton.tsx                 |   2 +-
 src/components/SubmitEventModal.tsx           |   2 +-
 src/components/TableView.tsx                  | 119 +--
 src/components/TagBadge.tsx                   |   3 +-
 src/components/ViewToggle.tsx                 |  13 +-
 src/components/admin/SubmissionsTab.tsx       | 434 --------
 src/contexts/ThemeContext.tsx                 |  26 +-
 src/hooks/useCheckIns.ts                      |   1 -
 src/hooks/useDragReorder.ts                   |   8 +-
 src/hooks/useFilters.ts                       |   1 +
 src/hooks/useFriendCode.ts                    | 142 ---
 src/hooks/useFriendLocations.ts               |   1 -
 src/hooks/useFriendRequests.ts                |   9 +-
 src/hooks/useFriends.ts                       |  10 +-
 src/hooks/useFriendsDependentData.ts          | 238 -----
 src/hooks/useFriendsItineraries.ts            |   1 -
 src/hooks/useProfile.ts                       | 106 +-
 src/hooks/useRsvp.ts                          |  52 -
 src/hooks/useViewMode.ts                      |   2 +-
 src/lib/analytics.ts                          |  43 -
 src/lib/api-validation.ts                     |  22 -
 src/lib/calendar.ts                           |   2 +-
 src/lib/fetch-events.ts                       |   6 +-
 src/lib/google-sheets.ts                      | 279 ------
 src/lib/luma.ts                               |  20 -
 src/lib/profile-cache.ts                      |  59 --
 src/lib/reactions.ts                          |   5 +-
 src/lib/social-urls.ts                        |  45 -
 src/lib/tags.ts                               |   8 +-
 src/lib/themes.ts                             |   2 +-
 src/lib/types.ts                              |  36 +-
 status.md                                     |  79 +-
 .../20260502120000_event_submissions.sql      |  38 -
 .../20260502_add_profile_fields.sql           |   2 -
 .../20260503_add_linkedin_jobtitle.sql        |   2 -
 89 files changed, 3393 insertions(+), 7239 deletions(-)
 create mode 100644 plans/ad-placements.md
 create mode 100644 plans/submit-form-improvements.md
 create mode 100644 plans/tomato-46571-theme-toggle.md
 delete mode 100644 scripts/ga4-audiences.mjs
 delete mode 100644 scripts/ga4-bigquery.mjs
 delete mode 100644 scripts/ga4-dashboard.mjs
 delete mode 100644 scripts/ga4-looker-setup.md
 delete mode 100644 scripts/ga4-metrics.mjs
 delete mode 100644 scripts/ga4-report.mjs
 delete mode 100644 scripts/ga4-setup.mjs
 delete mode 100644 src/app/api/admin/submissions/route.ts
 create mode 100644 src/app/api/image-proxy/route.ts
 delete mode 100644 src/app/error.tsx
 create mode 100644 src/app/plan/page.tsx
 create mode 100644 src/app/plan/s/[code]/page.tsx
 delete mode 100644 src/components/GalleryView.tsx
 create mode 100644 src/components/ItineraryFAB.tsx
 delete mode 100644 src/components/LockScreenModal.tsx
 delete mode 100644 src/components/LockScreenTemplate.tsx
 delete mode 100644 src/components/RsvpButton.tsx
 delete mode 100644 src/components/RsvpOverlay.tsx
 delete mode 100644 src/components/admin/SubmissionsTab.tsx
 delete mode 100644 src/hooks/useFriendCode.ts
 delete mode 100644 src/hooks/useFriendsDependentData.ts
 delete mode 100644 src/hooks/useRsvp.ts
 delete mode 100644 src/lib/luma.ts
 delete mode 100644 src/lib/profile-cache.ts
 delete mode 100644 src/lib/social-urls.ts
 delete mode 100644 supabase/migrations/20260502120000_event_submissions.sql
 delete mode 100644 supabase/migrations/20260502_add_profile_fields.sql
 delete mode 100644 supabase/migrations/20260503_add_linkedin_jobtitle.sql

diff --git a/.gitignore b/.gitignore
index c2041ac1..8469a369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,14 +38,10 @@ yarn-error.log*
 
 # secrets
 secrets.md
-notes/
 
 # one-off scripts
 scripts/migrate-itinerary-ids.ts
 
-# generated reports
-ga4-dashboard.html
-
 # typescript
 *.tsbuildinfo
 next-env.d.ts
diff --git a/handoff.md b/handoff.md
index 49fde15e..36494657 100644
--- a/handoff.md
+++ b/handoff.md
@@ -1,9 +1,11 @@
 # plan.wtf - Multi-Conference Side Event Guide
 
 ## Project Overview
-A standalone Next.js app that displays crypto/tech conference side events with interactive map, list, table, and gallery views. Landing page at `plan.wtf` shows active conference cards with event counts, days-away badges, social links, and upcoming conferences with "Notify Me" email signups. Users can filter events by conference, date range, time range, tags, and more. Add events to your plan and build a personal itinerary with PNG export and shareable links. Social features include friend connections, check-ins, emoji reactions, and event comments. RSVP flow for Luma events with in-app registration overlay.
+A standalone Next.js app that displays crypto/tech conference side events with interactive map, list, and table views. Users can filter events by conference, date range, time range, tags, and more. Star favorites and build a personal itinerary with PNG export and shareable links. Social features include friend connections, check-ins, emoji reactions, and event comments.
 
 **Live**: https://plan.wtf
+**Legacy**: https://sheeets.xyz (301 redirects to plan.wtf via .htaccess)
+**Vercel**: https://sheeets.vercel.app (redirects to plan.wtf)
 **Repo**: https://github.com/snackman/sheeets
 **Data Source**: Google Sheet `1xWmIHyEyOmPHfkYuZkucPRlLGWbb9CF6Oqvfl8FUV6k` (https://plan.wtf/data)
 
@@ -12,155 +14,523 @@ A standalone Next.js app that displays crypto/tech conference side events with i
 ## Tech Stack
 - **Next.js 16** (App Router, Turbopack)
 - **TypeScript**
-- **Tailwind CSS** (CSS custom properties theme system with `data-theme` attribute)
+- **Tailwind CSS** (dark theme, warm-dark color scheme: stone backgrounds, amber accents)
 - **Mapbox GL JS** via `react-map-gl` (individual markers, zoom-aware labels)
-- **Supabase** (auth via email OTP, itinerary sync, friends, check-ins, reactions, comments, POIs, image caching, ad tracking, profile pictures via Storage, RSVPs)
-- **OpenAI** (GPT-4o-mini for sponsor extraction in crawl script)
+- **Supabase** (auth via email OTP, itinerary sync, friends, check-ins, reactions, comments, POIs, image caching)
 - **@tanstack/react-virtual** (list virtualization for scroll performance)
 - **Google Sheets API** (service account auth for event submission)
-- **Google Analytics** (GA4, custom event tracking)
+- **Google Analytics** (GA4, measurement ID: `G-2WB3SFJ13V`, custom event tracking)
 - **html-to-image** for itinerary PNG export
-- **localStorage + Supabase** for user state (plan items, itinerary, hidden events — dual storage with sync)
+- **localStorage + Supabase** for user state (stars, itinerary — dual storage with sync)
 
----
+## Getting Started
+
+```bash
+cd sheeets
+npm install
+npm run dev        # http://localhost:3000
+```
+
+### Environment Variables (`.env.local`)
+```
+NEXT_PUBLIC_MAPBOX_TOKEN=pk.xxx           # Required for map view
+NEXT_PUBLIC_SUPABASE_URL=https://xxx.supabase.co
+NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJxxx      # Supabase anon key
+SUPABASE_SERVICE_ROLE_KEY=eyJxxx          # For server-side operations
+MAPBOX_TOKEN=pk.xxx                        # Server-side geocoding
+GOOGLE_SERVICE_ACCOUNT_EMAIL=sheeets-writer@planwtf.iam.gserviceaccount.com
+GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----\n..."
+```
+
+### Geocoding (for map view)
+Events have addresses but no lat/lng. Two systems:
 
-## Recent Changes (This Session — May 3, 2026)
-
-All changes on branch `pineapple-22344-itinerary-overhaul` (PR #123).
-
-### Share Card Flyer Gallery
-- **New file**: `src/app/api/image-proxy/route.ts` — server-side image proxy to bypass CORS for html-to-image canvas rendering
-- **ShareCardModal** (`src/components/ShareCardModal.tsx`):
-  - Pre-fetches flyer images as data URLs: checks `imageCache` → batch POST `/api/og` → proxy via `/api/image-proxy` → FileReader → data URL map
-  - Flyers/Text Only toggle (`ShareCardMode` type) — skips image pre-fetching in text mode
-  - Passes `flyerImages` map and `mode` prop to template
-- **ShareCardTemplate** (`src/components/ShareCardTemplate.tsx`):
-  - **Gallery mode** (default): 2-column grid of 486px square flyer tiles with event name (22px bold) and time (19px) above each image. Dark placeholder for events without flyers.
-  - **Text mode**: Classic layout with time + event name + address in a list
-  - End times now shown (e.g., "6:00p - 9:00p")
-  - Exported `ShareCardMode` type
-
-### /plan Page Improvements
-- **Friend avatars**: Added `useFriends()` + `useFriendsItineraries()` hooks, computes `friendsByEvent` map, passes `friendsGoing` prop to EventCard (blue left border + avatar stack)
-- **Google Calendar export**: Added `GoogleCalendarButton` (icon-only, 18px CalendarPlus) to header with `conferenceTimezone` and `exportableEvents` memos
-- **View mode sync**: /plan page reads `STORAGE_KEYS.VIEW_MODE` from localStorage on mount via useEffect + `viewModeRestored` gate to prevent flash
-- **Header cleanup**:
-  - Removed "My Plan (N events)" heading
-  - Conference dropdown moved next to back arrow (same flex group)
-  - Back button navigates to `/<conference-slug>` instead of `/`
-  - Logo replaces calendar emoji, heading says "My Plan" not "plan.wtf"
-  - CalendarX icon replaced with plan.wtf logo in empty state
-- **Schedule conflicts removed**: Removed conflict banner, per-card indicators, border styling, `detectConflicts` import
-- **Larger link/copy icons**: Bumped from `w-3.5 h-3.5` to `w-4 h-4` in EventCard to match StarButton
+1. **Build-time script** (populates static cache):
+```bash
+MAPBOX_SECRET_TOKEN=pk.xxx npx tsx scripts/geocode.ts
+```
+Creates/updates `src/data/geocoded-addresses.json`. Matched to events via `normalizeAddress()` in `fetch-events.ts`. **Auto-runs on every deploy** via the `prebuild` npm script — skips gracefully if `MAPBOX_SECRET_TOKEN` isn't set. Set the token in Vercel env vars to auto-geocode new addresses on each deploy.
+
+2. **Runtime API** (`/api/geocode`): Events not in the static cache get geocoded on-the-fly via Mapbox. The `useEvents` hook detects un-geocoded addresses and POSTs to this endpoint. Uses proximity bias based on conference city.
+
+The geocode cache also stores a `matchedAddress` field (full street address from Mapbox). This is passed to `AddressLink` via the `navAddress` prop so Lyft/Uber/Google Maps receive the complete address even when the spreadsheet has a shorthand like "The 1up Arcade Bar".
+
+### POI Address Backfill
+Existing user-added POIs may have incomplete addresses. Run to fix:
+```bash
+NEXT_PUBLIC_SUPABASE_URL=... SUPABASE_SERVICE_ROLE_KEY=... MAPBOX_SECRET_TOKEN=... npx tsx scripts/backfill-poi-addresses.ts
+```
 
 ---
 
-## Open PRs
-| PR | Branch | Description | Preview |
-|----|--------|-------------|---------|
-| #126 | `calzone-34833-gallery-view` | Gallery view (flyer grid) | https://sheeets-git-calzone-34833-gallery-view-pizza-dao.vercel.app |
-| #125 | `onion-98806-admin-submissions` | Admin submissions approval queue | https://sheeets-git-onion-98806-admin-submissions-pizza-dao.vercel.app |
-| #123 | `pineapple-22344-itinerary-overhaul` | Itinerary page overhaul + share card flyer gallery | https://sheeets-git-pineapple-22344-itinerary-overhaul-pizza-dao.vercel.app |
-| #122 | `worktree-agent-ab7637fb` | Luma RSVP flow + profile fields | https://sheeets-git-worktree-agent-ab7637fb-pizza-dao.vercel.app |
-| #89 | `image-ad-column` | Image ad column (stale) | — |
-| #78 | `luma-gmail-importer` | Gmail Luma importer (stale) | — |
+## Architecture
+
+### Data Flow
+```
+Google Sheet (GViz API, multiple tabs)
+  → fetch-events.ts (paginated, header detection, tag parsing, geocode lookup, synthetic tags)
+    → useEvents hook (lazy-geocodes missing addresses via /api/geocode)
+      → EventApp
+          ├── MapView (Mapbox GL, auto-centers on events, friend location markers)
+          ├── ListView (virtualized cards via @tanstack/react-virtual, grouped by date, OG images, reactions, comments)
+          └── TableView (compact rows with icon-only tags)
+```
+
+### Extracted Hooks (Architecture Refactor)
+| Hook | File | Purpose |
+|------|------|---------|
+| useViewMode | src/hooks/useViewMode.ts | View mode state (list/map/table) with localStorage |
+| useAuthGatedActions | src/hooks/useAuthGatedActions.ts | Auth-gated starring with pending action after login |
+| useConferenceData | src/hooks/useConferenceData.ts | Conference-scoped memos (types, vibes, counts, friends) |
+| useNowMode | src/hooks/useNowMode.ts | Auto-refresh tick for "Now" mode filtering |
+| useAdminConfig | src/hooks/useAdminConfig.ts | Admin config key-value store |
+
+### Extracted Modules
+| Module | File | Purpose |
+|--------|------|---------|
+| time-parse | src/lib/time-parse.ts | Time parsing and sorting helpers |
+| tags | src/lib/tags.ts | TYPE_TAGS, VIBE_TAGS constants |
+| conferences | src/lib/conferences.ts | Conference timezone helpers |
+| storage-keys | src/lib/storage-keys.ts | localStorage key constants |
+| user-display | src/lib/user-display.ts | Display name formatting |
+| pois | src/lib/pois.ts | Points of interest types |
+| json-ld | src/lib/json-ld.ts | JSON-LD structured data generation |
+| api-validation | src/lib/api-validation.ts | Zod schemas for API routes |
+
+### Conference Tab System
+Each conference tab in `EVENT_TABS` (in `src/lib/constants.ts`) defines:
+- `gid` — Google Sheet tab ID
+- `name` — Display name (used as filter key)
+- `timezone` — IANA timezone for "Now" filter and date defaults
+- `dates` — Array of ISO date strings for the date picker
+- `center` — `{lat, lng}` for default map center and geocoding proximity
+
+**Current tabs:**
+
+| Tab | GID | Timezone | Dates |
+|-----|-----|----------|-------|
+| SXSW 2026 | 1543768695 | America/Chicago | Mar 5-18, 2026 |
+| ETHCC 2026 | 437576609 | Europe/Paris | Mar 27-Apr 2, 2026 |
+
+Switching conferences resets the date range filter to that conference's dates. If the current time is before or after the conference date range, all events are shown.
+
+**Previously active tabs** (removed, GIDs for reference):
+- ETHDenver: 356217373
+- Consensus Hong Kong 2026: 377806756
+
+### Auth & User Data
+```
+Supabase Auth (email OTP via Resend SMTP)
+  → AuthContext (signIn, verifyOtp, signOut)
+  → useItinerary (dual storage: localStorage + Supabase itineraries table)
+  → useCheckIns (fetches check-in counts + user IDs per event for friend indicators)
+  → useEventReactions (batch-fetches all reactions, optimistic toggle)
+  → useEventComments (per-event comments with profile joins)
+  → useEventCommentCounts (batch comment counts)
+  → useFriendLocations (upserts own location on mount, fetches friends via RPC)
+  → AuthModal (two-step: email → 6-digit code)
+  → UserMenu (profile, friends, check-in, submit event)
+```
+
+**Auth guards**:
+- Starring an event requires auth — pending star completes after login + Supabase sync (race-condition safe via `ready` flag in useItinerary)
+- Itinerary filter button requires auth — if user signs out or auth is dismissed, `itineraryOnly` is automatically deselected
+- Toggling reactions requires auth — shows auth modal, no pending action stored
+
+**Email config**:
+- SMTP via **Resend** (`smtp.resend.com:465`)
+- Sender: `noreply@sheeets.xyz`
+- DNS records (DKIM, SPF, DMARC) configured on Namecheap cPanel for `sheeets.xyz`
+- Rate limit: 30 emails/hour (auto-increased with custom SMTP)
+
+### Event Submission
+Users can submit events via the **SubmitEventModal** (accessible from UserMenu):
+1. **Step 1**: Paste a Luma URL to auto-fill event details (via `/api/luma`), or enter manually
+2. **Step 2**: Editable form with conference selector, all event fields, tag picker
+3. **Step 3**: Success confirmation
+
+The submission writes to the **"Add Events Here"** section of the Google Sheet tab. The `findNextEmptyRow()` function in `google-sheets.ts` scans for the marker cell containing "Add Events Here", finds the header row below it, and appends to the first empty row after that.
+
+**URL parsing**: Submit form auto-detects platform from pasted URLs:
+- **Luma** (lu.ma/*): Fetches event data via Luma API
+- **Posh.vip**: Extracts event details via posh.vip page scraping
+- **Eventbrite**: Standard og:image scraping with JSON-LD fallback
+
+**Service account**: `sheeets-writer@planwtf.iam.gserviceaccount.com` (GCP project: `planwtf`)
+- Google Sheets API enabled
+- Shared as Editor on the spreadsheet
+- Env vars set in Vercel: `GOOGLE_SERVICE_ACCOUNT_EMAIL`, `GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY`
+
+### Social Features
+
+#### Emoji Reactions
+- Predefined set: 🔥 ❤️ 💯 👍 🎉 👀 (in `REACTION_EMOJIS` constant)
+- Rendered as pills `[🔥 3] [❤️ 1] [+]` via `EmojiReactions` component
+- Highlighted border (orange) when user has reacted
+- `compact` prop for smaller rendering in map popups
+- Optimistic add/remove with revert on error
+- Public reactions visible to all users (including anonymous); friends-only requires auth + friendship
+
+#### Event Comments
+- `CommentSection` component: expandable, collapsed shows count link
+- Scrollable list with avatar initial, name, time-ago, text
+- Public/friends visibility toggle on input
+- Delete own comments on hover
+- `useEventComments(eventId)` hook fetches per-event, joins profiles for display names
+- `useEventCommentCounts()` hook batch-fetches counts for all events
+
+#### Friend Location Sharing
+- `useFriendLocations` hook: upserts own location via `navigator.geolocation.getCurrentPosition()` on mount (any view, not just map), fetches friends via `get_friends_locations()` RPC, re-fetches every 5 min
+- `FriendMarker` component: 32px circular avatar (`unavatar.io/x/{handle}`), green/gray border based on recency, green pulse if <5min ago, 50% opacity if >1h stale, name + time-ago label visible at zoom >= 13
+
+#### Green Check-in Friend Indicators
+- `useCheckIns` returns `checkInUsersByEvent: Map<string, string[]>` (user IDs per event)
+- EventApp computes `checkedInFriendsByEvent` from check-in user IDs + friends list
+- Green MapPin row on EventCard: "Sam, Alex checked in"
+- `FriendsGoingModal` supports `accentColor` param ('blue' for itinerary, 'green' for check-in)
+
+### Multi-Tab Sheet Structure
+The Google Sheet has multiple tabs. Each event tab has:
+- **Header rows** (rows 1-12): Sponsor info, social links, promo content
+- **Data header** (row 13): `"", "Start Time", "End Time", "Organizer", "Event Name", "Address", "Cost", "Tags", "Link", "", "", "Note"`
+- **Event rows**: Below the header until the first empty row
+- **"Add Events Here" section**: Below the main events, with its own header row for user submissions
+
+The parser finds the header row by looking for `col B = "Start Time"`, then reads events until the first empty row.
+
+### File Structure
+```
+src/
+├── app/
+│   ├── page.tsx              # Renders EventApp
+│   ├── layout.tsx            # Inter font, dark theme, viewport config, GA4 script, JSON-LD
+│   ├── globals.css           # Tailwind + Mapbox CSS + warm-dark theme vars + safe-area insets
+│   ├── sitemap.ts            # Dynamic sitemap generation
+│   ├── robots.ts             # Robots.txt configuration
+│   ├── itinerary/
+│   │   ├── page.tsx          # Standalone itinerary page
+│   │   └── s/[code]/page.tsx # Shared itinerary viewer
+│   ├── admin/page.tsx        # Admin panel (sponsors, ticker, ad inventory, drag-reorder)
+│   └── api/
+│       ├── page.tsx          # Agent API documentation page
+│       ├── CodeBlock.tsx     # Tabbed code examples with copy button
+│       ├── geocode/route.ts  # Runtime geocoding via Mapbox (POST, batch up to 25)
+│       ├── og/route.ts       # OG image resolution (Luma API + HTML scraping + JSON-LD, Supabase cache)
+│       ├── fetch-event/route.ts # Fetch single event details for posh.vip/other platforms
+│       ├── luma/route.ts     # Luma event scraper for submit form auto-fill
+│       └── submit-event/route.ts # Event submission to Google Sheet via service account
+├── components/
+│   ├── EventApp.tsx          # Main orchestrator - hooks, view routing, auth guards
+│   ├── Header.tsx            # Logo, view toggle, itinerary badge, auth (sticky)
+│   ├── AuthModal.tsx         # Email OTP auth, UserMenu with profile, friends, check-in, submit event
+│   ├── SubmitEventModal.tsx  # 3-step event submission: URL paste → form → success
+│   ├── ViewToggle.tsx        # Map | List | Table toggle
+│   ├── FilterBar.tsx         # Conference tabs, Now toggle, Filters (conference-aware date bounds)
+│   ├── DateTimePicker.tsx    # Custom date dropdown + 30-min time dropdown (accepts dates prop)
+│   ├── AddressLink.tsx       # Address tap → Google Maps / Uber / Lyft (mobile sheet, desktop direct)
+│   ├── SearchBar.tsx         # Debounced text search (300ms)
+│   ├── TagBadge.tsx          # Tag icon with color (supports iconOnly mode, custom SVG crypto icons)
+│   ├── EventCard.tsx         # Event card: OG image, details, friends going/checked-in, reactions, comments
+│   ├── ListView.tsx          # Virtualized cards via @tanstack/react-virtual, grouped by date, sticky headers
+│   ├── TableView.tsx         # table-fixed layout, fills viewport, CSS truncate
+│   ├── MapView.tsx           # Mapbox map, auto-centers, friend markers, conference-aware center
+│   ├── MapViewWrapper.tsx    # Dynamic import wrapper (ssr: false)
+│   ├── MapMarker.tsx         # Clock-face SVG pin (white wedge, 19px), opaque amber featured labels
+│   ├── EventPopup.tsx        # Map popup with OG image, star, reactions, checked-in friends
+│   ├── EmojiReactions.tsx    # Row of emoji pills with picker dropdown
+│   ├── CommentSection.tsx    # Expandable comment list with input
+│   ├── FriendMarker.tsx      # Map marker for friend locations (avatar, pulse, time-ago)
+│   ├── NativeAdCard.tsx      # Native ad card interleaved in list view
+│   ├── POIPopup.tsx          # POI map popup with AddressLink, share toggle, delete
+│   ├── POIMarker.tsx         # POI map pin
+│   ├── POISearchBar.tsx      # Mapbox Search Box for adding POIs
+│   ├── StarButton.tsx        # Star toggle (yellow), friends count badge (orange)
+│   ├── ItineraryPanel.tsx    # Slide-over panel with conflict detection, share, PNG export
+│   ├── FriendsPanel.tsx      # Friends list slide-over with remove friend
+│   ├── OGImage.tsx           # Lazy-loaded OG image thumbnails (flexible height for non-square images)
+│   ├── SponsorsTicker.tsx    # Scrolling sponsor/announcement ticker below header
+│   ├── Providers.tsx         # AuthProvider wrapper
+│   └── Loading.tsx           # Spinner
+├── contexts/
+│   └── AuthContext.tsx       # Supabase auth context (email OTP)
+├── hooks/
+│   ├── useEvents.ts          # Fetch + parse events from GViz, lazy-geocode via /api/geocode
+│   ├── useFilters.ts         # Filter state (conference-aware dates, resets on conference switch)
+│   ├── useItinerary.ts       # Dual storage: localStorage + Supabase sync
+│   ├── useFriends.ts         # Friend list (bidirectional query + profiles)
+│   ├── useFriendRequests.ts  # Friend search, send/accept/reject/cancel requests
+│   ├── useFriendsItineraries.ts # Friends' event lists (RPC-based)
+│   ├── useCheckIns.ts        # Check-in counts + user IDs per event (Map<eventId, count/string[]>)
+│   ├── useEventReactions.ts  # Batch reactions with optimistic toggle
+│   ├── useEventComments.ts   # Per-event comments with profile joins
+│   ├── useEventCommentCounts.ts # Batch comment counts
+│   ├── useFriendLocations.ts # Location sharing: upsert own, fetch friends via RPC
+│   ├── useProfile.ts         # Current user's profile
+│   ├── usePOIs.ts            # Points of interest CRUD
+│   ├── useGeocoder.ts        # Mapbox Search Box API for POI search
+│   ├── useViewMode.ts        # View mode state with localStorage persistence
+│   ├── useAuthGatedActions.ts # Auth-gated starring with pending action
+│   ├── useConferenceData.ts  # Conference-scoped memos (types, vibes, counts, friends)
+│   ├── useNowMode.ts         # Auto-refresh tick for "Now" mode
+│   └── useAdminConfig.ts     # Admin config key-value store
+├── lib/
+│   ├── geo.ts                # distanceMeters() — haversine distance
+│   ├── gviz.ts               # GViz response parser
+│   ├── types.ts              # TypeScript types (ETHDenverEvent, FilterState, ReactionEmoji, NativeAd, etc.)
+│   ├── constants.ts          # EVENT_TABS (with dates/tz/center), tag colors, REACTION_EMOJIS
+│   ├── analytics.ts          # GA4 custom event tracking (gtag wrapper)
+│   ├── supabase.ts           # Supabase client (singleton, anon key)
+│   ├── google-sheets.ts      # Service account auth, findNextEmptyRow, appendEventRow
+│   ├── fetch-events.ts       # GViz fetch + synthetic tag generation + geocode lookup
+│   ├── fetch-events-cached.ts # Cached event fetching for server-side use
+│   ├── filters.ts            # Filter logic (conference-aware timezone in getConferenceNow)
+│   ├── utils.ts              # Date formatting, normalizeAddress, time parsing
+│   ├── calendar.ts           # ICS export for itinerary
+│   ├── json-ld.ts            # JSON-LD structured data generation (Schema.org Event, CollectionPage)
+│   ├── api-validation.ts     # Zod schemas for API route validation
+│   ├── time-parse.ts         # Time parsing and sorting helpers
+│   ├── tags.ts               # TYPE_TAGS, VIBE_TAGS constants
+│   ├── conferences.ts        # Conference timezone helpers
+│   ├── storage-keys.ts       # localStorage key constants
+│   ├── user-display.ts       # Display name formatting
+│   └── pois.ts               # Points of interest types
+├── data/
+│   └── geocoded-addresses.json  # Cached geocoded addresses
+scripts/
+├── geocode.ts                # Build-time geocoding script (multi-tab, proximity-aware)
+└── backfill-poi-addresses.ts # One-time script to fix incomplete POI addresses
+packages/
+└── mcp-server/               # MCP server package for AI agent integration
+supabase/
+├── migrations/               # SQL migrations (run via supabase db push --linked)
+└── functions/
+    └── agent-api/index.ts    # RESTful API edge function for AI agents
+public/
+└── logo.png                  # plan.wtf brand logo (black on transparent, inverted to white in header)
+```
+
+### Key Types (`src/lib/types.ts`)
+```typescript
+interface ETHDenverEvent {
+  id, date, dateISO, startTime, endTime, isAllDay,
+  organizer, name, address, cost, isFree,
+  vibe,           // Primary tag (first tag)
+  tags: string[], // All tags + synthetic tags ($$, Food, Bar)
+  conference,     // Which tab this event belongs to
+  link, hasFood, hasBar, note,
+  lat?, lng?, matchedAddress?,
+  timeOfDay, isDuplicate?
+}
+
+type ReactionEmoji = '🔥' | '❤️' | '💯' | '👍' | '🎉' | '👀'
+
+interface EventComment {
+  id, event_id, user_id, text,
+  visibility: 'public' | 'friends',
+  created_at, display_name?, x_handle?
+}
+
+interface FriendLocation {
+  user_id, lat, lng, updated_at,
+  display_name?, x_handle?
+}
+
+interface NativeAd {
+  id, title, description, ctaText, ctaUrl,
+  imageUrl?, sponsor, active, position?
+}
+
+type ViewMode = 'map' | 'list' | 'table'
+
+interface FilterState {
+  conference,      // Single-select: which conference to show
+  startDateTime,   // ISO local: "2026-03-12T14:00" (conference-aware default)
+  endDateTime,     // ISO local: "2026-03-18T23:30"
+  vibes,           // Selected tags (includes $$, Food, Bar)
+  selectedFriends, // Filter to events where selected friends are going
+  itineraryOnly,   // Show itinerary only
+  searchQuery,     // Text search
+  nowMode          // Show happening-now events
+}
+```
+
+### Supabase Tables
+
+| Table | Purpose | Key Columns |
+|-------|---------|-------------|
+| `profiles` | User metadata | user_id, display_name, x_handle, email, rsvp_name |
+| `itineraries` | User's starred events | user_id, event_ids (text[]), updated_at |
+| `check_ins` | User check-ins at events | user_id, event_id, lat, lng; UNIQUE(user_id, event_id) |
+| `friendships` | Bidirectional friends (user_a < user_b) | user_a, user_b |
+| `friend_requests` | Friend request flow | sender_id, receiver_id, status |
+| `friend_codes` | Shareable friend invite codes | user_id, code (unique) |
+| `shared_itineraries` | Shareable itinerary links | short_code (unique), event_ids, created_by |
+| `event_images` | OG image cache | event_id (PK), source_url, image_url |
+| `event_reactions` | Emoji reactions | event_id, user_id, emoji, visibility; UNIQUE(event_id, user_id, emoji) |
+| `event_comments` | Event comments | event_id, user_id, text (1-500 chars), visibility |
+| `user_locations` | Friend location sharing | user_id (PK), lat, lng, updated_at |
+| `rsvps` | RSVP tracking | user_id, event_id, luma_api_id, status, method |
+| `pois` | User points of interest | id (uuid), user_id, name, lat, lng, address, category, note, is_public |
+| `api_keys` | Agent API keys | user_id, key_hash (SHA-256), key_prefix, scopes, revoked_at |
+| `api_rate_limits` | Rate limiting | key_hash, window_start, request_count |
+| `events_cache` | 15-min TTL events cache for API | id, conference, date_iso, tags, link, cached_at |
+| `admin_config` | Key-value config store for admin settings | key (PK), value (jsonb), updated_at |
+
+**Supabase project**: `qsiukfwuwbpwyujfahtz` (sheeets)
+
+### Server-Side Aggregation RPCs
+| RPC | Purpose |
+|-----|---------|
+| `get_event_reaction_summaries` | Batch reaction counts for all events |
+| `get_event_comment_counts` | Batch comment counts for all events |
+| `get_event_checkin_counts` | Batch check-in counts for all events |
+
+### RLS Policies (Social Features)
+
+**Reactions & Comments visibility:**
+- "Anyone can read public reactions/comments" — no auth required, `visibility = 'public'`
+- "Friends can read friends-only reactions/comments" — requires auth + `are_friends()` check
+- Authenticated users can insert/delete their own
+
+**`are_friends()` helper** (SECURITY DEFINER): checks `friendships` table for bidirectional friendship.
+
+**`get_friends_locations()` RPC** (SECURITY DEFINER): returns `{user_id, lat, lng, updated_at}[]` for calling user's friends by joining `user_locations` with `friendships`.
+
+### SECURITY DEFINER Functions
+- `get_friends_itineraries()` — Returns friends' event_ids
+- `get_friends_locations()` — Returns friends' last known locations
+- `respond_to_friend_request(request_id, accept)` — Accept/reject + create friendship
+- `send_friend_request(receiver)` — Send or auto-accept mutual requests
+- `search_users(search_query, search_type)` — Find users by exact email/display_name/x_handle
+- `check_rate_limit(key_hash, window_min, max_req)` — Atomic rate limiting counter
+- `are_friends(uid1, uid2)` — Check if two users are friends
+
+### Edge Functions
+
+| Function | Auth | Purpose |
+|----------|------|---------|
+| `agent-api` | API key (`shts_` prefix) | RESTful API for AI agents — events, itinerary, friends, RSVPs, recommendations |
 
 ---
 
-## Pending Work
+## Hosting & DNS
 
-### Not yet pushed
-- **Blue header theme changes** — on local `calzone-34833-luma-rsvp` branch (globals.css, Header.tsx, ViewToggle.tsx, AuthModal.tsx)
+### plan.wtf (primary domain)
+- **Registrar**: Namecheap (API user: `snackman`)
+- **DNS**: Namecheap BasicDNS (`dns1.registrar-servers.com`)
+- **A Record**: `@` → `76.76.21.21` (Vercel)
+- **CNAME**: `www` → `cname.vercel-dns.com`
+- **SSL**: Vercel auto-provisioned
 
-### Gallery view card redesign
-- Updated plan at `plans/flyer-gallery-view.md` — overlay bar on image instead of text below, StarButton (not stars)
-- Not yet implemented
+### sheeets.xyz (legacy, redirects to plan.wtf)
+- **Hosting**: Namecheap cPanel (`premium266.web-hosting.com`)
+- **DNS**: `dns1.namecheaphosting.com` (hosting DNS, NOT registrar DNS)
+- **Redirects**: via `.htaccess` — all paths redirect to `plan.wtf` except `/admin` → Google Sheet
+- **Email DNS**: DKIM, SPF, DMARC configured for Resend
 
-### DB migration needed
-- `supabase/migrations/20260502_add_profile_fields.sql` — `ALTER TABLE profiles ADD COLUMN telegram_handle text; ADD COLUMN company text;`
-- Must be applied to Supabase production before merging PR #122
+### Vercel
+- **Team**: `pizza-dao`
+- **Project**: `sheeets`
+- **Production URL**: https://plan.wtf
+- **Auto-deploy**: from `master` branch
 
-### Luma pre-fill research (concluded)
-- Luma embed iframe does NOT support pre-filling name/email via URL params or postMessage
-- Only supported params: `coupon`, `utm_source`
-- Server-side API registration possible but requires organizer Luma Plus API keys (not viable for arbitrary events)
-- Current copy-fields approach is the best available UX
+### GCP (Google Cloud)
+- **Project**: `planwtf` (ID: 352068458659)
+- **Service account**: `sheeets-writer@planwtf.iam.gserviceaccount.com`
+- **APIs enabled**: Google Sheets API, Google Drive API
+- **CLI**: `gcloud` installed via Homebrew, authenticated as `snax.ynot@gmail.com`
+
+### Redirects
+| From | To | Method |
+|------|----|--------|
+| `sheeets.vercel.app/*` | `plan.wtf/*` | Vercel auto-redirect |
+| `sheeets.xyz/*` | `plan.wtf` | .htaccess 301 |
+| `sheeets.xyz/admin` | Google Sheet (admin) | .htaccess 301 |
+| `plan.wtf/data` | Google Sheet (data) | Next.js redirect |
 
 ---
 
-## Plans
-
-### Active
-- `plans/pineapple-22344-itinerary-overhaul.md` — Itinerary overhaul + share card flyer gallery (PR #123, ready to merge)
-- `plans/flyer-gallery-view.md` — Gallery view (implemented, card redesign pending)
-
-### Pending (not yet implemented)
-- `plans/admin-conference-management.md`
-- `plans/automated-testing.md`
-- `plans/calendar-export.md`
-- `plans/event-click-tracking.md`
-- `plans/featured-events.md`
-- `plans/google-calendar-export.md`
-- `plans/image-ad-column.md`
-- `plans/instant-geocoding.md`
-- `plans/itinerary-privacy.md`
-- `plans/luma-gmail-importer.md`
-- `plans/pineapple-49198-ai-sponsor-extraction.md`
-- `plans/profile-picture.md`
-- `plans/salami-77082-landing-page.md`
-- `plans/sponsor-admin-ui.md`
-- `plans/sponsor-crawling.md`
-
-### Done
-- `plans/done/ad-placements.md`
-- `plans/done/olive-29895-checkin-buttons.md`
-- `plans/done/per-conference-ad-inventory.md`
-- `plans/done/submit-form-improvements.md`
-- `plans/done/sxsw-theme.md`
-- `plans/done/sxsw-theme-v2.md`
-- `plans/done/tomato-46571-theme-toggle.md`
+## Adding a New Conference Tab
+
+1. Find the tab's `gid` from the spreadsheet HTML: `curl -sL "https://docs.google.com/spreadsheets/d/SHEET_ID/edit" | grep -oE '.{0,50}TAB_NAME.{0,50}'` — look for the number in quotes before the tab name
+2. Add to `EVENT_TABS` in `src/lib/constants.ts` with `gid`, `name`, `timezone`, `dates`, and `center`
+3. Add a proximity center in `scripts/geocode.ts` → `PROXIMITY_CENTERS` and in `src/app/api/geocode/route.ts` → `PROXIMITY` if the conference is in a new city
+4. Run the geocoding script to cache new addresses
 
 ---
 
-## Key Architecture Notes
-
-### Share Card Image Pipeline
-- **Image proxy**: `/api/image-proxy?url=<encoded>` — server-side fetch bypasses CORS for html-to-image canvas rendering
-- **Pre-fetch flow**: `imageCache` (OGImage.tsx) → batch POST `/api/og` → proxy fetch → FileReader → data URL map
-- **Two modes**: `ShareCardMode` = `'gallery'` (flyer grid) or `'text'` (classic list). Text mode skips image fetching entirely.
-- **Rendering**: html-to-image `toPng()` at 2x pixel ratio, 1080px card width. Uses explicit pixel sizes (not CSS grid/aspectRatio) for html-to-image compatibility.
-
-### RSVP System
-- `isLumaUrl()` / `getLumaSlug()` in `src/lib/luma.ts` — matches `lu.ma`, `luma.com`, `www.luma.com`
-- `useRsvp` hook — loads confirmed RSVPs from `rsvps` table, manages overlay state
-- `RsvpButton` — only renders for Luma events (inline `isLumaUrl` check)
-- `RsvpOverlay` — self-contained portal with inline `getLumaSlug`, copy fields, Luma iframe
-- Embed URL: `https://lu.ma/embed/event/{slug}/simple` (also works with `luma.com`)
-- DB table: `rsvps` (id, user_id, event_id, luma_api_id, status, method, created_at)
-
-### Performance Caching
-- **Edge caching**: `/api/events` (5min), `/api/geocoded-addresses` (1hr) via `Cache-Control` headers
-- **Server cache**: `fetchEventsCached()` uses `unstable_cache` with 5min revalidation
-- **SSR hydration**: `[slug]/page.tsx` passes `initialEvents` to `EventApp` — zero loading spinner
-- **Client cache**: sessionStorage with 5min staleness in `useEvents` hook
-- **OG image cache**: Module-level `imageCache` Map in `OGImage.tsx`, batch POST `/api/og` for gallery
-
-### Friend Data Pipeline
-- `Friend` type (`src/lib/types.ts`) — raw Supabase profile fields (`user_id`, `avatar_url`, `x_handle`, etc.)
-- `FriendInfo` type — lightweight view type (`userId`, `displayName`, `avatarUrl`, `xHandle`)
-- `useFriendsItineraries` hook — fetches friend itineraries, merges display names + avatars
-- `useConferenceData` hook — builds `friendsByEvent` and `checkedInFriendsByEvent` maps (both `Map<string, FriendInfo[]>`)
-- `UserAvatar` component — fallback chain: uploaded avatar → X/Twitter photo via unavatar.io → deterministic color initials
-
-### Theme System
-- Themes defined as CSS custom properties in `src/app/globals.css` using `[data-theme="name"]` selectors
-- Theme metadata in `src/lib/themes.ts` — `ThemeId` union type + `THEME_OPTIONS` array
-- **Header variables**: `--theme-header-bg`, `--theme-header-border`, `--theme-header-logo-filter`, `--theme-header-text`, `--theme-header-control-*`, `--theme-header-accent-*`
-- Per-conference theme selection via admin config (`theme:{conference}` key in Supabase)
-- 8 themes: dark, paper, light, light-blue, sxsw, sxsw2, gdc, ethcc
-
-### Icon System
-- Most icons from `lucide-react`
-- Custom planwtf calendar SVG at `src/components/icons/CalendarIcon.tsx`
-- Event add-to-plan: `Plus`/`Check` in circular container (`StarButton.tsx`)
-- View toggle: Map, List, Table, LayoutGrid (gallery)
+## Recent Changes (2026-03-07)
+
+### Merged This Session
+| PR | Description |
+|----|-------------|
+| #45 | Drag-to-reorder sponsors in admin panel |
+| #47 | Friends filter empty state with invite link |
+| #54 | JSON-LD structured data, SEO metadata, sitemap, robots.txt |
+| #55 | Server-side aggregation RPCs for batch data fetching |
+| #56 | List virtualization with @tanstack/react-virtual |
+| #57 | Architecture refactor: extract hooks, split modules, Zod validation |
+| #58 | Fix Eventbrite image fetching via JSON-LD extraction |
+| #59 | Posh.vip link parsing for submit + image display |
+
+### Direct Master Commits
+- Opaque featured labels on map (solid amber instead of transparent)
+- Food/Bar priority in tags filter (sort to front)
+- Smaller emoji reaction pills (match comments button height)
+- Remove submit button pop-out icon
+
+### Open PRs (not yet merged)
+| PR | Branch | Description | Status |
+|----|--------|-------------|--------|
+| #60 | advertiser-page | /advertise page + admin Ad Inventory tab | Draft |
+| #53 | tag-count-badges | Tag count badges on filter pills | Has merge conflicts |
+| #46 | worktree-agent-a678de75 | Onboarding wizard for first-time users | Draft |
+| #40 | luma-rsvp-v2 | Luma RSVP with in-page checkout | Draft |
+
+---
+
+## Development Notes
+
+### tsconfig Excludes
+`packages/` and `supabase/` are excluded from the root tsconfig. They have their own TypeScript configs and dependencies. Next.js will fail to build if these are included.
+
+### Key Patterns
+- **Warm-dark color scheme**: stone backgrounds (stone-950, stone-900, stone-800), amber accents. All slate references replaced with stone.
+- **Conference-aware defaults**: `useFilters` resets date range when switching conferences via `getDateTimeRangeForConference()`. `getConferenceNow(conference)` uses per-conference timezone. Map centers on conference city.
+- **Auth-gated actions**: Star and RSVP use the same pattern — `pendingRef` stores the action, shows AuthModal, completes after login via useEffect
+- **Profile fields**: Column is `rsvp_name` (NOT `farcaster_username`)
+- **Address links**: Use `<AddressLink>` component everywhere — desktop opens Google Maps, mobile shows Maps/Uber/Lyft drawer. Pass `navAddress` prop with the full Mapbox address.
+- **Profile auto-save**: Profile fields debounce-save after 800ms of inactivity
+- **Friends refresh**: `refreshFriends` is shared from EventApp → Header → UserMenu
+- **Optimistic updates**: Reactions, comments, friend requests all use optimistic UI with revert on error
+- **Scroll-based filter bar**: Both table and list views hide the filter bar on scroll down and show it on scroll up. Both have an `overflowAmount > 80` guard to prevent jitter.
+- **Contained scroll**: All three views use `h-dvh flex flex-col overflow-hidden` layout
+- **Check-in badges**: Green numbered badges on the time field. Green friend rows on event cards.
+- **Check-in logic**: Gets GPS, finds itinerary events within 150m that pass "now" filter, upserts to `check_ins` table
+- **OG images**: Lazy-loaded via IntersectionObserver. Luma uses API for clean cover images. Eventbrite uses JSON-LD extraction with og:image fallback. Other sites use HTML og:image scraping with relative URL resolution. Cached in Supabase `event_images` table.
+- **Event submission**: Writes to "Add Events Here" section of the sheet. Finds marker cell, then header row below, appends to first empty row.
+- **List virtualization**: @tanstack/react-virtual with variable-height items via measureElement. Flat list interleaves date headers, event cards, and native ads.
+- **Food/Bar tag priority**: 🍕 Food and 🍺 Bar always sort to front of vibes filter list.
+- **Prop threading pattern**: Social data (reactions, comments, check-ins, friend locations) flows from hooks in EventApp through view components (ListView/TableView/MapViewWrapper/MapView) to card/popup components.
+
+### Supabase Migrations
+Migrations are in `supabase/migrations/`. Push with:
+```bash
+supabase db push --linked
+```
+If remote has migrations not found locally, repair with:
+```bash
+supabase migration repair <version> --status reverted
+```
+
+**Pending migrations:**
+- `20260306120000_add_admin_config.sql` — admin_config table for admin settings
+- `20260307120000_add_aggregation_rpcs.sql` — server-side aggregation RPCs
+
+### Known Issues
+- `search_users` has two overloaded versions in Supabase — the old one `(text, uuid)` is unused and should be dropped
+- `check_ins` RLS policies may block friends' check-ins — if so, create a `get_friends_check_ins()` SECURITY DEFINER RPC
+- Check-in/reaction/comment data is fetched once on mount — no realtime subscriptions
+- Eventbrite og:image URLs that were cached before the relative-URL fix may still be broken in `event_images` table — clear stale entries or wait for TTL
+- PR #53 (tag count badges) has merge conflicts from architecture refactor — needs resolution
+- The `lightningcss.darwin-arm64.node` module causes build issues locally — use `npx tsc --noEmit` for type checking instead of `npm run build`
diff --git a/package-lock.json b/package-lock.json
index 143b12b9..6e452ef7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,6 @@
         "mapbox-gl": "^3.18.1",
         "next": "^16.1.7",
         "openai": "^6.34.0",
-        "qrcode.react": "^4.2.0",
         "react": "19.2.3",
         "react-dom": "19.2.3",
         "react-map-gl": "^8.1.0",
@@ -7408,15 +7407,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/qrcode.react": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-4.2.0.tgz",
-      "integrity": "sha512-QpgqWi8rD9DsS9EP3z7BT+5lY5SFhsqGjpgW5DY/i3mK4M9DTBNz3ErMi8BWYEfI3L0d8GIbGmcdFAS1uIRGjA==",
-      "license": "ISC",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
diff --git a/package.json b/package.json
index c3a41837..7d12e469 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "mapbox-gl": "^3.18.1",
     "next": "^16.1.7",
     "openai": "^6.34.0",
-    "qrcode.react": "^4.2.0",
     "react": "19.2.3",
     "react-dom": "19.2.3",
     "react-map-gl": "^8.1.0",
diff --git a/plans/ad-placements.md b/plans/ad-placements.md
new file mode 100644
index 00000000..ff7e9b29
--- /dev/null
+++ b/plans/ad-placements.md
@@ -0,0 +1,236 @@
+# Ad Placement Plan for plan.wtf
+
+## Top 5 Placements by ROI
+
+| Rank | Placement | Revenue | Disruption | Effort |
+|------|-----------|---------|------------|--------|
+| 1 | **Sponsored Event Cards (ListView)** | HIGH | LOW | LOW-MED |
+| 2 | **Enhanced SponsorsTicker** | MEDIUM | VERY LOW | VERY LOW |
+| 3 | **Featured Event Upsell (Submit Modal)** | HIGH | LOW | MEDIUM |
+| 4 | **Sponsored Map Pins** | HIGH | LOW-MED | MEDIUM |
+| 5 | **Itinerary Page Sponsor Banner** | MED-HIGH | LOW | LOW |
+
+---
+
+## All Placement Opportunities
+
+### 1. Sponsored Event Cards in ListView (Native Ad)
+
+**Location:** `src/components/ListView.tsx`, injected between real `EventCard` components within each date group. Insert after every 5th-8th card inside the `{group.events.map(...)}` block (~line 113).
+
+**Format:** Native ad identical to `EventCard` layout (OG image, name, time, address, tags) with a subtle "Sponsored" badge. Highest-value placement — blends naturally with real content.
+
+**Size:** Same as EventCard (~120px height mobile, full content width ~768px).
+
+**UX Disruption:** LOW. Users are already scanning cards; a labeled "Sponsored" card is minimally disruptive. Limit to 1 per date group or 1 per 5-8 events.
+
+**Revenue Potential:** HIGH. Conference organizers and sponsors will pay premium rates for this exact audience.
+
+**Implementation:** Create `SponsoredEventCard` wrapping `EventCard` with "Sponsored" label. Data source: Supabase table or constants. Insert into ListView map loop with index-based gating.
+
+---
+
+### 2. Enhanced SponsorsTicker (Existing Component)
+
+**Location:** `src/components/SponsorsTicker.tsx` — already rendered between Header and FilterBar in EventApp.tsx (line 379).
+
+**Currently:** Simple scrolling text ticker with one sponsor ("Stand With Crypto"). Hardcoded array.
+
+**Enhancement:** Expand to support multiple sponsors with logos, clickable CTAs, rotation. Support per-conference sponsors (different for SXSW vs ETHCC).
+
+**Size:** Current ~28px height, could expand to ~36px with small logos.
+
+**UX Disruption:** VERY LOW. Already exists and accepted by users.
+
+**Revenue Potential:** MEDIUM. Good for "presented by" brand awareness.
+
+**Implementation:** VERY LOW effort — just expand the sponsors array and optionally add image support.
+
+---
+
+### 3. Featured Event Upsell (Submit Modal)
+
+**Location:** `src/components/SubmitEventModal.tsx`, on the success step (step 3, ~line 504).
+
+**Format:** After success confirmation: "Want to feature your event? Promote it to the top of listings for $X" with CTA. Could also be a checkbox in step 2: "Feature this event ($X)".
+
+**Size:** Small card ~80-100px within modal.
+
+**UX Disruption:** LOW. Only shown to event submitters (organizers), not browsers.
+
+**Revenue Potential:** HIGH. Direct revenue from organizers. Proven model (Eventbrite, Meetup). Even $10-50/event adds up with hundreds of events per conference.
+
+**Implementation:** MEDIUM. Requires payment flow (Stripe), "featured" flag in data model, rendering logic to boost featured events.
+
+---
+
+### 4. Sponsored Map Pins
+
+**Location:** `src/components/MapView.tsx`, rendered as additional `Marker` components after the event markers block (~line 473).
+
+**Format:** Branded map pin with sponsor logo or distinct color + "AD" indicator. Clicking opens styled `EventPopup` with sponsor branding + CTA.
+
+**Size:** Same as regular markers (19px pin) with branded label.
+
+**UX Disruption:** LOW-MEDIUM. Users expect pins on maps. Must limit to 3-5 sponsored pins max to avoid clutter.
+
+**Revenue Potential:** HIGH. Location-based ads during conferences are extremely valuable for venue sponsors, afterparties, nearby businesses.
+
+**Implementation:** MEDIUM. New `SponsoredMapMarker` component, data source with lat/lng, popup integration.
+
+---
+
+### 5. Itinerary Page Sponsor Banner
+
+**Location:** `src/app/itinerary/page.tsx` (~line 364) and shared itinerary page `src/app/itinerary/s/[code]/page.tsx` (~line 233).
+
+**Format:** "Your itinerary is powered by [Sponsor]" or "Conference shuttle sponsored by [Sponsor] — book a ride" with CTA.
+
+**Size:** Full content width, 60-80px tall.
+
+**UX Disruption:** LOW. Low-traffic page; single banner feels natural.
+
+**Revenue Potential:** MEDIUM-HIGH for shared itineraries — when users share links, recipients see the sponsor (viral distribution).
+
+**Implementation:** LOW. Simple banner component.
+
+---
+
+### 6. Interstitial Between Date Groups in ListView
+
+**Location:** `src/components/ListView.tsx`, between `<section>` elements for date groups (~line 97). Insert after every 2nd-3rd date group.
+
+**Format:** Horizontal leaderboard-style banner with sponsor branding, message, CTA. Dark theme styled.
+
+**Size:** Full content width, 80-120px tall.
+
+**UX Disruption:** LOW-MEDIUM. Natural transition point between date groups.
+
+**Revenue Potential:** MEDIUM.
+
+**Implementation:** LOW.
+
+---
+
+### 7. Sponsored Rows in TableView
+
+**Location:** `src/components/TableView.tsx`, within `DateGroup` component (~line 401). Insert sponsored row at top of each date section.
+
+**Format:** Table row styled like regular rows but with subtle background highlight (`bg-orange-500/5 border-l-2 border-orange-500`) and "Sponsored" tag.
+
+**Size:** Same as regular table row (~40px).
+
+**UX Disruption:** LOW. TableView users are power users who scan quickly.
+
+**Revenue Potential:** MEDIUM.
+
+**Implementation:** LOW.
+
+---
+
+### 8. Event Popup Contextual Ad
+
+**Location:** `src/components/EventPopup.tsx`, after the note block (~line 206) in `SingleEventContent`.
+
+**Format:** Small contextual line: "Nearby: [Sponsor Venue]" or "Getting there? Book a ride with [Sponsor]".
+
+**Size:** Single line, ~20-24px tall.
+
+**UX Disruption:** LOW-MEDIUM. Popup is compact (300px); must be very minimal.
+
+**Revenue Potential:** MEDIUM. Contextual/location-aware ads command higher CPCs.
+
+**Implementation:** MEDIUM. Requires location-aware ad matching.
+
+---
+
+### 9. Desktop Sidebar (Map View)
+
+**Location:** `src/components/EventApp.tsx`, alongside MapView (~line 411). Add 300px sidebar on `lg:` breakpoint.
+
+**Format:** Vertical tower (300x600) or stacked sponsor cards. "Featured Events" or sponsor info.
+
+**Size:** 300px wide, desktop only.
+
+**UX Disruption:** MEDIUM. Reduces map width on desktop.
+
+**Revenue Potential:** MEDIUM.
+
+**Implementation:** MEDIUM.
+
+---
+
+### 10. API Docs Page Sponsorship
+
+**Location:** `src/app/api/page.tsx` hero section (~line 205) or footer (~line 1131).
+
+**Format:** "Powered by [Sponsor]" or "Build with [Sponsor's API]" banner.
+
+**UX Disruption:** VERY LOW. **Revenue Potential:** LOW. **Implementation:** VERY LOW.
+
+---
+
+## Things to Avoid
+
+1. **Full-screen interstitials/modals** — utility app used actively during conferences on slow mobile. Blocking modals = abandonment.
+2. **Ads in FilterBar or header** — primary navigation. Ads here feel like malware.
+3. **Auto-playing video** — drains battery/data on mobile conference networks.
+4. **Ads in AuthModal or profile** — trust-critical flows. Ads feel predatory.
+5. **Excessive sponsored map pins** — more than 3-5 clutters the map (primary value prop).
+6. **Ads in FriendsPanel/social features** — social features drive engagement; monetizing them kills stickiness.
+7. **Pop-unders or redirects** — crypto audience is ad-averse and technically savvy. Deceptive patterns get called out on Twitter.
+
+---
+
+## Monetization Models
+
+### Per-Conference Sponsorship Tiers
+
+| Tier | Price Range | Includes |
+|------|-------------|----------|
+| **Presenting** | $5,000-15,000 | Ticker (top billing), 5 sponsored cards, 3 map pins, itinerary banner, logo on shared itineraries |
+| **Gold** | $2,000-5,000 | Ticker, 3 sponsored cards, 1 map pin |
+| **Silver** | $500-2,000 | Ticker listing, 1 sponsored card |
+| **Featured Event** | $25-100/event | Highlighted card, boosted position |
+
+### Self-Serve (Future)
+
+| Model | Placement | Pricing |
+|-------|-----------|---------|
+| CPC | Sponsored cards, map pins | $0.50-2.00/click |
+| CPM | Banners, ticker | $5-15 CPM |
+| Flat Rate | Featured event listing | $25-100/event/conference |
+| Affiliate | Ride-share links in popups | Revenue share |
+
+**Recommended start:** Per-conference sponsorship tiers (manual sales). Simplest to implement, most lucrative for niche captive audience during conference windows.
+
+---
+
+## Implementation Phases
+
+**Phase 1 — Immediate (0 effort):**
+- Expand SponsorsTicker with more paying sponsors
+- Add per-conference sponsor filtering
+
+**Phase 2 — Sprint 1 (1-2 days):**
+- `SponsoredEventCard` component (EventCard wrapper + "Sponsored" badge)
+- Sponsored event data source (Supabase table or constants)
+- Inject into ListView
+- GA4 tracking for impressions/clicks
+
+**Phase 3 — Sprint 2 (2-3 days):**
+- "Feature this event" upsell in SubmitEventModal
+- Itinerary page sponsor banner
+- Sponsored row support in TableView
+
+**Phase 4 — Sprint 3 (3-5 days):**
+- `SponsoredMapMarker` component
+- Sponsored pins in MapView
+- Contextual sponsor link in EventPopup
+- Admin interface for managing sponsor data
+
+**Phase 5 — Future:**
+- Self-serve ad submission portal
+- Stripe integration for featured event payments
+- Desktop sidebar ads
+- Sponsor analytics dashboard (impressions, clicks, CTR)
diff --git a/plans/submit-form-improvements.md b/plans/submit-form-improvements.md
new file mode 100644
index 00000000..ec268c0e
--- /dev/null
+++ b/plans/submit-form-improvements.md
@@ -0,0 +1,58 @@
+# Submit Event Form Improvements
+
+## 4 Changes
+
+### 1. Date/time fields → use DateTimePicker dropdowns
+**Current**: Plain text inputs (`"Feb 16"`, `"7:00 PM"`)
+**Target**: Reuse the `DateTimePicker` component from FilterBar (date dropdown + 30-min time dropdown)
+
+The submit form needs a slightly different setup than the filter:
+- **Date**: Single date dropdown (not a datetime range), scoped to selected conference dates
+- **Start Time**: Standalone time dropdown (30-min intervals)
+- **End Time**: Standalone time dropdown (30-min intervals)
+
+We need to extract the `Dropdown` sub-component and `TIME_OPTIONS`/format helpers from `DateTimePicker.tsx` so the submit form can use date-only and time-only dropdowns independently.
+
+**Changes**:
+- `src/components/DateTimePicker.tsx` — Export `Dropdown`, `TIME_OPTIONS`, `formatDateShort`, `format12Hour`
+- `src/components/SubmitEventModal.tsx` — Replace text inputs with Dropdown components. Store date as ISO `"2026-03-10"` and times as 24h `"19:00"`. Convert to display format `"Mar 10"` / `"7:00 PM"` for the sheet on submit.
+
+### 2. Address → Google Places autocomplete (from rsvpizza)
+**Current**: Plain text input
+**Target**: Google Places autocomplete dropdown
+
+Create `src/components/AddressAutocomplete.tsx` adapted from rsvpizza's `LocationAutocomplete.tsx`:
+- Simplified for sheeets (no timezone, no city data, no venue name)
+- Uses `NEXT_PUBLIC_GOOGLE_MAPS_API_KEY` (Next.js convention)
+- Falls back to plain text input if no API key
+- Styled to match sheeets dark theme (slate-900 bg, slate-600 border, orange focus)
+- Types: `['geocode', 'establishment']`
+
+**Also need**: `npm install -D @types/google.maps` for TypeScript support
+
+**Env var**: Add `NEXT_PUBLIC_GOOGLE_MAPS_API_KEY` to Vercel (can reuse same GCP project as rsvpizza). Component works as plain input until key is added.
+
+### 3. Auto-fetch on Luma URL paste
+**Current**: User pastes URL, clicks "Fetch Event" button
+**Target**: Auto-fetch when a valid Luma URL is pasted or typed
+
+In `SubmitEventModal.tsx`:
+- Add a `useEffect` watching `lumaUrl` — when it matches a Luma URL pattern (`lu.ma/` or `luma.com/`), auto-trigger `handleFetchLuma()` after a short debounce (300ms)
+- Keep the "Fetch Event" button as fallback
+- Show loading state immediately on paste
+
+### 4. Luma API: fall back to `geo_address_info` for guests-only addresses
+**Current**: Only checks `geo_address_json` (null for guests-only events)
+**Target**: Fall back to `geo_address_info.city_state` or `geo_address_info.city`
+
+In `src/app/api/luma/route.ts`:
+- After checking `geo_address_json`, also check `geo_address_info`
+- Use `geo_address_info.full_address` → `geo_address_info.city_state` → `geo_address_info.city` as fallbacks
+- This gives at least city-level location for guests-only events
+
+## Files to modify/create
+1. `src/components/DateTimePicker.tsx` — Export internals
+2. `src/components/AddressAutocomplete.tsx` — NEW (adapted from rsvpizza)
+3. `src/components/SubmitEventModal.tsx` — All 4 changes converge here
+4. `src/app/api/luma/route.ts` — geo_address_info fallback
+5. `package.json` — Add `@types/google.maps` dev dependency
diff --git a/plans/tomato-46571-theme-toggle.md b/plans/tomato-46571-theme-toggle.md
new file mode 100644
index 00000000..8ed200b2
--- /dev/null
+++ b/plans/tomato-46571-theme-toggle.md
@@ -0,0 +1,935 @@
+# tomato-46571: Light/Dark Theme Toggle
+
+**Task ID**: tomato-46571
+**Priority**: P2
+**Feature**: Full light/dark theme toggle with Google-Sheets-inspired light palette
+
+---
+
+## Overview
+
+The Sheeets app is currently dark-mode-only with hardcoded dark Tailwind classes everywhere. This plan adds:
+1. A CSS-variable-driven dual-theme system (light default, dark via `.dark` class on `<html>`)
+2. A `ThemeProvider` context with system-preference detection and localStorage persistence
+3. A sun/moon toggle button in the Header
+4. Component-by-component class updates for every file in the app
+5. Mapbox style switching (light vs dark map tiles)
+6. Proper contrast adjustments for tag colors on light backgrounds
+
+---
+
+## 1. Tailwind v4 Dark Mode Configuration
+
+Sheeets uses **Tailwind CSS v4** (no `tailwind.config.js` -- config is in `globals.css` via `@theme`).
+
+In Tailwind v4, `dark:` variant works by default with the CSS `prefers-color-scheme: dark` media query. To switch to **class-based** dark mode (so we control it via JS), add this to `globals.css`:
+
+```css
+@custom-variant dark (&:where(.dark, .dark *));
+```
+
+This tells Tailwind v4 that `dark:` variants should activate when the `.dark` class is on an ancestor element (i.e., `<html class="dark">`).
+
+**File**: `src/app/globals.css`
+**Action**: Add the `@custom-variant` directive after the `@import` lines.
+
+---
+
+## 2. CSS Variables -- Complete Updated Block
+
+**File**: `src/app/globals.css`
+
+Replace the current `:root` variables and add `.dark` overrides. The light theme uses the Google Sheets palette; the dark theme preserves the current look.
+
+```css
+@import 'mapbox-gl/dist/mapbox-gl.css';
+@import "tailwindcss";
+
+@custom-variant dark (&:where(.dark, .dark *));
+
+/* Safe area insets for notched devices */
+:root {
+  --safe-area-top: env(safe-area-inset-top, 0px);
+  --safe-area-bottom: env(safe-area-inset-bottom, 0px);
+  --safe-area-left: env(safe-area-inset-left, 0px);
+  --safe-area-right: env(safe-area-inset-right, 0px);
+}
+
+/* ====== LIGHT THEME (default) ====== */
+:root {
+  --background: #FFFFFF;
+  --foreground: #1D1D1D;
+  --card: #F0F4F8;
+  --card-hover: #E2E8F0;
+  --border: #C8D0D8;
+  --border-light: #E2E8F0;
+  --header-bg: #1F3864;
+  --header-text: #FFFFFF;
+  --surface: #FFFFFF;
+  --surface-secondary: #F7F9FB;
+  --text-primary: #1D1D1D;
+  --text-secondary: #4A5568;
+  --text-muted: #718096;
+  --text-faint: #A0AEC0;
+  --accent: #f97316;
+  --accent-hover: #fb923c;
+  --input-bg: #FFFFFF;
+  --input-border: #C8D0D8;
+  --input-focus-border: #f97316;
+  --overlay-bg: rgba(0, 0, 0, 0.3);
+  --popup-bg: #FFFFFF;
+  --popup-border: #C8D0D8;
+  --popup-shadow: rgba(0, 0, 0, 0.15);
+  --scrollbar-track: #F0F4F8;
+  --scrollbar-thumb: #C8D0D8;
+  --scrollbar-thumb-hover: #A0AEC0;
+  --table-row-alt: #F0F6FF;
+  --table-header-bg: #1F3864;
+  --table-header-text: #FFFFFF;
+  --slider-track: #C8D0D8;
+  --map-label-bg: rgba(255, 255, 255, 0.9);
+  --map-label-text: #1D1D1D;
+  --badge-inactive-bg: #E2E8F0;
+  --badge-inactive-text: #4A5568;
+}
+
+/* ====== DARK THEME ====== */
+.dark {
+  --background: #0f172a;
+  --foreground: #f1f5f9;
+  --card: #1e293b;
+  --card-hover: #334155;
+  --border: #334155;
+  --border-light: #1e293b;
+  --header-bg: rgba(15, 23, 42, 0.95);
+  --header-text: #FFFFFF;
+  --surface: #0f172a;
+  --surface-secondary: #1e293b;
+  --text-primary: #f1f5f9;
+  --text-secondary: #94a3b8;
+  --text-muted: #64748b;
+  --text-faint: #475569;
+  --accent: #f97316;
+  --accent-hover: #fb923c;
+  --input-bg: #1e293b;
+  --input-border: #475569;
+  --input-focus-border: #f97316;
+  --overlay-bg: rgba(0, 0, 0, 0.5);
+  --popup-bg: #1e293b;
+  --popup-border: #334155;
+  --popup-shadow: rgba(0, 0, 0, 0.5);
+  --scrollbar-track: #0f172a;
+  --scrollbar-thumb: #334155;
+  --scrollbar-thumb-hover: #475569;
+  --table-row-alt: transparent;
+  --table-header-bg: #1e293b;
+  --table-header-text: #94a3b8;
+  --slider-track: #334155;
+  --map-label-bg: rgba(30, 41, 59, 0.9);
+  --map-label-text: #FFFFFF;
+  --badge-inactive-bg: #334155;
+  --badge-inactive-text: #cbd5e1;
+}
+
+@theme inline {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --font-sans: var(--font-inter);
+}
+
+body {
+  background: var(--background);
+  color: var(--foreground);
+  font-family: var(--font-inter), system-ui, -apple-system, sans-serif;
+  padding-top: var(--safe-area-top);
+  padding-bottom: var(--safe-area-bottom);
+}
+
+/* Prevent iOS auto-zoom on input focus */
+input, select, textarea {
+  font-size: 16px;
+}
+
+/* Custom scrollbar -- theme-aware */
+::-webkit-scrollbar {
+  width: 8px;
+  height: 6px;
+}
+::-webkit-scrollbar-track {
+  background: var(--scrollbar-track);
+}
+::-webkit-scrollbar-thumb {
+  background: var(--scrollbar-thumb);
+  border-radius: 4px;
+}
+::-webkit-scrollbar-thumb:hover {
+  background: var(--scrollbar-thumb-hover);
+}
+
+/* Card hover custom shade */
+.hover\:bg-slate-750:hover {
+  background-color: #283548;
+}
+
+/* Mapbox popup bounds */
+.mapboxgl-popup {
+  max-width: calc(100vw - 1rem) !important;
+}
+
+/* Mapbox popup overrides -- theme-aware */
+.map-popup .mapboxgl-popup-content {
+  background-color: var(--popup-bg);
+  border: 1px solid var(--popup-border);
+  border-radius: 8px;
+  padding: 12px;
+  box-shadow: 0 4px 24px var(--popup-shadow);
+  max-width: calc(100vw - 2rem);
+}
+.map-popup .mapboxgl-popup-tip {
+  border-top-color: var(--popup-bg);
+}
+.map-popup .mapboxgl-popup-close-btn {
+  display: none;
+}
+
+/* Scrollbar styling for multi-event popup */
+.map-popup .mapboxgl-popup-content ::-webkit-scrollbar {
+  width: 4px;
+}
+.map-popup .mapboxgl-popup-content ::-webkit-scrollbar-track {
+  background: transparent;
+}
+.map-popup .mapboxgl-popup-content ::-webkit-scrollbar-thumb {
+  background-color: var(--scrollbar-thumb);
+  border-radius: 2px;
+}
+
+/* Hide scrollbar for filter rows */
+.scrollbar-hide {
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+}
+.scrollbar-hide::-webkit-scrollbar {
+  display: none;
+}
+```
+
+---
+
+## 3. Theme Provider
+
+**New file**: `src/contexts/ThemeContext.tsx`
+
+```tsx
+'use client';
+
+import { createContext, useContext, useEffect, useState, useCallback } from 'react';
+
+type Theme = 'light' | 'dark';
+
+interface ThemeContextType {
+  theme: Theme;
+  toggleTheme: () => void;
+  setTheme: (theme: Theme) => void;
+}
+
+const ThemeContext = createContext<ThemeContextType | undefined>(undefined);
+
+const STORAGE_KEY = 'sheeets-theme';
+
+export function ThemeProvider({ children }: { children: React.ReactNode }) {
+  const [theme, setThemeState] = useState<Theme>('dark'); // SSR-safe default
+  const [mounted, setMounted] = useState(false);
+
+  // On mount: read localStorage or system preference
+  useEffect(() => {
+    const stored = localStorage.getItem(STORAGE_KEY) as Theme | null;
+    if (stored === 'light' || stored === 'dark') {
+      setThemeState(stored);
+    } else {
+      // Detect system preference
+      const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+      setThemeState(prefersDark ? 'dark' : 'light');
+    }
+    setMounted(true);
+  }, []);
+
+  // Apply class to <html> whenever theme changes
+  useEffect(() => {
+    if (!mounted) return;
+    const root = document.documentElement;
+    if (theme === 'dark') {
+      root.classList.add('dark');
+    } else {
+      root.classList.remove('dark');
+    }
+    localStorage.setItem(STORAGE_KEY, theme);
+  }, [theme, mounted]);
+
+  // Listen for system preference changes (only when no explicit user choice)
+  useEffect(() => {
+    const mq = window.matchMedia('(prefers-color-scheme: dark)');
+    const handler = (e: MediaQueryListEvent) => {
+      if (!localStorage.getItem(STORAGE_KEY)) {
+        setThemeState(e.matches ? 'dark' : 'light');
+      }
+    };
+    mq.addEventListener('change', handler);
+    return () => mq.removeEventListener('change', handler);
+  }, []);
+
+  const setTheme = useCallback((t: Theme) => {
+    setThemeState(t);
+  }, []);
+
+  const toggleTheme = useCallback(() => {
+    setThemeState((prev) => (prev === 'dark' ? 'light' : 'dark'));
+  }, []);
+
+  return (
+    <ThemeContext.Provider value={{ theme, toggleTheme, setTheme }}>
+      {children}
+    </ThemeContext.Provider>
+  );
+}
+
+export function useTheme() {
+  const ctx = useContext(ThemeContext);
+  if (!ctx) throw new Error('useTheme must be used within ThemeProvider');
+  return ctx;
+}
+```
+
+### Flash prevention script
+
+To prevent the flash of wrong theme on page load (FOUC), add an inline script to `<head>` that reads localStorage and applies the `.dark` class **before** React hydrates.
+
+**File**: `src/app/layout.tsx`
+
+Update the `<html>` tag and add a `<script>` in `<head>`:
+
+```tsx
+import type { Metadata, Viewport } from "next";
+import { Inter } from "next/font/google";
+import "./globals.css";
+import { Providers } from "@/components/Providers";
+
+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
+
+export const viewport: Viewport = {
+  width: 'device-width',
+  initialScale: 1,
+  maximumScale: 5,
+  viewportFit: 'cover',
+};
+
+export const metadata: Metadata = {
+  title: "sheeets.xyz",
+  description:
+    "Browse and discover crypto conference side events. Filter by date, time, tags, and more.",
+};
+
+// Inline script to apply dark class before paint (prevents FOUC)
+const themeScript = `
+  (function() {
+    try {
+      var t = localStorage.getItem('sheeets-theme');
+      if (t === 'dark' || (!t && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+        document.documentElement.classList.add('dark');
+      }
+    } catch(e) {}
+  })();
+`;
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <html lang="en" suppressHydrationWarning>
+      <head>
+        <script dangerouslySetInnerHTML={{ __html: themeScript }} />
+      </head>
+      <body className={`${inter.variable} antialiased`}>
+        <Providers>{children}</Providers>
+      </body>
+    </html>
+  );
+}
+```
+
+Note: `suppressHydrationWarning` on `<html>` prevents React from complaining about the class mismatch between server and client.
+
+### Update Providers
+
+**File**: `src/components/Providers.tsx`
+
+```tsx
+'use client';
+
+import { AuthProvider } from '@/contexts/AuthContext';
+import { ThemeProvider } from '@/contexts/ThemeContext';
+
+export function Providers({ children }: { children: React.ReactNode }) {
+  return (
+    <ThemeProvider>
+      <AuthProvider>{children}</AuthProvider>
+    </ThemeProvider>
+  );
+}
+```
+
+---
+
+## 4. Add STORAGE_KEYS entry
+
+**File**: `src/lib/constants.ts`
+
+Add `THEME` key to `STORAGE_KEYS`:
+
+```ts
+export const STORAGE_KEYS = {
+  ITINERARY: 'sheeets-itinerary',
+  ITINERARY_UPDATED: 'sheeets-itinerary-updated',
+  VIEW_MODE: 'sheeets-view',
+  THEME: 'sheeets-theme',
+};
+```
+
+---
+
+## 5. Component-by-Component Changes
+
+Below, every hardcoded dark Tailwind class is listed with its replacement. The pattern is:
+
+- **Light-first**: `bg-white dark:bg-slate-900` (light value first, dark override with `dark:` prefix)
+- CSS variable references where appropriate for things controlled by the theme vars
+
+### Key Mapping Legend
+
+| Current (dark-only) | Light equivalent | Combined |
+|---|---|---|
+| `bg-slate-900` | `bg-white` | `bg-white dark:bg-slate-900` |
+| `bg-slate-900/95` | `bg-white/95` | `bg-white/95 dark:bg-slate-900/95` |
+| `bg-slate-800` | `bg-gray-100` | `bg-gray-100 dark:bg-slate-800` |
+| `bg-slate-800/90` | `bg-white/90` | `bg-white/90 dark:bg-slate-800/90` |
+| `bg-slate-800/80` | `bg-gray-50/80` | `bg-gray-50/80 dark:bg-slate-800/80` |
+| `bg-slate-700` | `bg-gray-200` | `bg-gray-200 dark:bg-slate-700` |
+| `bg-slate-700/50` | `bg-gray-100/50` | `bg-gray-100/50 dark:bg-slate-700/50` |
+| `hover:bg-slate-750` | `hover:bg-gray-100` | `hover:bg-gray-100 dark:hover:bg-slate-750` |
+| `hover:bg-slate-700` | `hover:bg-gray-200` | `hover:bg-gray-200 dark:hover:bg-slate-700` |
+| `hover:bg-slate-600` | `hover:bg-gray-300` | `hover:bg-gray-300 dark:hover:bg-slate-600` |
+| `hover:bg-slate-600/50` | `hover:bg-gray-200/50` | `hover:bg-gray-200/50 dark:hover:bg-slate-600/50` |
+| `text-white` | `text-gray-900` | `text-gray-900 dark:text-white` |
+| `text-slate-100` | `text-gray-900` | `text-gray-900 dark:text-slate-100` |
+| `text-slate-200` | `text-gray-800` | `text-gray-800 dark:text-slate-200` |
+| `text-slate-300` | `text-gray-700` | `text-gray-700 dark:text-slate-300` |
+| `text-slate-400` | `text-gray-500` | `text-gray-500 dark:text-slate-400` |
+| `text-slate-500` | `text-gray-400` | `text-gray-400 dark:text-slate-500` |
+| `text-slate-600` | `text-gray-300` | `text-gray-300 dark:text-slate-600` |
+| `border-slate-800` | `border-gray-200` | `border-gray-200 dark:border-slate-800` |
+| `border-slate-700` | `border-gray-200` | `border-gray-200 dark:border-slate-700` |
+| `border-slate-600` | `border-gray-300` | `border-gray-300 dark:border-slate-600` |
+| `hover:text-slate-200` | `hover:text-gray-800` | `hover:text-gray-800 dark:hover:text-slate-200` |
+| `hover:text-white` | `hover:text-gray-900` | `hover:text-gray-900 dark:hover:text-white` |
+| `active:text-slate-200` | `active:text-gray-800` | `active:text-gray-800 dark:active:text-slate-200` |
+| `active:bg-slate-700` | `active:bg-gray-200` | `active:bg-gray-200 dark:active:bg-slate-700` |
+| `active:bg-slate-600` | `active:bg-gray-300` | `active:bg-gray-300 dark:active:bg-slate-600` |
+| `divide-slate-700/50` | `divide-gray-200` | `divide-gray-200 dark:divide-slate-700/50` |
+
+**IMPORTANT**: Elements that are **always** styled the same in both themes (e.g., the orange accent buttons when active, `bg-orange-500 text-white`) do NOT need `dark:` variants. Only change elements whose appearance differs between themes.
+
+---
+
+### 5.1 Header.tsx
+
+**File**: `src/components/Header.tsx`
+
+| Line | Current | New |
+|---|---|---|
+| 30 | `bg-slate-900/95 backdrop-blur-sm border-b border-slate-800` | `bg-white/95 dark:bg-slate-900/95 backdrop-blur-sm border-b border-gray-200 dark:border-slate-800` |
+| 37 | `text-white` (title) | `text-gray-900 dark:text-white` |
+| 51 | `border-slate-700 bg-slate-800 text-slate-400 hover:text-slate-200 hover:bg-slate-700 active:text-slate-200 active:bg-slate-700` | `border-gray-200 dark:border-slate-700 bg-gray-100 dark:bg-slate-800 text-gray-500 dark:text-slate-400 hover:text-gray-800 dark:hover:text-slate-200 hover:bg-gray-200 dark:hover:bg-slate-700 active:text-gray-800 dark:active:text-slate-200 active:bg-gray-200 dark:active:bg-slate-700` |
+| 73 | (itinerary inactive): `border-slate-700 bg-slate-800 text-slate-400 hover:text-slate-200 hover:bg-slate-700 active:text-slate-200 active:bg-slate-700` | Same mapping as sign-in button above |
+
+**Add theme toggle button**: Insert between the auth controls and ViewToggle (or after ViewToggle). Import `Sun`, `Moon` from `lucide-react` and `useTheme` from `@/contexts/ThemeContext`.
+
+```tsx
+import { useTheme } from '@/contexts/ThemeContext';
+import { Sun, Moon } from 'lucide-react';
+
+// Inside the component:
+const { theme, toggleTheme } = useTheme();
+
+// In JSX, between auth and ViewToggle:
+<button
+  onClick={toggleTheme}
+  className="p-1.5 rounded-lg border border-gray-200 dark:border-slate-700 bg-gray-100 dark:bg-slate-800 text-gray-500 dark:text-slate-400 hover:text-gray-800 dark:hover:text-slate-200 hover:bg-gray-200 dark:hover:bg-slate-700 transition-colors cursor-pointer"
+  aria-label={theme === 'dark' ? 'Switch to light mode' : 'Switch to dark mode'}
+  title={theme === 'dark' ? 'Light mode' : 'Dark mode'}
+>
+  {theme === 'dark' ? <Sun className="w-4 h-4" /> : <Moon className="w-4 h-4" />}
+</button>
+```
+
+---
+
+### 5.2 FilterBar.tsx
+
+**File**: `src/components/FilterBar.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Outer container (line 63) | `bg-slate-900 border-b border-slate-800` | `bg-white dark:bg-slate-900 border-b border-gray-200 dark:border-slate-800` |
+| Mobile conf dropdown bg (line 84) | `bg-slate-800 border border-slate-700` | `bg-white dark:bg-slate-800 border border-gray-200 dark:border-slate-700` |
+| Conf dropdown inactive btn (line 98) | `text-slate-300 hover:bg-slate-700 active:bg-slate-700` | `text-gray-700 dark:text-slate-300 hover:bg-gray-100 dark:hover:bg-slate-700 active:bg-gray-100 dark:active:bg-slate-700` |
+| Desktop conf inactive (line 119) | `bg-slate-800 text-slate-400 hover:text-slate-200 hover:bg-slate-700 active:text-slate-200 active:bg-slate-700` | `bg-gray-100 dark:bg-slate-800 text-gray-500 dark:text-slate-400 hover:text-gray-800 dark:hover:text-slate-200 hover:bg-gray-200 dark:hover:bg-slate-700 active:text-gray-800 dark:active:text-slate-200 active:bg-gray-200 dark:active:bg-slate-700` |
+| Desktop conf border (line 110) | `border border-slate-700` | `border border-gray-200 dark:border-slate-700` |
+| Now toggle inactive (line 136) | `bg-slate-800 text-slate-400 hover:text-slate-200 hover:bg-slate-700 active:text-slate-200 active:bg-slate-700 border border-slate-700` | `bg-gray-100 dark:bg-slate-800 text-gray-500 dark:text-slate-400 hover:text-gray-800 dark:hover:text-slate-200 hover:bg-gray-200 dark:hover:bg-slate-700 active:text-gray-800 dark:active:text-slate-200 active:bg-gray-200 dark:active:bg-slate-700 border border-gray-200 dark:border-slate-700` |
+| Filter toggle inactive (line 155) | `bg-slate-800 text-slate-400 hover:text-slate-200 hover:bg-slate-700 active:text-slate-200 active:bg-slate-700 border border-slate-700` | Same mapping as Now toggle inactive |
+| Expanded filter overlay (line 171) | `bg-slate-900` (mobile bg) | `bg-white dark:bg-slate-900` |
+| Now mode notice (line 174) | `bg-green-500/10 border border-green-500/20 text-green-400` | Keep as-is (green on both themes works) |
+| Section labels (lines 183, 248, 296, 329) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Slider value labels (lines 186/251) | `text-slate-300` | `text-gray-700 dark:text-slate-300` |
+| Slider track bg (lines 195/256) | `bg-slate-700` | `bg-gray-200 dark:bg-slate-700` |
+| Vibe/tag inactive buttons (lines 313/347) | `bg-slate-700 text-slate-300 hover:bg-slate-600 active:bg-slate-600` | `bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600 active:bg-gray-300 dark:active:bg-slate-600` |
+
+---
+
+### 5.3 EventCard.tsx
+
+**File**: `src/components/EventCard.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Card container (line 25) | `bg-slate-800 border border-slate-700 ... hover:bg-slate-750 hover:border-slate-600 active:bg-slate-750 active:border-slate-600` | `bg-white dark:bg-slate-800 border border-gray-200 dark:border-slate-700 ... hover:bg-gray-50 dark:hover:bg-slate-750 hover:border-gray-300 dark:hover:border-slate-600 active:bg-gray-50 dark:active:bg-slate-750 active:border-gray-300 dark:active:border-slate-600` |
+| Event name (line 40) | `text-white` | `text-gray-900 dark:text-white` |
+| Organizer (line 58) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Date/time (line 62) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Address (line 68) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Note (line 85) | `text-slate-600` | `text-gray-400 dark:text-slate-600` |
+
+---
+
+### 5.4 ListView.tsx
+
+**File**: `src/components/ListView.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Empty state (line 73) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Date header (line 86) | `bg-slate-900/95 backdrop-blur-sm ... border-b border-slate-800` | `bg-white/95 dark:bg-slate-900/95 backdrop-blur-sm ... border-b border-gray-200 dark:border-slate-800` |
+| Date label (line 88) | `text-white` | `text-gray-900 dark:text-white` |
+| Event count (line 91) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+
+---
+
+### 5.5 TableView.tsx
+
+**File**: `src/components/TableView.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Table border (line 22) | `border border-slate-700` | `border border-gray-200 dark:border-slate-700` |
+| Table header (line 24) | `text-slate-400 bg-slate-800 border-b border-slate-700` | `text-gray-500 dark:text-slate-400 bg-[#1F3864] dark:bg-slate-800 text-white dark:text-slate-400 border-b border-gray-200 dark:border-slate-700` |
+
+Note: In light mode the table header uses the Google Sheets header blue `#1F3864` with white text. In dark mode it stays `bg-slate-800` with `text-slate-400`. This needs careful handling:
+
+```tsx
+<thead className="text-xs uppercase tracking-wider sticky top-0 z-10 bg-[#1F3864] text-white dark:bg-slate-800 dark:text-slate-400 border-b border-gray-200 dark:border-slate-700">
+```
+
+| Location | Current | New |
+|---|---|---|
+| `<tbody>` divider (line 35) | `divide-y divide-slate-700/50` | `divide-y divide-gray-100 dark:divide-slate-700/50` |
+| Row bg (line 42) | `bg-slate-900` (normal) | `bg-white dark:bg-slate-900` |
+| Row hover (line 42) | `hover:bg-slate-800/70` | `hover:bg-gray-50 dark:hover:bg-slate-800/70` |
+| Duplicate row bg | `bg-red-950/30` | `bg-red-50 dark:bg-red-950/30` |
+| Star inactive (line 53) | `text-slate-600 hover:text-slate-400` | `text-gray-300 dark:text-slate-600 hover:text-gray-500 dark:hover:text-slate-400` |
+| Date cell (line 59) | `text-slate-300` | `text-gray-700 dark:text-slate-300` |
+| Time cell (line 64) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Organizer cell (line 70) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Event name cell (line 75) | `text-slate-100` | `text-gray-900 dark:text-slate-100` |
+| Location cell (line 96) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Extra tags count (line 116) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Empty state (line 128) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+
+**Alternate row striping for light mode**: Add alternating row backgrounds using even/odd:
+
+```tsx
+<tr
+  key={event.id}
+  className={`transition-colors ${
+    event.isDuplicate
+      ? 'bg-red-50 dark:bg-red-950/30'
+      : 'bg-white dark:bg-slate-900 even:bg-[#D6E4F0]/30 dark:even:bg-transparent'
+  } hover:bg-gray-50 dark:hover:bg-slate-800/70`}
+>
+```
+
+---
+
+### 5.6 MapView.tsx
+
+**File**: `src/components/MapView.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Map style (line 180) | `"mapbox://styles/mapbox/dark-v11"` | **Dynamic** -- see below |
+| No-token fallback bg (line 161) | `bg-slate-900` | `bg-gray-100 dark:bg-slate-900` |
+| No-token text (line 163) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| No-token subtext (line 166) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Locate button inactive (line 197) | `bg-slate-800 border-slate-600 text-slate-300 hover:bg-slate-700` | `bg-white dark:bg-slate-800 border-gray-300 dark:border-slate-600 text-gray-600 dark:text-slate-300 hover:bg-gray-100 dark:hover:bg-slate-700` |
+
+**Dynamic Mapbox style**:
+
+Import and use the theme context:
+
+```tsx
+import { useTheme } from '@/contexts/ThemeContext';
+
+// Inside component:
+const { theme } = useTheme();
+const mapStyle = theme === 'dark'
+  ? 'mapbox://styles/mapbox/dark-v11'
+  : 'mapbox://styles/mapbox/streets-v12';
+```
+
+Then use `mapStyle={mapStyle}` on the `<MapGL>` component.
+
+**Note**: When the theme changes, the map style will re-render. This is fine -- Mapbox handles style transitions smoothly.
+
+---
+
+### 5.7 MapMarker.tsx
+
+**File**: `src/components/MapMarker.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Label card (line 88) | `bg-slate-800/90 text-white` | `bg-white/90 dark:bg-slate-800/90 text-gray-900 dark:text-white` |
+| Label time (line 91) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+
+---
+
+### 5.8 EventPopup.tsx
+
+**File**: `src/components/EventPopup.tsx`
+
+The popup background is handled by CSS (`.map-popup` styles in globals.css, already using CSS variables). The inline text classes need updating:
+
+| Location | Current | New |
+|---|---|---|
+| Event name (line 52) | `text-white` | `text-gray-900 dark:text-white` |
+| Hover on name (line 52) | `hover:text-orange-300` | `hover:text-orange-500 dark:hover:text-orange-300` |
+| Organizer (line 62) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Close btn (line 76) | `text-slate-400 hover:text-white active:text-white` | `text-gray-400 dark:text-slate-400 hover:text-gray-900 dark:hover:text-white active:text-gray-900 dark:active:text-white` |
+| Cost text (line 92) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Date/time (line 98) | `text-slate-300` | `text-gray-700 dark:text-slate-300` |
+| Multi-popup title (line 154) | `text-white` | `text-gray-900 dark:text-white` |
+| Multi close btn (line 158) | `text-slate-400 hover:text-white active:text-white` | Same as single close btn |
+| Multi event button (line 172) | `bg-slate-700/50 hover:bg-slate-600/50 active:bg-slate-600/50` | `bg-gray-100/50 dark:bg-slate-700/50 hover:bg-gray-200/50 dark:hover:bg-slate-600/50 active:bg-gray-200/50 dark:active:bg-slate-600/50` |
+| Multi event name (line 175) | `text-white` | `text-gray-900 dark:text-white` |
+| Multi event time (line 185) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+
+---
+
+### 5.9 ItineraryPanel.tsx
+
+**File**: `src/components/ItineraryPanel.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Panel bg (line 230) | `bg-slate-900 border-l border-slate-700` | `bg-white dark:bg-slate-900 border-l border-gray-200 dark:border-slate-700` |
+| Panel header border (line 235) | `border-b border-slate-800` | `border-b border-gray-200 dark:border-slate-800` |
+| Title (line 236) | `text-white` | `text-gray-900 dark:text-white` |
+| Count text (line 238) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Icon buttons (lines 248-269) | `text-slate-400 hover:text-orange-400 active:text-orange-400` | `text-gray-400 dark:text-slate-400 hover:text-orange-500 dark:hover:text-orange-400 active:text-orange-500 dark:active:text-orange-400` |
+| Close btn (line 274) | `text-slate-400 hover:text-white active:text-white` | `text-gray-400 dark:text-slate-400 hover:text-gray-900 dark:hover:text-white active:text-gray-900 dark:active:text-white` |
+| Conf tabs border (line 285) | `border-b border-slate-800` | `border-b border-gray-200 dark:border-slate-800` |
+| Conf tab inactive (line 292-293) | `border-transparent text-slate-400 hover:text-slate-200 active:text-slate-200` | `border-transparent text-gray-500 dark:text-slate-400 hover:text-gray-800 dark:hover:text-slate-200 active:text-gray-800 dark:active:text-slate-200` |
+| Empty state icon (line 307) | `text-slate-600` | `text-gray-300 dark:text-slate-600` |
+| Empty state text (line 309) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Empty subtext (line 311) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Capture bg (line 318) | `bg-slate-900` | `bg-white dark:bg-slate-900` |
+| Branding text (line 322) | `text-white` | `text-gray-900 dark:text-white` |
+| Branding subtext (line 323) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Divider line (line 342) | `bg-slate-700` | `bg-gray-200 dark:bg-slate-700` |
+| Date header (line 343) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Event card (line 362) | `bg-slate-800 ... border-slate-700` | `bg-gray-50 dark:bg-slate-800 ... border-gray-200 dark:border-slate-700` |
+| Event name (line 380) | `text-white` | `text-gray-900 dark:text-white` |
+| Remove btn (line 386) | `text-slate-500 hover:text-red-400 active:text-red-400` | `text-gray-400 dark:text-slate-500 hover:text-red-500 dark:hover:text-red-400 active:text-red-500 dark:active:text-red-400` |
+| Time text (line 395) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Footer (line 424) | `text-slate-600` | `text-gray-400 dark:text-slate-600` |
+| Clear section border (line 431) | `border-t border-slate-800` | `border-t border-gray-200 dark:border-slate-800` |
+| Clear confirm text (line 434) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Cancel btn (line 444) | `bg-slate-700 hover:bg-slate-600 active:bg-slate-600 text-slate-300` | `bg-gray-200 dark:bg-slate-700 hover:bg-gray-300 dark:hover:bg-slate-600 active:bg-gray-300 dark:active:bg-slate-600 text-gray-700 dark:text-slate-300` |
+| Clear itinerary btn (line 453) | `bg-slate-800 hover:bg-slate-700 active:bg-slate-700 border border-slate-700 text-slate-400 hover:text-slate-300 active:text-slate-300` | `bg-gray-100 dark:bg-slate-800 hover:bg-gray-200 dark:hover:bg-slate-700 active:bg-gray-200 dark:active:bg-slate-700 border border-gray-200 dark:border-slate-700 text-gray-500 dark:text-slate-400 hover:text-gray-700 dark:hover:text-slate-300 active:text-gray-700 dark:active:text-slate-300` |
+
+**PNG export note**: The `handleSharePNG` function uses `backgroundColor: '#0f172a'` hardcoded. This should be made theme-aware:
+
+```tsx
+const { theme } = useTheme();
+// ...
+const blob = await toBlob(captureRef.current, {
+  backgroundColor: theme === 'dark' ? '#0f172a' : '#FFFFFF',
+  pixelRatio: 2,
+});
+```
+
+---
+
+### 5.10 AuthModal.tsx
+
+**File**: `src/components/AuthModal.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Modal bg (line 111) | `bg-slate-800 border border-slate-700` | `bg-white dark:bg-slate-800 border border-gray-200 dark:border-slate-700` |
+| Header border (line 113) | `border-b border-slate-700` | `border-b border-gray-200 dark:border-slate-700` |
+| Title (line 114) | `text-white` | `text-gray-900 dark:text-white` |
+| Close btn (line 119) | `text-slate-400 hover:text-white` | `text-gray-400 dark:text-slate-400 hover:text-gray-900 dark:hover:text-white` |
+| Description (line 128) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Input container (line 131) | `bg-slate-900 border border-slate-600` | `bg-gray-50 dark:bg-slate-900 border border-gray-300 dark:border-slate-600` |
+| Input icon (line 132) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Input text (line 138) | `text-white ... placeholder:text-slate-500` | `text-gray-900 dark:text-white ... placeholder:text-gray-400 dark:placeholder:text-slate-500` |
+| Code description (line 156-157) | `text-slate-400` / `text-white` | `text-gray-500 dark:text-slate-400` / `text-gray-900 dark:text-white` |
+| Code inputs (line 170) | `bg-slate-900 border border-slate-600 text-white` | `bg-gray-50 dark:bg-slate-900 border border-gray-300 dark:border-slate-600 text-gray-900 dark:text-white` |
+| Different email btn (line 178) | `text-slate-400 hover:text-slate-300` | `text-gray-500 dark:text-slate-400 hover:text-gray-700 dark:hover:text-slate-300` |
+| Success text (line 188) | `text-white` | `text-gray-900 dark:text-white` |
+| Success subtext (line 189) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+
+**UserMenu** (line 199+):
+
+| Location | Current | New |
+|---|---|---|
+| Email text (line 206) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Sign out btn (line 211) | `text-slate-400 hover:text-white` | `text-gray-400 dark:text-slate-400 hover:text-gray-900 dark:hover:text-white` |
+
+---
+
+### 5.11 SearchBar.tsx
+
+**File**: `src/components/SearchBar.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Search icon (line 52) | `text-slate-400` | `text-gray-400 dark:text-slate-400` |
+| Input (line 58) | `bg-slate-800 border border-slate-600 text-white placeholder-slate-400` | `bg-white dark:bg-slate-800 border border-gray-300 dark:border-slate-600 text-gray-900 dark:text-white placeholder-gray-400 dark:placeholder-slate-400` |
+| Clear btn (line 63) | `text-slate-400 hover:text-slate-200` | `text-gray-400 dark:text-slate-400 hover:text-gray-700 dark:hover:text-slate-200` |
+
+---
+
+### 5.12 ViewToggle.tsx
+
+**File**: `src/components/ViewToggle.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Container border (line 20) | `border border-slate-700` | `border border-gray-200 dark:border-slate-700` |
+| Inactive button (line 29) | `bg-slate-800 text-slate-400 hover:text-slate-200 hover:bg-slate-700 active:text-slate-200 active:bg-slate-700` | `bg-gray-100 dark:bg-slate-800 text-gray-500 dark:text-slate-400 hover:text-gray-800 dark:hover:text-slate-200 hover:bg-gray-200 dark:hover:bg-slate-700 active:text-gray-800 dark:active:text-slate-200 active:bg-gray-200 dark:active:bg-slate-700` |
+
+---
+
+### 5.13 TagBadge.tsx
+
+**File**: `src/components/TagBadge.tsx`
+
+No changes needed. TagBadge uses `style={{ backgroundColor: color }}` with white text, which works on both themes since the colored background provides its own contrast.
+
+---
+
+### 5.14 StarButton.tsx
+
+**File**: `src/components/StarButton.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Inactive star (line 32) | `text-slate-600 hover:text-yellow-400/60 active:text-yellow-400/60` | `text-gray-300 dark:text-slate-600 hover:text-yellow-500/60 dark:hover:text-yellow-400/60 active:text-yellow-500/60 dark:active:text-yellow-400/60` |
+
+---
+
+### 5.15 Loading.tsx
+
+**File**: `src/components/Loading.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Loading text (line 9) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+
+---
+
+### 5.16 EventApp.tsx
+
+**File**: `src/components/EventApp.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Loading wrapper (line 117) | `bg-slate-900` | `bg-white dark:bg-slate-900` |
+| Error wrapper (line 132) | `bg-slate-900` | `bg-white dark:bg-slate-900` |
+| Error text (line 141) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Main wrapper (line 155) | `bg-slate-900` (appears 3 times) | `bg-white dark:bg-slate-900` |
+
+---
+
+### 5.17 OGImage.tsx
+
+**File**: `src/components/OGImage.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Container bg (line 58) | `bg-slate-700/30` | `bg-gray-200/30 dark:bg-slate-700/30` |
+| Image fallback bg (line 63) | `bg-slate-900/50` | `bg-gray-100/50 dark:bg-slate-900/50` |
+| Loading pulse (line 69) | `bg-slate-700/50` | `bg-gray-200/50 dark:bg-slate-700/50` |
+
+---
+
+### 5.18 MapViewWrapper.tsx
+
+**File**: `src/components/MapViewWrapper.tsx`
+
+| Location | Current | New |
+|---|---|---|
+| Dynamic import loading (line 15) | `bg-slate-900` / `text-slate-400` | `bg-gray-100 dark:bg-slate-900` / `text-gray-500 dark:text-slate-400` |
+| Drawer bg (line 61) | `bg-slate-900/95 ... border-t border-slate-700` | `bg-white/95 dark:bg-slate-900/95 ... border-t border-gray-200 dark:border-slate-700` |
+| Event row (line 71) | `bg-slate-800/80` | `bg-gray-50/80 dark:bg-slate-800/80` |
+| Date/time text (line 89) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Event name (line 91) | `text-white` | `text-gray-900 dark:text-white` |
+| Organizer (line 96) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Toggle tab (line 121) | `bg-slate-800/90 ... border border-slate-600 ... text-slate-300 hover:text-white hover:bg-slate-700 active:bg-slate-700` | `bg-white/90 dark:bg-slate-800/90 ... border border-gray-300 dark:border-slate-600 ... text-gray-600 dark:text-slate-300 hover:text-gray-900 dark:hover:text-white hover:bg-gray-100 dark:hover:bg-slate-700 active:bg-gray-100 dark:active:bg-slate-700` |
+
+---
+
+### 5.19 Itinerary Page (`src/app/itinerary/page.tsx`)
+
+**File**: `src/app/itinerary/page.tsx`
+
+This file has extensive dark-only styling similar to ItineraryPanel. Apply the same mapping pattern:
+
+| Location | Current | New |
+|---|---|---|
+| Dynamic import loading (line 24) | `bg-slate-900` / `text-slate-400` | `bg-gray-100 dark:bg-slate-900` / `text-gray-500 dark:text-slate-400` |
+| Loading wrapper (line 199) | `bg-slate-900` | `bg-white dark:bg-slate-900` |
+| Page wrapper (line 206) | `bg-slate-900` | `bg-white dark:bg-slate-900` |
+| Header (line 208) | `bg-slate-900/95 ... border-b border-slate-800` | `bg-white/95 dark:bg-slate-900/95 ... border-b border-gray-200 dark:border-slate-800` |
+| Back arrow (line 213) | `text-slate-400 hover:text-white` | `text-gray-400 dark:text-slate-400 hover:text-gray-900 dark:hover:text-white` |
+| Title (line 218) | `text-white` | `text-gray-900 dark:text-white` |
+| Count (line 220) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Conference toggle border (line 227) | `border border-slate-700` | `border border-gray-200 dark:border-slate-700` |
+| Conf inactive (line 236) | `bg-slate-800 text-slate-400 hover:text-slate-200 hover:bg-slate-700` | `bg-gray-100 dark:bg-slate-800 text-gray-500 dark:text-slate-400 hover:text-gray-800 dark:hover:text-slate-200 hover:bg-gray-200 dark:hover:bg-slate-700` |
+| View toggle border (line 248) | `border border-slate-700` | `border border-gray-200 dark:border-slate-700` |
+| View toggle inactive (line 258) | `bg-slate-800 text-slate-400 hover:text-slate-200 hover:bg-slate-700` | Same as conf inactive |
+| Export buttons (lines 271-286) | `text-slate-400 hover:text-orange-400` | `text-gray-400 dark:text-slate-400 hover:text-orange-500 dark:hover:text-orange-400` |
+| Share link button (line 293) | `bg-slate-800 border border-slate-700 text-slate-400 hover:text-orange-400 hover:border-slate-600` | `bg-gray-100 dark:bg-slate-800 border border-gray-200 dark:border-slate-700 text-gray-500 dark:text-slate-400 hover:text-orange-500 dark:hover:text-orange-400 hover:border-gray-300 dark:hover:border-slate-600` |
+| Empty state (lines 308-320) | Same pattern as ItineraryPanel empty state |
+| Capture bg (line 331) | `bg-slate-900` | `bg-white dark:bg-slate-900` |
+| Branding (lines 332-335) | Same as ItineraryPanel |
+| Date divider (line 350) | `bg-slate-700` | `bg-gray-200 dark:bg-slate-700` |
+| Date label (line 351) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Event cards (line 368) | `bg-slate-800 ... border-slate-700` | `bg-gray-50 dark:bg-slate-800 ... border-gray-200 dark:border-slate-700` |
+| Event name (line 382) | `text-white` | `text-gray-900 dark:text-white` |
+| Remove button (line 399) | `text-slate-500 hover:text-red-400` | `text-gray-400 dark:text-slate-500 hover:text-red-500 dark:hover:text-red-400` |
+| Organizer (line 408) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Time (line 411) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Address (line 414) | `text-slate-500` | `text-gray-400 dark:text-slate-500` |
+| Footer (line 440) | `text-slate-600` | `text-gray-400 dark:text-slate-600` |
+| Clear section border (line 445) | `border-t border-slate-800` | `border-t border-gray-200 dark:border-slate-800` |
+| Clear confirm text (line 448) | `text-slate-400` | `text-gray-500 dark:text-slate-400` |
+| Cancel btn (line 456) | `bg-slate-700 hover:bg-slate-600 text-slate-300` | `bg-gray-200 dark:bg-slate-700 hover:bg-gray-300 dark:hover:bg-slate-600 text-gray-700 dark:text-slate-300` |
+| Clear btn (line 465) | `bg-slate-800 hover:bg-slate-700 border border-slate-700 text-slate-400 hover:text-slate-300` | `bg-gray-100 dark:bg-slate-800 hover:bg-gray-200 dark:hover:bg-slate-700 border border-gray-200 dark:border-slate-700 text-gray-500 dark:text-slate-400 hover:text-gray-700 dark:hover:text-slate-300` |
+
+**PNG export**: Same fix as ItineraryPanel -- make `backgroundColor` theme-aware. Import `useTheme`.
+
+---
+
+## 6. Tag/Vibe Color Contrast Analysis
+
+The `VIBE_COLORS` from `constants.ts` are used as background colors with white text. On light backgrounds these badges float on the page. Analysis of colors that might lack contrast against white text:
+
+| Tag | Color | White text contrast ratio | Issue? |
+|---|---|---|---|
+| Networking / BTC / $$ | `#F59E0B` (amber-500) | ~1.9:1 | **POOR** -- yellow on white text is hard to read |
+| Bar/Pub | `#FBBF24` (amber-400) | ~1.5:1 | **POOR** |
+| Brunch | `#FB923C` (orange-400) | ~2.2:1 | **Marginal** |
+
+**Recommendation**: These tag badges always render with `style={{ backgroundColor: color }}` and `text-white`. The contrast issues exist in the current dark theme too (they float on dark backgrounds, so the badge itself provides contrast). Since the badge has its own opaque background, the white text on colored badge works the same regardless of page theme. **No changes needed to VIBE_COLORS.**
+
+However, for the FilterBar's **inactive** tag buttons (which currently use `bg-slate-700 text-slate-300`), in light mode they will use `bg-gray-200 text-gray-700`, which provides good contrast. **No issues.**
+
+---
+
+## 7. Summary of New/Modified Files
+
+### New files:
+1. `src/contexts/ThemeContext.tsx` -- ThemeProvider + useTheme hook
+
+### Modified files:
+1. `src/app/globals.css` -- Complete rewrite of CSS variables, add `@custom-variant dark`
+2. `src/app/layout.tsx` -- Add theme script, `suppressHydrationWarning`, `<head>` tag
+3. `src/components/Providers.tsx` -- Wrap with ThemeProvider
+4. `src/lib/constants.ts` -- Add THEME to STORAGE_KEYS
+5. `src/components/Header.tsx` -- Theme-aware classes + theme toggle button
+6. `src/components/FilterBar.tsx` -- Theme-aware classes
+7. `src/components/EventCard.tsx` -- Theme-aware classes
+8. `src/components/ListView.tsx` -- Theme-aware classes
+9. `src/components/TableView.tsx` -- Theme-aware classes + alternate row striping
+10. `src/components/MapView.tsx` -- Dynamic map style + theme-aware classes
+11. `src/components/MapMarker.tsx` -- Theme-aware label classes
+12. `src/components/EventPopup.tsx` -- Theme-aware text classes
+13. `src/components/ItineraryPanel.tsx` -- Theme-aware classes + theme-aware PNG export
+14. `src/components/AuthModal.tsx` -- Theme-aware classes
+15. `src/components/SearchBar.tsx` -- Theme-aware classes
+16. `src/components/ViewToggle.tsx` -- Theme-aware classes
+17. `src/components/StarButton.tsx` -- Theme-aware inactive color
+18. `src/components/Loading.tsx` -- Theme-aware text color
+19. `src/components/EventApp.tsx` -- Theme-aware background classes
+20. `src/components/OGImage.tsx` -- Theme-aware placeholder colors
+21. `src/components/MapViewWrapper.tsx` -- Theme-aware classes
+22. `src/app/itinerary/page.tsx` -- Theme-aware classes + theme-aware PNG export
+
+---
+
+## 8. Implementation Order
+
+1. **`globals.css`** -- CSS variables + `@custom-variant dark` (foundation)
+2. **`ThemeContext.tsx`** -- Create theme provider (new file)
+3. **`layout.tsx`** -- Flash-prevention script + `suppressHydrationWarning`
+4. **`Providers.tsx`** -- Wire in ThemeProvider
+5. **`constants.ts`** -- Add THEME storage key
+6. **`Header.tsx`** -- Add toggle button + theme-aware classes (verify toggle works)
+7. **All remaining components** -- Apply class changes (can be done in any order)
+8. **`MapView.tsx`** -- Dynamic map style (last, since it's the most complex)
+
+---
+
+## 9. Verification Steps
+
+1. **Toggle test**: Click the sun/moon button in the header. Verify it switches between light and dark instantly with no flash.
+2. **Persistence test**: Set to light mode, refresh the page. It should stay light. Same for dark.
+3. **System preference test**: Clear localStorage (`sheeets-theme`), set OS to dark mode, reload. Should be dark. Switch OS to light, reload. Should be light.
+4. **Component audit**: Go through every view (table, list, map) and verify no hardcoded dark backgrounds remain visible in light mode.
+5. **Map test**: In light mode, verify the map uses light/streets tiles. In dark mode, verify dark tiles.
+6. **Popup test**: Click a map marker in light mode. Verify the popup has a white background with dark text.
+7. **Auth modal test**: Open the sign-in modal in light mode. Verify all inputs and text are readable.
+8. **Itinerary panel test**: Open the itinerary sidebar in light mode. Verify cards, buttons, and empty state are properly themed.
+9. **PNG export test**: In both modes, export itinerary as PNG. Light mode should have white background, dark mode should have dark background.
+10. **Table alternating rows**: In light mode, verify even rows have the subtle blue tint (`#D6E4F0`).
+11. **Table header**: In light mode, verify the table header is `#1F3864` dark blue with white text.
+12. **Mobile test**: Test on mobile viewport -- verify the filter dropdown, conference selector, and all overlays are properly themed.
+13. **Tag badges**: Verify colored badges are visible and readable in both themes.
+14. **Build test**: Run `npm run build` to verify no TypeScript errors.
+
+---
+
+## 10. Edge Cases & Notes
+
+- **html-to-image**: The PNG export hardcodes `backgroundColor`. Both ItineraryPanel and itinerary page need theme-aware values.
+- **Mapbox navigation controls**: The default Mapbox `NavigationControl` has its own styling. In dark mode it may look odd on a light map (or vice versa). If this is a problem, pass custom CSS classes, but typically Mapbox controls auto-adapt to the map style.
+- **`hover:bg-slate-750` custom class**: This only applies in dark mode. In light mode, `hover:bg-gray-50` or `hover:bg-gray-100` replaces it. The custom CSS rule in globals.css can stay as-is since it only triggers on `.hover\:bg-slate-750:hover` which will only be used with the `dark:` prefix now.
+- **Transitions**: Consider adding `transition-colors` to `<body>` or `<html>` for a smooth theme switch animation. However, this could cause performance issues with the map. Recommend NOT adding a global transition -- the instant switch is fine.
+- **Focus rings**: `focus:border-orange-500` works in both themes. No changes needed.
+- **Orange accent**: Kept consistent across both themes as specified (`#f97316`).
diff --git a/scripts/ga4-audiences.mjs b/scripts/ga4-audiences.mjs
deleted file mode 100644
index 7a22f15b..00000000
--- a/scripts/ga4-audiences.mjs
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * GA4 Audiences Script
- *
- * Creates GA4 Audiences via the Admin API (v1alpha).
- * Uses OAuth2 refresh token stored at ~/.claude/ga4-tokens.json.
- *
- * Usage: node scripts/ga4-audiences.mjs
- */
-
-import { readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-
-const PROPERTY_ID = '524531628';
-const TOKEN_PATH = join(homedir(), '.claude', 'ga4-tokens.json');
-
-// Audiences API is only available in v1alpha
-const ADMIN_BASE = `https://analyticsadmin.googleapis.com/v1alpha/properties/${PROPERTY_ID}`;
-
-// ---------- Helpers ----------
-
-// GA4 audience filters require: andGroup -> [orGroup -> [dimensionOrMetricFilter]]
-function eventFilter(eventName) {
-  return {
-    orGroup: {
-      filterExpressions: [{
-        dimensionOrMetricFilter: {
-          fieldName: 'eventName',
-          stringFilter: { matchType: 'EXACT', value: eventName },
-        },
-      }],
-    },
-  };
-}
-
-function simpleClause(clauseType, ...eventNames) {
-  return {
-    clauseType,
-    simpleFilter: {
-      scope: 'AUDIENCE_FILTER_SCOPE_ACROSS_ALL_SESSIONS',
-      filterExpression: eventNames.length === 1
-        ? { andGroup: { filterExpressions: [eventFilter(eventNames[0])] } }
-        : {
-            // OR across multiple events
-            andGroup: {
-              filterExpressions: [{
-                orGroup: {
-                  filterExpressions: eventNames.map(name => ({
-                    dimensionOrMetricFilter: {
-                      fieldName: 'eventName',
-                      stringFilter: { matchType: 'EXACT', value: name },
-                    },
-                  })),
-                },
-              }],
-            },
-          },
-    },
-  };
-}
-
-// ---------- Audience definitions ----------
-
-const AUDIENCES = [
-  {
-    displayName: 'Power Users',
-    description: 'Users who added to itinerary or checked in',
-    membershipDurationDays: 30,
-    filterClauses: [simpleClause('INCLUDE', 'itinerary', 'check_in')],
-  },
-  {
-    displayName: 'Onboarding Dropoffs',
-    description: 'Users who started onboarding but did not complete it',
-    membershipDurationDays: 30,
-    filterClauses: [
-      simpleClause('INCLUDE', 'onboarding_start'),
-      simpleClause('EXCLUDE', 'onboarding_complete'),
-    ],
-  },
-  {
-    displayName: 'Engaged Unauthenticated',
-    description: 'Users who clicked events but never authenticated',
-    membershipDurationDays: 30,
-    filterClauses: [
-      simpleClause('INCLUDE', 'event_click'),
-      simpleClause('EXCLUDE', 'auth_success'),
-    ],
-  },
-  {
-    displayName: 'Active Planners',
-    description: 'Users who added to itinerary in last 7 days',
-    membershipDurationDays: 7,
-    filterClauses: [simpleClause('INCLUDE', 'itinerary')],
-  },
-];
-
-// ---------- Token refresh ----------
-
-async function refreshAccessToken() {
-  const tokens = JSON.parse(readFileSync(TOKEN_PATH, 'utf-8'));
-
-  const clientId = process.env.GA4_CLIENT_ID || tokens.client_id;
-  const clientSecret = process.env.GA4_CLIENT_SECRET || tokens.client_secret;
-
-  if (!clientId || !clientSecret) {
-    throw new Error(
-      'Missing client credentials. Set GA4_CLIENT_ID/GA4_CLIENT_SECRET env vars ' +
-      'or add client_id/client_secret to ' + TOKEN_PATH
-    );
-  }
-
-  const res = await fetch('https://oauth2.googleapis.com/token', {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body: new URLSearchParams({
-      client_id: clientId,
-      client_secret: clientSecret,
-      refresh_token: tokens.refresh_token,
-      grant_type: 'refresh_token',
-    }),
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Token refresh failed: ${res.status} ${err}`);
-  }
-
-  const data = await res.json();
-  const updated = { ...tokens, ...data };
-  writeFileSync(TOKEN_PATH, JSON.stringify(updated, null, 2));
-  return data.access_token;
-}
-
-// ---------- API helper ----------
-
-async function createAudience(accessToken, audience) {
-  const res = await fetch(`${ADMIN_BASE}/audiences`, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(audience),
-  });
-
-  if (res.status === 409) {
-    console.log(`  [skip] ${audience.displayName} (already exists)`);
-    return;
-  }
-
-  if (!res.ok) {
-    const err = await res.text();
-    console.error(`  [error] ${audience.displayName}: ${res.status} ${err}`);
-    return;
-  }
-
-  const result = await res.json();
-  console.log(`  [created] ${audience.displayName} (${result.name})`);
-}
-
-// ---------- Main ----------
-
-async function main() {
-  console.log('Refreshing access token...');
-  const accessToken = await refreshAccessToken();
-  console.log('Token refreshed.\n');
-
-  console.log(`Creating ${AUDIENCES.length} audiences...\n`);
-  for (const audience of AUDIENCES) {
-    await createAudience(accessToken, audience);
-  }
-
-  console.log('\nDone.');
-}
-
-main().catch((err) => {
-  console.error('Fatal error:', err.message);
-  process.exit(1);
-});
diff --git a/scripts/ga4-bigquery.mjs b/scripts/ga4-bigquery.mjs
deleted file mode 100644
index 4e45cc27..00000000
--- a/scripts/ga4-bigquery.mjs
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * GA4 BigQuery Export Script
- *
- * Enables BigQuery daily export for the GA4 property via the Admin API (v1alpha).
- * Uses OAuth2 refresh token stored at ~/.claude/ga4-tokens.json.
- *
- * Prerequisites:
- *   - BigQuery API must be enabled on the GCP project (planwtf)
- *   - The GA4 service account needs BigQuery Editor role on the project
- *
- * Usage: node scripts/ga4-bigquery.mjs
- */
-
-import { readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-
-const PROPERTY_ID = '524531628';
-const TOKEN_PATH = join(homedir(), '.claude', 'ga4-tokens.json');
-
-// BigQuery links API is only available in v1alpha
-const ADMIN_BASE = `https://analyticsadmin.googleapis.com/v1alpha/properties/${PROPERTY_ID}`;
-
-const BIGQUERY_LINK = {
-  project: 'projects/planwtf',
-  datasetLocation: 'us',
-  dailyExportEnabled: true,
-  streamingExportEnabled: false,
-  freshDailyExportEnabled: true,
-  includeAdvertisingId: false,
-  exportStreams: [],
-};
-
-// ---------- Token refresh ----------
-
-async function refreshAccessToken() {
-  const tokens = JSON.parse(readFileSync(TOKEN_PATH, 'utf-8'));
-
-  const clientId = process.env.GA4_CLIENT_ID || tokens.client_id;
-  const clientSecret = process.env.GA4_CLIENT_SECRET || tokens.client_secret;
-
-  if (!clientId || !clientSecret) {
-    throw new Error(
-      'Missing client credentials. Set GA4_CLIENT_ID/GA4_CLIENT_SECRET env vars ' +
-      'or add client_id/client_secret to ' + TOKEN_PATH
-    );
-  }
-
-  const res = await fetch('https://oauth2.googleapis.com/token', {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body: new URLSearchParams({
-      client_id: clientId,
-      client_secret: clientSecret,
-      refresh_token: tokens.refresh_token,
-      grant_type: 'refresh_token',
-    }),
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Token refresh failed: ${res.status} ${err}`);
-  }
-
-  const data = await res.json();
-  const updated = { ...tokens, ...data };
-  writeFileSync(TOKEN_PATH, JSON.stringify(updated, null, 2));
-  return data.access_token;
-}
-
-// ---------- Main ----------
-
-async function main() {
-  console.log('Refreshing access token...');
-  const accessToken = await refreshAccessToken();
-  console.log('Token refreshed.\n');
-
-  console.log('Creating BigQuery link for project "planwtf"...\n');
-
-  const res = await fetch(`${ADMIN_BASE}/bigQueryLinks`, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(BIGQUERY_LINK),
-  });
-
-  if (res.status === 409) {
-    console.log('[skip] BigQuery link already exists for this property.');
-    console.log('Done.');
-    return;
-  }
-
-  if (!res.ok) {
-    const err = await res.text();
-    console.error(`[error] BigQuery link creation failed: ${res.status}`);
-    console.error(err);
-
-    // Provide helpful guidance for common errors
-    if (res.status === 403) {
-      console.error('\nPermission denied. Make sure:');
-      console.error('  1. The OAuth user has Editor access on the GA4 property');
-      console.error('  2. The BigQuery API is enabled on GCP project "planwtf"');
-      console.error('     -> https://console.cloud.google.com/apis/library/bigquery.googleapis.com?project=planwtf');
-      console.error('  3. The user has BigQuery Admin role on the GCP project');
-    } else if (res.status === 400) {
-      console.error('\nBad request. Possible causes:');
-      console.error('  1. BigQuery API not enabled on GCP project "planwtf"');
-      console.error('     -> https://console.cloud.google.com/apis/library/bigquery.googleapis.com?project=planwtf');
-      console.error('  2. The GCP project ID "planwtf" may be incorrect');
-    } else if (res.status === 404) {
-      console.error('\nProperty not found. Make sure property ID 524531628 is correct.');
-    }
-
-    process.exit(1);
-  }
-
-  const result = await res.json();
-  console.log(`[created] BigQuery link: ${result.name}`);
-  console.log(`  Project: ${result.project}`);
-  console.log(`  Daily export: ${result.dailyExportEnabled}`);
-  console.log(`  Streaming export: ${result.streamingExportEnabled}`);
-  console.log(`  Fresh daily export: ${result.freshDailyExportEnabled}`);
-  console.log('\nBigQuery export will start within 24 hours.');
-  console.log('Data will appear in dataset: analytics_524531628');
-  console.log('\nDone.');
-}
-
-main().catch((err) => {
-  console.error('Fatal error:', err.message);
-  process.exit(1);
-});
diff --git a/scripts/ga4-dashboard.mjs b/scripts/ga4-dashboard.mjs
deleted file mode 100644
index 20c72aab..00000000
--- a/scripts/ga4-dashboard.mjs
+++ /dev/null
@@ -1,718 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * GA4 HTML Dashboard Generator
- *
- * Generates a self-contained HTML analytics dashboard with Chart.js visualizations.
- * Pulls data from GA4 Data API + Admin API and opens the result in the browser.
- *
- * Usage: node scripts/ga4-dashboard.mjs
- */
-
-import { readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-import { execSync } from 'child_process';
-
-const PROPERTY_ID = '524531628';
-const TOKEN_PATH = join(homedir(), '.claude', 'ga4-tokens.json');
-
-const DATA_BASE = `https://analyticsdata.googleapis.com/v1beta/properties/${PROPERTY_ID}`;
-const ADMIN_BASE = `https://analyticsadmin.googleapis.com/v1alpha/properties/${PROPERTY_ID}`;
-
-// ---------- Token refresh ----------
-
-async function refreshAccessToken() {
-  const tokens = JSON.parse(readFileSync(TOKEN_PATH, 'utf-8'));
-
-  const clientId = process.env.GA4_CLIENT_ID || tokens.client_id;
-  const clientSecret = process.env.GA4_CLIENT_SECRET || tokens.client_secret;
-
-  if (!clientId || !clientSecret) {
-    throw new Error(
-      'Missing client credentials. Set GA4_CLIENT_ID/GA4_CLIENT_SECRET env vars ' +
-        'or add client_id/client_secret to ' +
-        TOKEN_PATH,
-    );
-  }
-
-  const res = await fetch('https://oauth2.googleapis.com/token', {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body: new URLSearchParams({
-      client_id: clientId,
-      client_secret: clientSecret,
-      refresh_token: tokens.refresh_token,
-      grant_type: 'refresh_token',
-    }),
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Token refresh failed: ${res.status} ${err}`);
-  }
-
-  const data = await res.json();
-  const updated = { ...tokens, ...data };
-  writeFileSync(TOKEN_PATH, JSON.stringify(updated, null, 2));
-  return data.access_token;
-}
-
-// ---------- API helpers ----------
-
-async function runReport(accessToken, body) {
-  const res = await fetch(`${DATA_BASE}:runReport`, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(body),
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`runReport failed: ${res.status} ${err}`);
-  }
-
-  return res.json();
-}
-
-async function adminGet(accessToken, path) {
-  const res = await fetch(`${ADMIN_BASE}/${path}`, {
-    headers: { Authorization: `Bearer ${accessToken}` },
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Admin API failed: ${res.status} ${err}`);
-  }
-
-  return res.json();
-}
-
-// ---------- Data helpers ----------
-
-function extractRows(report) {
-  if (!report.rows) return [];
-  return report.rows.map((row) => [
-    ...row.dimensionValues.map((d) => d.value),
-    ...row.metricValues.map((m) => m.value),
-  ]);
-}
-
-function fmt(n) {
-  return Number(n).toLocaleString('en-US');
-}
-
-function fmtPct(n) {
-  return (Number(n) * 100).toFixed(1) + '%';
-}
-
-function escapeHtml(s) {
-  return String(s)
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;');
-}
-
-// ---------- Data fetchers ----------
-
-async function fetchTotals(accessToken) {
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    metrics: [
-      { name: 'sessions' },
-      { name: 'totalUsers' },
-      { name: 'newUsers' },
-      { name: 'bounceRate' },
-    ],
-  });
-  const row = report.rows?.[0];
-  if (!row) return { sessions: 0, users: 0, newUsers: 0, bounceRate: 0 };
-  return {
-    sessions: Number(row.metricValues[0].value),
-    users: Number(row.metricValues[1].value),
-    newUsers: Number(row.metricValues[2].value),
-    bounceRate: Number(row.metricValues[3].value),
-  };
-}
-
-async function fetchTraffic(accessToken) {
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'sessionSourceMedium' }],
-    metrics: [{ name: 'sessions' }],
-    orderBys: [{ metric: { metricName: 'sessions' }, desc: true }],
-    limit: 15,
-  });
-  return extractRows(report); // [[source, sessions], ...]
-}
-
-async function fetchEvents(accessToken) {
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'eventName' }],
-    metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
-    orderBys: [{ metric: { metricName: 'eventCount' }, desc: true }],
-    limit: 30,
-  });
-  return extractRows(report); // [[eventName, count, users], ...]
-}
-
-async function fetchFunnelData(accessToken, events) {
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'eventName' }],
-    metrics: [{ name: 'totalUsers' }],
-    dimensionFilter: {
-      filter: {
-        fieldName: 'eventName',
-        inListFilter: { values: events },
-      },
-    },
-  });
-  const rows = extractRows(report);
-  const map = Object.fromEntries(rows.map((r) => [r[0], Number(r[1])]));
-  // Return in funnel order
-  return events.map((e) => ({ step: e, users: map[e] || 0 }));
-}
-
-async function fetchConversions(accessToken) {
-  const conversionEvents = [
-    'auth_success',
-    'itinerary',
-    'check_in',
-    'submit_event_success',
-    'onboarding_complete',
-    'ad_click',
-    'rsvp_confirm',
-  ];
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'eventName' }],
-    metrics: [{ name: 'eventCount' }],
-    dimensionFilter: {
-      filter: {
-        fieldName: 'eventName',
-        inListFilter: { values: conversionEvents },
-      },
-    },
-    orderBys: [{ metric: { metricName: 'eventCount' }, desc: true }],
-  });
-  return extractRows(report); // [[eventName, count], ...]
-}
-
-async function fetchTimeSeries(accessToken) {
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'date' }],
-    metrics: [{ name: 'sessions' }],
-    orderBys: [{ dimension: { dimensionName: 'date' } }],
-  });
-  return extractRows(report); // [[YYYYMMDD, sessions], ...]
-}
-
-async function fetchPages(accessToken) {
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'pagePath' }],
-    metrics: [{ name: 'screenPageViews' }],
-    orderBys: [{ metric: { metricName: 'screenPageViews' }, desc: true }],
-    limit: 15,
-  });
-  return extractRows(report); // [[pagePath, views], ...]
-}
-
-async function fetchDevices(accessToken) {
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'deviceCategory' }],
-    metrics: [{ name: 'sessions' }],
-    orderBys: [{ metric: { metricName: 'sessions' }, desc: true }],
-  });
-  return extractRows(report); // [[device, sessions], ...]
-}
-
-async function fetchAudiences(accessToken) {
-  const data = await adminGet(accessToken, 'audiences');
-  const allAudiences = data.audiences || [];
-  // Filter out built-in audiences (audiences/0 = All Users, audiences/1 = Purchasers)
-  return allAudiences.filter(
-    (a) => !a.name.includes('audiences/0') && !a.name.includes('audiences/1'),
-  );
-}
-
-// ---------- HTML generation ----------
-
-function formatDate(yyyymmdd) {
-  const y = yyyymmdd.slice(0, 4);
-  const m = yyyymmdd.slice(4, 6);
-  const d = yyyymmdd.slice(6, 8);
-  return `${m}/${d}`;
-}
-
-function buildFunnelHtml(title, steps, color) {
-  if (!steps || steps.length === 0) {
-    return `<div class="card"><h2>${escapeHtml(title)}</h2><p style="color:#64748b;">No data</p></div>`;
-  }
-  const maxUsers = steps[0].users || 1;
-  const bars = steps
-    .map((s, i) => {
-      const pctOfFirst = maxUsers > 0 ? ((s.users / maxUsers) * 100).toFixed(1) : '0.0';
-      const widthPct = Math.max(Number(pctOfFirst), 2); // min 2% so it's visible
-      const convLabel = i === 0 ? '100%' : pctOfFirst + '%';
-      return `
-      <div class="funnel-bar">
-        <div class="label">${escapeHtml(s.step)}</div>
-        <div class="bar-container">
-          <div class="bar" style="width: ${widthPct}%; background: ${color};">${fmt(s.users)} users</div>
-        </div>
-        <div class="stats">${convLabel}</div>
-      </div>`;
-    })
-    .join('');
-
-  return `<div class="card"><h2>${escapeHtml(title)}</h2>${bars}</div>`;
-}
-
-function buildHtml(data) {
-  const {
-    totals,
-    traffic,
-    events,
-    onboardingFunnel,
-    authFunnel,
-    engagementFunnel,
-    conversions,
-    timeSeries,
-    pages,
-    devices,
-    audiences,
-  } = data;
-
-  const now = new Date().toLocaleString('en-US', {
-    dateStyle: 'medium',
-    timeStyle: 'short',
-  });
-
-  // Prepare chart data
-  const tsLabels = JSON.stringify((timeSeries || []).map((r) => formatDate(r[0])));
-  const tsValues = JSON.stringify((timeSeries || []).map((r) => Number(r[1])));
-
-  const trafficTop10 = (traffic || []).slice(0, 10);
-  const trafficLabels = JSON.stringify(trafficTop10.map((r) => r[0]));
-  const trafficValues = JSON.stringify(trafficTop10.map((r) => Number(r[1])));
-
-  const convLabels = JSON.stringify((conversions || []).map((r) => r[0]));
-  const convValues = JSON.stringify((conversions || []).map((r) => Number(r[1])));
-
-  const deviceLabels = JSON.stringify((devices || []).map((r) => r[0]));
-  const deviceValues = JSON.stringify((devices || []).map((r) => Number(r[1])));
-  const deviceColors = JSON.stringify(
-    (devices || []).map((_, i) => ['#3b82f6', '#8b5cf6', '#ec4899', '#f59e0b', '#10b981'][i % 5]),
-  );
-
-  // Events table (top 20)
-  const eventsTop20 = (events || []).slice(0, 20);
-  const eventsTableRows = eventsTop20
-    .map(
-      (r) =>
-        `<tr><td>${escapeHtml(r[0])}</td><td style="text-align:right">${fmt(r[1])}</td><td style="text-align:right">${fmt(r[2])}</td></tr>`,
-    )
-    .join('');
-
-  // Pages table
-  const pagesTableRows = (pages || [])
-    .map(
-      (r) =>
-        `<tr><td>${escapeHtml(r[0])}</td><td style="text-align:right">${fmt(r[1])}</td></tr>`,
-    )
-    .join('');
-
-  // Audiences table
-  const audiencesTableRows = (audiences || [])
-    .map((a) => {
-      const displayName = a.displayName || '';
-      const desc = a.description || '';
-      const duration = a.membershipDurationDays
-        ? a.membershipDurationDays + ' days'
-        : 'Unlimited';
-      return `<tr><td>${escapeHtml(displayName)}</td><td>${escapeHtml(desc)}</td><td style="text-align:right">${escapeHtml(duration)}</td></tr>`;
-    })
-    .join('');
-
-  // Funnel HTML
-  const onboardingFunnelHtml = buildFunnelHtml('Onboarding Funnel', onboardingFunnel, '#3b82f6');
-  const authFunnelHtml = buildFunnelHtml('Auth Funnel', authFunnel, '#8b5cf6');
-  const engagementFunnelHtml = buildFunnelHtml('Engagement Funnel', engagementFunnel, '#10b981');
-
-  return `<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>plan.wtf Analytics Dashboard</title>
-  <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-  <style>
-    * { margin: 0; padding: 0; box-sizing: border-box; }
-    body { background: #0f172a; color: #e2e8f0; font-family: system-ui, -apple-system, sans-serif; padding: 24px; }
-    .grid { display: grid; gap: 20px; margin-bottom: 20px; }
-    .grid-2 { grid-template-columns: 1fr 1fr; }
-    .grid-3 { grid-template-columns: 1fr 1fr 1fr; }
-    .grid-4 { grid-template-columns: 1fr 1fr 1fr 1fr; }
-    .card { background: #1e293b; border-radius: 12px; padding: 20px; border: 1px solid #334155; }
-    .scorecard { text-align: center; }
-    .scorecard .value { font-size: 2.5rem; font-weight: 700; color: #3b82f6; }
-    .scorecard .label { font-size: 0.875rem; color: #94a3b8; margin-top: 4px; }
-    h1 { font-size: 1.5rem; margin-bottom: 4px; }
-    .subtitle { color: #64748b; font-size: 0.875rem; margin-bottom: 24px; }
-    h2 { font-size: 1rem; color: #94a3b8; margin-bottom: 12px; }
-    table { width: 100%; border-collapse: collapse; font-size: 0.875rem; }
-    th { text-align: left; padding: 8px; color: #94a3b8; border-bottom: 1px solid #334155; }
-    td { padding: 8px; border-bottom: 1px solid #1e293b; }
-    tr:hover td { background: #334155; }
-    .funnel-bar { display: flex; align-items: center; margin-bottom: 8px; }
-    .funnel-bar .label { width: 160px; font-size: 0.8rem; color: #94a3b8; flex-shrink: 0; }
-    .funnel-bar .bar-container { flex: 1; height: 28px; background: #334155; border-radius: 4px; position: relative; overflow: hidden; }
-    .funnel-bar .bar { height: 100%; border-radius: 4px; display: flex; align-items: center; padding-left: 8px; font-size: 0.75rem; font-weight: 600; white-space: nowrap; min-width: fit-content; }
-    .funnel-bar .stats { width: 60px; text-align: right; font-size: 0.8rem; color: #94a3b8; flex-shrink: 0; margin-left: 8px; }
-    .chart-container { position: relative; width: 100%; }
-    .no-data { color: #64748b; font-style: italic; }
-    @media (max-width: 768px) {
-      .grid-2, .grid-3, .grid-4 { grid-template-columns: 1fr; }
-    }
-  </style>
-</head>
-<body>
-  <h1>plan.wtf Analytics Dashboard</h1>
-  <p class="subtitle">Generated ${escapeHtml(now)} &mdash; Last 30 days</p>
-
-  <!-- Row 1: Scorecards -->
-  <div class="grid grid-4">
-    <div class="card scorecard">
-      <div class="value">${totals ? fmt(totals.sessions) : '--'}</div>
-      <div class="label">Total Sessions</div>
-    </div>
-    <div class="card scorecard">
-      <div class="value">${totals ? fmt(totals.users) : '--'}</div>
-      <div class="label">Total Users</div>
-    </div>
-    <div class="card scorecard">
-      <div class="value">${totals ? fmt(totals.newUsers) : '--'}</div>
-      <div class="label">New Users</div>
-    </div>
-    <div class="card scorecard">
-      <div class="value">${totals ? fmtPct(totals.bounceRate) : '--'}</div>
-      <div class="label">Bounce Rate</div>
-    </div>
-  </div>
-
-  <!-- Row 2: Sessions Over Time + Traffic Sources -->
-  <div class="grid grid-2">
-    <div class="card">
-      <h2>Sessions Over Time</h2>
-      <div class="chart-container"><canvas id="sessionsChart"></canvas></div>
-    </div>
-    <div class="card">
-      <h2>Traffic Sources (Top 10)</h2>
-      <div class="chart-container"><canvas id="trafficChart"></canvas></div>
-    </div>
-  </div>
-
-  <!-- Row 3: Funnels -->
-  <div class="grid grid-3">
-    ${onboardingFunnelHtml}
-    ${authFunnelHtml}
-    ${engagementFunnelHtml}
-  </div>
-
-  <!-- Row 4: Events + Pages tables -->
-  <div class="grid grid-2">
-    <div class="card">
-      <h2>Top Events</h2>
-      ${
-        eventsTableRows
-          ? `<div style="max-height:500px;overflow-y:auto;">
-        <table>
-          <thead><tr><th>Event Name</th><th style="text-align:right">Count</th><th style="text-align:right">Users</th></tr></thead>
-          <tbody>${eventsTableRows}</tbody>
-        </table>
-      </div>`
-          : '<p class="no-data">No data</p>'
-      }
-    </div>
-    <div class="card">
-      <h2>Top Pages</h2>
-      ${
-        pagesTableRows
-          ? `<div style="max-height:500px;overflow-y:auto;">
-        <table>
-          <thead><tr><th>Page Path</th><th style="text-align:right">Views</th></tr></thead>
-          <tbody>${pagesTableRows}</tbody>
-        </table>
-      </div>`
-          : '<p class="no-data">No data</p>'
-      }
-    </div>
-  </div>
-
-  <!-- Row 5: Conversions + Device Split -->
-  <div class="grid grid-2">
-    <div class="card">
-      <h2>Conversions</h2>
-      <div class="chart-container"><canvas id="conversionsChart"></canvas></div>
-    </div>
-    <div class="card">
-      <h2>Device Split</h2>
-      <div class="chart-container" style="max-width:350px;margin:0 auto;"><canvas id="devicesChart"></canvas></div>
-    </div>
-  </div>
-
-  <!-- Row 6: Audiences -->
-  <div class="grid">
-    <div class="card">
-      <h2>Audiences</h2>
-      ${
-        audiencesTableRows
-          ? `<table>
-          <thead><tr><th>Name</th><th>Description</th><th style="text-align:right">Membership Duration</th></tr></thead>
-          <tbody>${audiencesTableRows}</tbody>
-        </table>`
-          : '<p class="no-data">No custom audiences found</p>'
-      }
-    </div>
-  </div>
-
-  <script>
-    const chartDefaults = {
-      color: '#94a3b8',
-      borderColor: '#334155',
-    };
-    Chart.defaults.color = chartDefaults.color;
-    Chart.defaults.borderColor = chartDefaults.borderColor;
-
-    // Sessions Over Time - Line Chart
-    new Chart(document.getElementById('sessionsChart'), {
-      type: 'line',
-      data: {
-        labels: ${tsLabels},
-        datasets: [{
-          label: 'Sessions',
-          data: ${tsValues},
-          borderColor: '#3b82f6',
-          backgroundColor: 'rgba(59, 130, 246, 0.1)',
-          fill: true,
-          tension: 0.3,
-          pointRadius: 2,
-          pointHoverRadius: 5,
-        }],
-      },
-      options: {
-        responsive: true,
-        plugins: {
-          legend: { display: false },
-        },
-        scales: {
-          x: { grid: { color: '#334155' }, ticks: { maxRotation: 45 } },
-          y: { grid: { color: '#334155' }, beginAtZero: true },
-        },
-      },
-    });
-
-    // Traffic Sources - Horizontal Bar Chart
-    new Chart(document.getElementById('trafficChart'), {
-      type: 'bar',
-      data: {
-        labels: ${trafficLabels},
-        datasets: [{
-          label: 'Sessions',
-          data: ${trafficValues},
-          backgroundColor: '#3b82f6',
-          borderRadius: 4,
-        }],
-      },
-      options: {
-        responsive: true,
-        indexAxis: 'y',
-        plugins: {
-          legend: { display: false },
-        },
-        scales: {
-          x: { grid: { color: '#334155' }, beginAtZero: true },
-          y: { grid: { display: false } },
-        },
-      },
-    });
-
-    // Conversions - Bar Chart
-    new Chart(document.getElementById('conversionsChart'), {
-      type: 'bar',
-      data: {
-        labels: ${convLabels},
-        datasets: [{
-          label: 'Event Count',
-          data: ${convValues},
-          backgroundColor: ['#3b82f6', '#8b5cf6', '#ec4899', '#f59e0b', '#10b981', '#06b6d4', '#f97316'],
-          borderRadius: 4,
-        }],
-      },
-      options: {
-        responsive: true,
-        plugins: {
-          legend: { display: false },
-        },
-        scales: {
-          x: { grid: { display: false }, ticks: { maxRotation: 45 } },
-          y: { grid: { color: '#334155' }, beginAtZero: true },
-        },
-      },
-    });
-
-    // Devices - Doughnut Chart
-    new Chart(document.getElementById('devicesChart'), {
-      type: 'doughnut',
-      data: {
-        labels: ${deviceLabels},
-        datasets: [{
-          data: ${deviceValues},
-          backgroundColor: ${deviceColors},
-          borderWidth: 0,
-        }],
-      },
-      options: {
-        responsive: true,
-        plugins: {
-          legend: {
-            position: 'bottom',
-            labels: { padding: 16, usePointStyle: true },
-          },
-        },
-      },
-    });
-  </script>
-</body>
-</html>`;
-}
-
-// ---------- Main ----------
-
-async function main() {
-  console.log('Refreshing access token...');
-  const accessToken = await refreshAccessToken();
-  console.log('Token refreshed.\n');
-
-  console.log('Fetching GA4 data (all requests in parallel)...');
-
-  // Fetch all data in parallel with error resilience
-  const [
-    totals,
-    traffic,
-    events,
-    onboardingFunnel,
-    authFunnel,
-    engagementFunnel,
-    conversions,
-    timeSeries,
-    pages,
-    devices,
-    audiences,
-  ] = await Promise.all([
-    fetchTotals(accessToken).catch((e) => {
-      console.warn('  Warning: failed to fetch totals:', e.message);
-      return null;
-    }),
-    fetchTraffic(accessToken).catch((e) => {
-      console.warn('  Warning: failed to fetch traffic:', e.message);
-      return [];
-    }),
-    fetchEvents(accessToken).catch((e) => {
-      console.warn('  Warning: failed to fetch events:', e.message);
-      return [];
-    }),
-    fetchFunnelData(accessToken, [
-      'session_start',
-      'onboarding_start',
-      'onboarding_step',
-      'onboarding_complete',
-    ]).catch((e) => {
-      console.warn('  Warning: failed to fetch onboarding funnel:', e.message);
-      return [];
-    }),
-    fetchFunnelData(accessToken, ['auth_prompt', 'auth_success']).catch((e) => {
-      console.warn('  Warning: failed to fetch auth funnel:', e.message);
-      return [];
-    }),
-    fetchFunnelData(accessToken, [
-      'session_start',
-      'event_click',
-      'itinerary',
-      'check_in',
-    ]).catch((e) => {
-      console.warn('  Warning: failed to fetch engagement funnel:', e.message);
-      return [];
-    }),
-    fetchConversions(accessToken).catch((e) => {
-      console.warn('  Warning: failed to fetch conversions:', e.message);
-      return [];
-    }),
-    fetchTimeSeries(accessToken).catch((e) => {
-      console.warn('  Warning: failed to fetch time series:', e.message);
-      return [];
-    }),
-    fetchPages(accessToken).catch((e) => {
-      console.warn('  Warning: failed to fetch pages:', e.message);
-      return [];
-    }),
-    fetchDevices(accessToken).catch((e) => {
-      console.warn('  Warning: failed to fetch devices:', e.message);
-      return [];
-    }),
-    fetchAudiences(accessToken).catch((e) => {
-      console.warn('  Warning: failed to fetch audiences:', e.message);
-      return [];
-    }),
-  ]);
-
-  console.log('Data fetched successfully.\n');
-
-  console.log('Generating HTML dashboard...');
-  const html = buildHtml({
-    totals,
-    traffic,
-    events,
-    onboardingFunnel,
-    authFunnel,
-    engagementFunnel,
-    conversions,
-    timeSeries,
-    pages,
-    devices,
-    audiences,
-  });
-
-  const outPath = join(process.cwd(), 'ga4-dashboard.html');
-  writeFileSync(outPath, html);
-  console.log(`Dashboard written to ${outPath}`);
-
-  // Open in browser
-  try {
-    const platform = process.platform;
-    if (platform === 'win32') {
-      execSync(`start "" "${outPath}"`, { shell: true });
-    } else if (platform === 'darwin') {
-      execSync(`open "${outPath}"`);
-    } else {
-      execSync(`xdg-open "${outPath}"`);
-    }
-    console.log('Opened in browser.');
-  } catch {
-    console.log('Could not open browser automatically. Open the file manually.');
-  }
-}
-
-main().catch((err) => {
-  console.error('Fatal error:', err.message);
-  process.exit(1);
-});
diff --git a/scripts/ga4-looker-setup.md b/scripts/ga4-looker-setup.md
deleted file mode 100644
index e7bba145..00000000
--- a/scripts/ga4-looker-setup.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Looker Studio Dashboard Setup for plan.wtf
-
-## Quick Start
-
-1. Open [Looker Studio](https://lookerstudio.google.com/)
-2. Click **Create → Report**
-3. Add data source: **Google Analytics** → select **Sheeets.xyz** account → **property 524531628**
-4. Click **Add to Report**
-
-## Recommended Dashboard Pages
-
-### Page 1: Traffic Overview
-- **Scorecard**: Sessions, Users, New Users, Bounce Rate (date range: last 30 days)
-- **Time series chart**: Sessions over time (daily)
-- **Table**: Sessions by Source/Medium (top 10)
-- **Pie chart**: Sessions by Device Category
-- **Bar chart**: Top 10 Landing Pages (dimension: pagePath)
-
-### Page 2: Conference Performance
-- **Scorecard**: Total Page Views
-- **Table**: Page views by `pagePath` filtered to `/{conference-slug}` pages
-- **Bar chart**: Conference select events by `conference` custom dimension
-- **Time series**: Conference page views over time
-
-### Page 3: User Engagement
-- **Funnel chart**: session_start → onboarding_start → onboarding_complete → itinerary → check_in
-- **Scorecard**: Onboarding completion rate (onboarding_complete / onboarding_start)
-- **Scorecard**: Auth conversion rate (auth_success / auth_prompt)
-- **Table**: Top events by eventCount
-- **Bar chart**: Tag toggles by `tag` custom dimension
-
-### Page 4: Conversions & Monetization
-- **Table**: Key conversion events (auth_success, itinerary, check_in, submit_event_success, ad_click, rsvp_confirm)
-- **Time series**: Conversion events over time
-- **Scorecard**: Total ad clicks
-- **Table**: Ad clicks by `placement` custom dimension
-
-### Page 5: Audiences
-- **Scorecard**: Power Users count
-- **Scorecard**: Onboarding Dropoffs count
-- **Scorecard**: Engaged Unauthenticated count
-- **Table**: User properties breakdown (conference_slug, is_authenticated)
-
-## Custom Dimensions Available
-All 19 custom dimensions registered in GA4 are available as dimensions in Looker Studio:
-- view_mode, conference, tag, action, search_term, event_name, trigger, placement, step, modal, provider, visibility, category, emoji, test_id, variant_id
-- User-scoped: conference_slug, has_itinerary, is_authenticated
-
-## Filters
-Add a **date range control** and **conference dropdown** (using `conference` dimension) to every page.
diff --git a/scripts/ga4-metrics.mjs b/scripts/ga4-metrics.mjs
deleted file mode 100644
index b91a81a3..00000000
--- a/scripts/ga4-metrics.mjs
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * GA4 Custom Metrics Script
- *
- * Registers custom metrics in GA4 via the Admin API.
- * Uses OAuth2 refresh token stored at ~/.claude/ga4-tokens.json.
- *
- * Usage: node scripts/ga4-metrics.mjs
- */
-
-import { readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-
-const PROPERTY_ID = '524531628';
-const TOKEN_PATH = join(homedir(), '.claude', 'ga4-tokens.json');
-
-const ADMIN_BASE = `https://analyticsadmin.googleapis.com/v1beta/properties/${PROPERTY_ID}`;
-
-// ---------- Custom metrics to register ----------
-
-const CUSTOM_METRICS = [
-  {
-    parameterName: 'itinerary_count',
-    displayName: 'Itinerary Count',
-    measurementUnit: 'STANDARD',
-    scope: 'EVENT',
-  },
-  {
-    parameterName: 'tag_count',
-    displayName: 'Tag Count',
-    measurementUnit: 'STANDARD',
-    scope: 'EVENT',
-  },
-  {
-    parameterName: 'search_count',
-    displayName: 'Search Count',
-    measurementUnit: 'STANDARD',
-    scope: 'EVENT',
-  },
-];
-
-// ---------- Token refresh ----------
-
-async function refreshAccessToken() {
-  const tokens = JSON.parse(readFileSync(TOKEN_PATH, 'utf-8'));
-
-  const clientId = process.env.GA4_CLIENT_ID || tokens.client_id;
-  const clientSecret = process.env.GA4_CLIENT_SECRET || tokens.client_secret;
-
-  if (!clientId || !clientSecret) {
-    throw new Error(
-      'Missing client credentials. Set GA4_CLIENT_ID/GA4_CLIENT_SECRET env vars ' +
-      'or add client_id/client_secret to ' + TOKEN_PATH
-    );
-  }
-
-  const res = await fetch('https://oauth2.googleapis.com/token', {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body: new URLSearchParams({
-      client_id: clientId,
-      client_secret: clientSecret,
-      refresh_token: tokens.refresh_token,
-      grant_type: 'refresh_token',
-    }),
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Token refresh failed: ${res.status} ${err}`);
-  }
-
-  const data = await res.json();
-  const updated = { ...tokens, ...data };
-  writeFileSync(TOKEN_PATH, JSON.stringify(updated, null, 2));
-  return data.access_token;
-}
-
-// ---------- API helper ----------
-
-async function createCustomMetric(accessToken, metric) {
-  const res = await fetch(`${ADMIN_BASE}/customMetrics`, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(metric),
-  });
-
-  if (res.status === 409) {
-    console.log(`  [skip] ${metric.parameterName} (already exists)`);
-    return;
-  }
-
-  if (!res.ok) {
-    const err = await res.text();
-    console.error(`  [error] ${metric.parameterName}: ${res.status} ${err}`);
-    return;
-  }
-
-  const result = await res.json();
-  console.log(`  [created] ${metric.parameterName} (${result.name})`);
-}
-
-// ---------- Main ----------
-
-async function main() {
-  console.log('Refreshing access token...');
-  const accessToken = await refreshAccessToken();
-  console.log('Token refreshed.\n');
-
-  console.log(`Registering ${CUSTOM_METRICS.length} custom metrics...\n`);
-  for (const metric of CUSTOM_METRICS) {
-    await createCustomMetric(accessToken, metric);
-  }
-
-  console.log('\nDone.');
-}
-
-main().catch((err) => {
-  console.error('Fatal error:', err.message);
-  process.exit(1);
-});
diff --git a/scripts/ga4-report.mjs b/scripts/ga4-report.mjs
deleted file mode 100644
index fb418128..00000000
--- a/scripts/ga4-report.mjs
+++ /dev/null
@@ -1,365 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * GA4 Report CLI
- *
- * Query GA4 data via the Data API and Admin API.
- *
- * Usage: node scripts/ga4-report.mjs [traffic|events|funnels|funnel-detail|conversions|dimensions]
- */
-
-import { readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-
-const PROPERTY_ID = '524531628';
-const TOKEN_PATH = join(homedir(), '.claude', 'ga4-tokens.json');
-
-// Client credentials are read from the tokens file (client_id, client_secret fields)
-// or from GA4_CLIENT_ID / GA4_CLIENT_SECRET env vars.
-// To keep secrets out of version control, add to ~/.claude/ga4-tokens.json:
-//   "client_id": "<your-client-id>",
-//   "client_secret": "<your-client-secret>"
-
-const DATA_BASE = `https://analyticsdata.googleapis.com/v1beta/properties/${PROPERTY_ID}`;
-const ADMIN_BASE = `https://analyticsadmin.googleapis.com/v1beta/properties/${PROPERTY_ID}`;
-
-// ---------- Token refresh ----------
-
-async function refreshAccessToken() {
-  const tokens = JSON.parse(readFileSync(TOKEN_PATH, 'utf-8'));
-
-  const clientId = process.env.GA4_CLIENT_ID || tokens.client_id;
-  const clientSecret = process.env.GA4_CLIENT_SECRET || tokens.client_secret;
-
-  if (!clientId || !clientSecret) {
-    throw new Error(
-      'Missing client credentials. Set GA4_CLIENT_ID/GA4_CLIENT_SECRET env vars ' +
-      'or add client_id/client_secret to ' + TOKEN_PATH
-    );
-  }
-
-  const res = await fetch('https://oauth2.googleapis.com/token', {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body: new URLSearchParams({
-      client_id: clientId,
-      client_secret: clientSecret,
-      refresh_token: tokens.refresh_token,
-      grant_type: 'refresh_token',
-    }),
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Token refresh failed: ${res.status} ${err}`);
-  }
-
-  const data = await res.json();
-  const updated = { ...tokens, ...data };
-  writeFileSync(TOKEN_PATH, JSON.stringify(updated, null, 2));
-  return data.access_token;
-}
-
-// ---------- API helpers ----------
-
-async function runReport(accessToken, body) {
-  const res = await fetch(`${DATA_BASE}:runReport`, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(body),
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`runReport failed: ${res.status} ${err}`);
-  }
-
-  return res.json();
-}
-
-async function adminGet(accessToken, path) {
-  const res = await fetch(`${ADMIN_BASE}/${path}`, {
-    headers: { Authorization: `Bearer ${accessToken}` },
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Admin API failed: ${res.status} ${err}`);
-  }
-
-  return res.json();
-}
-
-// ---------- Formatters ----------
-
-function printTable(headers, rows) {
-  const widths = headers.map((h, i) =>
-    Math.max(h.length, ...rows.map((r) => String(r[i] || '').length))
-  );
-
-  const sep = widths.map((w) => '-'.repeat(w + 2)).join('+');
-  const formatRow = (row) =>
-    row.map((cell, i) => ` ${String(cell || '').padEnd(widths[i])} `).join('|');
-
-  console.log(formatRow(headers));
-  console.log(sep);
-  rows.forEach((row) => console.log(formatRow(row)));
-  console.log(`\n${rows.length} rows\n`);
-}
-
-function extractRows(report) {
-  if (!report.rows) return [];
-  return report.rows.map((row) => [
-    ...row.dimensionValues.map((d) => d.value),
-    ...row.metricValues.map((m) => m.value),
-  ]);
-}
-
-// ---------- Report types ----------
-
-async function reportTraffic(accessToken) {
-  console.log('Traffic by Source/Medium (last 30 days)\n');
-
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'sessionSourceMedium' }],
-    metrics: [{ name: 'sessions' }, { name: 'activeUsers' }, { name: 'bounceRate' }],
-    orderBys: [{ metric: { metricName: 'sessions' }, desc: true }],
-    limit: 20,
-  });
-
-  const rows = extractRows(report);
-  printTable(['Source / Medium', 'Sessions', 'Users', 'Bounce Rate'], rows);
-}
-
-async function reportEvents(accessToken) {
-  console.log('Event Counts (last 30 days)\n');
-
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'eventName' }],
-    metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
-    orderBys: [{ metric: { metricName: 'eventCount' }, desc: true }],
-    limit: 50,
-  });
-
-  const rows = extractRows(report);
-  printTable(['Event Name', 'Count', 'Users'], rows);
-}
-
-async function reportFunnels(accessToken) {
-  console.log('Key Funnel Metrics (last 30 days)\n');
-
-  const funnelEvents = [
-    'session_start',
-    'onboarding_start',
-    'onboarding_complete',
-    'auth_prompt',
-    'auth_success',
-    'itinerary',
-    'check_in',
-    'submit_event_open',
-    'submit_event_success',
-  ];
-
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'eventName' }],
-    metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
-    dimensionFilter: {
-      filter: {
-        fieldName: 'eventName',
-        inListFilter: { values: funnelEvents },
-      },
-    },
-    orderBys: [{ metric: { metricName: 'eventCount' }, desc: true }],
-  });
-
-  const rows = extractRows(report);
-
-  // Sort by funnel order
-  const orderMap = Object.fromEntries(funnelEvents.map((e, i) => [e, i]));
-  rows.sort((a, b) => (orderMap[a[0]] ?? 99) - (orderMap[b[0]] ?? 99));
-
-  printTable(['Funnel Step', 'Count', 'Users'], rows);
-}
-
-async function reportConversions(accessToken) {
-  console.log('Key Conversion Events (last 30 days)\n');
-
-  const conversionEvents = [
-    'auth_success',
-    'itinerary',
-    'check_in',
-    'submit_event_success',
-    'onboarding_complete',
-    'ad_click',
-    'rsvp_confirm',
-  ];
-
-  const report = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'eventName' }],
-    metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
-    dimensionFilter: {
-      filter: {
-        fieldName: 'eventName',
-        inListFilter: { values: conversionEvents },
-      },
-    },
-    orderBys: [{ metric: { metricName: 'eventCount' }, desc: true }],
-  });
-
-  const rows = extractRows(report);
-  printTable(['Conversion Event', 'Count', 'Users'], rows);
-}
-
-async function reportDimensions(accessToken) {
-  console.log('Registered Custom Dimensions\n');
-
-  const data = await adminGet(accessToken, 'customDimensions');
-  const dims = data.customDimensions || [];
-
-  const rows = dims.map((d) => [
-    d.parameterName,
-    d.displayName,
-    d.scope,
-    d.description || '',
-  ]);
-
-  // Sort by scope then name
-  rows.sort((a, b) => a[2].localeCompare(b[2]) || a[0].localeCompare(b[0]));
-
-  printTable(['Parameter', 'Display Name', 'Scope', 'Description'], rows);
-}
-
-async function reportFunnelDetail(accessToken) {
-  console.log('Funnel Analysis (last 30 days)\n');
-
-  // Onboarding funnel
-  const onboardingEvents = ['session_start', 'onboarding_start', 'onboarding_step', 'onboarding_complete'];
-  const onboardingReport = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'eventName' }],
-    metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
-    dimensionFilter: {
-      filter: {
-        fieldName: 'eventName',
-        inListFilter: { values: onboardingEvents },
-      },
-    },
-  });
-
-  console.log('=== Onboarding Funnel ===');
-  const onboardingRows = extractRows(onboardingReport);
-  const orderMap1 = Object.fromEntries(onboardingEvents.map((e, i) => [e, i]));
-  onboardingRows.sort((a, b) => (orderMap1[a[0]] ?? 99) - (orderMap1[b[0]] ?? 99));
-
-  // Calculate drop-off rates
-  const onboardingWithRates = onboardingRows.map((row, i) => {
-    const prevUsers = i > 0 ? Number(onboardingRows[i - 1][2]) : Number(row[2]);
-    const currentUsers = Number(row[2]);
-    const rate = i === 0 ? '100%' : `${((currentUsers / prevUsers) * 100).toFixed(1)}%`;
-    const dropOff = i === 0 ? '-' : `${((1 - currentUsers / prevUsers) * 100).toFixed(1)}%`;
-    return [...row, rate, dropOff];
-  });
-  printTable(['Step', 'Count', 'Users', 'Conv Rate', 'Drop-off'], onboardingWithRates);
-
-  // Auth funnel
-  const authEvents = ['auth_prompt', 'auth_success'];
-  const authReport = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'eventName' }],
-    metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
-    dimensionFilter: {
-      filter: {
-        fieldName: 'eventName',
-        inListFilter: { values: authEvents },
-      },
-    },
-  });
-
-  console.log('=== Auth Funnel ===');
-  const authRows = extractRows(authReport);
-  const orderMap2 = Object.fromEntries(authEvents.map((e, i) => [e, i]));
-  authRows.sort((a, b) => (orderMap2[a[0]] ?? 99) - (orderMap2[b[0]] ?? 99));
-
-  const authWithRates = authRows.map((row, i) => {
-    const prevUsers = i > 0 ? Number(authRows[i - 1][2]) : Number(row[2]);
-    const currentUsers = Number(row[2]);
-    const rate = i === 0 ? '100%' : `${((currentUsers / prevUsers) * 100).toFixed(1)}%`;
-    const dropOff = i === 0 ? '-' : `${((1 - currentUsers / prevUsers) * 100).toFixed(1)}%`;
-    return [...row, rate, dropOff];
-  });
-  printTable(['Step', 'Count', 'Users', 'Conv Rate', 'Drop-off'], authWithRates);
-
-  // Engagement funnel
-  const engagementEvents = ['session_start', 'event_click', 'itinerary', 'check_in'];
-  const engReport = await runReport(accessToken, {
-    dateRanges: [{ startDate: '30daysAgo', endDate: 'today' }],
-    dimensions: [{ name: 'eventName' }],
-    metrics: [{ name: 'eventCount' }, { name: 'totalUsers' }],
-    dimensionFilter: {
-      filter: {
-        fieldName: 'eventName',
-        inListFilter: { values: engagementEvents },
-      },
-    },
-  });
-
-  console.log('=== Engagement Funnel ===');
-  const engRows = extractRows(engReport);
-  const orderMap3 = Object.fromEntries(engagementEvents.map((e, i) => [e, i]));
-  engRows.sort((a, b) => (orderMap3[a[0]] ?? 99) - (orderMap3[b[0]] ?? 99));
-
-  const engWithRates = engRows.map((row, i) => {
-    const prevUsers = i > 0 ? Number(engRows[i - 1][2]) : Number(row[2]);
-    const currentUsers = Number(row[2]);
-    const rate = i === 0 ? '100%' : `${((currentUsers / prevUsers) * 100).toFixed(1)}%`;
-    const dropOff = i === 0 ? '-' : `${((1 - currentUsers / prevUsers) * 100).toFixed(1)}%`;
-    return [...row, rate, dropOff];
-  });
-  printTable(['Step', 'Count', 'Users', 'Conv Rate', 'Drop-off'], engWithRates);
-}
-
-// ---------- Main ----------
-
-const REPORTS = {
-  traffic: reportTraffic,
-  events: reportEvents,
-  funnels: reportFunnels,
-  'funnel-detail': reportFunnelDetail,
-  conversions: reportConversions,
-  dimensions: reportDimensions,
-};
-
-async function main() {
-  const reportType = process.argv[2];
-
-  if (!reportType || !REPORTS[reportType]) {
-    console.log('Usage: node scripts/ga4-report.mjs [traffic|events|funnels|funnel-detail|conversions|dimensions]');
-    console.log('\nReport types:');
-    console.log('  traffic        Sessions by source/medium (last 30 days)');
-    console.log('  events         Event counts (last 30 days)');
-    console.log('  funnels        Key funnel metrics (onboarding, auth)');
-    console.log('  funnel-detail  Detailed funnel analysis with conversion/drop-off rates');
-    console.log('  conversions    Key conversion events');
-    console.log('  dimensions     List registered custom dimensions');
-    process.exit(1);
-  }
-
-  console.log('Refreshing access token...');
-  const accessToken = await refreshAccessToken();
-  console.log('Token refreshed.\n');
-
-  await REPORTS[reportType](accessToken);
-}
-
-main().catch((err) => {
-  console.error('Fatal error:', err.message);
-  process.exit(1);
-});
diff --git a/scripts/ga4-setup.mjs b/scripts/ga4-setup.mjs
deleted file mode 100644
index 67b18eb0..00000000
--- a/scripts/ga4-setup.mjs
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * GA4 Setup Script
- *
- * Registers custom dimensions and key events (conversions) in GA4 via the Admin API.
- * Uses OAuth2 refresh token stored at ~/.claude/ga4-tokens.json.
- *
- * Usage: node scripts/ga4-setup.mjs
- */
-
-import { readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-
-const PROPERTY_ID = '524531628';
-const TOKEN_PATH = join(homedir(), '.claude', 'ga4-tokens.json');
-
-// Client credentials are read from the tokens file (client_id, client_secret fields)
-// or from GA4_CLIENT_ID / GA4_CLIENT_SECRET env vars.
-// To keep secrets out of version control, add to ~/.claude/ga4-tokens.json:
-//   "client_id": "<your-client-id>",
-//   "client_secret": "<your-client-secret>"
-
-const ADMIN_BASE = `https://analyticsadmin.googleapis.com/v1beta/properties/${PROPERTY_ID}`;
-
-// ---------- Custom dimensions to register ----------
-
-const EVENT_DIMENSIONS = [
-  { parameterName: 'view_mode', displayName: 'View Mode', description: 'Map/List/Table/Gallery' },
-  { parameterName: 'conference', displayName: 'Conference', description: 'Conference slug' },
-  { parameterName: 'tag', displayName: 'Tag', description: 'Filter tag name' },
-  { parameterName: 'action', displayName: 'Action', description: 'Add/remove action' },
-  { parameterName: 'search_term', displayName: 'Search Term', description: 'Search query' },
-  { parameterName: 'event_name', displayName: 'Tracked Event Name', description: 'Name of event clicked' },
-  { parameterName: 'trigger', displayName: 'Auth Trigger', description: 'What triggered auth prompt' },
-  { parameterName: 'placement', displayName: 'Ad Placement', description: 'Ad placement location' },
-  { parameterName: 'step', displayName: 'Onboarding Step', description: 'Which onboarding step' },
-  { parameterName: 'modal', displayName: 'Modal Name', description: 'Which modal was dismissed' },
-  { parameterName: 'provider', displayName: 'Nav Provider', description: 'Google Maps/Uber/Lyft' },
-  { parameterName: 'visibility', displayName: 'Comment Visibility', description: 'Public/friends' },
-  { parameterName: 'category', displayName: 'POI Category', description: 'POI category' },
-  { parameterName: 'emoji', displayName: 'Reaction Emoji', description: 'Which emoji used' },
-  { parameterName: 'test_id', displayName: 'AB Test ID', description: 'A/B test identifier' },
-  { parameterName: 'variant_id', displayName: 'AB Variant', description: 'A/B test variant' },
-];
-
-const USER_DIMENSIONS = [
-  { parameterName: 'conference_slug', displayName: 'User Conference', description: 'User selected conference' },
-  { parameterName: 'has_itinerary', displayName: 'Has Itinerary', description: 'Whether user has itinerary items' },
-  { parameterName: 'is_authenticated', displayName: 'Is Authenticated', description: 'Whether user is logged in' },
-];
-
-const KEY_EVENTS = [
-  'auth_success',
-  'itinerary',
-  'check_in',
-  'submit_event_success',
-  'onboarding_complete',
-  'ad_click',
-  'rsvp_confirm',
-];
-
-// ---------- Token refresh ----------
-
-async function refreshAccessToken() {
-  const tokens = JSON.parse(readFileSync(TOKEN_PATH, 'utf-8'));
-
-  const clientId = process.env.GA4_CLIENT_ID || tokens.client_id;
-  const clientSecret = process.env.GA4_CLIENT_SECRET || tokens.client_secret;
-
-  if (!clientId || !clientSecret) {
-    throw new Error(
-      'Missing client credentials. Set GA4_CLIENT_ID/GA4_CLIENT_SECRET env vars ' +
-      'or add client_id/client_secret to ' + TOKEN_PATH
-    );
-  }
-
-  const res = await fetch('https://oauth2.googleapis.com/token', {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body: new URLSearchParams({
-      client_id: clientId,
-      client_secret: clientSecret,
-      refresh_token: tokens.refresh_token,
-      grant_type: 'refresh_token',
-    }),
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Token refresh failed: ${res.status} ${err}`);
-  }
-
-  const data = await res.json();
-  // Persist the new access token (keep existing refresh_token)
-  const updated = { ...tokens, ...data };
-  writeFileSync(TOKEN_PATH, JSON.stringify(updated, null, 2));
-  return data.access_token;
-}
-
-// ---------- API helpers ----------
-
-async function createCustomDimension(accessToken, dimension, scope) {
-  const body = {
-    parameterName: dimension.parameterName,
-    displayName: dimension.displayName,
-    description: dimension.description || '',
-    scope: scope, // EVENT or USER
-  };
-
-  const res = await fetch(`${ADMIN_BASE}/customDimensions`, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(body),
-  });
-
-  if (res.status === 409) {
-    console.log(`  [skip] ${dimension.parameterName} (already exists)`);
-    return;
-  }
-
-  if (!res.ok) {
-    const err = await res.text();
-    console.error(`  [error] ${dimension.parameterName}: ${res.status} ${err}`);
-    return;
-  }
-
-  console.log(`  [created] ${dimension.parameterName}`);
-}
-
-async function createKeyEvent(accessToken, eventName) {
-  const body = { eventName };
-
-  const res = await fetch(`${ADMIN_BASE}/keyEvents`, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(body),
-  });
-
-  if (res.status === 409) {
-    console.log(`  [skip] ${eventName} (already exists)`);
-    return;
-  }
-
-  if (!res.ok) {
-    const err = await res.text();
-    console.error(`  [error] ${eventName}: ${res.status} ${err}`);
-    return;
-  }
-
-  console.log(`  [created] ${eventName}`);
-}
-
-// ---------- Main ----------
-
-async function main() {
-  console.log('Refreshing access token...');
-  const accessToken = await refreshAccessToken();
-  console.log('Token refreshed.\n');
-
-  console.log(`Registering ${EVENT_DIMENSIONS.length} event-scoped custom dimensions...`);
-  for (const dim of EVENT_DIMENSIONS) {
-    await createCustomDimension(accessToken, dim, 'EVENT');
-  }
-
-  console.log(`\nRegistering ${USER_DIMENSIONS.length} user-scoped custom dimensions...`);
-  for (const dim of USER_DIMENSIONS) {
-    await createCustomDimension(accessToken, dim, 'USER');
-  }
-
-  console.log(`\nRegistering ${KEY_EVENTS.length} key events (conversions)...`);
-  for (const eventName of KEY_EVENTS) {
-    await createKeyEvent(accessToken, eventName);
-  }
-
-  console.log('\nDone.');
-}
-
-main().catch((err) => {
-  console.error('Fatal error:', err.message);
-  process.exit(1);
-});
diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
index b286555c..ccb92cda 100644
--- a/src/app/admin/page.tsx
+++ b/src/app/admin/page.tsx
@@ -11,14 +11,12 @@ import type { AdminConfig, SponsorEntry, NativeAd, UpsellCopy, AdInventoryItem,
 import { isConferencePast, conferenceToTab } from '@/lib/conferences';
 import type { TabConfig } from '@/lib/conferences';
 import SponsorDataTab from '@/components/admin/SponsorDataTab';
-import SubmissionsTab from '@/components/admin/SubmissionsTab';
 
 const SESSION_KEY = 'sheeets-admin-auth';
 
-type AdminTab = 'submissions' | 'featured' | 'conferences' | 'sponsors' | 'nativeAds' | 'upsell' | 'adInventory' | 'theme' | 'abTests' | 'adReports' | 'eventAnalytics' | 'sponsorData';
+type AdminTab = 'featured' | 'conferences' | 'sponsors' | 'nativeAds' | 'upsell' | 'adInventory' | 'theme' | 'abTests' | 'adReports' | 'eventAnalytics' | 'sponsorData';
 
 const TAB_LABELS: { key: AdminTab; label: string }[] = [
-  { key: 'submissions', label: 'Submissions' },
   { key: 'featured', label: 'Featured' },
   { key: 'conferences', label: 'Conferences' },
   { key: 'sponsors', label: 'Sponsors' },
@@ -108,7 +106,7 @@ export default function AdminPage() {
   const [search, setSearch] = useState('');
   const [togglingId, setTogglingId] = useState<string | null>(null);
 
-  const [activeTab, setActiveTab] = useState<AdminTab>('submissions');
+  const [activeTab, setActiveTab] = useState<AdminTab>('featured');
   const [adminConfig, setAdminConfig] = useState<AdminConfig | null>(null);
   const [configLoading, setConfigLoading] = useState(false);
   const [saving, setSaving] = useState(false);
@@ -663,11 +661,6 @@ export default function AdminPage() {
 
       {/* Content */}
       <div className="max-w-5xl mx-auto px-4 py-4">
-        {/* Tab: Submissions */}
-        {activeTab === 'submissions' && (
-          <SubmissionsTab allConferenceTabs={allConferenceTabs} password={password} />
-        )}
-
         {/* Tab 1: Featured */}
         {activeTab === 'featured' && (
           <>
diff --git a/src/app/api/admin/submissions/route.ts b/src/app/api/admin/submissions/route.ts
deleted file mode 100644
index a37834a3..00000000
--- a/src/app/api/admin/submissions/route.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { createClient } from '@supabase/supabase-js';
-import { parseBody, SubmissionActionSchema } from '@/lib/api-validation';
-import { insertEventRowSorted, getSheetTitle, findReviewRow, deleteSheetRow, writeCell } from '@/lib/google-sheets';
-import { FALLBACK_TABS } from '@/lib/conferences';
-import { getConferenceTabs } from '@/lib/get-conferences';
-import { normalizeAddress } from '@/lib/utils';
-
-const ADMIN_PASSWORD = 'trusttheplan';
-
-function getSupabase() {
-  return createClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL!,
-    process.env.SUPABASE_SERVICE_ROLE_KEY!
-  );
-}
-
-export async function GET(req: NextRequest) {
-  const password = req.nextUrl.searchParams.get('password');
-  if (password !== ADMIN_PASSWORD) {
-    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
-  }
-
-  const status = req.nextUrl.searchParams.get('status') || 'pending';
-  const conference = req.nextUrl.searchParams.get('conference') || '';
-
-  const supabase = getSupabase();
-  let query = supabase
-    .from('event_submissions')
-    .select('*')
-    .order('created_at', { ascending: false });
-
-  if (status !== 'all') {
-    query = query.eq('status', status);
-  }
-  if (conference) {
-    query = query.eq('conference', conference);
-  }
-
-  const { data, error } = await query;
-
-  if (error) {
-    return NextResponse.json({ error: error.message }, { status: 500 });
-  }
-
-  return NextResponse.json({ submissions: data });
-}
-
-export async function POST(req: NextRequest) {
-  const { data, error: parseError } = await parseBody(req, SubmissionActionSchema);
-  if (parseError) return parseError;
-
-  const { password, action, id, rejection_reason, edits } = data;
-
-  if (password !== ADMIN_PASSWORD) {
-    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
-  }
-
-  const supabase = getSupabase();
-
-  // Fetch the submission
-  const { data: submission, error: fetchError } = await supabase
-    .from('event_submissions')
-    .select('*')
-    .eq('id', id)
-    .eq('status', 'pending')
-    .single();
-
-  if (fetchError || !submission) {
-    return NextResponse.json(
-      { error: 'Submission not found or already reviewed' },
-      { status: 404 }
-    );
-  }
-
-  // Resolve conference tab
-  let tabs = FALLBACK_TABS;
-  try {
-    tabs = await getConferenceTabs();
-  } catch { /* use fallback */ }
-
-  const tab = tabs.find((t: { name: string }) => t.name === submission.conference);
-  if (!tab) {
-    return NextResponse.json(
-      { error: `Conference tab not found: ${submission.conference}` },
-      { status: 400 }
-    );
-  }
-
-  const sheetName = await getSheetTitle(tab.gid);
-
-  if (action === 'reject') {
-    // 1. Find the review row by original name/date
-    const reviewRowIdx = await findReviewRow(sheetName, submission.event_name, submission.event_date);
-
-    // 2. Mark column M as REJECTED (if row found)
-    if (reviewRowIdx !== null) {
-      try {
-        await writeCell(sheetName, `M${reviewRowIdx + 1}`, 'REJECTED');
-      } catch (sheetErr) {
-        console.warn('Failed to mark sheet row as rejected:', sheetErr);
-      }
-    } else {
-      console.warn(`Review row not found for rejection: ${submission.event_name} / ${submission.event_date}`);
-    }
-
-    // 3. Update Supabase
-    const { error: updateError } = await supabase
-      .from('event_submissions')
-      .update({
-        status: 'rejected',
-        rejection_reason: rejection_reason || null,
-        reviewed_at: new Date().toISOString(),
-      })
-      .eq('id', id)
-      .eq('status', 'pending');
-
-    if (updateError) {
-      return NextResponse.json({ error: updateError.message }, { status: 500 });
-    }
-
-    return NextResponse.json({ success: true, action: 'rejected' });
-  }
-
-  // ---- Approve ----
-
-  // Merge admin edits over submission fields
-  const eventFields = {
-    event_name: edits?.event_name ?? submission.event_name,
-    event_date: edits?.event_date ?? submission.event_date,
-    start_time: edits?.start_time ?? submission.start_time,
-    end_time: edits?.end_time ?? submission.end_time,
-    organizer: edits?.organizer ?? submission.organizer,
-    address: edits?.address ?? submission.address,
-    cost: edits?.cost ?? submission.cost,
-    tags: edits?.tags ?? submission.tags,
-    link: edits?.link ?? submission.link,
-    has_food: edits?.has_food ?? submission.has_food,
-    has_bar: edits?.has_bar ?? submission.has_bar,
-    note: edits?.note ?? submission.note,
-  };
-
-  try {
-    // 1. Find the review row by ORIGINAL name/date (before edits)
-    const reviewRowIdx = await findReviewRow(sheetName, submission.event_name, submission.event_date);
-
-    // 2. Insert into main section (this shifts all rows below down by 1)
-    const sheetRow = await insertEventRowSorted(sheetName, tab.gid, {
-      date: eventFields.event_date,
-      startTime: eventFields.start_time,
-      endTime: eventFields.end_time,
-      organizer: eventFields.organizer,
-      name: eventFields.event_name,
-      address: eventFields.address,
-      cost: eventFields.cost,
-      tags: eventFields.tags,
-      link: eventFields.link,
-      food: eventFields.has_food,
-      bar: eventFields.has_bar,
-      note: eventFields.note,
-    });
-
-    // 3. Delete from review section (+1 because insertEventRowSorted shifted rows down)
-    if (reviewRowIdx !== null) {
-      try {
-        await deleteSheetRow(tab.gid, reviewRowIdx + 1);
-      } catch (deleteErr) {
-        console.warn('Failed to delete review row:', deleteErr);
-      }
-    } else {
-      console.warn(`Review row not found for approval: ${submission.event_name} / ${submission.event_date}`);
-    }
-
-    // 4. Upsert geocoded address if coords exist
-    if (submission.coords_lat && submission.coords_lng && eventFields.address) {
-      try {
-        await supabase.from('geocoded_addresses').upsert({
-          normalized_address: normalizeAddress(eventFields.address),
-          lat: submission.coords_lat,
-          lng: submission.coords_lng,
-          matched_address: eventFields.address,
-          conference: submission.conference,
-        });
-      } catch (geoErr) {
-        console.error('Failed to save geocoded address:', geoErr);
-      }
-    }
-
-    // 5. Update Supabase status
-    const { error: updateError } = await supabase
-      .from('event_submissions')
-      .update({
-        status: 'approved',
-        reviewed_at: new Date().toISOString(),
-        sheet_row: sheetRow,
-      })
-      .eq('id', id)
-      .eq('status', 'pending');
-
-    if (updateError) {
-      return NextResponse.json({ error: updateError.message }, { status: 500 });
-    }
-
-    return NextResponse.json({ success: true, action: 'approved', sheet_row: sheetRow });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : 'Unknown error';
-    return NextResponse.json(
-      { error: `Failed to write to sheet: ${message}` },
-      { status: 500 }
-    );
-  }
-}
diff --git a/src/app/api/image-proxy/route.ts b/src/app/api/image-proxy/route.ts
new file mode 100644
index 00000000..0949b59b
--- /dev/null
+++ b/src/app/api/image-proxy/route.ts
@@ -0,0 +1,39 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+export async function GET(request: NextRequest) {
+  const url = request.nextUrl.searchParams.get('url');
+  if (!url) {
+    return NextResponse.json({ error: 'Missing url parameter' }, { status: 400 });
+  }
+
+  try {
+    new URL(url);
+  } catch {
+    return NextResponse.json({ error: 'Invalid url' }, { status: 400 });
+  }
+
+  try {
+    const res = await fetch(url, {
+      signal: AbortSignal.timeout(10000),
+      headers: {
+        'User-Agent': 'Mozilla/5.0 (compatible; sheeets-bot/1.0)',
+      },
+    });
+
+    if (!res.ok) {
+      return NextResponse.json({ error: 'Upstream fetch failed' }, { status: 502 });
+    }
+
+    const contentType = res.headers.get('content-type') || 'image/jpeg';
+    const buffer = await res.arrayBuffer();
+
+    return new NextResponse(buffer, {
+      headers: {
+        'Content-Type': contentType,
+        'Cache-Control': 'public, max-age=86400, s-maxage=86400',
+      },
+    });
+  } catch {
+    return NextResponse.json({ error: 'Proxy fetch failed' }, { status: 502 });
+  }
+}
diff --git a/src/app/api/submit-event/route.ts b/src/app/api/submit-event/route.ts
index 81c8efef..28888929 100644
--- a/src/app/api/submit-event/route.ts
+++ b/src/app/api/submit-event/route.ts
@@ -31,7 +31,6 @@ export async function POST(request: NextRequest) {
 
     const sheetName = await getSheetTitle(tab.gid);
 
-    // Write to sheet review section (primary — must succeed)
     const row = await appendEventRow(sheetName, {
       date: event.date.trim(),
       startTime: event.startTime.trim(),
@@ -47,35 +46,6 @@ export async function POST(request: NextRequest) {
       note: event.note.trim(),
     });
 
-    // Track in Supabase (non-fatal — wrapped in try/catch)
-    try {
-      const supabase = createClient(
-        process.env.NEXT_PUBLIC_SUPABASE_URL!,
-        process.env.SUPABASE_SERVICE_ROLE_KEY!
-      );
-      await supabase.from('event_submissions').insert({
-        conference,
-        status: 'pending',
-        event_name: event.name.trim(),
-        event_date: event.date.trim(),
-        start_time: event.startTime.trim(),
-        end_time: event.endTime.trim(),
-        organizer: event.organizer.trim(),
-        address: event.address.trim(),
-        cost: event.cost.trim(),
-        tags: event.tags.trim(),
-        link: event.link.trim(),
-        has_food: event.food,
-        has_bar: event.bar,
-        note: event.note.trim(),
-        coords_lat: coords?.lat ?? null,
-        coords_lng: coords?.lng ?? null,
-        sheet_row: row,
-      });
-    } catch (trackErr) {
-      console.error('Failed to track submission in Supabase:', trackErr);
-    }
-
     // Upsert geocoded address to Supabase for instant map pin display
     if (coords && event.address.trim()) {
       try {
@@ -91,11 +61,12 @@ export async function POST(request: NextRequest) {
           conference,
         });
       } catch (geoErr) {
+        // Non-fatal: log but don't fail the submission
         console.error('Failed to save geocoded address:', geoErr);
       }
     }
 
-    return NextResponse.json({ success: true, row, pending: true });
+    return NextResponse.json({ success: true, row });
   } catch (err) {
     console.error('Submit event error:', err);
     const message = err instanceof Error ? err.message : 'Unknown error';
diff --git a/src/app/error.tsx b/src/app/error.tsx
deleted file mode 100644
index c00c473c..00000000
--- a/src/app/error.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-'use client';
-
-import { useEffect } from 'react';
-import { trackError } from '@/lib/analytics';
-
-export default function Error({
-  error,
-  reset,
-}: {
-  error: Error & { digest?: string };
-  reset: () => void;
-}) {
-  useEffect(() => {
-    trackError(error.message, 'error-boundary');
-  }, [error]);
-
-  return (
-    <div className="min-h-screen flex flex-col items-center justify-center gap-4 px-4 bg-[var(--theme-bg-primary)]">
-      <h2 className="text-lg font-semibold text-[var(--theme-text-primary)]">Something went wrong</h2>
-      <p className="text-sm text-[var(--theme-text-muted)] text-center max-w-md">{error.message}</p>
-      <button
-        onClick={reset}
-        className="px-4 py-2 rounded-lg text-sm font-medium bg-[var(--theme-accent)] text-white hover:opacity-90 transition-opacity"
-      >
-        Try again
-      </button>
-    </div>
-  );
-}
diff --git a/src/app/globals.css b/src/app/globals.css
index 85085715..1483e09d 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -53,42 +53,6 @@
 
   --theme-logo-filter: invert(1);
 
-  --theme-header-bg: var(--theme-bg-primary);
-  --theme-header-border: var(--theme-border-secondary);
-  --theme-header-logo-filter: var(--theme-logo-filter);
-  --theme-header-text: var(--theme-text-secondary);
-  --theme-header-text-hover: var(--theme-text-primary);
-  --theme-header-control-bg: var(--theme-bg-secondary);
-  --theme-header-control-bg-hover: var(--theme-bg-tertiary);
-  --theme-header-control-border: var(--theme-border-primary);
-  --theme-header-accent: var(--theme-accent);
-  --theme-header-accent-muted: var(--theme-accent-muted);
-  --theme-header-badge-bg: var(--theme-accent);
-  --theme-header-badge-text: var(--theme-accent-text);
-  --theme-header-badge-border: var(--theme-accent);
-
-  --theme-map-pin: #1c1917;
-  --theme-map-pin-night: rgba(255,255,255,0.4);
-
-  --theme-bg-list: var(--theme-bg-primary);
-  --theme-bg-filter: var(--theme-bg-primary);
-  --theme-filter-text: var(--theme-text-secondary);
-  --theme-filter-control-bg: var(--theme-bg-secondary);
-  --theme-filter-control-border: var(--theme-border-primary);
-  --theme-filter-active: var(--theme-accent);
-  --theme-filter-active-bg: var(--theme-accent-muted);
-  --theme-filter-badge-bg: var(--theme-text-secondary);
-  --theme-filter-badge-text: var(--theme-bg-primary);
-  --theme-filter-badge-border: var(--theme-text-secondary);
-  --theme-table-header-bg: var(--theme-bg-secondary);
-  --theme-table-header-text: var(--theme-text-secondary);
-  --theme-landing-card-bg: var(--theme-bg-card);
-  --theme-landing-card-text: var(--theme-text-primary);
-  --theme-landing-card-secondary: var(--theme-text-secondary);
-  --theme-landing-card-muted: var(--theme-text-muted);
-  --theme-landing-card-accent: var(--theme-accent);
-  --theme-landing-card-border: var(--theme-border-primary);
-
   --theme-scrollbar-track: #0c0a09;
   --theme-scrollbar-thumb: #292524;
   --theme-scrollbar-thumb-hover: #44403c;
@@ -106,21 +70,6 @@
   --tag-purple: #A855F7;
   --tag-default: #6B7280;
   --friend-blue: #3B82F6;
-
-  --theme-modal-header-bg: transparent;
-  --theme-modal-header-text: var(--theme-text-primary);
-  --theme-modal-header-close: var(--theme-text-secondary);
-  --theme-modal-bg: var(--theme-bg-secondary);
-
-  --theme-date-sep-bg: var(--theme-bg-primary);
-  --theme-date-sep-text: var(--theme-text-primary);
-  --theme-date-sep-muted: var(--theme-text-muted);
-  --theme-date-sep-border: var(--theme-border-secondary);
-
-  --theme-ticker-bg: var(--theme-bg-primary);
-  --theme-ticker-text: var(--theme-text-secondary);
-  --theme-ticker-link: var(--theme-text-primary);
-  --theme-ticker-border: var(--theme-border-secondary);
 }
 
 /* --- Paper theme — warm parchment/cream aesthetic --- */
@@ -158,9 +107,6 @@
 
   --theme-now-bg: #c0564a;
 
-  --theme-map-pin: #d4a32c;
-  --theme-map-pin-night: #6b4c0a;
-
   --theme-logo-filter: invert(0);
 
   --theme-scrollbar-track: #f5f0e8;
@@ -217,9 +163,6 @@
 
   --theme-now-bg: #22c55e;
 
-  --theme-map-pin: #fca5a5;
-  --theme-map-pin-night: #dc2626;
-
   --theme-logo-filter: invert(0);
 
   --theme-scrollbar-track: #fafafa;
@@ -253,8 +196,8 @@
   --theme-bg-primary: #fafafa;
   --theme-bg-secondary: #f5f5f5;
   --theme-bg-tertiary: #e5e5e5;
-  --theme-bg-card: #f7f7f8;
-  --theme-bg-card-hover: #f0f0f2;
+  --theme-bg-card: #ffffff;
+  --theme-bg-card-hover: #f5f5f5;
   --theme-bg-input: #ffffff;
 
   --theme-border-primary: #d4d4d4;
@@ -278,33 +221,6 @@
 
   --theme-logo-filter: brightness(0) saturate(100%) invert(22%) sepia(60%) saturate(1200%) hue-rotate(198deg) brightness(95%) contrast(95%);
 
-  --theme-header-bg: #1c4586;
-  --theme-header-border: #153a73;
-  --theme-header-logo-filter: brightness(0) invert(1);
-  --theme-header-text: rgba(255, 255, 255, 0.7);
-  --theme-header-text-hover: #ffffff;
-  --theme-header-control-bg: rgba(255, 255, 255, 0.1);
-  --theme-header-control-bg-hover: rgba(255, 255, 255, 0.2);
-  --theme-header-control-border: rgba(255, 255, 255, 0.2);
-  --theme-header-accent: #ffffff;
-  --theme-header-accent-muted: rgba(255, 255, 255, 0.15);
-
-  --theme-map-pin: #93c5fd;
-  --theme-map-pin-night: #1c4586;
-
-  --theme-bg-list: rgba(28, 69, 134, 0.06);
-  --theme-bg-filter: #1c4586;
-  --theme-filter-text: rgba(255, 255, 255, 0.7);
-  --theme-filter-control-bg: rgba(255, 255, 255, 0.1);
-  --theme-filter-control-border: rgba(255, 255, 255, 0.2);
-  --theme-filter-active: #ffffff;
-  --theme-filter-active-bg: rgba(255, 255, 255, 0.15);
-  --theme-filter-badge-bg: transparent;
-  --theme-filter-badge-text: #ffffff;
-  --theme-filter-badge-border: #ffffff;
-  --theme-table-header-bg: #1c4586;
-  --theme-table-header-text: #ffffff;
-
   --theme-scrollbar-track: #fafafa;
   --theme-scrollbar-thumb: #d4d4d4;
   --theme-scrollbar-thumb-hover: #a3a3a3;
@@ -314,40 +230,14 @@
   --theme-popup-featured-border: rgba(28, 69, 134, 0.5);
   --theme-popup-shadow: rgba(0, 0, 0, 0.1);
 
-  --theme-landing-card-bg: #1c4586;
-  --theme-landing-card-text: #ffffff;
-  --theme-landing-card-secondary: rgba(255, 255, 255, 0.7);
-  --theme-landing-card-muted: rgba(255, 255, 255, 0.5);
-  --theme-landing-card-accent: #ffffff;
-  --theme-landing-card-border: rgba(255, 255, 255, 0.15);
-
-  --tag-green: #34d399;
-  --tag-blue: #93c5fd;
-  --tag-yellow: #fbbf24;
-  --tag-pink: #f472b6;
-  --tag-teal: #5eead4;
-  --tag-purple: #c4b5fd;
-  --tag-default: #94a3b8;
+  --tag-green: #059669;
+  --tag-blue: #2563EB;
+  --tag-yellow: #D97706;
+  --tag-pink: #DB2777;
+  --tag-teal: #0D9488;
+  --tag-purple: #7C3AED;
+  --tag-default: #4B5563;
   --friend-blue: #2563EB;
-
-  --theme-modal-header-bg: #1c4586;
-  --theme-modal-header-text: #ffffff;
-  --theme-modal-header-close: rgba(255, 255, 255, 0.7);
-  --theme-modal-bg: #edf0f3;
-
-  --theme-date-sep-bg: #1c4586;
-  --theme-date-sep-text: #ffffff;
-  --theme-date-sep-muted: rgba(255, 255, 255, 0.7);
-  --theme-date-sep-border: rgba(255, 255, 255, 0.2);
-
-  --theme-ticker-bg: var(--theme-bg-list);
-  --theme-ticker-text: #1c4586;
-  --theme-ticker-link: #1c4586;
-  --theme-ticker-border: rgba(28, 69, 134, 0.15);
-
-  --theme-header-badge-bg: transparent;
-  --theme-header-badge-text: #ffffff;
-  --theme-header-badge-border: #ffffff;
 }
 
 /* Light-blue: alternating table rows */
@@ -355,7 +245,6 @@
   background-color: rgba(28, 69, 134, 0.05);
 }
 
-
 /* --- SXSW theme — neon lime on dark forest green --- */
 [data-theme="sxsw"] {
   --background: #0a1410;
diff --git a/src/app/itinerary/page.tsx b/src/app/itinerary/page.tsx
index de071011..7710673d 100644
--- a/src/app/itinerary/page.tsx
+++ b/src/app/itinerary/page.tsx
@@ -1,553 +1,5 @@
-'use client';
+import { redirect } from 'next/navigation';
 
-import { useMemo, useState, useRef, useCallback, useEffect } from 'react';
-import Link from 'next/link';
-import dynamic from 'next/dynamic';
-import { AddressLink } from '@/components/AddressLink';
-import { ArrowLeft, AlertTriangle, Trash2, CalendarX, Share2, Map as MapIcon, List, GripVertical, Star, ExternalLink, Eye, EyeOff, MapPinCheck, Loader2 } from 'lucide-react';
-import clsx from 'clsx';
-import { useEvents } from '@/hooks/useEvents';
-import { useItinerary } from '@/hooks/useItinerary';
-import { useAuth } from '@/contexts/AuthContext';
-import { supabase } from '@/lib/supabase';
-import { VIBE_COLORS } from '@/lib/tags';
-import { formatDateLabel } from '@/lib/utils';
-import { sortByStartTime, detectConflicts } from '@/lib/time-parse';
-import { trackItineraryClear, trackItineraryConferenceTab, trackItineraryShareLink, trackItineraryReorder, trackItineraryView } from '@/lib/analytics';
-import type { ETHDenverEvent } from '@/lib/types';
-import { Loading } from '@/components/Loading';
-import { useEventCheckIn } from '@/hooks/useEventCheckIn';
-import { passesNowFilter, getConferenceNow } from '@/lib/filters';
-import { useDragReorder } from '@/hooks/useDragReorder';
-import { useProfile } from '@/hooks/useProfile';
-import { ShareCardModal } from '@/components/ShareCardModal';
-import { GoogleCalendarButton } from '@/components/GoogleCalendarButton';
-import { getTabConfig } from '@/lib/conferences';
-import { useConferenceTabs } from '@/hooks/useConferenceTabs';
-
-const MapView = dynamic(
-  () => import('@/components/MapView').then((mod) => ({ default: mod.MapView })),
-  {
-    ssr: false,
-    loading: () => (
-      <div className="w-full h-full bg-[var(--theme-bg-primary)] flex items-center justify-center">
-        <div className="text-[var(--theme-text-secondary)]">Loading map...</div>
-      </div>
-    ),
-  }
-);
-
-type ItineraryViewMode = 'list' | 'map';
-
-function generateShortCode(): string {
-  const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
-  let code = '';
-  for (let i = 0; i < 8; i++) {
-    code += chars[Math.floor(Math.random() * chars.length)];
-  }
-  return code;
-}
-
-function CheckInToast({ result, onDismiss }: { result: { ok: boolean; message: string }; onDismiss: () => void }) {
-  useEffect(() => {
-    const timer = setTimeout(onDismiss, 3000);
-    return () => clearTimeout(timer);
-  }, [onDismiss]);
-
-  return (
-    <div className={`mx-4 mt-2 px-3 py-2 rounded-lg text-sm font-medium ${
-      result.ok
-        ? 'bg-green-600 text-white'
-        : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] border border-[var(--theme-border-primary)]'
-    }`}>
-      {result.message}
-    </div>
-  );
-}
-
-export default function ItineraryPage() {
-  const { events, loading } = useEvents();
-  const { itinerary, toggle: toggleItinerary, clear: clearItinerary, reorder: reorderItinerary, hiddenEvents, toggleHidden } = useItinerary();
-  const { user } = useAuth();
-  const { profile } = useProfile();
-  const { checkInToEvent, loading: checkInLoading, result: checkInResult, clearResult: clearCheckInResult } = useEventCheckIn();
-  const { tabs } = useConferenceTabs();
-  const [showClearConfirm, setShowClearConfirm] = useState(false);
-  const [viewMode, setViewMode] = useState<ItineraryViewMode>('list');
-  const [shareStatus, setShareStatus] = useState<'idle' | 'sharing' | 'copied'>('idle');
-  const [showShareCard, setShowShareCard] = useState(false);
-  const captureRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    trackItineraryView();
-  }, []);
-
-  // Get conferences that have itinerary events
-  const allItineraryEvents = useMemo(
-    () => events.filter((e) => itinerary.has(e.id)),
-    [events, itinerary]
-  );
-  const conferences = useMemo(
-    () => [...new Set(allItineraryEvents.map((e) => e.conference).filter(Boolean))],
-    [allItineraryEvents]
-  );
-  const [activeConference, setActiveConference] = useState('');
-
-  // Auto-select first conference when data loads
-  useMemo(() => {
-    if (conferences.length > 0 && !activeConference) {
-      setActiveConference(conferences[0]);
-    }
-  }, [conferences, activeConference]);
-
-  const itineraryEvents = useMemo(
-    () => allItineraryEvents.filter((e) => !activeConference || e.conference === activeConference),
-    [allItineraryEvents, activeConference]
-  );
-
-  const conflicts = useMemo(() => detectConflicts(itineraryEvents), [itineraryEvents]);
-
-  // Timezone for the active conference (used for Google Calendar export)
-  const conferenceTimezone = useMemo(
-    () => getTabConfig(activeConference, tabs).timezone,
-    [activeConference, tabs]
-  );
-
-  // Events eligible for Google Calendar export (exclude hidden)
-  const exportableEvents = useMemo(
-    () => itineraryEvents.filter((e) => !hiddenEvents.has(e.id)),
-    [itineraryEvents, hiddenEvents]
-  );
-
-  const dateGroups = useMemo(() => {
-    const groupMap = new Map<string, ETHDenverEvent[]>();
-    for (const event of itineraryEvents) {
-      const key = event.dateISO || 'unknown';
-      if (!groupMap.has(key)) groupMap.set(key, []);
-      groupMap.get(key)!.push(event);
-    }
-    return Array.from(groupMap.entries())
-      .sort(([a], [b]) => a.localeCompare(b))
-      .map(([dateISO, groupEvents]) => ({
-        dateISO,
-        label: dateISO === 'unknown' ? 'Date TBD' : formatDateLabel(dateISO),
-        events: groupEvents.sort(sortByStartTime),
-      }));
-  }, [itineraryEvents]);
-
-  // Flat ordered list of all event IDs across date groups (for drag reorder)
-  const flatEventIds = useMemo(
-    () => dateGroups.flatMap((g) => g.events.map((e) => e.id)),
-    [dateGroups]
-  );
-
-  const handleReorder = useCallback(
-    (orderedIds: string[]) => {
-      trackItineraryReorder();
-      // The drag reorder gives us the visible (conference-filtered) IDs in new order.
-      // Preserve IDs from other conferences that aren't visible.
-      const allIds = [...itinerary];
-      const visibleIdSet = new Set(flatEventIds);
-      const otherIds = allIds.filter((id) => !visibleIdSet.has(id));
-      reorderItinerary([...orderedIds, ...otherIds]);
-    },
-    [itinerary, flatEventIds, reorderItinerary]
-  );
-
-  const {
-    setOrderedIds,
-    registerItemRef,
-    getDragHandleProps,
-    getItemProps,
-    getDropIndicator,
-    dragId,
-  } = useDragReorder({ onReorder: handleReorder });
-
-  // Keep ordered IDs in sync
-  useEffect(() => {
-    setOrderedIds(flatEventIds);
-  }, [flatEventIds, setOrderedIds]);
-
-  const handleShareLink = useCallback(async () => {
-    if (itineraryEvents.length === 0) return;
-    setShareStatus('sharing');
-    try {
-      const shortCode = generateShortCode();
-      const eventIds = itineraryEvents
-        .filter((e) => !hiddenEvents.has(e.id))
-        .map((e) => e.id);
-      const { error } = await supabase.from('shared_itineraries').insert({
-        short_code: shortCode,
-        event_ids: eventIds,
-        created_by: user?.id ?? null,
-      });
-      if (error) {
-        console.error('Failed to create share link:', error);
-        setShareStatus('idle');
-        return;
-      }
-      const shareUrl = `${window.location.origin}/itinerary/s/${shortCode}`;
-      await navigator.clipboard.writeText(shareUrl);
-      setShareStatus('copied');
-      setTimeout(() => setShareStatus('idle'), 2500);
-    } catch (err) {
-      console.error('Share failed:', err);
-      setShareStatus('idle');
-    }
-  }, [itineraryEvents, hiddenEvents, user]);
-
-  if (loading) {
-    return (
-      <div className="min-h-screen bg-[var(--theme-bg-primary)]">
-        <Loading />
-      </div>
-    );
-  }
-
-  return (
-    <div className={viewMode === 'map' ? 'h-screen flex flex-col bg-[var(--theme-bg-primary)]' : 'min-h-screen bg-[var(--theme-bg-primary)]'}>
-      {/* Header */}
-      <header className="sticky top-0 z-50 bg-[var(--theme-bg-primary)]/95 backdrop-blur-sm border-b border-[var(--theme-border-secondary)]">
-        <div className="max-w-2xl mx-auto px-4 py-3 flex items-center justify-between gap-4">
-          <div className="flex items-center gap-3">
-            <Link
-              href="/"
-              className="p-1.5 text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] transition-colors"
-              aria-label="Back to events"
-            >
-              <ArrowLeft className="w-5 h-5" />
-            </Link>
-            <h1 className="text-lg font-bold text-[var(--theme-text-primary)]">
-              My Itinerary{' '}
-              <span className="text-sm font-normal text-[var(--theme-text-secondary)]">
-                ({itineraryEvents.length} event{itineraryEvents.length !== 1 ? 's' : ''})
-              </span>
-            </h1>
-          </div>
-          {/* Conference tabs */}
-          {conferences.length > 0 && (
-            <div className="flex rounded-lg border border-[var(--theme-border-primary)] overflow-hidden">
-              {conferences.map((conf) => (
-                <button
-                  key={conf}
-                  onClick={() => { trackItineraryConferenceTab(conf); setActiveConference(conf); }}
-                  className={clsx(
-                    'px-2.5 py-1 text-xs font-medium transition-colors cursor-pointer',
-                    activeConference === conf
-                      ? 'bg-[var(--theme-accent)] text-[var(--theme-accent-text)]'
-                      : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)]'
-                  )}
-                >
-                  {conf.replace(/ 2026$/, '')}
-                </button>
-              ))}
-            </div>
-          )}
-          <div className="flex items-center gap-1">
-            {itineraryEvents.length > 0 && (
-              <>
-                {/* View toggle */}
-                <div className="flex rounded-lg border border-[var(--theme-border-primary)] overflow-hidden mr-1">
-                  {([
-                    { mode: 'list' as const, icon: List, label: 'List' },
-                    { mode: 'map' as const, icon: MapIcon, label: 'Map' },
-                  ]).map(({ mode, icon: Icon, label }) => (
-                    <button
-                      key={mode}
-                      onClick={() => setViewMode(mode)}
-                      className={clsx(
-                        'flex items-center gap-1 px-2 py-1 text-xs font-medium transition-colors cursor-pointer',
-                        viewMode === mode
-                          ? 'bg-[var(--theme-accent)] text-[var(--theme-accent-text)]'
-                          : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)]'
-                      )}
-                      aria-label={`${label} view`}
-                    >
-                      <Icon className="w-3.5 h-3.5" />
-                      <span className="hidden sm:inline">{label}</span>
-                    </button>
-                  ))}
-                </div>
-
-                <button
-                  onClick={() => setShowShareCard(true)}
-                  className="p-1.5 text-[var(--theme-text-secondary)] hover:text-[var(--theme-accent)] transition-colors cursor-pointer"
-                  aria-label="Share my plan"
-                  title="Share my plan as PNG"
-                >
-                  <Share2 className="w-4 h-4" />
-                </button>
-                <button
-                  onClick={() => { trackItineraryShareLink(); handleShareLink(); }}
-                  disabled={shareStatus === 'sharing'}
-                  className={clsx(
-                    'px-2 py-1 text-xs font-medium rounded transition-colors cursor-pointer',
-                    shareStatus === 'copied'
-                      ? 'bg-emerald-500/20 text-emerald-400'
-                      : 'bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-accent)] hover:border-[var(--theme-border-primary)]'
-                  )}
-                  title="Share link"
-                >
-                  {shareStatus === 'sharing' ? 'Saving...' : shareStatus === 'copied' ? 'Copied!' : 'Share Link'}
-                </button>
-                <GoogleCalendarButton
-                  events={exportableEvents}
-                  timezone={conferenceTimezone}
-                />
-              </>
-            )}
-          </div>
-        </div>
-      </header>
-
-      {/* Check-in result toast */}
-      {checkInResult && (
-        <CheckInToast result={checkInResult} onDismiss={clearCheckInResult} />
-      )}
-
-      {/* Content */}
-      {itineraryEvents.length === 0 ? (
-        <div className="flex flex-col items-center justify-center py-16 text-center px-4">
-          <CalendarX className="w-12 h-12 text-[var(--theme-text-faint)] mb-4" />
-          <p className="text-[var(--theme-text-secondary)] font-medium mb-2">No events in your itinerary yet</p>
-          <p className="text-[var(--theme-text-muted)] text-sm max-w-xs mb-4">
-            Star events from the main page to build your schedule!
-          </p>
-          <Link
-            href="/"
-            className="px-4 py-2 bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)] rounded-lg text-sm font-medium transition-colors"
-          >
-            Browse Events
-          </Link>
-        </div>
-      ) : viewMode === 'map' ? (
-        <main className="flex-1 min-h-0">
-          <MapView
-            events={itineraryEvents}
-            itinerary={itinerary}
-            onItineraryToggle={toggleItinerary}
-          />
-        </main>
-      ) : (
-        <div className="max-w-2xl mx-auto px-4 pb-8">
-          <div ref={captureRef} className="bg-[var(--theme-bg-primary)]">
-            <div className="pt-3 pb-1 px-1 flex items-center gap-2">
-              <span className="text-base">📅</span>
-              <span className="text-sm font-bold text-[var(--theme-text-primary)]">sheeets.xyz</span>
-              <span className="text-xs text-[var(--theme-text-muted)]">— My Itinerary</span>
-            </div>
-
-            {conflicts.size > 0 && (
-              <div className="mt-2 mb-1 px-3 py-2 bg-[var(--theme-accent)]/10 border border-[var(--theme-accent)]/20 rounded-lg flex items-center gap-2">
-                <AlertTriangle className="w-4 h-4 text-[var(--theme-accent)] shrink-0" />
-                <p className="text-[var(--theme-accent)] text-xs">
-                  {conflicts.size} event{conflicts.size !== 1 ? 's' : ''} with schedule conflicts
-                </p>
-              </div>
-            )}
-
-            {dateGroups.map((group) => (
-              <section key={group.dateISO} className="mt-4">
-                <div className="flex items-center gap-2 mb-2">
-                  <div className="h-px flex-1 bg-[var(--theme-border-secondary)]" />
-                  <h3 className="text-xs font-bold text-[var(--theme-text-secondary)] uppercase tracking-wider whitespace-nowrap">
-                    {group.label}
-                  </h3>
-                  <div className="h-px flex-1 bg-[var(--theme-border-secondary)]" />
-                </div>
-
-                <div className="space-y-2">
-                  {group.events.map((event) => {
-                    const hasConflict = conflicts.has(event.id);
-                    const vibeColor = VIBE_COLORS[event.vibe] || VIBE_COLORS['default'];
-                    const timeDisplay = event.isAllDay
-                      ? 'All Day'
-                      : `${event.startTime}${event.endTime ? ` - ${event.endTime}` : ''}`;
-                    const dropIndicator = getDropIndicator(event.id);
-                    const isBeingDragged = dragId === event.id;
-
-                    return (
-                      <div
-                        key={event.id}
-                        ref={(el) => registerItemRef(event.id, el)}
-                        {...getItemProps(event.id)}
-                        className="relative"
-                      >
-                        {/* Drop indicator - above */}
-                        {dropIndicator.showAbove && (
-                          <div className="absolute -top-1.5 left-0 right-0 h-0.5 bg-[var(--theme-accent)] rounded-full z-10" />
-                        )}
-
-                        <div
-                          className={`bg-[var(--theme-bg-secondary)] rounded-lg p-3 border transition-opacity ${
-                            hasConflict ? 'border-[var(--theme-accent)]/40' : 'border-[var(--theme-border-primary)]'
-                          } ${isBeingDragged ? 'opacity-40' : 'opacity-100'}`}
-                        >
-                          {hasConflict && (
-                            <div className="flex items-center gap-1.5 mb-2 text-[var(--theme-accent)]">
-                              <AlertTriangle className="w-3 h-3" />
-                              <span className="text-[10px] font-medium uppercase tracking-wide">
-                                Schedule conflict
-                              </span>
-                            </div>
-                          )}
-
-                          <div className="flex items-start gap-2">
-                            <div
-                              data-export-hide
-                              {...getDragHandleProps(event.id)}
-                              className="shrink-0 pt-0.5 text-[var(--theme-text-faint)] hover:text-[var(--theme-text-secondary)] active:text-[var(--theme-text-secondary)] cursor-grab active:cursor-grabbing touch-none select-none"
-                              aria-label="Drag to reorder"
-                              title="Drag to reorder"
-                            >
-                              <GripVertical className="w-4 h-4" />
-                            </div>
-                            <h4 className="flex-1 text-sm font-semibold text-[var(--theme-text-primary)] leading-tight min-w-0">
-                              {event.name}
-                            </h4>
-                            <div className="flex items-center gap-0.5 shrink-0" data-export-hide>
-                              {passesNowFilter(event, getConferenceNow(activeConference)) && (
-                                <button
-                                  onClick={(e) => {
-                                    e.stopPropagation();
-                                    checkInToEvent(event.id, event.name);
-                                  }}
-                                  disabled={checkInLoading}
-                                  className="p-1 text-green-400 hover:text-green-300 transition-colors cursor-pointer"
-                                  aria-label="Check in"
-                                  title="Check in"
-                                >
-                                  {checkInLoading ? (
-                                    <Loader2 className="w-3.5 h-3.5 animate-spin" />
-                                  ) : (
-                                    <MapPinCheck className="w-3.5 h-3.5" />
-                                  )}
-                                </button>
-                              )}
-                              {event.link && (
-                                <a
-                                  href={event.link}
-                                  target="_blank"
-                                  rel="noopener noreferrer"
-                                  className="p-1 text-[var(--theme-text-muted)] hover:text-[var(--theme-accent)] transition-colors"
-                                  aria-label="Open event link"
-                                  title="Open event link"
-                                >
-                                  <ExternalLink className="w-3.5 h-3.5" />
-                                </a>
-                              )}
-                              <button
-                                onClick={(e) => {
-                                  e.stopPropagation();
-                                  toggleHidden(event.id);
-                                }}
-                                className={`p-1 transition-colors cursor-pointer ${
-                                  hiddenEvents.has(event.id)
-                                    ? 'text-[var(--theme-text-muted)]'
-                                    : 'text-[var(--theme-text-faint)] hover:text-[var(--theme-text-muted)]'
-                                }`}
-                                title={hiddenEvents.has(event.id) ? 'Hidden from friends (tap to show)' : 'Hide from friends'}
-                              >
-                                {hiddenEvents.has(event.id) ? <EyeOff className="w-3.5 h-3.5" /> : <Eye className="w-3.5 h-3.5" />}
-                              </button>
-                              <button
-                                onClick={() => toggleItinerary(event.id)}
-                                className="p-1 text-[var(--theme-accent)] hover:text-[var(--theme-accent)] transition-colors cursor-pointer"
-                                aria-label="Remove from itinerary"
-                                title="Remove from itinerary"
-                              >
-                                <Star className="w-3.5 h-3.5 fill-current" />
-                              </button>
-                            </div>
-                          </div>
-
-                          {event.organizer && (
-                            <p className="text-[var(--theme-text-muted)] text-xs mt-0.5 ml-6">By {event.organizer}</p>
-                          )}
-
-                          <p className="text-[var(--theme-text-secondary)] text-xs mt-1 ml-6">{timeDisplay}</p>
-
-                          {event.address && (
-                            <AddressLink address={event.address} navAddress={event.matchedAddress} lat={event.lat} lng={event.lng}
-                              eventId={event.id} eventName={event.name}
-                              className="text-[var(--theme-text-muted)] hover:text-[var(--theme-text-secondary)] text-xs mt-0.5 truncate block transition-colors ml-6">
-                              {event.address}
-                            </AddressLink>
-                          )}
-
-                          <div className="flex items-center gap-1.5 mt-1.5 ml-6">
-                            {event.vibe && (
-                              <span
-                                className="px-1.5 py-0.5 rounded text-[10px] font-semibold text-white"
-                                style={{ backgroundColor: vibeColor }}
-                              >
-                                {event.vibe}
-                              </span>
-                            )}
-                            {event.isFree && (
-                              <span className="px-1.5 py-0.5 rounded text-[10px] font-medium bg-emerald-500/20 text-emerald-400">
-                                FREE
-                              </span>
-                            )}
-                          </div>
-                        </div>
-
-                        {/* Drop indicator - below */}
-                        {dropIndicator.showBelow && (
-                          <div className="absolute -bottom-1.5 left-0 right-0 h-0.5 bg-[var(--theme-accent)] rounded-full z-10" />
-                        )}
-                      </div>
-                    );
-                  })}
-                </div>
-              </section>
-            ))}
-
-            <div className="pt-3 pb-2 text-center">
-              <span className="text-[10px] text-[var(--theme-text-faint)]">sheeets.xyz — side event guide</span>
-            </div>
-          </div>
-
-          {/* Clear button */}
-          <div className="mt-6 pt-4 border-t border-[var(--theme-border-secondary)]">
-            {showClearConfirm ? (
-              <div className="flex items-center gap-2">
-                <span className="text-sm text-[var(--theme-text-secondary)]">Clear all events?</span>
-                <button
-                  onClick={() => { trackItineraryClear(); clearItinerary(); setShowClearConfirm(false); }}
-                  className="px-3 py-1.5 bg-red-500 hover:bg-red-600 text-white text-xs font-medium rounded transition-colors cursor-pointer"
-                >
-                  Yes, clear
-                </button>
-                <button
-                  onClick={() => setShowClearConfirm(false)}
-                  className="px-3 py-1.5 bg-[var(--theme-bg-tertiary)] hover:bg-[var(--theme-bg-tertiary)] text-[var(--theme-text-secondary)] text-xs font-medium rounded transition-colors cursor-pointer"
-                >
-                  Cancel
-                </button>
-              </div>
-            ) : (
-              <button
-                onClick={() => setShowClearConfirm(true)}
-                className="w-full flex items-center justify-center gap-2 px-4 py-2 bg-[var(--theme-bg-secondary)] hover:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-border-primary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-secondary)] rounded-lg text-sm font-medium transition-colors cursor-pointer"
-              >
-                <Trash2 className="w-4 h-4" />
-                Clear Itinerary
-              </button>
-            )}
-          </div>
-        </div>
-      )}
-
-      <ShareCardModal
-        isOpen={showShareCard}
-        onClose={() => setShowShareCard(false)}
-        events={itineraryEvents}
-        conferenceName={activeConference || 'Itinerary'}
-        displayName={profile?.display_name ?? null}
-        avatarUrl={profile?.avatar_url}
-        hiddenEventIds={hiddenEvents}
-      />
-    </div>
-  );
+export default function ItineraryRedirect() {
+  redirect('/plan');
 }
diff --git a/src/app/itinerary/s/[code]/page.tsx b/src/app/itinerary/s/[code]/page.tsx
index 957540fc..63d72a11 100644
--- a/src/app/itinerary/s/[code]/page.tsx
+++ b/src/app/itinerary/s/[code]/page.tsx
@@ -1,351 +1,5 @@
-'use client';
+import { redirect } from 'next/navigation';
 
-import { useEffect, useMemo, useState, useCallback } from 'react';
-import { useParams } from 'next/navigation';
-import Link from 'next/link';
-import { AddressLink } from '@/components/AddressLink';
-import dynamic from 'next/dynamic';
-import { ArrowLeft, Calendar, Map as MapIcon, List, Copy, Check } from 'lucide-react';
-import clsx from 'clsx';
-import { useEvents } from '@/hooks/useEvents';
-import { useItinerary } from '@/hooks/useItinerary';
-import { useAuth } from '@/contexts/AuthContext';
-import { supabase } from '@/lib/supabase';
-import { VIBE_COLORS } from '@/lib/tags';
-import { formatDateLabel } from '@/lib/utils';
-import { sortByStartTime } from '@/lib/time-parse';
-import type { ETHDenverEvent } from '@/lib/types';
-import { Loading } from '@/components/Loading';
-import { AuthModal } from '@/components/AuthModal';
-
-const MapView = dynamic(
-  () => import('@/components/MapView').then((mod) => ({ default: mod.MapView })),
-  {
-    ssr: false,
-    loading: () => (
-      <div className="w-full h-full bg-[var(--theme-bg-primary)] flex items-center justify-center">
-        <div className="text-[var(--theme-text-secondary)]">Loading map...</div>
-      </div>
-    ),
-  }
-);
-
-type SharedViewMode = 'list' | 'map';
-
-export default function SharedItineraryPage() {
-  const params = useParams();
-  const code = params.code as string;
-
-  const { events, loading: eventsLoading } = useEvents();
-  const { itinerary, addMany, toggle: toggleItinerary } = useItinerary();
-  const { user } = useAuth();
-
-  const [sharedEventIds, setSharedEventIds] = useState<string[] | null>(null);
-  const [loadingShare, setLoadingShare] = useState(true);
-  const [notFound, setNotFound] = useState(false);
-  const [viewMode, setViewMode] = useState<SharedViewMode>('list');
-  const [copyStatus, setCopyStatus] = useState<'idle' | 'copied'>('idle');
-  const [showAuth, setShowAuth] = useState(false);
-  const [pendingCopy, setPendingCopy] = useState(false);
-
-  // Fetch shared itinerary from Supabase
-  useEffect(() => {
-    async function fetchShared() {
-      try {
-        const { data, error } = await supabase
-          .from('shared_itineraries')
-          .select('event_ids')
-          .eq('short_code', code)
-          .maybeSingle();
-
-        if (error || !data) {
-          setNotFound(true);
-        } else {
-          setSharedEventIds(data.event_ids);
-        }
-      } catch {
-        setNotFound(true);
-      }
-      setLoadingShare(false);
-    }
-
-    if (code) fetchShared();
-  }, [code]);
-
-  // Handle pending copy after auth
-  useEffect(() => {
-    if (pendingCopy && user && sharedEventIds) {
-      addMany(sharedEventIds);
-      setCopyStatus('copied');
-      setPendingCopy(false);
-      setTimeout(() => setCopyStatus('idle'), 2500);
-    }
-  }, [pendingCopy, user, sharedEventIds, addMany]);
-
-  const sharedEvents = useMemo(() => {
-    if (!sharedEventIds) return [];
-    const idSet = new Set(sharedEventIds);
-    return events.filter((e) => idSet.has(e.id));
-  }, [events, sharedEventIds]);
-
-  const dateGroups = useMemo(() => {
-    const groupMap = new Map<string, ETHDenverEvent[]>();
-    for (const event of sharedEvents) {
-      const key = event.dateISO || 'unknown';
-      if (!groupMap.has(key)) groupMap.set(key, []);
-      groupMap.get(key)!.push(event);
-    }
-    return Array.from(groupMap.entries())
-      .sort(([a], [b]) => a.localeCompare(b))
-      .map(([dateISO, groupEvents]) => ({
-        dateISO,
-        label: dateISO === 'unknown' ? 'Date TBD' : formatDateLabel(dateISO),
-        events: groupEvents.sort(sortByStartTime),
-      }));
-  }, [sharedEvents]);
-
-  const dateRange = useMemo(() => {
-    if (dateGroups.length === 0) return '';
-    if (dateGroups.length === 1) return dateGroups[0].label;
-    return `${dateGroups[0].label} - ${dateGroups[dateGroups.length - 1].label}`;
-  }, [dateGroups]);
-
-  const handleCopyToItinerary = useCallback(() => {
-    if (!sharedEventIds || sharedEventIds.length === 0) return;
-
-    if (!user) {
-      setPendingCopy(true);
-      setShowAuth(true);
-      return;
-    }
-
-    addMany(sharedEventIds);
-    setCopyStatus('copied');
-    setTimeout(() => setCopyStatus('idle'), 2500);
-  }, [sharedEventIds, user, addMany]);
-
-  const handleAuthClose = useCallback(() => {
-    setShowAuth(false);
-    // If user didn't sign in, cancel pending copy
-    if (!user) {
-      setPendingCopy(false);
-    }
-  }, [user]);
-
-  const loading = eventsLoading || loadingShare;
-
-  if (loading) {
-    return (
-      <div className="min-h-screen bg-[var(--theme-bg-primary)]">
-        <Loading />
-      </div>
-    );
-  }
-
-  if (notFound) {
-    return (
-      <div className="min-h-screen bg-[var(--theme-bg-primary)] flex flex-col items-center justify-center px-4">
-        <p className="text-[var(--theme-text-secondary)] text-lg font-medium mb-2">Itinerary not found</p>
-        <p className="text-[var(--theme-text-muted)] text-sm mb-4">This share link may have expired or is invalid.</p>
-        <Link
-          href="/"
-          className="px-4 py-2 bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)] rounded-lg text-sm font-medium transition-colors"
-        >
-          Browse Events
-        </Link>
-      </div>
-    );
-  }
-
-  return (
-    <div className={viewMode === 'map' ? 'h-screen flex flex-col bg-[var(--theme-bg-primary)]' : 'min-h-screen bg-[var(--theme-bg-primary)]'}>
-      {/* Header */}
-      <header className="sticky top-0 z-50 bg-[var(--theme-bg-primary)]/95 backdrop-blur-sm border-b border-[var(--theme-border-secondary)]">
-        <div className="max-w-2xl mx-auto px-4 py-3 flex items-center justify-between gap-4">
-          <div className="flex items-center gap-3">
-            <Link
-              href="/"
-              className="p-1.5 text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] transition-colors"
-              aria-label="Back to events"
-            >
-              <ArrowLeft className="w-5 h-5" />
-            </Link>
-            <div>
-              <h1 className="text-lg font-bold text-[var(--theme-text-primary)]">Shared Itinerary</h1>
-              <p className="text-xs text-[var(--theme-text-secondary)]">
-                {sharedEvents.length} event{sharedEvents.length !== 1 ? 's' : ''}
-                {dateRange && ` · ${dateRange}`}
-              </p>
-            </div>
-          </div>
-          <div className="flex items-center gap-1">
-            {sharedEvents.length > 0 && (
-              <>
-                {/* View toggle */}
-                <div className="flex rounded-lg border border-[var(--theme-border-primary)] overflow-hidden mr-1">
-                  {([
-                    { mode: 'list' as const, icon: List, label: 'List' },
-                    { mode: 'map' as const, icon: MapIcon, label: 'Map' },
-                  ]).map(({ mode, icon: Icon, label }) => (
-                    <button
-                      key={mode}
-                      onClick={() => setViewMode(mode)}
-                      className={clsx(
-                        'flex items-center gap-1 px-2 py-1 text-xs font-medium transition-colors cursor-pointer',
-                        viewMode === mode
-                          ? 'bg-[var(--theme-accent)] text-[var(--theme-accent-text)]'
-                          : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)]'
-                      )}
-                      aria-label={`${label} view`}
-                    >
-                      <Icon className="w-3.5 h-3.5" />
-                      <span className="hidden sm:inline">{label}</span>
-                    </button>
-                  ))}
-                </div>
-              </>
-            )}
-          </div>
-        </div>
-      </header>
-
-      {/* Copy to itinerary banner */}
-      {sharedEvents.length > 0 && (
-        <div className="bg-[var(--theme-bg-secondary)]/50 border-b border-[var(--theme-border-secondary)]">
-          <div className="max-w-2xl mx-auto px-4 py-3 flex items-center justify-between gap-3">
-            <p className="text-sm text-[var(--theme-text-secondary)]">
-              Add these events to your itinerary
-            </p>
-            <button
-              onClick={handleCopyToItinerary}
-              className={clsx(
-                'flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors cursor-pointer',
-                copyStatus === 'copied'
-                  ? 'bg-emerald-500/20 text-emerald-400'
-                  : 'bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)]'
-              )}
-            >
-              {copyStatus === 'copied' ? (
-                <>
-                  <Check className="w-4 h-4" />
-                  Added!
-                </>
-              ) : (
-                <>
-                  <Copy className="w-4 h-4" />
-                  Copy to My Itinerary
-                </>
-              )}
-            </button>
-          </div>
-        </div>
-      )}
-
-      {/* Content */}
-      {sharedEvents.length === 0 ? (
-        <div className="flex flex-col items-center justify-center py-16 text-center px-4">
-          <Calendar className="w-12 h-12 text-[var(--theme-text-faint)] mb-4" />
-          <p className="text-[var(--theme-text-secondary)] font-medium mb-2">No matching events found</p>
-          <p className="text-[var(--theme-text-muted)] text-sm max-w-xs mb-4">
-            The events in this itinerary may no longer be available.
-          </p>
-          <Link
-            href="/"
-            className="px-4 py-2 bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)] rounded-lg text-sm font-medium transition-colors"
-          >
-            Browse Events
-          </Link>
-        </div>
-      ) : viewMode === 'map' ? (
-        <main className="flex-1 min-h-0">
-          <MapView
-            events={sharedEvents}
-            itinerary={itinerary}
-            onItineraryToggle={toggleItinerary}
-          />
-        </main>
-      ) : (
-        <div className="max-w-2xl mx-auto px-4 pb-8">
-          {dateGroups.map((group) => (
-            <section key={group.dateISO} className="mt-4">
-              <div className="flex items-center gap-2 mb-2">
-                <div className="h-px flex-1 bg-[var(--theme-border-secondary)]" />
-                <h3 className="text-xs font-bold text-[var(--theme-text-secondary)] uppercase tracking-wider whitespace-nowrap">
-                  {group.label}
-                </h3>
-                <div className="h-px flex-1 bg-[var(--theme-border-secondary)]" />
-              </div>
-
-              <div className="space-y-2">
-                {group.events.map((event) => {
-                  const vibeColor = VIBE_COLORS[event.vibe] || VIBE_COLORS['default'];
-                  const timeDisplay = event.isAllDay
-                    ? 'All Day'
-                    : `${event.startTime}${event.endTime ? ` - ${event.endTime}` : ''}`;
-
-                  return (
-                    <div
-                      key={event.id}
-                      className="bg-[var(--theme-bg-secondary)] rounded-lg p-3 border border-[var(--theme-border-primary)]"
-                    >
-                      <h4 className="text-sm font-semibold text-[var(--theme-text-primary)] leading-tight">
-                        {event.link ? (
-                          <a
-                            href={event.link}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            className="hover:text-[var(--theme-accent)] transition-colors"
-                          >
-                            {event.name}
-                          </a>
-                        ) : (
-                          event.name
-                        )}
-                      </h4>
-
-                      {event.organizer && (
-                        <p className="text-[var(--theme-text-muted)] text-xs mt-0.5">By {event.organizer}</p>
-                      )}
-
-                      <p className="text-[var(--theme-text-secondary)] text-xs mt-1">{timeDisplay}</p>
-
-                      {event.address && (
-                        <AddressLink address={event.address} navAddress={event.matchedAddress} lat={event.lat} lng={event.lng}
-                          eventId={event.id} eventName={event.name}
-                          className="text-[var(--theme-text-muted)] hover:text-[var(--theme-text-secondary)] text-xs mt-0.5 truncate block transition-colors">
-                          {event.address}
-                        </AddressLink>
-                      )}
-
-                      <div className="flex items-center gap-1.5 mt-1.5">
-                        {event.vibe && (
-                          <span
-                            className="px-1.5 py-0.5 rounded text-[10px] font-semibold text-white"
-                            style={{ backgroundColor: vibeColor }}
-                          >
-                            {event.vibe}
-                          </span>
-                        )}
-                        {event.isFree && (
-                          <span className="px-1.5 py-0.5 rounded text-[10px] font-medium bg-emerald-500/20 text-emerald-400">
-                            FREE
-                          </span>
-                        )}
-                      </div>
-                    </div>
-                  );
-                })}
-              </div>
-            </section>
-          ))}
-
-          <div className="pt-3 pb-2 text-center">
-            <span className="text-[10px] text-[var(--theme-text-faint)]">sheeets.xyz — side event guide</span>
-          </div>
-        </div>
-      )}
-
-      <AuthModal isOpen={showAuth} onClose={handleAuthClose} />
-    </div>
-  );
+export default function SharedItineraryRedirect({ params }: { params: { code: string } }) {
+  redirect(`/plan/s/${params.code}`);
 }
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index e550247a..cd64c88f 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -51,11 +51,8 @@ export default function RootLayout({
   const websiteJsonLd = buildWebSiteJsonLd();
 
   return (
-    <html lang="en" data-theme="light-blue">
+    <html lang="en">
       <head>
-        <script
-          dangerouslySetInnerHTML={{ __html: `(function(){try{var t=localStorage.getItem('user-theme-override');if(t)document.documentElement.setAttribute('data-theme',t)}catch(e){}})()` }}
-        />
         <script
           type="application/ld+json"
           dangerouslySetInnerHTML={{ __html: JSON.stringify(websiteJsonLd) }}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 54585133..778b3b65 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -225,15 +225,15 @@ export default async function Home() {
                   href={`/${tab.slug}`}
                   className="group block rounded-xl border p-5 transition-all duration-200 hover:scale-[1.02]"
                   style={{
-                    backgroundColor: 'var(--theme-landing-card-bg)',
-                    borderColor: 'var(--theme-landing-card-border)',
+                    backgroundColor: 'var(--theme-bg-card)',
+                    borderColor: 'var(--theme-border-primary)',
                   }}
                 >
                   <h3
                     className="text-lg font-semibold transition-colors duration-200 mb-1"
-                    style={{ color: 'var(--theme-landing-card-text)' }}
+                    style={{ color: 'var(--theme-text-primary)' }}
                   >
-                    <span className="group-hover:opacity-80">{tab.name}</span>
+                    <span className="group-hover:text-[var(--theme-accent)]">{tab.name}</span>
                   </h3>
                   {daysLabel && (
                     <span
@@ -241,11 +241,11 @@ export default async function Home() {
                       style={{
                         backgroundColor: 'transparent',
                         border: daysLabel === 'Happening now'
-                          ? '1px solid var(--theme-landing-card-accent)'
-                          : '1px solid var(--theme-landing-card-secondary)',
+                          ? '1px solid var(--theme-accent)'
+                          : '1px solid var(--theme-text-secondary)',
                         color: daysLabel === 'Happening now'
-                          ? 'var(--theme-landing-card-accent)'
-                          : 'var(--theme-landing-card-secondary)',
+                          ? 'var(--theme-accent)'
+                          : 'var(--theme-text-secondary)',
                       }}
                     >
                       {daysLabel}
@@ -253,13 +253,13 @@ export default async function Home() {
                   )}
 
                   {dateRange && (
-                    <p className="text-sm mb-1" style={{ color: 'var(--theme-landing-card-secondary)' }}>
+                    <p className="text-sm mb-1" style={{ color: 'var(--theme-text-secondary)' }}>
                       {dateRange}
                     </p>
                   )}
 
                   {city && (
-                    <p className="text-sm" style={{ color: 'var(--theme-landing-card-muted)' }}>
+                    <p className="text-sm" style={{ color: 'var(--theme-text-muted)' }}>
                       {city}
                     </p>
                   )}
@@ -267,7 +267,7 @@ export default async function Home() {
                   {count > 0 && (
                     <p
                       className="text-sm font-medium mt-3"
-                      style={{ color: 'var(--theme-landing-card-accent)' }}
+                      style={{ color: 'var(--theme-accent)' }}
                     >
                       {count} events
                     </p>
diff --git a/src/app/plan/page.tsx b/src/app/plan/page.tsx
new file mode 100644
index 00000000..f9713c5e
--- /dev/null
+++ b/src/app/plan/page.tsx
@@ -0,0 +1,507 @@
+'use client';
+
+import { Suspense, useMemo, useState, useRef, useCallback, useEffect } from 'react';
+import { useSearchParams } from 'next/navigation';
+import Link from 'next/link';
+import dynamic from 'next/dynamic';
+import { EventCard } from '@/components/EventCard';
+import { Trash2, Share2, GripVertical, Eye, EyeOff } from 'lucide-react';
+import { useEvents } from '@/hooks/useEvents';
+import { useItinerary } from '@/hooks/useItinerary';
+
+
+import { formatDateLabel } from '@/lib/utils';
+import { trackItineraryClear, trackItineraryReorder } from '@/lib/analytics';
+import type { ETHDenverEvent } from '@/lib/types';
+import { Loading } from '@/components/Loading';
+import { useEventCheckIn } from '@/hooks/useEventCheckIn';
+import { useDragReorder } from '@/hooks/useDragReorder';
+import { useProfile } from '@/hooks/useProfile';
+import { Header } from '@/components/Header';
+import { FilterBar } from '@/components/FilterBar';
+import { SponsorsTicker } from '@/components/SponsorsTicker';
+import { ShareCardModal } from '@/components/ShareCardModal';
+import { useConferenceTabs } from '@/hooks/useConferenceTabs';
+import { useFilters } from '@/hooks/useFilters';
+import { useAdminConfig } from '@/hooks/useAdminConfig';
+import { useConferenceData } from '@/hooks/useConferenceData';
+import { GoogleCalendarButton } from '@/components/GoogleCalendarButton';
+import { getTabConfig } from '@/lib/conferences';
+import { passesNowFilter, applyFilters, computeTagCounts, getConferenceNow } from '@/lib/filters';
+import { resolveItemVariants, getVisitorId } from '@/lib/ab-testing';
+import { TableView } from '@/components/TableView';
+import { useFriends } from '@/hooks/useFriends';
+import { useFriendsItineraries } from '@/hooks/useFriendsItineraries';
+import type { FriendInfo } from '@/lib/types';
+import { STORAGE_KEYS } from '@/lib/storage-keys';
+
+const MapView = dynamic(
+  () => import('@/components/MapView').then((mod) => ({ default: mod.MapView })),
+  {
+    ssr: false,
+    loading: () => (
+      <div className="w-full h-full bg-[var(--theme-bg-primary)] flex items-center justify-center">
+        <div className="text-[var(--theme-text-secondary)]">Loading map...</div>
+      </div>
+    ),
+  }
+);
+
+type ItineraryViewMode = 'list' | 'map' | 'table';
+
+
+function CheckInToast({ result, onDismiss }: { result: { ok: boolean; message: string }; onDismiss: () => void }) {
+  useEffect(() => {
+    const timer = setTimeout(onDismiss, 3000);
+    return () => clearTimeout(timer);
+  }, [onDismiss]);
+
+  return (
+    <div className={`mx-4 mt-2 px-3 py-2 rounded-lg text-sm font-medium ${
+      result.ok
+        ? 'bg-green-600 text-white'
+        : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] border border-[var(--theme-border-primary)]'
+    }`}>
+      {result.message}
+    </div>
+  );
+}
+
+function ItineraryContent() {
+  const { events, loading } = useEvents();
+  const { tabs: conferenceTabs } = useConferenceTabs();
+  const { itinerary, toggle: toggleItinerary, clear: clearItinerary, reorder: reorderItinerary, hiddenEvents, toggleHidden } = useItinerary();
+
+  const { profile } = useProfile();
+  const { config } = useAdminConfig();
+  const { friends } = useFriends();
+  const { friendItineraries } = useFriendsItineraries(friends);
+
+  const friendsByEvent = useMemo(() => {
+    const map = new Map<string, FriendInfo[]>();
+    for (const fi of friendItineraries) {
+      for (const eid of fi.eventIds) {
+        if (!map.has(eid)) map.set(eid, []);
+        map.get(eid)!.push({
+          userId: fi.userId,
+          displayName: fi.displayName,
+          avatarUrl: fi.avatarUrl,
+          xHandle: fi.xHandle,
+        });
+      }
+    }
+    return map;
+  }, [friendItineraries]);
+
+  const { checkInToEvent, loading: checkInLoading, result: checkInResult, clearResult: clearCheckInResult } = useEventCheckIn();
+  const [showClearConfirm, setShowClearConfirm] = useState(false);
+  const [viewMode, setViewModeState] = useState<ItineraryViewMode>('list');
+  const setViewMode = useCallback((mode: ItineraryViewMode) => {
+    setViewModeState(mode);
+    localStorage.setItem(STORAGE_KEYS.VIEW_MODE, mode);
+  }, []);
+  const [viewModeRestored, setViewModeRestored] = useState(false);
+  useEffect(() => {
+    const saved = localStorage.getItem(STORAGE_KEYS.VIEW_MODE);
+    if (saved === 'list' || saved === 'map' || saved === 'table') {
+      setViewMode(saved);
+    }
+    setViewModeRestored(true);
+  }, []);
+  const [showShareCard, setShowShareCard] = useState(false);
+  const captureRef = useRef<HTMLDivElement>(null);
+
+  // User location for distance display
+  const [userLocation, setUserLocation] = useState<{ lat: number; lng: number } | null>(null);
+  useEffect(() => {
+    if (!navigator.geolocation) return;
+    const watchId = navigator.geolocation.watchPosition(
+      (pos) => setUserLocation({ lat: pos.coords.latitude, lng: pos.coords.longitude }),
+      () => {},
+      { maximumAge: 30000, enableHighAccuracy: false }
+    );
+    return () => navigator.geolocation.clearWatch(watchId);
+  }, []);
+
+  // Get conferences that have itinerary events — iterate Set to preserve insertion/reorder order
+  const allItineraryEvents = useMemo(() => {
+    const eventMap = new Map(events.map(e => [e.id, e]));
+    const result: ETHDenverEvent[] = [];
+    for (const id of itinerary) {
+      const ev = eventMap.get(id);
+      if (ev) result.push(ev);
+    }
+    return result;
+  }, [events, itinerary]);
+  const conferences = useMemo(
+    () => [...new Set(allItineraryEvents.map((e) => e.conference).filter(Boolean))],
+    [allItineraryEvents]
+  );
+  const searchParams = useSearchParams();
+  const confParam = searchParams.get('conf') || '';
+
+  // Filters
+  const {
+    filters,
+    setFilter,
+    setConference,
+    setDateTimeRange,
+    toggleVibe,
+    toggleNowMode,
+    toggleTagMatchAll,
+    toggleFriend,
+    clearFilters,
+    activeFilterCount,
+  } = useFilters(confParam || undefined, conferenceTabs);
+
+  const activeConference = filters.conference;
+
+  // Auto-select conference from URL param or first itinerary conference
+  useEffect(() => {
+    if (confParam && conferences.includes(confParam)) {
+      setConference(confParam);
+    } else if (conferences.length > 0 && !activeConference) {
+      setConference(conferences[0]);
+    }
+  }, [conferences, confParam]);
+
+  const {
+    availableConferences,
+    availableTypes,
+    availableVibes,
+    friendsForFilter,
+    selectedFriendEventIds,
+  } = useConferenceData({
+    events: allItineraryEvents,
+    filters,
+    itinerary,
+    friends,
+    friendItineraries,
+    checkInUsersByEvent: new Map(),
+    setFilter,
+  });
+
+  // Apply filters to itinerary events
+  const itineraryEvents = useMemo(() => {
+    const confFiltered = allItineraryEvents.filter((e) => !activeConference || e.conference === activeConference);
+    return applyFilters(confFiltered, filters, itinerary, filters.nowMode ? getConferenceNow(filters.conference).getTime() : undefined, selectedFriendEventIds);
+  }, [allItineraryEvents, activeConference, filters, itinerary, selectedFriendEventIds]);
+
+  const tagCounts = useMemo(() => computeTagCounts(itineraryEvents), [itineraryEvents]);
+
+  // Sponsors
+  const visitorId = useMemo(() => typeof window !== 'undefined' ? getVisitorId() : '', []);
+  const resolvedSponsors = useMemo(
+    () => resolveItemVariants(config?.sponsors || [], visitorId),
+    [config?.sponsors, visitorId]
+  );
+
+  const dateGroups = useMemo(() => {
+    const groupMap = new Map<string, ETHDenverEvent[]>();
+    for (const event of itineraryEvents) {
+      const key = event.dateISO || 'unknown';
+      if (!groupMap.has(key)) groupMap.set(key, []);
+      groupMap.get(key)!.push(event);
+    }
+    return Array.from(groupMap.entries())
+      .sort(([a], [b]) => a.localeCompare(b))
+      .map(([dateISO, groupEvents]) => ({
+        dateISO,
+        label: dateISO === 'unknown' ? 'Date TBD' : formatDateLabel(dateISO),
+        events: groupEvents,
+      }));
+  }, [itineraryEvents]);
+
+  const conferenceTimezone = useMemo(
+    () => getTabConfig(activeConference, conferenceTabs).timezone,
+    [activeConference, conferenceTabs]
+  );
+
+  const exportableEvents = useMemo(
+    () => itineraryEvents.filter((e) => !hiddenEvents.has(e.id)),
+    [itineraryEvents, hiddenEvents]
+  );
+
+  // Flat ordered list of all event IDs across date groups (for drag reorder)
+  const flatEventIds = useMemo(
+    () => dateGroups.flatMap((g) => g.events.map((e) => e.id)),
+    [dateGroups]
+  );
+
+  const handleReorder = useCallback(
+    (orderedIds: string[]) => {
+      trackItineraryReorder();
+      // The drag reorder gives us the visible (conference-filtered) IDs in new order.
+      // Preserve IDs from other conferences that aren't visible.
+      const allIds = [...itinerary];
+      const visibleIdSet = new Set(flatEventIds);
+      const otherIds = allIds.filter((id) => !visibleIdSet.has(id));
+      reorderItinerary([...orderedIds, ...otherIds]);
+    },
+    [itinerary, flatEventIds, reorderItinerary]
+  );
+
+  const {
+    setOrderedIds,
+    registerItemRef,
+    getDragHandleProps,
+    getItemProps,
+    getDropIndicator,
+    dragId,
+  } = useDragReorder({ onReorder: handleReorder });
+
+  // Keep ordered IDs in sync
+  useEffect(() => {
+    setOrderedIds(flatEventIds);
+  }, [flatEventIds, setOrderedIds]);
+
+
+  if (loading || !viewModeRestored) {
+    return (
+      <div className="min-h-screen bg-[var(--theme-bg-primary)]">
+        <Loading />
+      </div>
+    );
+  }
+
+  return (
+    <div className={viewMode === 'map' || viewMode === 'table' ? 'h-screen flex flex-col bg-[var(--theme-bg-primary)]' : 'min-h-screen bg-[var(--theme-bg-primary)]'}>
+      <Header
+        viewMode={viewMode}
+        onViewChange={setViewMode}
+        events={events}
+        itinerary={itinerary}
+        onOpenFriends={() => {}}
+        activeConference={activeConference}
+      />
+
+      <SponsorsTicker
+        sponsors={resolvedSponsors}
+        conference={activeConference}
+      />
+
+      <FilterBar
+        filters={filters}
+        onSetConference={setConference}
+        onSetDateTimeRange={setDateTimeRange}
+        onToggleVibe={toggleVibe}
+        onToggleNowMode={toggleNowMode}
+        onToggleTagMatchAll={toggleTagMatchAll}
+        onClearFilters={clearFilters}
+        activeFilterCount={activeFilterCount}
+        availableConferences={availableConferences}
+        availableTypes={availableTypes}
+        availableVibes={availableVibes}
+        tagCounts={tagCounts}
+        friendsForFilter={friendsForFilter}
+        selectedFriends={filters.selectedFriends}
+        onToggleFriend={toggleFriend}
+        searchQuery={filters.searchQuery}
+        onSearchChange={(query) => setFilter('searchQuery', query)}
+        eventCount={itineraryEvents.length}
+        conferenceTabs={conferenceTabs}
+        itineraryCount={itineraryEvents.length}
+        onItineraryToggle={() => {}}
+        trailingButtons={
+          itineraryEvents.length > 0 ? (
+            <div className="flex items-center gap-0.5">
+              <button
+                onClick={() => setShowShareCard(true)}
+                className="shrink-0 p-2 rounded-lg text-[var(--theme-text-secondary)] hover:text-[var(--theme-accent)] transition-colors cursor-pointer"
+                aria-label="Share my plan"
+                title="Share my plan as PNG"
+              >
+                <Share2 className="w-5 h-5" />
+              </button>
+              <GoogleCalendarButton
+                events={exportableEvents}
+                timezone={conferenceTimezone}
+              />
+            </div>
+          ) : undefined
+        }
+      />
+
+      {/* Check-in result toast */}
+      {checkInResult && (
+        <CheckInToast result={checkInResult} onDismiss={clearCheckInResult} />
+      )}
+
+      {/* Content */}
+      {itineraryEvents.length === 0 ? (
+        <div className="flex flex-col items-center justify-center py-16 text-center px-4">
+          <img src="/logo.png" alt="" className="h-10 w-auto opacity-30 mb-4" style={{ filter: 'var(--theme-logo-filter)' }} />
+          <p className="text-[var(--theme-text-secondary)] font-medium mb-2">No events in your plan yet</p>
+          <p className="text-[var(--theme-text-muted)] text-sm max-w-xs mb-4">
+            Add events from the main page to build your schedule!
+          </p>
+          <Link
+            href="/"
+            className="px-4 py-2 bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)] rounded-lg text-sm font-medium transition-colors"
+          >
+            Browse Events
+          </Link>
+        </div>
+      ) : viewMode === 'map' ? (
+        <main className="flex-1 min-h-0">
+          <MapView
+            events={itineraryEvents}
+            itinerary={itinerary}
+            onItineraryToggle={toggleItinerary}
+            conference={activeConference}
+            conferenceTabs={conferenceTabs}
+          />
+        </main>
+      ) : viewMode === 'table' ? (
+        <main className="flex-1 min-h-0 min-w-0 flex flex-col overflow-hidden">
+          <TableView
+            events={itineraryEvents}
+            totalCount={itineraryEvents.length}
+            itinerary={itinerary}
+            onItineraryToggle={toggleItinerary}
+            conference={activeConference}
+            userLocation={userLocation}
+            friendsByEvent={friendsByEvent}
+          />
+        </main>
+      ) : (
+        <div className="max-w-2xl mx-auto px-4 pb-8">
+          <div ref={captureRef} className="bg-[var(--theme-bg-primary)]">
+            {dateGroups.map((group) => (
+              <section key={group.dateISO} className="mt-4">
+                <div className="flex items-center gap-2 mb-2">
+                  <div className="h-px flex-1 bg-[var(--theme-border-secondary)]" />
+                  <h3 className="text-xs font-bold text-[var(--theme-text-secondary)] uppercase tracking-wider whitespace-nowrap">
+                    {group.label}
+                  </h3>
+                  <div className="h-px flex-1 bg-[var(--theme-border-secondary)]" />
+                </div>
+
+                <div className="space-y-2">
+                  {group.events.map((event) => {
+                    const dropIndicator = getDropIndicator(event.id);
+                    const isBeingDragged = dragId === event.id;
+
+                    return (
+                      <div
+                        key={event.id}
+                        ref={(el) => registerItemRef(event.id, el)}
+                        {...getItemProps(event.id)}
+                        className="relative"
+                      >
+                        {/* Drop indicator - above */}
+                        {dropIndicator.showAbove && (
+                          <div className="absolute -top-1.5 left-0 right-0 h-0.5 bg-[var(--theme-accent)] rounded-full z-10" />
+                        )}
+
+                        <div className={`flex items-start gap-2 ${isBeingDragged ? 'opacity-40' : 'opacity-100'} transition-opacity`}>
+                          <div
+                            data-export-hide
+                            {...getDragHandleProps(event.id)}
+                            className="shrink-0 pt-4 text-[var(--theme-text-faint)] hover:text-[var(--theme-text-secondary)] active:text-[var(--theme-text-secondary)] cursor-grab active:cursor-grabbing touch-none select-none"
+                            aria-label="Drag to reorder"
+                            title="Drag to reorder"
+                          >
+                            <GripVertical className="w-4 h-4" />
+                          </div>
+                          <div className="flex-1 min-w-0">
+                            <EventCard
+                              event={event}
+                              isInItinerary={true}
+                              onItineraryToggle={toggleItinerary}
+                              onCheckIn={(eventId) => checkInToEvent(eventId, event.name)}
+                              checkInLoading={checkInLoading}
+                              liveUrgency={passesNowFilter(event, getConferenceNow(activeConference)) ? 'green' : undefined}
+                              conference={activeConference}
+                              userLocation={userLocation}
+                              friendsGoing={friendsByEvent.get(event.id)}
+                            />
+                          </div>
+                        </div>
+
+                        {/* Hide/show toggle for friends visibility */}
+                        <div className="flex justify-end mt-1 mr-1" data-export-hide>
+                          <button
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              toggleHidden(event.id);
+                            }}
+                            className={`flex items-center gap-1 px-2 py-0.5 rounded text-[10px] transition-colors cursor-pointer ${
+                              hiddenEvents.has(event.id)
+                                ? 'text-[var(--theme-text-muted)] bg-[var(--theme-bg-tertiary)]'
+                                : 'text-[var(--theme-text-faint)] hover:text-[var(--theme-text-muted)]'
+                            }`}
+                            title={hiddenEvents.has(event.id) ? 'Hidden from friends (tap to show)' : 'Hide from friends'}
+                          >
+                            {hiddenEvents.has(event.id) ? <EyeOff className="w-3 h-3" /> : <Eye className="w-3 h-3" />}
+                            <span>{hiddenEvents.has(event.id) ? 'Hidden' : 'Hide'}</span>
+                          </button>
+                        </div>
+
+                        {/* Drop indicator - below */}
+                        {dropIndicator.showBelow && (
+                          <div className="absolute -bottom-1.5 left-0 right-0 h-0.5 bg-[var(--theme-accent)] rounded-full z-10" />
+                        )}
+                      </div>
+                    );
+                  })}
+                </div>
+              </section>
+            ))}
+
+            <div className="pt-3 pb-2 text-center">
+              <span className="text-[10px] text-[var(--theme-text-faint)]">plan.wtf — side event guide</span>
+            </div>
+          </div>
+
+          {/* Clear button */}
+          <div className="mt-6 pt-4 border-t border-[var(--theme-border-secondary)]">
+            {showClearConfirm ? (
+              <div className="flex items-center gap-2">
+                <span className="text-sm text-[var(--theme-text-secondary)]">Clear all events?</span>
+                <button
+                  onClick={() => { trackItineraryClear(); clearItinerary(); setShowClearConfirm(false); }}
+                  className="px-3 py-1.5 bg-red-500 hover:bg-red-600 text-white text-xs font-medium rounded transition-colors cursor-pointer"
+                >
+                  Yes, clear
+                </button>
+                <button
+                  onClick={() => setShowClearConfirm(false)}
+                  className="px-3 py-1.5 bg-[var(--theme-bg-tertiary)] hover:bg-[var(--theme-bg-tertiary)] text-[var(--theme-text-secondary)] text-xs font-medium rounded transition-colors cursor-pointer"
+                >
+                  Cancel
+                </button>
+              </div>
+            ) : (
+              <button
+                onClick={() => setShowClearConfirm(true)}
+                className="w-full flex items-center justify-center gap-2 px-4 py-2 bg-[var(--theme-bg-secondary)] hover:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-border-primary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-secondary)] rounded-lg text-sm font-medium transition-colors cursor-pointer"
+              >
+                <Trash2 className="w-4 h-4" />
+                Clear Plan
+              </button>
+            )}
+          </div>
+        </div>
+      )}
+
+      <ShareCardModal
+        isOpen={showShareCard}
+        onClose={() => setShowShareCard(false)}
+        events={itineraryEvents}
+        conferenceName={activeConference || 'My Plan'}
+        displayName={profile?.display_name ?? null}
+        avatarUrl={profile?.avatar_url}
+        hiddenEventIds={hiddenEvents}
+      />
+    </div>
+  );
+}
+
+export default function ItineraryPage() {
+  return (
+    <Suspense fallback={<div className="min-h-screen bg-[var(--theme-bg-primary)]"><Loading /></div>}>
+      <ItineraryContent />
+    </Suspense>
+  );
+}
diff --git a/src/app/plan/s/[code]/page.tsx b/src/app/plan/s/[code]/page.tsx
new file mode 100644
index 00000000..e70a0cf5
--- /dev/null
+++ b/src/app/plan/s/[code]/page.tsx
@@ -0,0 +1,351 @@
+'use client';
+
+import { useEffect, useMemo, useState, useCallback } from 'react';
+import { useParams } from 'next/navigation';
+import Link from 'next/link';
+import { AddressLink } from '@/components/AddressLink';
+import dynamic from 'next/dynamic';
+import { ArrowLeft, Calendar, Map as MapIcon, List, Copy, Check } from 'lucide-react';
+import clsx from 'clsx';
+import { useEvents } from '@/hooks/useEvents';
+import { useItinerary } from '@/hooks/useItinerary';
+import { useAuth } from '@/contexts/AuthContext';
+import { supabase } from '@/lib/supabase';
+import { VIBE_COLORS } from '@/lib/tags';
+import { formatDateLabel } from '@/lib/utils';
+import { sortByStartTime } from '@/lib/time-parse';
+import type { ETHDenverEvent } from '@/lib/types';
+import { Loading } from '@/components/Loading';
+import { AuthModal } from '@/components/AuthModal';
+
+const MapView = dynamic(
+  () => import('@/components/MapView').then((mod) => ({ default: mod.MapView })),
+  {
+    ssr: false,
+    loading: () => (
+      <div className="w-full h-full bg-[var(--theme-bg-primary)] flex items-center justify-center">
+        <div className="text-[var(--theme-text-secondary)]">Loading map...</div>
+      </div>
+    ),
+  }
+);
+
+type SharedViewMode = 'list' | 'map';
+
+export default function SharedItineraryPage() {
+  const params = useParams();
+  const code = params.code as string;
+
+  const { events, loading: eventsLoading } = useEvents();
+  const { itinerary, addMany, toggle: toggleItinerary } = useItinerary();
+  const { user } = useAuth();
+
+  const [sharedEventIds, setSharedEventIds] = useState<string[] | null>(null);
+  const [loadingShare, setLoadingShare] = useState(true);
+  const [notFound, setNotFound] = useState(false);
+  const [viewMode, setViewMode] = useState<SharedViewMode>('list');
+  const [copyStatus, setCopyStatus] = useState<'idle' | 'copied'>('idle');
+  const [showAuth, setShowAuth] = useState(false);
+  const [pendingCopy, setPendingCopy] = useState(false);
+
+  // Fetch shared itinerary from Supabase
+  useEffect(() => {
+    async function fetchShared() {
+      try {
+        const { data, error } = await supabase
+          .from('shared_itineraries')
+          .select('event_ids')
+          .eq('short_code', code)
+          .maybeSingle();
+
+        if (error || !data) {
+          setNotFound(true);
+        } else {
+          setSharedEventIds(data.event_ids);
+        }
+      } catch {
+        setNotFound(true);
+      }
+      setLoadingShare(false);
+    }
+
+    if (code) fetchShared();
+  }, [code]);
+
+  // Handle pending copy after auth
+  useEffect(() => {
+    if (pendingCopy && user && sharedEventIds) {
+      addMany(sharedEventIds);
+      setCopyStatus('copied');
+      setPendingCopy(false);
+      setTimeout(() => setCopyStatus('idle'), 2500);
+    }
+  }, [pendingCopy, user, sharedEventIds, addMany]);
+
+  const sharedEvents = useMemo(() => {
+    if (!sharedEventIds) return [];
+    const idSet = new Set(sharedEventIds);
+    return events.filter((e) => idSet.has(e.id));
+  }, [events, sharedEventIds]);
+
+  const dateGroups = useMemo(() => {
+    const groupMap = new Map<string, ETHDenverEvent[]>();
+    for (const event of sharedEvents) {
+      const key = event.dateISO || 'unknown';
+      if (!groupMap.has(key)) groupMap.set(key, []);
+      groupMap.get(key)!.push(event);
+    }
+    return Array.from(groupMap.entries())
+      .sort(([a], [b]) => a.localeCompare(b))
+      .map(([dateISO, groupEvents]) => ({
+        dateISO,
+        label: dateISO === 'unknown' ? 'Date TBD' : formatDateLabel(dateISO),
+        events: groupEvents.sort(sortByStartTime),
+      }));
+  }, [sharedEvents]);
+
+  const dateRange = useMemo(() => {
+    if (dateGroups.length === 0) return '';
+    if (dateGroups.length === 1) return dateGroups[0].label;
+    return `${dateGroups[0].label} - ${dateGroups[dateGroups.length - 1].label}`;
+  }, [dateGroups]);
+
+  const handleCopyToItinerary = useCallback(() => {
+    if (!sharedEventIds || sharedEventIds.length === 0) return;
+
+    if (!user) {
+      setPendingCopy(true);
+      setShowAuth(true);
+      return;
+    }
+
+    addMany(sharedEventIds);
+    setCopyStatus('copied');
+    setTimeout(() => setCopyStatus('idle'), 2500);
+  }, [sharedEventIds, user, addMany]);
+
+  const handleAuthClose = useCallback(() => {
+    setShowAuth(false);
+    // If user didn't sign in, cancel pending copy
+    if (!user) {
+      setPendingCopy(false);
+    }
+  }, [user]);
+
+  const loading = eventsLoading || loadingShare;
+
+  if (loading) {
+    return (
+      <div className="min-h-screen bg-[var(--theme-bg-primary)]">
+        <Loading />
+      </div>
+    );
+  }
+
+  if (notFound) {
+    return (
+      <div className="min-h-screen bg-[var(--theme-bg-primary)] flex flex-col items-center justify-center px-4">
+        <p className="text-[var(--theme-text-secondary)] text-lg font-medium mb-2">Plan not found</p>
+        <p className="text-[var(--theme-text-muted)] text-sm mb-4">This share link may have expired or is invalid.</p>
+        <Link
+          href="/"
+          className="px-4 py-2 bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)] rounded-lg text-sm font-medium transition-colors"
+        >
+          Browse Events
+        </Link>
+      </div>
+    );
+  }
+
+  return (
+    <div className={viewMode === 'map' ? 'h-screen flex flex-col bg-[var(--theme-bg-primary)]' : 'min-h-screen bg-[var(--theme-bg-primary)]'}>
+      {/* Header */}
+      <header className="sticky top-0 z-50 bg-[var(--theme-bg-primary)]/95 backdrop-blur-sm border-b border-[var(--theme-border-secondary)]">
+        <div className="max-w-2xl mx-auto px-4 py-3 flex items-center justify-between gap-4">
+          <div className="flex items-center gap-3">
+            <Link
+              href="/"
+              className="p-1.5 text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] transition-colors"
+              aria-label="Back to events"
+            >
+              <ArrowLeft className="w-5 h-5" />
+            </Link>
+            <div>
+              <h1 className="text-lg font-bold text-[var(--theme-text-primary)]">Shared Plan</h1>
+              <p className="text-xs text-[var(--theme-text-secondary)]">
+                {sharedEvents.length} event{sharedEvents.length !== 1 ? 's' : ''}
+                {dateRange && ` · ${dateRange}`}
+              </p>
+            </div>
+          </div>
+          <div className="flex items-center gap-1">
+            {sharedEvents.length > 0 && (
+              <>
+                {/* View toggle */}
+                <div className="flex rounded-lg border border-[var(--theme-border-primary)] overflow-hidden mr-1">
+                  {([
+                    { mode: 'list' as const, icon: List, label: 'List' },
+                    { mode: 'map' as const, icon: MapIcon, label: 'Map' },
+                  ]).map(({ mode, icon: Icon, label }) => (
+                    <button
+                      key={mode}
+                      onClick={() => setViewMode(mode)}
+                      className={clsx(
+                        'flex items-center gap-1 px-2 py-1 text-xs font-medium transition-colors cursor-pointer',
+                        viewMode === mode
+                          ? 'bg-[var(--theme-accent)] text-[var(--theme-accent-text)]'
+                          : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)]'
+                      )}
+                      aria-label={`${label} view`}
+                    >
+                      <Icon className="w-3.5 h-3.5" />
+                      <span className="hidden sm:inline">{label}</span>
+                    </button>
+                  ))}
+                </div>
+              </>
+            )}
+          </div>
+        </div>
+      </header>
+
+      {/* Copy to itinerary banner */}
+      {sharedEvents.length > 0 && (
+        <div className="bg-[var(--theme-bg-secondary)]/50 border-b border-[var(--theme-border-secondary)]">
+          <div className="max-w-2xl mx-auto px-4 py-3 flex items-center justify-between gap-3">
+            <p className="text-sm text-[var(--theme-text-secondary)]">
+              Add these events to your plan
+            </p>
+            <button
+              onClick={handleCopyToItinerary}
+              className={clsx(
+                'flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors cursor-pointer',
+                copyStatus === 'copied'
+                  ? 'bg-emerald-500/20 text-emerald-400'
+                  : 'bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)]'
+              )}
+            >
+              {copyStatus === 'copied' ? (
+                <>
+                  <Check className="w-4 h-4" />
+                  Added!
+                </>
+              ) : (
+                <>
+                  <Copy className="w-4 h-4" />
+                  Copy to My Plan
+                </>
+              )}
+            </button>
+          </div>
+        </div>
+      )}
+
+      {/* Content */}
+      {sharedEvents.length === 0 ? (
+        <div className="flex flex-col items-center justify-center py-16 text-center px-4">
+          <Calendar className="w-12 h-12 text-[var(--theme-text-faint)] mb-4" />
+          <p className="text-[var(--theme-text-secondary)] font-medium mb-2">No matching events found</p>
+          <p className="text-[var(--theme-text-muted)] text-sm max-w-xs mb-4">
+            The events in this itinerary may no longer be available.
+          </p>
+          <Link
+            href="/"
+            className="px-4 py-2 bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)] rounded-lg text-sm font-medium transition-colors"
+          >
+            Browse Events
+          </Link>
+        </div>
+      ) : viewMode === 'map' ? (
+        <main className="flex-1 min-h-0">
+          <MapView
+            events={sharedEvents}
+            itinerary={itinerary}
+            onItineraryToggle={toggleItinerary}
+          />
+        </main>
+      ) : (
+        <div className="max-w-2xl mx-auto px-4 pb-8">
+          {dateGroups.map((group) => (
+            <section key={group.dateISO} className="mt-4">
+              <div className="flex items-center gap-2 mb-2">
+                <div className="h-px flex-1 bg-[var(--theme-border-secondary)]" />
+                <h3 className="text-xs font-bold text-[var(--theme-text-secondary)] uppercase tracking-wider whitespace-nowrap">
+                  {group.label}
+                </h3>
+                <div className="h-px flex-1 bg-[var(--theme-border-secondary)]" />
+              </div>
+
+              <div className="space-y-2">
+                {group.events.map((event) => {
+                  const vibeColor = VIBE_COLORS[event.vibe] || VIBE_COLORS['default'];
+                  const timeDisplay = event.isAllDay
+                    ? 'All Day'
+                    : `${event.startTime}${event.endTime ? ` - ${event.endTime}` : ''}`;
+
+                  return (
+                    <div
+                      key={event.id}
+                      className="bg-[var(--theme-bg-secondary)] rounded-lg p-3 border border-[var(--theme-border-primary)]"
+                    >
+                      <h4 className="text-sm font-semibold text-[var(--theme-text-primary)] leading-tight">
+                        {event.link ? (
+                          <a
+                            href={event.link}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="hover:text-[var(--theme-accent)] transition-colors"
+                          >
+                            {event.name}
+                          </a>
+                        ) : (
+                          event.name
+                        )}
+                      </h4>
+
+                      {event.organizer && (
+                        <p className="text-[var(--theme-text-muted)] text-xs mt-0.5">By {event.organizer}</p>
+                      )}
+
+                      <p className="text-[var(--theme-text-secondary)] text-xs mt-1">{timeDisplay}</p>
+
+                      {event.address && (
+                        <AddressLink address={event.address} navAddress={event.matchedAddress} lat={event.lat} lng={event.lng}
+                          eventId={event.id} eventName={event.name}
+                          className="text-[var(--theme-text-muted)] hover:text-[var(--theme-text-secondary)] text-xs mt-0.5 truncate block transition-colors">
+                          {event.address}
+                        </AddressLink>
+                      )}
+
+                      <div className="flex items-center gap-1.5 mt-1.5">
+                        {event.vibe && (
+                          <span
+                            className="px-1.5 py-0.5 rounded text-[10px] font-semibold text-white"
+                            style={{ backgroundColor: vibeColor }}
+                          >
+                            {event.vibe}
+                          </span>
+                        )}
+                        {event.isFree && (
+                          <span className="px-1.5 py-0.5 rounded text-[10px] font-medium bg-emerald-500/20 text-emerald-400">
+                            FREE
+                          </span>
+                        )}
+                      </div>
+                    </div>
+                  );
+                })}
+              </div>
+            </section>
+          ))}
+
+          <div className="pt-3 pb-2 text-center">
+            <span className="text-[10px] text-[var(--theme-text-faint)]">plan.wtf — side event guide</span>
+          </div>
+        </div>
+      )}
+
+      <AuthModal isOpen={showAuth} onClose={handleAuthClose} />
+    </div>
+  );
+}
diff --git a/src/app/robots.ts b/src/app/robots.ts
index a2b370f2..b5eb3575 100644
--- a/src/app/robots.ts
+++ b/src/app/robots.ts
@@ -5,7 +5,7 @@ export default function robots(): MetadataRoute.Robots {
     rules: {
       userAgent: '*',
       allow: '/',
-      disallow: ['/admin', '/itinerary'],
+      disallow: ['/admin', '/plan', '/itinerary'],
     },
     sitemap: 'https://plan.wtf/sitemap.xml',
   };
diff --git a/src/components/AuthModal.tsx b/src/components/AuthModal.tsx
index 1f299125..fa1be552 100644
--- a/src/components/AuthModal.tsx
+++ b/src/components/AuthModal.tsx
@@ -2,15 +2,12 @@
 
 import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
 import { createPortal } from 'react-dom';
-import { X, Mail, LogOut, User, Check, Loader2, Users, Search, UserPlus, Clock, XCircle, CircleUser, Link2, ArrowRight, Send, Building2, Briefcase, Linkedin, Smartphone, Moon, Sun } from 'lucide-react';
+import { X, Mail, LogOut, User, Check, Loader2, Users, Search, UserPlus, Clock, XCircle, CircleUser, Link2, Share2, ArrowRight } from 'lucide-react';
 import { ShareCardModal } from './ShareCardModal';
-import { LockScreenModal } from './LockScreenModal';
 import { useAuth } from '@/contexts/AuthContext';
-import { useTheme } from '@/contexts/ThemeContext';
 import { trackAuthSuccess, trackSignOut, trackFriendCodeGenerate, trackFriendCodeCopy, trackModalDismiss } from '@/lib/analytics';
 import { getDisplayName } from '@/lib/user-display';
 import UserAvatar from './UserAvatar';
-import { getSocialLinks } from '@/lib/social-urls';
 
 import { supabase } from '@/lib/supabase';
 import { useProfile } from '@/hooks/useProfile';
@@ -127,7 +124,7 @@ export function AuthModal({ isOpen, onClose }: AuthModalProps) {
   return (
     <>
       <div className="fixed inset-0 z-[80] bg-black/50" onClick={handleClose} />
-      <div className="fixed inset-0 z-[90] flex items-center justify-center p-4" onClick={handleClose}>
+      <div className="fixed inset-0 z-[90] flex items-center justify-center p-4">
         <div className="bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] rounded-xl shadow-2xl w-full max-w-sm" onClick={(e) => e.stopPropagation()}>
           {/* Header */}
           <div className="flex items-center justify-between px-4 py-3 border-b border-[var(--theme-border-primary)]">
@@ -376,7 +373,6 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
   const { profile, updateProfile, uploadAvatar } = useProfile();
   const { friendCount, refreshFriends: localRefreshFriends } = useFriends();
   const { config } = useAdminConfig();
-  const { theme, setTheme } = useTheme();
 
   const refreshFriends = useCallback(async () => {
     await localRefreshFriends();
@@ -400,10 +396,6 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
   const [displayName, setDisplayName] = useState('');
   const [xHandle, setXHandle] = useState('');
   const [rsvpName, setRsvpName] = useState('');
-  const [telegramHandle, setTelegramHandle] = useState('');
-  const [company, setCompany] = useState('');
-  const [linkedinUrl, setLinkedinUrl] = useState('');
-  const [jobTitle, setJobTitle] = useState('');
   const [saving, setSaving] = useState(false);
   const [saveStatus, setSaveStatus] = useState<'idle' | 'saved'>('idle');
   const saveTimeout = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -434,63 +426,12 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
   const shareConferenceName = activeConference || 'Itinerary';
   const badgeCount = externalCount ?? pendingIncomingCount;
 
-  // Lock screen card state
-  const [showLockScreen, setShowLockScreen] = useState(false);
-  const [friendCode, setFriendCode] = useState<string | null>(null);
-  const socialLinks = useMemo(
-    () => getSocialLinks(profile ?? {}),
-    [profile]
-  );
-
-  // Ensure friend code exists (create if needed) for lock screen card
-  useEffect(() => {
-    if (!user) return;
-    (async () => {
-      const { data: existing } = await supabase
-        .from('friend_codes')
-        .select('code')
-        .eq('user_id', user.id)
-        .single();
-
-      if (existing?.code) {
-        setFriendCode(existing.code);
-        return;
-      }
-
-      // Generate a new code (8 char alphanumeric)
-      const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-      const arr = new Uint8Array(8);
-      crypto.getRandomValues(arr);
-      const code = Array.from(arr, (b) => chars[b % chars.length]).join('');
-
-      const { error } = await supabase
-        .from('friend_codes')
-        .insert({ user_id: user.id, code });
-
-      if (error) {
-        // Race condition — try fetching again
-        const { data: retry } = await supabase
-          .from('friend_codes')
-          .select('code')
-          .eq('user_id', user.id)
-          .single();
-        if (retry?.code) setFriendCode(retry.code);
-      } else {
-        setFriendCode(code);
-      }
-    })();
-  }, [user]);
-
   // Sync form state when profile loads
   useEffect(() => {
     if (profile) {
       setDisplayName(profile.display_name ?? '');
       setXHandle(profile.x_handle ?? '');
       setRsvpName(profile.rsvp_name ?? '');
-      setTelegramHandle(profile.telegram_handle ?? '');
-      setCompany(profile.company ?? '');
-      setLinkedinUrl(profile.linkedin_url ?? '');
-      setJobTitle(profile.job_title ?? '');
     }
   }, [profile]);
 
@@ -511,17 +452,9 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
   // Auto-save profile on change (debounced)
   useEffect(() => {
     if (!profile) return;
-    const current = { displayName, xHandle, rsvpName, telegramHandle, company, linkedinUrl, jobTitle };
-    const original = {
-      displayName: profile.display_name ?? '',
-      xHandle: profile.x_handle ?? '',
-      rsvpName: profile.rsvp_name ?? '',
-      telegramHandle: profile.telegram_handle ?? '',
-      company: profile.company ?? '',
-      linkedinUrl: profile.linkedin_url ?? '',
-      jobTitle: profile.job_title ?? '',
-    };
-    if (current.displayName === original.displayName && current.xHandle === original.xHandle && current.rsvpName === original.rsvpName && current.telegramHandle === original.telegramHandle && current.company === original.company && current.linkedinUrl === original.linkedinUrl && current.jobTitle === original.jobTitle) return;
+    const current = { displayName, xHandle, rsvpName };
+    const original = { displayName: profile.display_name ?? '', xHandle: profile.x_handle ?? '', rsvpName: profile.rsvp_name ?? '' };
+    if (current.displayName === original.displayName && current.xHandle === original.xHandle && current.rsvpName === original.rsvpName) return;
 
     if (saveTimeout.current) clearTimeout(saveTimeout.current);
     setSaveStatus('idle');
@@ -531,10 +464,6 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
         display_name: displayName.trim() || null,
         x_handle: xHandle.trim() || null,
         rsvp_name: rsvpName.trim() || null,
-        telegram_handle: telegramHandle.trim() || null,
-        company: company.trim() || null,
-        linkedin_url: linkedinUrl.trim() || null,
-        job_title: jobTitle.trim() || null,
       });
       setSaving(false);
       setSaveStatus('saved');
@@ -544,7 +473,7 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
     return () => {
       if (saveTimeout.current) clearTimeout(saveTimeout.current);
     };
-  }, [displayName, xHandle, rsvpName, telegramHandle, company, linkedinUrl, jobTitle, profile, updateProfile]);
+  }, [displayName, xHandle, rsvpName, profile, updateProfile]);
 
   async function handleAvatarSelect(e: React.ChangeEvent<HTMLInputElement>) {
     const file = e.target.files?.[0];
@@ -659,13 +588,12 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
     <>
       <button
         onClick={() => setOpen(true)}
-        className="relative flex items-center gap-1.5 px-3 py-1.5 rounded-lg border border-[var(--theme-header-control-border)] text-[var(--theme-header-text)] hover:text-[var(--theme-header-text-hover)] active:text-[var(--theme-header-text-hover)] transition-colors text-sm cursor-pointer"
-        style={{ backgroundColor: 'var(--theme-header-control-bg)' }}
+        className="relative flex items-center gap-1.5 px-3 py-1.5 rounded-lg border border-[var(--theme-border-primary)] bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] transition-colors text-sm cursor-pointer"
         title="Profile"
       >
         <CircleUser className="w-4 h-4" />
         {badgeCount > 0 && (
-          <span className="absolute -top-1.5 -right-1.5 min-w-[18px] h-[18px] flex items-center justify-center text-[10px] font-bold rounded-full px-1 border border-[var(--theme-header-badge-border)] bg-[var(--theme-header-badge-bg)] text-[var(--theme-header-badge-text)]">
+          <span className="absolute -top-1.5 -right-1.5 min-w-[18px] h-[18px] flex items-center justify-center text-[10px] font-bold rounded-full px-1 border border-[var(--theme-accent)] bg-[var(--theme-accent)] text-[var(--theme-accent-text)]">
             {badgeCount}
           </span>
         )}
@@ -676,14 +604,14 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
             setOpen(false);
             setSearchQuery('');
           }}>
-            <div className="bg-[var(--theme-modal-bg)] border border-[var(--theme-border-primary)] rounded-xl shadow-2xl w-full max-w-sm" onClick={(e) => e.stopPropagation()}>
+            <div className="bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] rounded-xl shadow-2xl w-full max-w-sm" onClick={(e) => e.stopPropagation()}>
               {/* Header */}
-              <div className="flex items-center justify-between px-4 py-3 border-b border-[var(--theme-border-primary)] rounded-t-xl" style={{ backgroundColor: 'var(--theme-modal-header-bg)' }}>
-                <h2 className="text-base font-bold truncate" style={{ color: 'var(--theme-modal-header-text)' }}>{user.email}</h2>
+              <div className="flex items-center justify-between px-4 py-3 border-b border-[var(--theme-border-primary)]">
+                <h2 className="text-base font-bold text-[var(--theme-text-primary)] truncate">{user.email}</h2>
                 <button onClick={() => {
                   setOpen(false);
                   setSearchQuery('');
-                }} className="p-1 hover:opacity-80 transition-colors cursor-pointer" style={{ color: 'var(--theme-modal-header-close)' }}>
+                }} className="p-1 text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] transition-colors cursor-pointer">
                   <X className="w-4 h-4" />
                 </button>
               </div>
@@ -692,8 +620,8 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
               <div className="max-h-[80vh] overflow-y-auto px-4 py-5 space-y-4">
                 {/* Profile Fields */}
                 <div className="space-y-3">
-                  {/* Avatar + Name row */}
-                  <div className="flex items-center gap-3">
+                  {/* Avatar upload */}
+                  <div className="flex items-center gap-4">
                     <button
                       type="button"
                       onClick={() => avatarInputRef.current?.click()}
@@ -701,7 +629,7 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
                       className="relative group cursor-pointer shrink-0"
                     >
                       <UserAvatar
-                        size="md"
+                        size="lg"
                         avatarUrl={profile?.avatar_url}
                         xHandle={profile?.x_handle}
                         displayName={profile?.display_name}
@@ -709,9 +637,9 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
                       />
                       <div className="absolute inset-0 rounded-full bg-black/50 flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity">
                         {avatarUploading ? (
-                          <Loader2 className="w-4 h-4 text-white animate-spin" />
+                          <Loader2 className="w-5 h-5 text-white animate-spin" />
                         ) : (
-                          <User className="w-4 h-4 text-white" />
+                          <User className="w-5 h-5 text-white" />
                         )}
                       </div>
                     </button>
@@ -723,51 +651,28 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
                       onChange={handleAvatarSelect}
                     />
                     <div className="flex-1 min-w-0">
-                      <div className="flex items-center bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg focus-within:border-[var(--theme-accent)]">
-                        <User className="w-4 h-4 text-[var(--theme-text-muted)] ml-3 shrink-0" />
-                        <input
-                          type="text"
-                          value={displayName}
-                          onChange={(e) => setDisplayName(e.target.value)}
-                          placeholder="Username"
-                          className="flex-1 bg-transparent text-[var(--theme-text-primary)] text-sm px-2 py-2 focus:outline-none placeholder:text-[var(--theme-text-muted)]"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                  {avatarError && (
-                    <p className="text-xs text-red-400">{avatarError}</p>
-                  )}
-
-                  <div>
-                    <div className="flex items-center bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg focus-within:border-[var(--theme-accent)]">
-                      <Building2 className="w-4 h-4 text-[var(--theme-text-muted)] ml-3 shrink-0" />
-                      <input
-                        type="text"
-                        value={company}
-                        onChange={(e) => setCompany(e.target.value)}
-                        placeholder="Organization"
-                        className="flex-1 bg-transparent text-[var(--theme-text-primary)] text-sm px-2 py-2 focus:outline-none placeholder:text-[var(--theme-text-muted)]"
-                      />
+                      <p className="text-xs text-[var(--theme-text-muted)]">
+                        {avatarUploading ? 'Uploading...' : 'Tap to change photo'}
+                      </p>
+                      {avatarError && (
+                        <p className="text-xs text-red-400 mt-0.5">{avatarError}</p>
+                      )}
                     </div>
                   </div>
 
                   <div>
-                    <div className="flex items-center bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg focus-within:border-[var(--theme-accent)]">
-                      <Briefcase className="w-4 h-4 text-[var(--theme-text-muted)] ml-3 shrink-0" />
-                      <input
-                        type="text"
-                        value={jobTitle}
-                        onChange={(e) => setJobTitle(e.target.value)}
-                        placeholder="Job Title"
-                        className="flex-1 bg-transparent text-[var(--theme-text-primary)] text-sm px-2 py-2 focus:outline-none placeholder:text-[var(--theme-text-muted)]"
-                      />
-                    </div>
+                    <input
+                      type="text"
+                      value={displayName}
+                      onChange={(e) => setDisplayName(e.target.value)}
+                      placeholder="Username"
+                      className="w-full bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg text-[var(--theme-text-primary)] text-sm px-3 py-2 focus:border-[var(--theme-accent)] focus:outline-none placeholder:text-[var(--theme-text-muted)]"
+                    />
                   </div>
 
                   <div>
                     <div className="flex items-center bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg focus-within:border-[var(--theme-accent)]">
-                      <span className="text-[var(--theme-text-muted)] text-sm ml-3 shrink-0 select-none font-bold leading-none" style={{ fontFamily: 'serif' }}>{'\u{1D54F}'}</span>
+                      <span className="text-[var(--theme-text-muted)] text-sm pl-3 select-none">@</span>
                       <input
                         type="text"
                         value={xHandle}
@@ -778,32 +683,6 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
                     </div>
                   </div>
 
-                  <div>
-                    <div className="flex items-center bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg focus-within:border-[var(--theme-accent)]">
-                      <Send className="w-4 h-4 text-[var(--theme-text-muted)] ml-3 shrink-0" />
-                      <input
-                        type="text"
-                        value={telegramHandle}
-                        onChange={(e) => setTelegramHandle(e.target.value.replace(/^@/, ''))}
-                        placeholder="Telegram"
-                        className="flex-1 bg-transparent text-[var(--theme-text-primary)] text-sm px-2 py-2 focus:outline-none placeholder:text-[var(--theme-text-muted)]"
-                      />
-                    </div>
-                  </div>
-
-                  <div>
-                    <div className="flex items-center bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg focus-within:border-[var(--theme-accent)]">
-                      <Linkedin className="w-4 h-4 text-[var(--theme-text-muted)] ml-3 shrink-0" />
-                      <input
-                        type="text"
-                        value={linkedinUrl}
-                        onChange={(e) => setLinkedinUrl(e.target.value)}
-                        placeholder="linkedin.com/in/yourname"
-                        className="flex-1 bg-transparent text-[var(--theme-text-primary)] text-sm px-2 py-2 focus:outline-none placeholder:text-[var(--theme-text-muted)]"
-                      />
-                    </div>
-                  </div>
-
                   {saveStatus === 'saved' && (
                     <div className="flex items-center gap-1 text-green-400">
                       <Check className="w-3.5 h-3.5" />
@@ -812,17 +691,6 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
                   )}
                 </div>
 
-                {/* Lock Screen Card */}
-                {(socialLinks.length > 0 || friendCode) && (
-                  <button
-                    onClick={() => setShowLockScreen(true)}
-                    className="w-full flex items-center justify-center gap-2 px-4 py-2.5 bg-[var(--theme-bg-tertiary)] hover:bg-[var(--theme-bg-card-hover)] text-[var(--theme-text-primary)] rounded-lg text-sm font-medium transition-colors cursor-pointer"
-                  >
-                    <Smartphone className="w-3.5 h-3.5" />
-                    Generate Lock Screen
-                  </button>
-                )}
-
                 {/* Friends */}
                 <div className="border-t border-[var(--theme-border-primary)] pt-4 space-y-3">
                   {/* Friends button + Friend Link button */}
@@ -949,26 +817,28 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
                   )}
                 </div>
 
-                {/* Sign Out + Dark Mode Toggle */}
-                <div className="border-t border-[var(--theme-border-primary)] pt-4 flex items-center gap-2">
+                {/* Share Itinerary + Submit Event + Sign Out */}
+                <div className="border-t border-[var(--theme-border-primary)] pt-4 space-y-2">
+                  {itineraryEvents.length > 0 && (
+                    <button
+                      onClick={() => { setOpen(false); setShowShareCard(true); }}
+                      className="w-full flex items-center justify-center gap-2 px-4 py-2.5 bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)] rounded-lg text-sm font-medium transition-colors cursor-pointer"
+                    >
+                      <Share2 className="w-4 h-4" />
+                      Share My Plan
+                    </button>
+                  )}
                   <button
                     onClick={() => {
                       trackSignOut();
                       signOut();
                       setOpen(false);
                     }}
-                    className="flex-1 flex items-center justify-center gap-2 px-4 py-2.5 border border-[var(--theme-border-primary)] hover:border-red-500/50 hover:bg-red-500/10 text-[var(--theme-text-secondary)] hover:text-red-400 rounded-lg text-sm transition-colors cursor-pointer"
+                    className="w-full flex items-center justify-center gap-2 px-4 py-2.5 border border-[var(--theme-border-primary)] hover:border-red-500/50 hover:bg-red-500/10 text-[var(--theme-text-secondary)] hover:text-red-400 rounded-lg text-sm transition-colors cursor-pointer"
                   >
                     <LogOut className="w-3.5 h-3.5" />
                     Sign out
                   </button>
-                  <button
-                    onClick={() => setTheme(theme === 'dark' ? 'light-blue' : 'dark')}
-                    aria-label={theme === 'dark' ? 'Switch to light mode' : 'Switch to dark mode'}
-                    className="shrink-0 flex items-center justify-center w-10 h-10 border border-[var(--theme-border-primary)] hover:border-[var(--theme-text-primary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] rounded-lg transition-colors cursor-pointer"
-                  >
-                    {theme === 'dark' ? <Sun className="w-4 h-4" /> : <Moon className="w-4 h-4" />}
-                  </button>
                 </div>
 
                 {/* Profile Ad Placement */}
@@ -987,7 +857,7 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
                         trackAdEvent({ ad_id: profileAd.id || 'profile-ad', ad_name: profileAd.title, placement: 'profile', event_type: 'click', url: profileAd.link });
                       }}
                     >
-                      <div className="bg-[var(--theme-bg-card)] border border-[var(--theme-border-primary)] rounded-lg p-3 transition-colors hover:border-[var(--theme-accent)]">
+                      <div className="bg-[var(--theme-bg-card)] border border-[var(--theme-border-primary)] rounded-lg p-3 transition-colors hover:border-amber-500/30">
                         <div className="flex gap-3">
                           {profileAd.imageUrl && (
                             <div className="w-[60px] h-[60px] flex-shrink-0 rounded-lg overflow-hidden bg-[var(--theme-bg-tertiary)]">
@@ -997,12 +867,12 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
                           <div className="flex-1 min-w-0">
                             <div className="flex items-center gap-2 mb-1">
                               <span className="text-xs font-semibold text-[var(--theme-text-primary)] truncate">{profileAd.title}</span>
-                              <span className="flex-shrink-0 text-[9px] uppercase tracking-wider px-1.5 py-0.5 rounded bg-[var(--theme-accent-muted)] text-[var(--theme-accent)] border border-[var(--theme-accent-muted)]">
+                              <span className="flex-shrink-0 text-[9px] uppercase tracking-wider px-1.5 py-0.5 rounded bg-amber-500/15 text-amber-400 border border-amber-500/20">
                                 Ad
                               </span>
                             </div>
                             <p className="text-[11px] text-[var(--theme-text-secondary)] line-clamp-2 mb-1.5">{profileAd.description}</p>
-                            <span className="inline-flex items-center gap-1 text-[var(--theme-accent)] text-[11px] font-medium">
+                            <span className="inline-flex items-center gap-1 text-amber-400 text-[11px] font-medium">
                               {profileAd.badge || 'Learn more'}
                               <ArrowRight className="w-3 h-3" />
                             </span>
@@ -1025,17 +895,6 @@ export function UserMenu({ events, itinerary, onOpenFriends, onSubmitEvent, pend
         displayName={profile?.display_name ?? null}
         avatarUrl={profile?.avatar_url}
       />
-      <LockScreenModal
-        isOpen={showLockScreen}
-        onClose={() => setShowLockScreen(false)}
-        displayName={profile?.display_name ?? null}
-        company={profile?.company ?? null}
-        jobTitle={profile?.job_title ?? null}
-        avatarUrl={profile?.avatar_url ?? null}
-        xHandle={profile?.x_handle ?? null}
-        socialLinks={socialLinks}
-        friendCode={friendCode}
-      />
     </>
   );
 }
diff --git a/src/components/CommentSection.tsx b/src/components/CommentSection.tsx
index b5b066bf..df8b4178 100644
--- a/src/components/CommentSection.tsx
+++ b/src/components/CommentSection.tsx
@@ -40,8 +40,8 @@ export function CommentSection({ eventId, commentCount = 0 }: CommentSectionProp
         }}
         className="flex items-center gap-1.5 text-xs text-[var(--theme-text-muted)] hover:text-[var(--theme-text-secondary)] transition-colors cursor-pointer"
       >
-        <MessageCircle className="w-5 h-5" />
-        {commentCount > 0 && <span>{commentCount}</span>}
+        <MessageCircle className="w-3.5 h-3.5" />
+        {commentCount > 0 ? `${commentCount} comment${commentCount !== 1 ? 's' : ''}` : 'Comments'}
       </button>
     );
   }
diff --git a/src/components/EmojiReactions.tsx b/src/components/EmojiReactions.tsx
index a45bbd80..3a15e412 100644
--- a/src/components/EmojiReactions.tsx
+++ b/src/components/EmojiReactions.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { useState } from 'react';
-import { ThumbsUp } from 'lucide-react';
+import { Plus } from 'lucide-react';
 import { REACTION_EMOJIS } from '@/lib/constants';
 import type { ReactionEmoji } from '@/lib/types';
 import { trackReactionToggle, trackReactionPickerOpen } from '@/lib/analytics';
@@ -32,6 +32,7 @@ export function EmojiReactions({
   // Emojis available to add
   const availableEmojis = REACTION_EMOJIS.filter((e) => !activeEmojis.has(e));
 
+  const pillSize = compact ? 'px-1.5 py-0.5 text-[10px]' : 'px-1.5 py-0.5 text-xs';
   const gap = compact ? 'gap-1' : 'gap-1.5';
 
   return (
@@ -44,10 +45,14 @@ export function EmojiReactions({
             trackReactionToggle(eventId, r.emoji, !r.reacted);
             onToggle(eventId, r.emoji);
           }}
-          className="py-0.5 transition-colors cursor-pointer inline-flex items-center gap-0.5"
+          className={`${pillSize} rounded-full border transition-colors cursor-pointer inline-flex items-center gap-1 ${
+            r.reacted
+              ? 'border-[var(--theme-accent)]/60 bg-[var(--theme-accent)]/10 text-[var(--theme-text-primary)]'
+              : 'border-[var(--theme-border-primary)] bg-[var(--theme-bg-tertiary)]/50 text-[var(--theme-text-secondary)] hover:border-[var(--theme-text-muted)]'
+          }`}
         >
-          <span className="text-[18px] leading-none">{r.emoji}</span>
-          <span className={`text-xs ${r.reacted ? 'text-[var(--theme-accent)]' : 'text-[var(--theme-text-muted)]'}`}>{r.count}</span>
+          <span>{r.emoji}</span>
+          <span className="font-medium">{r.count}</span>
         </button>
       ))}
 
@@ -59,9 +64,9 @@ export function EmojiReactions({
             if (!showPicker) trackReactionPickerOpen();
             setShowPicker(!showPicker);
           }}
-          className="text-[var(--theme-text-muted)] hover:text-[var(--theme-text-primary)] transition-colors cursor-pointer inline-flex items-center"
+          className={`${pillSize} rounded-full border border-[var(--theme-border-primary)] bg-[var(--theme-bg-tertiary)]/50 text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:border-[var(--theme-text-muted)] transition-colors cursor-pointer inline-flex items-center`}
         >
-          <ThumbsUp className="w-5 h-5 translate-y-[3px]" />
+          <Plus className={compact ? 'w-2.5 h-2.5' : 'w-3 h-3'} />
         </button>
 
         {showPicker && (
@@ -73,8 +78,8 @@ export function EmojiReactions({
                 setShowPicker(false);
               }}
             />
-            <div className="absolute bottom-full left-0 mb-1 z-[41] bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] rounded-lg shadow-xl p-1.5 grid grid-cols-4 gap-1 min-w-[160px]">
-              {REACTION_EMOJIS.map((emoji) => (
+            <div className="absolute bottom-full left-0 mb-1 z-[41] bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] rounded-lg shadow-xl p-1.5 flex gap-1">
+              {(availableEmojis.length > 0 ? availableEmojis : REACTION_EMOJIS).map((emoji) => (
                 <button
                   key={emoji}
                   onClick={(e) => {
diff --git a/src/components/EventApp.tsx b/src/components/EventApp.tsx
index c14b2e1d..1d5ddfee 100644
--- a/src/components/EventApp.tsx
+++ b/src/components/EventApp.tsx
@@ -1,14 +1,17 @@
 'use client';
 
 import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
+import { useRouter } from 'next/navigation';
 import { useEvents } from '@/hooks/useEvents';
 import { useFilters } from '@/hooks/useFilters';
 import { useItinerary } from '@/hooks/useItinerary';
 import { usePOIs } from '@/hooks/usePOIs';
 import { useFriends } from '@/hooks/useFriends';
-import { useFriendsDependentData } from '@/hooks/useFriendsDependentData';
+import { useFriendsItineraries } from '@/hooks/useFriendsItineraries';
+import { useCheckIns } from '@/hooks/useCheckIns';
 import { useEventReactions } from '@/hooks/useEventReactions';
 import { useEventCommentCounts } from '@/hooks/useEventCommentCounts';
+import { useFriendLocations } from '@/hooks/useFriendLocations';
 import { useViewMode } from '@/hooks/useViewMode';
 import { useAuthGatedActions } from '@/hooks/useAuthGatedActions';
 import { useConferenceData } from '@/hooks/useConferenceData';
@@ -17,7 +20,6 @@ import { useAdminConfig } from '@/hooks/useAdminConfig';
 import { useConferenceTabs } from '@/hooks/useConferenceTabs';
 import { useABTest } from '@/hooks/useABTest';
 import { useEventCheckIn } from '@/hooks/useEventCheckIn';
-import { useFriendCode } from '@/hooks/useFriendCode';
 import { useTheme } from '@/contexts/ThemeContext';
 import { ThemeId, DEFAULT_THEME, THEME_OPTIONS } from '@/lib/themes';
 import type { ABTest, ETHDenverEvent } from '@/lib/types';
@@ -25,7 +27,6 @@ import { resolveItemVariants, getVisitorId } from '@/lib/ab-testing';
 import { Header } from './Header';
 import { FilterBar } from './FilterBar';
 import { ListView } from './ListView';
-import { GalleryView } from './GalleryView';
 import { TableView } from './TableView';
 import { MapViewWrapper } from './MapViewWrapper';
 import { Loading } from './Loading';
@@ -34,18 +35,16 @@ import { SubmitEventModal } from './SubmitEventModal';
 import { FriendsPanel } from './FriendsPanel';
 import { SponsorsTicker } from './SponsorsTicker';
 import { CheckInFAB } from './CheckInFAB';
+import { ItineraryFAB } from './ItineraryFAB';
 import { OnboardingWizard } from './OnboardingWizard';
 import { STORAGE_KEYS } from '@/lib/storage-keys';
-import { trackAuthPrompt, trackRsvpOpen, trackRsvpConfirm, setConferenceProperty } from '@/lib/analytics';
+import { trackAuthPrompt } from '@/lib/analytics';
 import { getTabConfig } from '@/lib/conferences';
 import { extractFeaturedEvents } from '@/lib/featured';
 import { passesNowFilter, getConferenceNow, applyFilters, computeTagCounts } from '@/lib/filters';
 import { parseTimeToMinutes } from '@/lib/time-parse';
 import { distanceMeters } from '@/lib/geo';
 import { useAuth } from '@/contexts/AuthContext';
-import { useRsvp } from '@/hooks/useRsvp';
-import { useProfile } from '@/hooks/useProfile';
-import { RsvpOverlay } from './RsvpOverlay';
 
 export function EventApp({ initialConference, initialEvents }: { initialConference?: string; initialEvents?: ETHDenverEvent[] }) {
   const { config } = useAdminConfig();
@@ -95,9 +94,11 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
   const { pois, addPOI, removePOI, updatePOI, ownerNames } = usePOIs();
 
   const { friends, removeFriend, refreshFriends } = useFriends();
-  const { friendItineraries, checkInCounts, checkInUsersByEvent, friendLocations } = useFriendsDependentData(friends);
+  const { friendItineraries } = useFriendsItineraries(friends);
+  const { checkInCounts, checkInUsersByEvent } = useCheckIns(friends);
   const { reactionsByEvent, toggleReaction } = useEventReactions();
   const commentCounts = useEventCommentCounts();
+  const friendLocations = useFriendLocations(friends);
 
   const {
     showAuthForStar,
@@ -142,8 +143,8 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
   });
 
   const featuredEvents = useMemo(
-    () => filters.itineraryOnly ? [] : extractFeaturedEvents(filteredEvents),
-    [filteredEvents, filters.itineraryOnly],
+    () => extractFeaturedEvents(filteredEvents),
+    [filteredEvents],
   );
 
   // Events filtered by everything EXCEPT vibes — used to compute tag counts
@@ -168,9 +169,6 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
     clearResult: clearCheckInResult,
   } = useEventCheckIn();
 
-  const { getRsvpStatus, openRsvp, confirmRsvp, closeRsvp, activeRsvp } = useRsvp();
-  const { profile } = useProfile();
-
   const liveEventIds = useMemo(() => {
     const now = getConferenceNow(filters.conference);
     const nowMinutes = now.getHours() * 60 + now.getMinutes();
@@ -243,14 +241,15 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
     checkInToNearbyEvents(events, itinerary, filters.conference);
   }, [checkInToNearbyEvents, events, itinerary, filters.conference]);
 
+  const router = useRouter();
   const handleItineraryFilterToggle = useCallback(() => {
     if (!authUser) {
       trackAuthPrompt('itinerary_button');
       setShowSignIn(true);
       return;
     }
-    toggleBool('itineraryOnly');
-  }, [authUser, toggleBool]);
+    router.push(`/plan${filters.conference ? `?conf=${encodeURIComponent(filters.conference)}` : ''}`);
+  }, [authUser, router, filters.conference]);
 
   // Theme: read from admin config per-conference and apply
   const { setTheme } = useTheme();
@@ -277,7 +276,6 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
       if (window.location.pathname !== newPath) {
         window.history.replaceState(null, '', newPath);
       }
-      setConferenceProperty(tab.slug);
     }
   }, [filters.conference, conferenceTabs]);
 
@@ -360,45 +358,6 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
   const [showSubmitEvent, setShowSubmitEvent] = useState(false);
   const [showSignIn, setShowSignIn] = useState(false);
 
-  // Friend code (?fc=) URL handler
-  const { toast: friendCodeToast } = useFriendCode({
-    openAuth: () => setShowSignIn(true),
-    refreshFriends,
-  });
-
-  const handleRsvp = useCallback((eventId: string, lumaUrl: string, eventName: string) => {
-    if (!authUser) {
-      trackAuthPrompt('rsvp');
-      setShowSignIn(true);
-      return;
-    }
-    trackRsvpOpen(eventId, eventName);
-    openRsvp(eventId, lumaUrl, eventName);
-  }, [authUser, openRsvp]);
-
-  const handleRsvpConfirm = useCallback(() => {
-    if (activeRsvp) {
-      trackRsvpConfirm(activeRsvp.eventId, activeRsvp.eventName);
-    }
-    confirmRsvp();
-  }, [activeRsvp, confirmRsvp]);
-
-  // Stable callback refs for child prop stability
-  const handleOpenFriends = useCallback(() => setShowFriends(true), []);
-  const handleOpenSubmitEvent = useCallback(() => setShowSubmitEvent(true), []);
-  const handleOpenSignIn = useCallback(() => setShowSignIn(true), []);
-  const handleSearchChange = useCallback((q: string) => setFilter('searchQuery', q), [setFilter]);
-  const handleCloseAuth = useCallback(() => { dismissAuth(); setShowSignIn(false); }, [dismissAuth]);
-  const handleCloseSubmitEvent = useCallback(() => setShowSubmitEvent(false), []);
-  const handleCloseFriends = useCallback(() => setShowFriends(false), []);
-  const handleOnboardingAuth = useCallback(() => { setShowOnboarding(false); setShowSignIn(true); }, []);
-
-  // Memoized derived value
-  const filteredItineraryCount = useMemo(
-    () => filteredEvents.filter(e => itinerary.has(e.id)).length,
-    [filteredEvents, itinerary]
-  );
-
   // Onboarding wizard for first-time users
   const [showOnboarding, setShowOnboarding] = useState(false);
   useEffect(() => {
@@ -444,7 +403,7 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
           onViewChange={setViewMode}
           events={events}
           itinerary={itinerary}
-          onOpenFriends={handleOpenFriends}
+          onOpenFriends={() => setShowFriends(true)}
           refreshFriends={refreshFriends}
         />
         <Loading />
@@ -460,7 +419,7 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
           onViewChange={setViewMode}
           events={events}
           itinerary={itinerary}
-          onOpenFriends={handleOpenFriends}
+          onOpenFriends={() => setShowFriends(true)}
           refreshFriends={refreshFriends}
         />
         <div className="flex flex-col items-center justify-center min-h-[60vh] gap-3 px-4">
@@ -484,8 +443,8 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
         onViewChange={setViewMode}
         events={events}
         itinerary={itinerary}
-        onOpenFriends={handleOpenFriends}
-        onSubmitEvent={handleOpenSubmitEvent}
+        onOpenFriends={() => setShowFriends(true)}
+        onSubmitEvent={() => setShowSubmitEvent(true)}
         refreshFriends={refreshFriends}
         activeConference={filters.conference}
         hasNearbyLiveEvents={hasNearbyLiveEvents}
@@ -501,7 +460,7 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
 
       {/* Filter bar -- collapses on scroll down in table/list views */}
       <div className={
-        viewMode === 'table' || viewMode === 'list' || viewMode === 'gallery'
+        viewMode === 'table' || viewMode === 'list'
           ? `shrink-0 transition-all duration-200 ${contentScrolled ? 'lg:overflow-visible lg:max-h-none overflow-hidden max-h-0' : ''}`
           : 'shrink-0'
       }>
@@ -522,14 +481,13 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
           selectedFriends={filters.selectedFriends}
           onToggleFriend={toggleFriend}
           searchQuery={filters.searchQuery}
-          onSearchChange={handleSearchChange}
+          onSearchChange={(query) => setFilter('searchQuery', query)}
           eventCount={filteredEvents.length}
-          onSubmitEvent={handleOpenSubmitEvent}
-          onSignIn={handleOpenSignIn}
+          onSubmitEvent={() => setShowSubmitEvent(true)}
+          onSignIn={() => setShowSignIn(true)}
           conferenceTabs={conferenceTabs}
-          itineraryCount={filteredItineraryCount}
+          itineraryCount={filteredEvents.filter(e => itinerary.has(e.id)).length}
           onItineraryToggle={handleItineraryFilterToggle}
-          isItineraryActive={filters.itineraryOnly}
         />
       </div>
 
@@ -555,17 +513,15 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
             onRemovePOI={removePOI}
             onUpdatePOI={updatePOI}
             ownerNames={ownerNames}
-            onSignIn={handleOpenSignIn}
+            onSignIn={() => setShowSignIn(true)}
             conferenceTabs={conferenceTabs}
             onCheckIn={checkInToEvent}
             checkInLoading={checkInLoading}
             liveEventIds={liveEventIds}
-            getRsvpStatus={getRsvpStatus}
-            onRsvp={handleRsvp}
           />
         </main>
       ) : viewMode === 'table' ? (
-        <main className="flex-1 min-h-0 min-w-0 flex flex-col overflow-hidden bg-[var(--theme-bg-list)]">
+        <main className="flex-1 min-h-0 min-w-0 flex flex-col overflow-hidden">
           <TableView
             events={filteredEvents}
             totalCount={conferenceEventCount}
@@ -582,34 +538,13 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
             conference={filters.conference}
             featuredEvents={featuredEvents}
             isSignedIn={!!authUser}
-            onSignIn={handleOpenSignIn}
+            onSignIn={() => setShowSignIn(true)}
             liveEventIds={liveEventIds}
             userLocation={userLocation}
-            getRsvpStatus={getRsvpStatus}
-            onRsvp={handleRsvp}
-          />
-        </main>
-      ) : viewMode === 'gallery' ? (
-        <main ref={listMainRef} onScroll={handleListScroll} className="flex-1 min-h-0 overflow-y-auto bg-[var(--theme-bg-list)]">
-          <GalleryView
-            events={filteredEvents}
-            totalCount={conferenceEventCount}
-            itinerary={itinerary}
-            onItineraryToggle={handleItineraryToggle}
-            friendsCountByEvent={friendsCountByEvent}
-            friendsByEvent={friendsByEvent}
-            checkedInFriendsByEvent={checkedInFriendsByEvent}
-            checkInCounts={checkInCounts}
-            reactionsByEvent={reactionsByEvent}
-            onToggleReaction={handleToggleReaction}
-            commentCounts={commentCounts}
-            scrollContainerRef={listMainRef}
-            conference={filters.conference}
-            liveEventIds={liveEventIds}
           />
         </main>
       ) : (
-        <main ref={listMainRef} onScroll={handleListScroll} className="flex-1 min-h-0 overflow-y-auto bg-[var(--theme-bg-list)]">
+        <main ref={listMainRef} onScroll={handleListScroll} className="flex-1 min-h-0 overflow-y-auto">
           <ListView
             events={filteredEvents}
             totalCount={conferenceEventCount}
@@ -633,8 +568,6 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
             checkInLoading={checkInLoading}
             liveEventIds={liveEventIds}
             userLocation={userLocation}
-            getRsvpStatus={getRsvpStatus}
-            onRsvp={handleRsvp}
           />
         </main>
       )}
@@ -648,11 +581,15 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
         />
       )}
 
-      <AuthModal isOpen={showAuthForStar || showSignIn} onClose={handleCloseAuth} />
-      <SubmitEventModal isOpen={showSubmitEvent} onClose={handleCloseSubmitEvent} upsellCopy={config?.upsell_copy} initialConference={filters.conference} conferenceTabs={conferenceTabs} />
+      {itineraryCount > 0 && !hasNearbyLiveEvents && (
+        <ItineraryFAB count={itineraryCount} conference={filters.conference} />
+      )}
+
+      <AuthModal isOpen={showAuthForStar || showSignIn} onClose={() => { dismissAuth(); setShowSignIn(false); }} />
+      <SubmitEventModal isOpen={showSubmitEvent} onClose={() => setShowSubmitEvent(false)} upsellCopy={config?.upsell_copy} initialConference={filters.conference} conferenceTabs={conferenceTabs} />
       <FriendsPanel
         isOpen={showFriends}
-        onClose={handleCloseFriends}
+        onClose={() => setShowFriends(false)}
         friends={friends}
         onRemoveFriend={removeFriend}
       />
@@ -663,33 +600,9 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
         availableConferences={availableConferences}
         conferenceEventCounts={conferenceEventCounts}
         events={events}
-        onOpenAuth={handleOnboardingAuth}
+        onOpenAuth={() => { setShowOnboarding(false); setShowSignIn(true); }}
         conferenceTabs={conferenceTabs}
       />
-      {activeRsvp && (
-        <RsvpOverlay
-          eventName={activeRsvp.eventName}
-          lumaUrl={activeRsvp.lumaUrl}
-          userName={profile?.rsvp_name ?? profile?.display_name}
-          userEmail={profile?.email}
-          userXHandle={profile?.x_handle}
-          userTelegram={profile?.telegram_handle}
-          userCompany={profile?.company}
-          userLinkedin={profile?.linkedin_url}
-          userJobTitle={profile?.job_title}
-          onConfirm={handleRsvpConfirm}
-          onClose={closeRsvp}
-        />
-      )}
-      {friendCodeToast && (
-        <div className={`fixed bottom-6 left-1/2 -translate-x-1/2 z-[9999] px-4 py-3 rounded-lg shadow-lg text-sm font-medium transition-opacity duration-300 ${
-          friendCodeToast.type === 'success'
-            ? 'bg-green-600 text-white'
-            : 'bg-red-600 text-white'
-        }`}>
-          {friendCodeToast.message}
-        </div>
-      )}
     </div>
   );
 }
diff --git a/src/components/EventCard.tsx b/src/components/EventCard.tsx
index 0adb4b43..5498fb96 100644
--- a/src/components/EventCard.tsx
+++ b/src/components/EventCard.tsx
@@ -1,10 +1,10 @@
 'use client';
 
-import { useState, useEffect, useRef, memo } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import { MapPin, Calendar, X, Link, Check, MapPinCheck, Loader2 } from 'lucide-react';
 import type { ETHDenverEvent, ReactionEmoji, FriendInfo } from '@/lib/types';
-import { trackEventClick, trackCopyEventLink, trackFriendsGoingOpen, trackFriendsCheckedInOpen, trackOutboundClick } from '@/lib/analytics';
+import { trackEventClick, trackCopyEventLink, trackFriendsGoingOpen, trackFriendsCheckedInOpen } from '@/lib/analytics';
 import { trackAdEvent } from '@/lib/ad-tracking';
 import { trackEvent } from '@/lib/event-tracking';
 import { formatFriendsText } from '@/lib/user-display';
@@ -18,7 +18,6 @@ import { EmojiReactions } from './EmojiReactions';
 import UserAvatar from './UserAvatar';
 import { CommentSection } from './CommentSection';
 import { FriendAvatarStack } from './FriendAvatarStack';
-import { RsvpButton } from './RsvpButton';
 
 interface EventCardProps {
   event: ETHDenverEvent;
@@ -38,8 +37,6 @@ interface EventCardProps {
   liveUrgency?: 'green' | 'yellow' | 'red';
   userLocation?: { lat: number; lng: number } | null;
   onOpenLightbox?: (imageUrl: string, rsvpUrl?: string) => void;
-  rsvpStatus?: 'idle' | 'confirmed';
-  onRsvp?: () => void;
   /** Compact mode for map popups — smaller text, no impression tracking */
   compact?: boolean;
 }
@@ -124,7 +121,7 @@ function FriendsGoingModal({
   );
 }
 
-export const EventCard = memo(function EventCard({
+export function EventCard({
   event,
   isInItinerary = false,
   onItineraryToggle,
@@ -141,8 +138,6 @@ export const EventCard = memo(function EventCard({
   liveUrgency,
   userLocation,
   onOpenLightbox,
-  rsvpStatus,
-  onRsvp,
   compact,
 }: EventCardProps) {
   const [showFriendsModal, setShowFriendsModal] = useState(false);
@@ -229,44 +224,14 @@ export const EventCard = memo(function EventCard({
     }`}
       style={event.isFeatured ? { borderColor: 'var(--theme-popup-featured-border)' } : hasFriends ? { borderLeftColor: 'var(--friend-blue)' } : undefined}
     >
-      {/* Left column: action buttons + cover image */}
-      <div className="flex items-center shrink-0 gap-1">
-        <div className="flex flex-col items-center gap-1">
-          {onItineraryToggle && (
-            <StarButton
-              eventId={event.id}
-              isStarred={isInItinerary}
-              onToggle={onItineraryToggle}
-            />
-          )}
-          {onRsvp && event.link && (
-            <div className="mt-px">
-              <RsvpButton eventLink={event.link} status={rsvpStatus ?? 'idle'} onClick={onRsvp} />
-            </div>
-          )}
-          {event.link && (
-            <button
-              onClick={handleCopyLink}
-              className="p-1 text-[var(--theme-text-muted)] hover:text-[var(--theme-text-secondary)] transition-colors cursor-pointer"
-              aria-label="Copy event link"
-              title="Copy link"
-            >
-              {copied ? (
-                <Check className="w-4 h-4 text-green-400" />
-              ) : (
-                <Link className="w-4 h-4" />
-              )}
-            </button>
-          )}
-        </div>
-        {event.link && <OGImage url={event.link} eventId={event.id} rsvpUrl={event.link} onOpenLightbox={onOpenLightbox} />}
-      </div>
+      {/* Left: cover image */}
+      {event.link && <OGImage url={event.link} eventId={event.id} rsvpUrl={event.link} onOpenLightbox={onOpenLightbox} />}
 
       {/* Right: event details */}
       <div className="flex-1 min-w-0">
-        {/* Top row: Name */}
-        <div>
-          <div className="min-w-0">
+        {/* Top row: Name + Avatars + Star */}
+        <div className="flex items-start gap-2">
+          <div className="flex-1 min-w-0">
             <h3 className={`font-semibold text-[var(--theme-text-primary)] ${compact ? 'text-sm' : 'text-sm sm:text-base'} leading-tight`}>
               {event.isFeatured && (
                 <span className="inline-block text-[9px] font-semibold uppercase tracking-wider px-1.5 py-0.5 rounded mr-1.5 align-middle" style={{ color: 'var(--theme-popup-featured-border)', background: 'var(--theme-accent-muted)' }}>Featured</span>
@@ -279,7 +244,6 @@ export const EventCard = memo(function EventCard({
                   className="hover:text-[var(--theme-accent)] active:text-[var(--theme-accent)] transition-colors"
                   onClick={() => {
                     trackEventClick(event.name, event.link!);
-                    trackOutboundClick(event.name, event.link!);
                     trackEvent({
                       event_id: event.id,
                       event_name: event.name,
@@ -310,6 +274,46 @@ export const EventCard = memo(function EventCard({
               <p className="text-[var(--theme-text-muted)] text-xs mt-0.5">{event.organizer}</p>
             )}
           </div>
+
+          <div className="flex items-start shrink-0 gap-1.5">
+            {/* Friend avatars — inline with star button */}
+            {friendsGoing && friendsGoing.length > 0 && (
+              <button
+                onClick={(e) => {
+                  e.stopPropagation();
+                  trackFriendsGoingOpen(event.name);
+                  setShowFriendsModal(true);
+                }}
+                className="cursor-pointer hover:opacity-80 transition-opacity"
+                title={formatFriendsText(friendsGoing)}
+              >
+                <FriendAvatarStack friends={friendsGoing} maxShow={2} size="sm" />
+              </button>
+            )}
+            <div className="flex flex-col items-center gap-0.5">
+              {onItineraryToggle && (
+                <StarButton
+                  eventId={event.id}
+                  isStarred={isInItinerary}
+                  onToggle={onItineraryToggle}
+                />
+              )}
+              {event.link && (
+                <button
+                  onClick={handleCopyLink}
+                  className="p-1 text-[var(--theme-text-muted)] hover:text-[var(--theme-text-secondary)] transition-colors cursor-pointer"
+                  aria-label="Copy event link"
+                  title="Copy link"
+                >
+                  {copied ? (
+                    <Check className="w-4 h-4 text-green-400" />
+                  ) : (
+                    <Link className="w-4 h-4" />
+                  )}
+                </button>
+              )}
+            </div>
+          </div>
         </div>
 
         {/* Date + Time + Check In */}
@@ -369,33 +373,22 @@ export const EventCard = memo(function EventCard({
           </AddressLink>
         )}
 
-        {/* Tags */}
-        <div className="flex flex-wrap items-center gap-1.5 mt-3">
-          {event.tags.map((tag) => (
-            <TagBadge key={tag} tag={tag} iconOnly={compact} />
-          ))}
-        </div>
+        {/* Tags row */}
+        {event.tags.length > 0 && (
+          <div className="flex flex-wrap items-center gap-1.5 mt-3">
+            {event.tags.map((tag) => (
+              <TagBadge key={tag} tag={tag} iconOnly={compact} />
+            ))}
+          </div>
+        )}
 
         {/* Note */}
         {event.note && (
           <p className="text-[var(--theme-text-faint)] text-xs mt-1 italic truncate">{event.note}</p>
         )}
 
-        {/* Bottom row: friends + reactions + checked-in indicator */}
-        <div className="flex items-center gap-2 mt-2">
-          {friendsGoing && friendsGoing.length > 0 && (
-            <button
-              onClick={(e) => {
-                e.stopPropagation();
-                trackFriendsGoingOpen(event.name);
-                setShowFriendsModal(true);
-              }}
-              className="cursor-pointer hover:opacity-80 transition-opacity shrink-0"
-              title={formatFriendsText(friendsGoing)}
-            >
-              <FriendAvatarStack friends={friendsGoing} maxShow={2} size="sm" />
-            </button>
-          )}
+        {/* Bottom row: reactions + checked-in indicator */}
+        <div className="flex flex-wrap items-center gap-2 mt-2">
           {onToggleReaction && (
             <EmojiReactions
               eventId={event.id}
@@ -444,4 +437,4 @@ export const EventCard = memo(function EventCard({
       )}
     </div>
   );
-});
+}
diff --git a/src/components/EventPopup.tsx b/src/components/EventPopup.tsx
index 43fa3ec3..6f633ee7 100644
--- a/src/components/EventPopup.tsx
+++ b/src/components/EventPopup.tsx
@@ -1,9 +1,14 @@
 'use client';
 
-import { memo } from 'react';
 import { Popup } from 'react-map-gl/mapbox';
-import { X } from 'lucide-react';
+import { X, Calendar, MapPin } from 'lucide-react';
 import type { ETHDenverEvent, ReactionEmoji, FriendInfo } from '@/lib/types';
+import { shortenAddress } from '@/lib/utils';
+import { StarButton } from './StarButton';
+import { FriendAvatarStack } from './FriendAvatarStack';
+import { AddressLink } from './AddressLink';
+import { TagBadge } from './TagBadge';
+import { OGImage } from './OGImage';
 import { EventCard } from './EventCard';
 
 interface EventPopupProps {
@@ -24,8 +29,6 @@ interface EventPopupProps {
   onCheckIn?: (eventId: string) => void;
   checkInLoading?: boolean;
   liveUrgency?: 'green' | 'yellow' | 'red';
-  rsvpStatus?: 'idle' | 'confirmed';
-  onRsvp?: () => void;
 }
 
 interface MultiEventPopupProps {
@@ -33,6 +36,7 @@ interface MultiEventPopupProps {
   latitude: number;
   longitude: number;
   onClose: () => void;
+  onSelectEvent?: (event: ETHDenverEvent) => void;
   itinerary?: Set<string>;
   onItineraryToggle?: (eventId: string) => void;
   friendsCountByEvent?: Map<string, number>;
@@ -44,7 +48,7 @@ interface MultiEventPopupProps {
   commentCounts?: Map<string, number>;
 }
 
-export const EventPopup = memo(function EventPopup({
+export function EventPopup({
   event,
   latitude,
   longitude,
@@ -62,8 +66,6 @@ export const EventPopup = memo(function EventPopup({
   onCheckIn,
   checkInLoading,
   liveUrgency,
-  rsvpStatus,
-  onRsvp,
 }: EventPopupProps) {
   return (
     <Popup
@@ -92,20 +94,19 @@ export const EventPopup = memo(function EventPopup({
           onCheckIn={onCheckIn}
           checkInLoading={checkInLoading}
           liveUrgency={liveUrgency}
-          rsvpStatus={rsvpStatus}
-          onRsvp={onRsvp}
           compact
         />
       </div>
     </Popup>
   );
-});
+}
 
 export function MultiEventPopup({
   events,
   latitude,
   longitude,
   onClose,
+  onSelectEvent,
   itinerary,
   onItineraryToggle,
   friendsCountByEvent,
@@ -141,23 +142,73 @@ export function MultiEventPopup({
           </button>
         </div>
         <div className="max-h-[260px] overflow-y-auto space-y-2 pr-1">
-          {events.map((event) => (
-            <div key={event.id}>
-              <EventCard
-                event={event}
-                isInItinerary={itinerary?.has(event.id) ?? false}
-                onItineraryToggle={onItineraryToggle}
-                friendsCount={friendsCountByEvent?.get(event.id)}
-                friendsGoing={friendsByEvent?.get(event.id)}
-                checkedInFriends={checkedInFriendsByEvent?.get(event.id)}
-                checkInCount={checkInCounts?.get(event.id)}
-                reactions={reactionsByEvent?.get(event.id)}
-                onToggleReaction={onToggleReaction}
-                commentCount={commentCounts?.get(event.id)}
-                compact
-              />
-            </div>
-          ))}
+          {events.map((event) => {
+            const timeDisplay = event.isAllDay
+              ? 'All Day'
+              : `${event.startTime}${event.endTime ? ` - ${event.endTime}` : ''}`;
+            const isInItinerary = itinerary?.has(event.id) ?? false;
+            const eventFriends = friendsByEvent?.get(event.id);
+            const eventCheckedIn = checkedInFriendsByEvent?.get(event.id);
+            return (
+              <div
+                key={event.id}
+                className="flex gap-2.5 p-2.5 bg-[var(--theme-bg-tertiary)]/50 hover:bg-[var(--theme-bg-tertiary)]/70 active:bg-[var(--theme-bg-tertiary)]/70 rounded-lg transition-colors cursor-pointer"
+                onClick={() => onSelectEvent?.(event)}
+              >
+                {/* Cover image */}
+                {event.link && <OGImage key={event.id} url={event.link} eventId={event.id} rsvpUrl={event.link} />}
+
+                {/* Details */}
+                <div className="flex-1 min-w-0">
+                  <div className="flex items-start gap-1">
+                    <div className="flex-1 min-w-0">
+                      <p className="text-xs font-semibold text-[var(--theme-text-primary)] leading-tight truncate">
+                        {event.name}
+                      </p>
+                      {event.organizer && (
+                        <p className="text-[10px] text-[var(--theme-text-muted)] mt-0.5 truncate">{event.organizer}</p>
+                      )}
+                    </div>
+                    {onItineraryToggle && (
+                      <StarButton
+                        eventId={event.id}
+                        isStarred={isInItinerary}
+                        onToggle={onItineraryToggle}
+                        size="sm"
+                        friendsCount={friendsCountByEvent?.get(event.id)}
+                      />
+                    )}
+                  </div>
+                  <div className="relative w-fit mt-1">
+                    <p className="text-[var(--theme-text-secondary)] text-[10px] flex items-center gap-1">
+                      <Calendar className="w-2.5 h-2.5 shrink-0" />
+                      <span>{event.date} · {timeDisplay}</span>
+                    </p>
+                    {(checkInCounts?.get(event.id) ?? 0) > 0 && (
+                      <span className="absolute -top-0.5 -right-2 min-w-[12px] h-[12px] flex items-center justify-center rounded-full bg-green-500 text-white text-[7px] font-bold px-0.5 pointer-events-none">
+                        {checkInCounts!.get(event.id)}
+                      </span>
+                    )}
+                  </div>
+                  {event.address && (
+                    <AddressLink address={event.address} navAddress={event.matchedAddress} lat={event.lat} lng={event.lng}
+                      eventId={event.id} eventName={event.name}
+                      className="w-full text-[var(--theme-text-muted)] hover:text-[var(--theme-text-secondary)] text-[10px] mt-0.5 flex items-center gap-1 overflow-hidden transition-colors">
+                      <MapPin className="w-2.5 h-2.5 shrink-0" />
+                      <span className="truncate">{shortenAddress(event.address)}</span>
+                    </AddressLink>
+                  )}
+                  {event.tags.length > 0 && (
+                    <div className="flex items-center gap-1 mt-1">
+                      {event.tags.map((tag) => (
+                        <TagBadge key={tag} tag={tag} iconOnly />
+                      ))}
+                    </div>
+                  )}
+                </div>
+              </div>
+            );
+          })}
         </div>
       </div>
     </Popup>
diff --git a/src/components/FilterBar.tsx b/src/components/FilterBar.tsx
index 6a77c64e..ef18f558 100644
--- a/src/components/FilterBar.tsx
+++ b/src/components/FilterBar.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { memo, useState, useRef } from 'react';
+import { useState, useRef } from 'react';
 import clsx from 'clsx';
 import { X, ListFilter, Clock, Users, MapPin, Plus, Link2, Check, Loader2, ChevronDown } from 'lucide-react';
 import { CalendarIcon } from './icons/CalendarIcon';
@@ -39,10 +39,10 @@ interface FilterBarProps {
   conferenceTabs?: TabConfig[];
   itineraryCount: number;
   onItineraryToggle: () => void;
-  isItineraryActive: boolean;
+  trailingButtons?: React.ReactNode;
 }
 
-export const FilterBar = memo(function FilterBar({
+export function FilterBar({
   filters,
   onSetConference,
   onSetDateTimeRange,
@@ -66,7 +66,7 @@ export const FilterBar = memo(function FilterBar({
   conferenceTabs,
   itineraryCount,
   onItineraryToggle,
-  isItineraryActive,
+  trailingButtons,
 }: FilterBarProps) {
   const [expanded, setExpanded] = useState(false);
   const [confOpen, setConfOpen] = useState(false);
@@ -129,10 +129,10 @@ export const FilterBar = memo(function FilterBar({
   }
 
   return (
-    <div className="relative bg-[var(--theme-bg-filter)] border-b border-[var(--theme-border-secondary)] z-30">
-      <div className="px-2 sm:px-4 pt-3.5 pb-2 space-y-3">
+    <div className="relative bg-[var(--theme-bg-primary)] border-b border-[var(--theme-border-secondary)] z-30">
+      <div className="px-2 sm:px-4 py-3 space-y-3">
         {/* Top row: Conference tabs + Filter toggle */}
-        <div className="flex items-center gap-1.5 sm:gap-3 lg:justify-center">
+        <div className="flex items-center gap-3 lg:justify-center">
           {/* Conference selector — dropdown on all screen sizes */}
           {availableConferences.length > 0 && (
             <div className="shrink-0">
@@ -140,13 +140,13 @@ export const FilterBar = memo(function FilterBar({
                 ref={(el) => { confBtnRef.current = el; }}
                 onClick={() => setConfOpen(!confOpen)}
                 className={clsx(
-                  'flex items-center gap-1.5 px-3 h-9 rounded-lg font-semibold cursor-pointer transition-colors border',
+                  'flex items-center gap-1.5 px-3 py-2 rounded-lg font-semibold cursor-pointer transition-colors border',
                   confOpen
-                    ? 'text-[var(--theme-filter-active)] border-[var(--theme-filter-active)]'
-                    : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border-[var(--theme-filter-control-border)]',
+                    ? 'text-[var(--theme-accent)] border-[var(--theme-accent)]'
+                    : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border-[var(--theme-border-primary)]',
                   (filters.conference || 'All').length > 12 ? 'text-xs' : 'text-sm'
                 )}
-                style={confOpen ? { backgroundColor: 'var(--theme-filter-active-bg)' } : undefined}
+                style={confOpen ? { backgroundColor: 'var(--theme-accent-muted)' } : undefined}
               >
                 <MapPin className="w-3.5 h-3.5 shrink-0" />
                 <span className="whitespace-nowrap">{filters.conference || 'All'}</span>
@@ -188,7 +188,7 @@ export const FilterBar = memo(function FilterBar({
             {onSubmitEvent && (
               <button
                 onClick={onSubmitEvent}
-                className="shrink-0 h-9 flex items-center justify-center rounded-lg bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-filter-control-border)] transition-colors cursor-pointer px-2 xl:px-3 gap-1.5"
+                className="shrink-0 h-9 flex items-center justify-center rounded-lg bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-border-primary)] transition-colors cursor-pointer px-2 xl:px-3 gap-1.5"
                 aria-label="Submit event"
               >
                 <Plus className="w-4 h-4" />
@@ -205,12 +205,12 @@ export const FilterBar = memo(function FilterBar({
             onClick={() => { trackNowMode(!filters.nowMode); onToggleNowMode(); }}
             aria-label="Now"
             className={clsx(
-              'shrink-0 flex items-center gap-1 px-2.5 h-9 rounded-lg text-sm font-semibold transition-colors cursor-pointer',
+              'shrink-0 flex items-center gap-1 px-2.5 py-2 rounded-lg text-sm font-semibold transition-colors cursor-pointer',
               filters.nowMode
-                ? 'text-[var(--theme-filter-active)] border border-[var(--theme-filter-active)]'
-                : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-filter-control-border)]'
+                ? 'text-[var(--theme-accent)] border border-[var(--theme-accent)]'
+                : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-border-primary)]'
             )}
-            style={filters.nowMode ? { backgroundColor: 'var(--theme-filter-active-bg)' } : undefined}
+            style={filters.nowMode ? { backgroundColor: 'var(--theme-accent-muted)' } : undefined}
           >
             <Clock className="w-4 h-4" />
           </button>
@@ -220,50 +220,41 @@ export const FilterBar = memo(function FilterBar({
             onClick={() => setExpanded(!expanded)}
             aria-label="Filters"
             className={clsx(
-              'group shrink-0 flex items-center gap-1 px-2.5 h-9 rounded-lg text-sm font-medium transition-colors cursor-pointer',
+              'shrink-0 flex items-center gap-1 px-2.5 py-2 rounded-lg text-sm font-medium transition-colors cursor-pointer',
               expanded
-                ? 'text-[var(--theme-filter-active)] border border-[var(--theme-filter-active)]'
-                : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-filter-control-border)]'
+                ? 'text-[var(--theme-accent)] border border-[var(--theme-accent)]'
+                : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-border-primary)]'
             )}
-            style={expanded ? { backgroundColor: 'var(--theme-filter-active-bg)' } : undefined}
+            style={expanded ? { backgroundColor: 'var(--theme-accent-muted)' } : undefined}
           >
             <ListFilter className="w-4 h-4" />
             {activeFilterCount > 0 && (
               <span className={clsx(
-                'text-[10px] font-bold min-w-[18px] h-[18px] flex items-center justify-center rounded-full px-1 transition-colors',
+                'text-[10px] font-bold min-w-[18px] h-[18px] flex items-center justify-center rounded-full px-1',
                 expanded
-                  ? 'bg-[var(--theme-filter-active)] text-[var(--theme-bg-filter)] border border-[var(--theme-filter-active)]'
-                  : 'bg-[var(--theme-filter-badge-bg)] text-[var(--theme-filter-badge-text)] border border-[var(--theme-filter-badge-border)] group-hover:text-[var(--theme-text-primary)] group-hover:border-[var(--theme-text-primary)] group-hover:bg-transparent'
+                  ? 'bg-[var(--theme-accent-text)] text-[var(--theme-accent)] border border-[var(--theme-accent)]'
+                  : 'bg-[var(--theme-text-secondary)] text-[var(--theme-bg-primary)]'
               )}>
                 {activeFilterCount}
               </span>
             )}
           </button>
 
-          {/* Itinerary toggle */}
-          <button
-            onClick={onItineraryToggle}
-            aria-label={`Itinerary: ${itineraryCount} events`}
-            className={clsx(
-              'group shrink-0 flex items-center gap-1 px-2.5 h-9 rounded-lg text-sm font-medium transition-colors cursor-pointer',
-              isItineraryActive
-                ? 'text-[var(--theme-filter-active)] border border-[var(--theme-filter-active)]'
-                : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-filter-control-border)]'
-            )}
-            style={isItineraryActive ? { backgroundColor: 'var(--theme-filter-active-bg)' } : undefined}
-          >
-            <CalendarIcon className="w-5 h-5" />
-            {itineraryCount > 0 && (
-              <span className={clsx(
-                'text-[10px] font-bold min-w-[18px] h-[18px] flex items-center justify-center rounded-full px-1 transition-colors',
-                isItineraryActive
-                  ? 'bg-[var(--theme-filter-active)] text-[var(--theme-bg-filter)] border border-[var(--theme-filter-active)]'
-                  : 'bg-[var(--theme-filter-badge-bg)] text-[var(--theme-filter-badge-text)] border border-[var(--theme-filter-badge-border)] group-hover:text-[var(--theme-text-primary)] group-hover:border-[var(--theme-text-primary)] group-hover:bg-transparent'
-              )}>
-                {itineraryCount}
-              </span>
-            )}
-          </button>
+          {/* Trailing buttons: plan button or custom (e.g. share/calendar on /plan) */}
+          {trailingButtons || (
+            <button
+              onClick={onItineraryToggle}
+              aria-label={`My Plan: ${itineraryCount} events`}
+              className="shrink-0 flex items-center gap-1 px-2.5 py-2 rounded-lg text-sm font-medium transition-colors cursor-pointer bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-border-primary)]"
+            >
+              <CalendarIcon className="w-5 h-5" />
+              {itineraryCount > 0 && (
+                <span className="text-[10px] font-bold min-w-[18px] h-[18px] flex items-center justify-center rounded-full px-1 bg-[var(--theme-text-secondary)] text-[var(--theme-bg-primary)]">
+                  {itineraryCount}
+                </span>
+              )}
+            </button>
+          )}
         </div>
 
         {/* Search bar — mobile only (desktop is inline in the row above) */}
@@ -272,7 +263,7 @@ export const FilterBar = memo(function FilterBar({
           {onSubmitEvent && (
             <button
               onClick={onSubmitEvent}
-              className="shrink-0 w-9 h-9 flex items-center justify-center rounded-lg bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-filter-control-border)] transition-colors cursor-pointer"
+              className="shrink-0 w-9 h-9 flex items-center justify-center rounded-lg bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-border-primary)] transition-colors cursor-pointer"
               aria-label="Submit event"
             >
               <Plus className="w-4 h-4" />
@@ -282,7 +273,7 @@ export const FilterBar = memo(function FilterBar({
 
         {/* Expandable filter content — overlays map on mobile */}
         {expanded && (
-          <div className="space-y-3 pt-1 sm:relative absolute left-0 right-0 sm:bg-transparent bg-[var(--theme-bg-primary)] sm:px-0 px-2 sm:pb-0 pb-4 sm:shadow-none shadow-lg shadow-black/40 sm:max-h-none max-h-[70vh] overflow-y-auto">
+          <div className="space-y-3 pt-1 sm:relative absolute left-0 right-0 sm:bg-transparent bg-[var(--theme-bg-primary)] sm:px-0 px-2 sm:pb-0 pb-4 sm:shadow-none shadow-lg shadow-black/40">
             {/* Now mode notice */}
             {filters.nowMode && (
               <div className="flex items-center gap-2 px-3 py-2 rounded-lg bg-green-500/10 border border-green-500/20 text-green-400 text-sm">
@@ -297,7 +288,7 @@ export const FilterBar = memo(function FilterBar({
               return (
                 <div className={clsx('flex gap-3 items-end', filters.nowMode && 'opacity-30 pointer-events-none')}>
                   <div className="w-40 shrink-0">
-                    <div className="text-xs uppercase tracking-wider text-[var(--theme-filter-text)] mb-2">Start</div>
+                    <div className="text-xs uppercase tracking-wider text-[var(--theme-text-secondary)] mb-2">Start</div>
                     <DateTimePicker
                       value={filters.startDateTime}
                       min={`${tabDates[0]}T00:00`}
@@ -310,7 +301,7 @@ export const FilterBar = memo(function FilterBar({
                     />
                   </div>
                   <div className="w-40 shrink-0">
-                    <div className="text-xs uppercase tracking-wider text-[var(--theme-filter-text)] mb-2">End</div>
+                    <div className="text-xs uppercase tracking-wider text-[var(--theme-text-secondary)] mb-2">End</div>
                     <DateTimePicker
                       value={filters.endDateTime}
                       min={filters.startDateTime}
@@ -339,7 +330,7 @@ export const FilterBar = memo(function FilterBar({
                 if (groupTags.length === 0) return null;
                 return (
                   <div key={group.label}>
-                    <div className="text-xs uppercase tracking-wider text-[var(--theme-filter-text)] mb-1">{group.label}</div>
+                    <div className="text-xs uppercase tracking-wider text-[var(--theme-text-secondary)] mb-1">{group.label}</div>
                     <div className="flex flex-wrap gap-2">
                       {groupTags.map((vibe) => {
                         const isActive = filters.vibes.includes(vibe);
@@ -353,14 +344,14 @@ export const FilterBar = memo(function FilterBar({
                             className={clsx(
                               'flex items-center gap-1.5 px-3 py-1.5 rounded-full text-sm font-medium transition-colors whitespace-nowrap cursor-pointer',
                               isActive
-                                ? 'bg-[var(--theme-filter-active-bg)] border'
-                                : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:bg-[var(--theme-filter-control-border)] active:bg-[var(--theme-filter-control-border)] border border-[var(--theme-filter-control-border)]'
+                                ? 'border'
+                                : 'bg-[var(--theme-bg-tertiary)] text-[var(--theme-text-primary)] hover:bg-[var(--theme-border-primary)] active:bg-[var(--theme-border-primary)] border border-transparent'
                             )}
                             style={isActive ? { borderColor: vibeColor, color: vibeColor } : undefined}
                           >
                             {Icon && <Icon className="w-3.5 h-3.5" />}
                             {vibe}
-                            <span className={clsx('text-xs', isActive ? 'opacity-70' : 'opacity-60')}>
+                            <span className={clsx('text-xs', isActive ? 'opacity-70' : 'text-[var(--theme-text-muted)]')}>
                               ({count})
                             </span>
                           </button>
@@ -381,14 +372,14 @@ export const FilterBar = memo(function FilterBar({
                   {/* Any/All toggle — only show when tags are selected */}
                   {filters.vibes.length > 1 && (
                     <div className="flex items-center gap-2">
-                      <span className="text-xs text-[var(--theme-filter-text)]">Match</span>
+                      <span className="text-xs text-[var(--theme-text-secondary)]">Match</span>
                       <button
                         onClick={onToggleTagMatchAll}
                         className={clsx(
                           'px-2 py-0.5 rounded text-xs font-medium transition-colors cursor-pointer',
                           !filters.tagMatchAll
                             ? 'bg-[var(--theme-accent)] text-[var(--theme-accent-text)]'
-                            : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)]'
+                            : 'bg-[var(--theme-bg-tertiary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)]'
                         )}
                       >
                         Any
@@ -399,7 +390,7 @@ export const FilterBar = memo(function FilterBar({
                           'px-2 py-0.5 rounded text-xs font-medium transition-colors cursor-pointer',
                           filters.tagMatchAll
                             ? 'bg-[var(--theme-accent)] text-[var(--theme-accent-text)]'
-                            : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)]'
+                            : 'bg-[var(--theme-bg-tertiary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)]'
                         )}
                       >
                         All
@@ -409,7 +400,7 @@ export const FilterBar = memo(function FilterBar({
                   {groupRows}
                   {otherTags.length > 0 && (
                     <div>
-                      <div className="text-xs uppercase tracking-wider text-[var(--theme-filter-text)] mb-1">Other</div>
+                      <div className="text-xs uppercase tracking-wider text-[var(--theme-text-secondary)] mb-1">Other</div>
                       <div className="flex flex-wrap gap-2">
                         {otherTags.map((vibe) => {
                           const isActive = filters.vibes.includes(vibe);
@@ -423,14 +414,14 @@ export const FilterBar = memo(function FilterBar({
                               className={clsx(
                                 'flex items-center gap-1.5 px-3 py-1.5 rounded-full text-sm font-medium transition-colors whitespace-nowrap cursor-pointer',
                                 isActive
-                                  ? 'bg-[var(--theme-filter-active-bg)] border'
-                                  : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:bg-[var(--theme-filter-control-border)] active:bg-[var(--theme-filter-control-border)] border border-[var(--theme-filter-control-border)]'
+                                  ? 'border'
+                                  : 'bg-[var(--theme-bg-tertiary)] text-[var(--theme-text-primary)] hover:bg-[var(--theme-border-primary)] active:bg-[var(--theme-border-primary)] border border-transparent'
                               )}
                               style={isActive ? { borderColor: vibeColor, color: vibeColor } : undefined}
                             >
                               {Icon && <Icon className="w-3.5 h-3.5" />}
                               {vibe}
-                              <span className={clsx('text-xs', isActive ? 'opacity-70' : 'opacity-60')}>
+                              <span className={clsx('text-xs', isActive ? 'opacity-70' : 'text-[var(--theme-text-muted)]')}>
                                 ({count})
                               </span>
                             </button>
@@ -445,7 +436,7 @@ export const FilterBar = memo(function FilterBar({
 
             {/* Friends filter */}
             <div>
-              <div className="text-xs uppercase tracking-wider text-[var(--theme-filter-text)] mb-1">
+              <div className="text-xs uppercase tracking-wider text-[var(--theme-text-secondary)] mb-1">
                 Friends
               </div>
               {friendsForFilter.length > 0 ? (
@@ -460,7 +451,7 @@ export const FilterBar = memo(function FilterBar({
                           'shrink-0 flex items-center gap-1.5 px-3 py-1.5 rounded-full text-sm font-medium transition-colors whitespace-nowrap cursor-pointer',
                           isActive
                             ? 'text-white'
-                            : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:bg-[var(--theme-filter-control-border)] active:bg-[var(--theme-filter-control-border)]'
+                            : 'bg-[var(--theme-bg-tertiary)] text-[var(--theme-text-primary)] hover:bg-[var(--theme-border-primary)] active:bg-[var(--theme-border-primary)]'
                         )}
                         style={isActive ? { backgroundColor: 'var(--friend-blue)' } : undefined}
                       >
@@ -481,11 +472,11 @@ export const FilterBar = memo(function FilterBar({
                 </div>
               ) : (
                 <div
-                  className={clsx('bg-[var(--theme-filter-control-bg)] rounded-lg p-4 flex items-center gap-3 border border-[var(--theme-filter-control-border)]', !user && 'cursor-pointer hover:bg-[var(--theme-filter-control-border)] transition-colors')}
+                  className={clsx('bg-[var(--theme-bg-tertiary)]/50 rounded-lg p-4 flex items-center gap-3', !user && 'cursor-pointer hover:bg-[var(--theme-bg-tertiary)]/70 transition-colors')}
                 >
-                  <Users className="w-5 h-5 text-[var(--theme-filter-text)] shrink-0" />
+                  <Users className="w-5 h-5 text-[var(--theme-text-muted)] shrink-0" />
                   <div className="flex-1 min-w-0" onClick={!user ? onSignIn : undefined}>
-                    <p className="text-[var(--theme-filter-text)] text-sm">{user ? 'Add friends to see their plans' : 'Sign in to add friends'}</p>
+                    <p className="text-[var(--theme-text-secondary)] text-sm">{user ? 'Add friends to see their plans' : 'Sign in to add friends'}</p>
                   </div>
                   {user && (
                     <button
@@ -495,7 +486,7 @@ export const FilterBar = memo(function FilterBar({
                         'shrink-0 flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-sm font-medium transition-colors cursor-pointer',
                         friendLinkCopied
                           ? 'bg-green-500/20 text-green-400'
-                          : 'bg-[var(--theme-filter-control-bg)] text-[var(--theme-filter-text)] hover:text-[var(--theme-filter-active)] border border-[var(--theme-filter-control-border)]'
+                          : 'bg-orange-500 hover:bg-orange-600 text-white'
                       )}
                     >
                       {friendLinkCopied ? (
@@ -511,7 +502,7 @@ export const FilterBar = memo(function FilterBar({
                       ) : (
                         <>
                           <Link2 className="w-3.5 h-3.5" />
-                          Copy friend link
+                          Copy invite link
                         </>
                       )}
                     </button>
@@ -525,7 +516,7 @@ export const FilterBar = memo(function FilterBar({
               <div className="flex items-center">
                 <button
                   onClick={() => { trackClearFilters(); onClearFilters(); }}
-                  className="flex items-center gap-1.5 text-[var(--theme-filter-active)] hover:opacity-80 active:opacity-80 text-sm font-medium whitespace-nowrap transition-colors cursor-pointer"
+                  className="flex items-center gap-1.5 text-[var(--theme-accent)] hover:opacity-80 active:opacity-80 text-sm font-medium whitespace-nowrap transition-colors cursor-pointer"
                 >
                   <X className="w-3.5 h-3.5" />
                   Clear all
@@ -537,4 +528,4 @@ export const FilterBar = memo(function FilterBar({
       </div>
     </div>
   );
-});
+}
diff --git a/src/components/GalleryView.tsx b/src/components/GalleryView.tsx
deleted file mode 100644
index a4c5af4e..00000000
--- a/src/components/GalleryView.tsx
+++ /dev/null
@@ -1,393 +0,0 @@
-'use client';
-
-import { useMemo, useState, useCallback, useEffect } from 'react';
-import type { ETHDenverEvent, ReactionEmoji, FriendInfo } from '@/lib/types';
-import { formatDateLabel } from '@/lib/utils';
-import { sortByStartTime } from '@/lib/time-parse';
-import { VIBE_COLORS } from '@/lib/constants';
-import { TAG_ICONS } from './TagBadge';
-import { StarButton } from './StarButton';
-import { imageCache, FlyerLightbox } from './OGImage';
-
-/* ------------------------------------------------------------------ */
-/* Types                                                               */
-/* ------------------------------------------------------------------ */
-
-interface GalleryViewProps {
-  events: ETHDenverEvent[];
-  totalCount: number;
-  itinerary?: Set<string>;
-  onItineraryToggle?: (eventId: string) => void;
-  friendsCountByEvent?: Map<string, number>;
-  friendsByEvent?: Map<string, FriendInfo[]>;
-  checkedInFriendsByEvent?: Map<string, FriendInfo[]>;
-  checkInCounts?: Map<string, number>;
-  reactionsByEvent?: Map<string, { emoji: ReactionEmoji; count: number; reacted: boolean }[]>;
-  onToggleReaction?: (eventId: string, emoji: ReactionEmoji) => void;
-  commentCounts?: Map<string, number>;
-  scrollContainerRef?: React.RefObject<HTMLDivElement | null>;
-  conference?: string;
-  liveEventIds?: Map<string, 'green' | 'yellow' | 'red'>;
-}
-
-interface DateGroup {
-  dateISO: string;
-  label: string;
-  events: ETHDenverEvent[];
-}
-
-/* ------------------------------------------------------------------ */
-/* GalleryCard                                                         */
-/* ------------------------------------------------------------------ */
-
-function GalleryCard({
-  event,
-  isInItinerary,
-  onItineraryToggle,
-  friendsGoing,
-  liveUrgency,
-  onClick,
-}: {
-  event: ETHDenverEvent;
-  isInItinerary: boolean;
-  onItineraryToggle?: (eventId: string) => void;
-  friendsGoing?: FriendInfo[];
-  liveUrgency?: 'green' | 'yellow' | 'red';
-  onClick: () => void;
-}) {
-  const [imageUrl, setImageUrl] = useState<string | null>(
-    event.link ? imageCache.get(event.link) ?? null : null
-  );
-  const [loaded, setLoaded] = useState(event.link ? imageCache.has(event.link) : true);
-  const [imgError, setImgError] = useState(false);
-
-  // Lazy-load OG image via IntersectionObserver (same pattern as OGImage component)
-  const cardRef = useCallback(
-    (node: HTMLDivElement | null) => {
-      if (!node || !event.link || imageCache.has(event.link)) return;
-
-      const observer = new IntersectionObserver(
-        ([entry]) => {
-          if (!entry.isIntersecting) return;
-          observer.disconnect();
-
-          const params = new URLSearchParams({ url: event.link! });
-          if (event.id) params.set('eventId', event.id);
-
-          fetch(`/api/og?${params.toString()}`)
-            .then((res) => res.json())
-            .then((data) => {
-              imageCache.set(event.link!, data.imageUrl);
-              setImageUrl(data.imageUrl);
-              setLoaded(true);
-            })
-            .catch(() => {
-              imageCache.set(event.link!, null);
-              setLoaded(true);
-            });
-        },
-        { rootMargin: '200px' }
-      );
-
-      observer.observe(node);
-    },
-    [event.link, event.id]
-  );
-
-  const timeDisplay = event.isAllDay
-    ? 'All Day'
-    : `${event.startTime}${event.endTime ? ` \u2013 ${event.endTime}` : ''}`;
-
-  const hasImage = loaded && imageUrl && !imgError;
-  const showPlaceholder = !event.link || (loaded && !imageUrl) || imgError;
-
-  // Tag icon + color for placeholder
-  const primaryTag = event.tags[0] || event.vibe;
-  const TagIcon = primaryTag ? TAG_ICONS[primaryTag] : null;
-  const tagColor = primaryTag ? VIBE_COLORS[primaryTag] || VIBE_COLORS['default'] : undefined;
-
-  return (
-    <div
-      ref={cardRef}
-      className="relative aspect-square rounded-lg overflow-hidden cursor-pointer group"
-      onClick={onClick}
-      role="button"
-      tabIndex={0}
-      aria-label={`View flyer for ${event.name}`}
-    >
-      {/* Image or shimmer or placeholder */}
-      {!loaded && !showPlaceholder && (
-        <div className="absolute inset-0 animate-pulse bg-stone-800/50" />
-      )}
-
-      {hasImage && (
-        <img
-          src={imageUrl!}
-          alt=""
-          className="absolute inset-0 w-full h-full object-cover"
-          loading="lazy"
-          onError={() => setImgError(true)}
-        />
-      )}
-
-      {showPlaceholder && (
-        <div
-          className="absolute inset-0 flex flex-col items-center justify-center gap-2 px-3"
-          style={{
-            backgroundColor: tagColor
-              ? `color-mix(in srgb, ${tagColor} 15%, var(--theme-bg-secondary))`
-              : 'var(--theme-bg-secondary)',
-          }}
-        >
-          {TagIcon && (
-            <TagIcon
-              className="w-8 h-8 opacity-60"
-              style={{ color: tagColor }}
-            />
-          )}
-          <span className="text-xs text-center text-[var(--theme-text-secondary)] line-clamp-2 font-medium">
-            {event.name}
-          </span>
-        </div>
-      )}
-
-      {/* StarButton + friend avatars overlay — top-right */}
-      {onItineraryToggle && (
-        <div className="absolute top-1.5 right-1.5 z-10 flex items-center gap-1">
-          {friendsGoing && friendsGoing.length > 0 && (
-            <div className="flex items-center">
-              {friendsGoing.slice(0, 3).map((friend, i) => (
-                <div
-                  key={friend.userId}
-                  className={`w-5 h-5 rounded-full border border-white/50 shrink-0 overflow-hidden ${i > 0 ? '-ml-1.5' : ''}`}
-                  style={{ zIndex: 3 - i }}
-                  title={friend.displayName}
-                >
-                  {friend.avatarUrl ? (
-                    <img
-                      src={friend.avatarUrl}
-                      alt=""
-                      className="w-full h-full object-cover"
-                    />
-                  ) : (
-                    <div
-                      className="w-full h-full flex items-center justify-center text-[8px] font-bold text-white"
-                      style={{
-                        backgroundColor: `hsl(${Math.abs(friend.userId.split('').reduce((a, c) => ((a << 5) - a + c.charCodeAt(0)) | 0, 0)) % 360}, 60%, 45%)`,
-                      }}
-                    >
-                      {(friend.displayName || '?')[0].toUpperCase()}
-                    </div>
-                  )}
-                </div>
-              ))}
-            </div>
-          )}
-          <div className="rounded-full bg-black/40 backdrop-blur-sm" style={{ '--theme-text-secondary': '#ffffff', '--theme-border-primary': 'rgba(255,255,255,0.6)', '--theme-accent': '#ffffff', '--theme-accent-muted': 'rgba(255,255,255,0.2)' } as React.CSSProperties}>
-            <StarButton
-              eventId={event.id}
-              isStarred={isInItinerary}
-              onToggle={onItineraryToggle}
-              size="sm"
-            />
-          </div>
-        </div>
-      )}
-
-      {/* Bottom overlay bar — gradient + name + time */}
-      <div className="absolute inset-x-0 bottom-0 bg-gradient-to-t from-black/70 to-transparent pt-8 pb-1.5 px-2">
-        <div className="flex flex-col">
-          <span className="text-white text-sm font-medium line-clamp-1">
-            {event.name}
-          </span>
-          <span className="text-white/70 text-xs flex items-center gap-1">
-            {liveUrgency && (
-              <span className={`w-1.5 h-1.5 rounded-full animate-pulse shrink-0 ${
-                liveUrgency === 'red' ? 'bg-red-400' :
-                liveUrgency === 'yellow' ? 'bg-yellow-400' :
-                'bg-green-400'
-              }`} />
-            )}
-            {timeDisplay}
-          </span>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-/* ------------------------------------------------------------------ */
-/* GalleryView                                                         */
-/* ------------------------------------------------------------------ */
-
-export function GalleryView({
-  events,
-  totalCount,
-  itinerary,
-  onItineraryToggle,
-  friendsCountByEvent,
-  friendsByEvent,
-  scrollContainerRef,
-  conference,
-  liveEventIds,
-}: GalleryViewProps) {
-  /* ---- date-group the events ---- */
-  const dateGroups: DateGroup[] = useMemo(() => {
-    const groupMap = new Map<string, ETHDenverEvent[]>();
-    for (const event of events) {
-      const key = event.dateISO || 'unknown';
-      if (!groupMap.has(key)) groupMap.set(key, []);
-      groupMap.get(key)!.push(event);
-    }
-    return Array.from(groupMap.entries())
-      .sort(([a], [b]) => a.localeCompare(b))
-      .map(([dateISO, groupEvents]) => ({
-        dateISO,
-        label: dateISO === 'unknown' ? 'Date TBD' : formatDateLabel(dateISO),
-        events: groupEvents.sort(sortByStartTime),
-      }));
-  }, [events]);
-
-  /* ---- flyer lightbox navigation ---- */
-  const [lightboxEventIndex, setLightboxEventIndex] = useState<number | null>(null);
-  const [, setImageLoadTick] = useState(0);
-
-  // Flat list of all events for lightbox prev/next
-  const allEvents = useMemo(
-    () => dateGroups.flatMap((g) => g.events),
-    [dateGroups]
-  );
-
-  const lightboxEvent = lightboxEventIndex !== null ? allEvents[lightboxEventIndex] : null;
-  const lightboxImageUrl = lightboxEvent?.link
-    ? imageCache.get(lightboxEvent.link) ?? null
-    : null;
-  const lightboxRsvpUrl = lightboxEvent?.link;
-
-  const hasImage = useCallback((idx: number) => {
-    const ev = allEvents[idx];
-    return !!(ev?.link && imageCache.get(ev.link));
-  }, [allEvents]);
-
-  const canPrev = lightboxEventIndex !== null && allEvents.slice(0, lightboxEventIndex).some((ev) => ev.link && imageCache.get(ev.link));
-  const canNext = lightboxEventIndex !== null && allEvents.slice(lightboxEventIndex + 1).some((ev) => ev.link && imageCache.get(ev.link));
-
-  // Preload adjacent event OG images when lightbox is open
-  useEffect(() => {
-    if (lightboxEventIndex === null) return;
-    const toPreload: number[] = [lightboxEventIndex];
-    for (let d = 1; d <= 2; d++) {
-      if (lightboxEventIndex + d < allEvents.length) toPreload.push(lightboxEventIndex + d);
-      if (lightboxEventIndex - d >= 0) toPreload.push(lightboxEventIndex - d);
-    }
-    for (const pos of toPreload) {
-      const ev = allEvents[pos];
-      if (ev.link && !imageCache.has(ev.link)) {
-        const params = new URLSearchParams({ url: ev.link });
-        if (ev.id) params.set('eventId', ev.id);
-        fetch(`/api/og?${params.toString()}`)
-          .then((res) => res.json())
-          .then((data) => {
-            imageCache.set(ev.link!, data.imageUrl);
-            setImageLoadTick((n) => n + 1);
-          })
-          .catch(() => {
-            imageCache.set(ev.link!, null);
-            setImageLoadTick((n) => n + 1);
-          });
-      }
-    }
-  }, [lightboxEventIndex, allEvents]);
-
-  const handleLightboxPrev = useCallback(() => {
-    if (!canPrev) return;
-    setLightboxEventIndex((i) => {
-      for (let j = i! - 1; j >= 0; j--) {
-        if (hasImage(j)) return j;
-      }
-      return i;
-    });
-  }, [canPrev, hasImage]);
-
-  const handleLightboxNext = useCallback(() => {
-    if (!canNext) return;
-    setLightboxEventIndex((i) => {
-      for (let j = i! + 1; j < allEvents.length; j++) {
-        if (hasImage(j)) return j;
-      }
-      return i;
-    });
-  }, [canNext, hasImage, allEvents.length]);
-
-  /* ---- empty state ---- */
-  if (events.length === 0) {
-    return (
-      <div className="flex flex-col items-center justify-center py-20 text-[var(--theme-text-muted)]">
-        <p className="text-lg font-medium">No events found</p>
-        <p className="text-sm mt-1">Try adjusting your filters</p>
-      </div>
-    );
-  }
-
-  // Track a running global index across date groups for lightbox
-  let globalIndex = 0;
-
-  return (
-    <div className="max-w-6xl mx-auto px-2 sm:px-4 pb-8">
-      {dateGroups.map((group, groupIdx) => {
-        const startIndex = globalIndex;
-        const cards = group.events.map((event, eventIdx) => {
-          const idx = startIndex + eventIdx;
-          return (
-            <GalleryCard
-              key={event.id}
-              event={event}
-              isInItinerary={itinerary?.has(event.id) ?? false}
-              onItineraryToggle={onItineraryToggle}
-              friendsGoing={friendsByEvent?.get(event.id)}
-              liveUrgency={liveEventIds?.get(event.id)}
-              onClick={() => setLightboxEventIndex(idx)}
-            />
-          );
-        });
-        globalIndex += group.events.length;
-
-        return (
-          <div key={group.dateISO}>
-            {/* Date header */}
-            <div className={`sticky top-0 z-20 bg-[var(--theme-date-sep-bg)] px-3 sm:px-4 py-2 border-b border-[var(--theme-date-sep-border)] rounded-lg ${groupIdx > 0 ? 'mt-6' : ''}`}>
-              <div className="flex items-center justify-between">
-                <h2 className="text-base font-bold text-[var(--theme-date-sep-text)]">
-                  {group.label}
-                </h2>
-                <span className="text-xs text-[var(--theme-date-sep-muted)] font-medium">
-                  {group.events.length} event{group.events.length !== 1 ? 's' : ''}
-                </span>
-              </div>
-            </div>
-
-            {/* Grid */}
-            <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-3 mt-3">
-              {cards}
-            </div>
-          </div>
-        );
-      })}
-
-      {/* Flyer lightbox with prev/next navigation */}
-      {lightboxEventIndex !== null && lightboxImageUrl && lightboxEvent && (
-        <FlyerLightbox
-          imageUrl={lightboxImageUrl}
-          rsvpUrl={lightboxRsvpUrl}
-          onClose={() => setLightboxEventIndex(null)}
-          onPrev={canPrev ? handleLightboxPrev : undefined}
-          onNext={canNext ? handleLightboxNext : undefined}
-          eventId={lightboxEvent.id}
-          isInItinerary={itinerary?.has(lightboxEvent.id)}
-          onItineraryToggle={onItineraryToggle}
-          friendsGoing={friendsByEvent?.get(lightboxEvent.id)}
-        />
-      )}
-    </div>
-  );
-}
diff --git a/src/components/GoogleCalendarButton.tsx b/src/components/GoogleCalendarButton.tsx
index 39991d22..495d7d8d 100644
--- a/src/components/GoogleCalendarButton.tsx
+++ b/src/components/GoogleCalendarButton.tsx
@@ -42,12 +42,12 @@ export function GoogleCalendarButton({ events, timezone }: GoogleCalendarButtonP
       onClick={handleClick}
       disabled={isLoading}
       className={clsx(
-        'px-2 py-1 text-xs font-medium rounded transition-colors cursor-pointer inline-flex items-center gap-1',
+        'p-1.5 rounded transition-colors cursor-pointer',
         status === 'success'
-          ? 'bg-emerald-500/20 text-emerald-400'
+          ? 'text-emerald-400'
           : status === 'error'
-            ? 'bg-red-500/20 text-red-400 hover:bg-red-500/30'
-            : 'bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-accent)] hover:border-[var(--theme-border-primary)]'
+            ? 'text-red-400 hover:text-red-300'
+            : 'text-[var(--theme-text-secondary)] hover:text-[var(--theme-accent)]'
       )}
       title={
         status === 'error' && errorMessage
@@ -55,38 +55,14 @@ export function GoogleCalendarButton({ events, timezone }: GoogleCalendarButtonP
           : 'Add all events to Google Calendar'
       }
     >
-      {status === 'authorizing' && (
-        <>
-          <Loader2 className="w-3 h-3 animate-spin" />
-          <span>Connecting...</span>
-        </>
-      )}
-      {status === 'exporting' && (
-        <>
-          <Loader2 className="w-3 h-3 animate-spin" />
-          <span>Adding {events.length} event{events.length !== 1 ? 's' : ''}...</span>
-        </>
-      )}
-      {status === 'success' && (
-        <>
-          <Check className="w-3 h-3" />
-          <span>
-            Added {result?.inserted ?? events.length}
-            {result?.failed ? ` (${result.failed} failed)` : ''}!
-          </span>
-        </>
-      )}
-      {status === 'error' && (
-        <>
-          <AlertCircle className="w-3 h-3" />
-          <span>Retry</span>
-        </>
-      )}
-      {status === 'idle' && (
-        <>
-          <CalendarPlus className="w-3 h-3" />
-          <span className="hidden sm:inline">Google Cal</span>
-        </>
+      {isLoading ? (
+        <Loader2 className="w-[18px] h-[18px] animate-spin" />
+      ) : status === 'success' ? (
+        <Check className="w-[18px] h-[18px]" />
+      ) : status === 'error' ? (
+        <AlertCircle className="w-[18px] h-[18px]" />
+      ) : (
+        <CalendarPlus className="w-[18px] h-[18px]" />
       )}
     </button>
   );
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 904305a7..3fb7e94b 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { memo, useState } from 'react';
+import { useState } from 'react';
 import Image from 'next/image';
 import { User, MapPin, Loader2 } from 'lucide-react';
 import { trackAuthPrompt } from '@/lib/analytics';
@@ -21,9 +21,10 @@ interface HeaderProps {
   hasNearbyLiveEvents?: boolean;
   onBulkCheckIn?: () => void;
   checkInLoading?: boolean;
+  children?: React.ReactNode;
 }
 
-export const Header = memo(function Header({
+export function Header({
   viewMode,
   onViewChange,
   events,
@@ -35,17 +36,18 @@ export const Header = memo(function Header({
   hasNearbyLiveEvents,
   onBulkCheckIn,
   checkInLoading,
+  children,
 }: HeaderProps) {
   const { user, loading } = useAuth();
   const [showAuth, setShowAuth] = useState(false);
 
   return (
     <>
-      <header className="sticky top-0 shrink-0 z-50 backdrop-blur-sm border-b border-[var(--theme-header-border)]" style={{ backgroundColor: 'color-mix(in srgb, var(--theme-header-bg) 95%, transparent)' }}>
+      <header className="sticky top-0 shrink-0 z-50 backdrop-blur-sm border-b border-[var(--theme-border-secondary)]" style={{ backgroundColor: 'color-mix(in srgb, var(--theme-bg-primary) 95%, transparent)' }}>
         <div className="px-2 sm:px-4 py-3 flex items-center justify-between gap-4">
           {/* Left: Branding */}
           <div className="flex items-center min-w-0">
-            <a href="/" style={{ marginTop: '-4px' }}><Image src="/logo.png" alt="plan.wtf" width={130} height={36} style={{ filter: 'var(--theme-header-logo-filter)' }} priority /></a>
+            <a href="/"><Image src="/logo.png" alt="plan.wtf" width={130} height={36} style={{ filter: 'var(--theme-logo-filter)' }} priority /></a>
           </div>
 
           {/* Right: Controls */}
@@ -69,6 +71,8 @@ export const Header = memo(function Header({
               </button>
             )}
 
+            {children}
+
             {/* Auth / Profile — far right */}
             {!loading && (
               user ? (
@@ -76,8 +80,7 @@ export const Header = memo(function Header({
               ) : (
                 <button
                   onClick={() => { trackAuthPrompt('sign_in_button'); setShowAuth(true); }}
-                  className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg border border-[var(--theme-header-control-border)] text-[var(--theme-header-text)] hover:text-[var(--theme-header-text-hover)] active:text-[var(--theme-header-text-hover)] transition-colors text-sm cursor-pointer"
-                  style={{ backgroundColor: 'var(--theme-header-control-bg)' }}
+                  className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg border border-[var(--theme-border-primary)] bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)] transition-colors text-sm cursor-pointer"
                 >
                   <User className="w-3.5 h-3.5" />
                   <span className="hidden sm:inline">Sign in</span>
@@ -91,4 +94,4 @@ export const Header = memo(function Header({
       <AuthModal isOpen={showAuth} onClose={() => setShowAuth(false)} />
     </>
   );
-});
+}
diff --git a/src/components/ItineraryFAB.tsx b/src/components/ItineraryFAB.tsx
new file mode 100644
index 00000000..9a1138db
--- /dev/null
+++ b/src/components/ItineraryFAB.tsx
@@ -0,0 +1,23 @@
+'use client';
+
+import Link from 'next/link';
+import { CalendarIcon } from './icons/CalendarIcon';
+
+interface ItineraryFABProps {
+  count: number;
+  conference?: string;
+}
+
+export function ItineraryFAB({ count, conference }: ItineraryFABProps) {
+  const href = conference ? `/plan?conf=${encodeURIComponent(conference)}` : '/plan';
+
+  return (
+    <Link
+      href={href}
+      className="fixed bottom-6 right-6 z-40 flex items-center gap-2 px-4 py-3 rounded-full bg-[var(--theme-accent)] text-[var(--theme-accent-text)] shadow-lg hover:bg-[var(--theme-accent-hover)] transition-colors"
+    >
+      <CalendarIcon className="w-5 h-5" />
+      <span className="text-sm font-semibold">{count}</span>
+    </Link>
+  );
+}
diff --git a/src/components/ItineraryPanel.tsx b/src/components/ItineraryPanel.tsx
index 6c67d295..0a9585f4 100644
--- a/src/components/ItineraryPanel.tsx
+++ b/src/components/ItineraryPanel.tsx
@@ -166,7 +166,7 @@ export function ItineraryPanel({
         {/* Header */}
         <div className="flex items-center justify-between px-4 py-3 border-b border-[var(--theme-border-secondary)]">
           <h2 className="text-lg font-bold text-[var(--theme-text-primary)]">
-            My Itinerary{' '}
+            My Plan{' '}
             <span className="text-sm font-normal text-[var(--theme-text-secondary)]">
               ({itineraryEvents.length} event
               {itineraryEvents.length !== 1 ? 's' : ''})
@@ -176,7 +176,7 @@ export function ItineraryPanel({
             {itineraryEvents.length > 0 && (
               <>
                 <Link
-                  href="/itinerary"
+                  href={`/plan${selectedConference ? `?conf=${encodeURIComponent(selectedConference)}` : ''}`}
                   className="p-1.5 text-[var(--theme-text-secondary)] hover:text-[var(--theme-accent-link)] active:text-[var(--theme-accent-link)] transition-colors"
                   aria-label="Open full page"
                   title="Open full page"
@@ -229,7 +229,7 @@ export function ItineraryPanel({
             <div className="flex flex-col items-center justify-center py-16 text-center">
               <CalendarX className="w-12 h-12 text-[var(--theme-text-faint)] mb-4" />
               <p className="text-[var(--theme-text-secondary)] font-medium mb-2">
-                No events in your itinerary yet
+                No events in your plan yet
               </p>
               <p className="text-[var(--theme-text-muted)] text-sm max-w-xs">
                 Tap + on any event to add it to your plan!
@@ -242,8 +242,8 @@ export function ItineraryPanel({
                 {/* Branding header (visible in PNG) */}
                 <div className="pt-3 pb-1 px-1 flex items-center gap-2">
                   <span className="text-base">📅</span>
-                  <span className="text-sm font-bold text-[var(--theme-text-primary)]">sheeets.xyz</span>
-                  <span className="text-xs text-[var(--theme-text-muted)]">— My Itinerary</span>
+                  <span className="text-sm font-bold text-[var(--theme-text-primary)]">plan.wtf</span>
+                  <span className="text-xs text-[var(--theme-text-muted)]">— My Plan</span>
                 </div>
 
                 {/* Conflict warning */}
@@ -400,7 +400,7 @@ export function ItineraryPanel({
 
                 {/* Footer in PNG */}
                 <div className="pt-3 pb-2 text-center">
-                  <span className="text-[10px] text-[var(--theme-text-faint)]">sheeets.xyz — side event guide</span>
+                  <span className="text-[10px] text-[var(--theme-text-faint)]">plan.wtf — side event guide</span>
                 </div>
               </div>
 
@@ -432,7 +432,7 @@ export function ItineraryPanel({
                     className="w-full flex items-center justify-center gap-2 px-4 py-2 bg-[var(--theme-bg-secondary)] hover:bg-[var(--theme-bg-tertiary)] active:bg-[var(--theme-bg-tertiary)] border border-[var(--theme-border-primary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-secondary)] active:text-[var(--theme-text-secondary)] rounded-lg text-sm font-medium transition-colors cursor-pointer"
                   >
                     <Trash2 className="w-4 h-4" />
-                    Clear Itinerary
+                    Clear Plan
                   </button>
                 )}
               </div>
@@ -445,7 +445,7 @@ export function ItineraryPanel({
         isOpen={showShareCard}
         onClose={() => setShowShareCard(false)}
         events={itineraryEvents}
-        conferenceName={selectedConference || 'Itinerary'}
+        conferenceName={selectedConference || 'My Plan'}
         displayName={profile?.display_name ?? null}
         avatarUrl={profile?.avatar_url}
         hiddenEventIds={hiddenEvents}
diff --git a/src/components/ListView.tsx b/src/components/ListView.tsx
index d5ee1204..7d0b7641 100644
--- a/src/components/ListView.tsx
+++ b/src/components/ListView.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { memo, useMemo, useEffect, useRef, useState, useCallback } from 'react';
+import { useMemo, useEffect, useRef, useState, useCallback } from 'react';
 import { useVirtualizer } from '@tanstack/react-virtual';
 import type { ETHDenverEvent, ReactionEmoji, NativeAd, FriendInfo } from '@/lib/types';
 import { formatDateLabel } from '@/lib/utils';
@@ -43,8 +43,6 @@ interface ListViewProps {
   checkInLoading?: boolean;
   liveEventIds?: Map<string, 'green' | 'yellow' | 'red'>;
   userLocation?: { lat: number; lng: number } | null;
-  getRsvpStatus?: (eventId: string) => 'idle' | 'confirmed';
-  onRsvp?: (eventId: string, lumaUrl: string, eventName: string) => void;
 }
 
 interface DateGroup {
@@ -120,7 +118,7 @@ function buildFlatList(
 /* ------------------------------------------------------------------ */
 
 
-export const ListView = memo(function ListView({
+export function ListView({
   events,
   totalCount,
   itinerary,
@@ -144,8 +142,6 @@ export const ListView = memo(function ListView({
   checkInLoading,
   liveEventIds,
   userLocation,
-  getRsvpStatus,
-  onRsvp,
 }: ListViewProps) {
   const activeAds = useMemo(() => nativeAds?.filter(ad => ad.active !== false) || [], [nativeAds]);
 
@@ -186,7 +182,7 @@ export const ListView = memo(function ListView({
       if (item.kind === 'ad') return 120;
       return 180; // event card estimate
     },
-    overscan: 4,
+    overscan: 5,
     measureElement: (el) => {
       // Include the item's actual height (padding is part of the element)
       return el.getBoundingClientRect().height;
@@ -202,8 +198,6 @@ export const ListView = memo(function ListView({
 
   /* ---- flyer lightbox navigation ---- */
   const [lightboxEventIndex, setLightboxEventIndex] = useState<number | null>(null);
-  // Counter to force re-render when an OG image finishes loading into the cache
-  const [, setImageLoadTick] = useState(0);
 
   // Build ordered list of event indices (skip ads and headers)
   const eventIndices = useMemo(
@@ -218,63 +212,26 @@ export const ListView = memo(function ListView({
   const lightboxRsvpUrl = lightboxEvent?.kind === 'event' ? lightboxEvent.event.link : undefined;
 
   const lightboxPosInEvents = lightboxEventIndex !== null ? eventIndices.indexOf(lightboxEventIndex) : -1;
-
-  const hasImageAtPos = useCallback((pos: number) => {
-    const idx = eventIndices[pos];
-    const item = flatItems[idx];
-    return item?.kind === 'event' && !!(item.event.link && imageCache.get(item.event.link));
-  }, [eventIndices, flatItems]);
-
-  const canPrev = lightboxPosInEvents > 0 && eventIndices.slice(0, lightboxPosInEvents).some((idx) => {
-    const item = flatItems[idx];
-    return item?.kind === 'event' && !!(item.event.link && imageCache.get(item.event.link));
-  });
-  const canNext = lightboxPosInEvents >= 0 && lightboxPosInEvents < eventIndices.length - 1 && eventIndices.slice(lightboxPosInEvents + 1).some((idx) => {
-    const item = flatItems[idx];
-    return item?.kind === 'event' && !!(item.event.link && imageCache.get(item.event.link));
-  });
-
-  // Preload current + adjacent event OG images when lightbox is open
-  useEffect(() => {
-    if (lightboxPosInEvents < 0) return;
-    const toPreload: number[] = [lightboxPosInEvents];
-    for (let d = 1; d <= 2; d++) {
-      if (lightboxPosInEvents + d < eventIndices.length) toPreload.push(lightboxPosInEvents + d);
-      if (lightboxPosInEvents - d >= 0) toPreload.push(lightboxPosInEvents - d);
-    }
-    for (const pos of toPreload) {
-      const idx = eventIndices[pos];
-      const item = flatItems[idx];
-      if (item.kind === 'event' && item.event.link && !imageCache.has(item.event.link)) {
-        const params = new URLSearchParams({ url: item.event.link });
-        if (item.event.id) params.set('eventId', item.event.id);
-        fetch(`/api/og?${params.toString()}`)
-          .then(res => res.json())
-          .then(data => {
-            imageCache.set(item.event.link!, data.imageUrl);
-            setImageLoadTick(n => n + 1);
-          })
-          .catch(() => {
-            imageCache.set(item.event.link!, null);
-            setImageLoadTick(n => n + 1);
-          });
-      }
-    }
-  }, [lightboxPosInEvents, eventIndices, flatItems]);
+  const canPrev = lightboxPosInEvents > 0;
+  const canNext = lightboxPosInEvents >= 0 && lightboxPosInEvents < eventIndices.length - 1;
 
   const handleLightboxPrev = useCallback(() => {
     if (!canPrev) return;
-    for (let p = lightboxPosInEvents - 1; p >= 0; p--) {
-      if (hasImageAtPos(p)) { setLightboxEventIndex(eventIndices[p]); return; }
+    const prevIdx = eventIndices[lightboxPosInEvents - 1];
+    const prevItem = flatItems[prevIdx];
+    if (prevItem.kind === 'event' && prevItem.event.link && imageCache.get(prevItem.event.link)) {
+      setLightboxEventIndex(prevIdx);
     }
-  }, [canPrev, eventIndices, lightboxPosInEvents, hasImageAtPos]);
+  }, [canPrev, eventIndices, lightboxPosInEvents, flatItems]);
 
   const handleLightboxNext = useCallback(() => {
     if (!canNext) return;
-    for (let p = lightboxPosInEvents + 1; p < eventIndices.length; p++) {
-      if (hasImageAtPos(p)) { setLightboxEventIndex(eventIndices[p]); return; }
+    const nextIdx = eventIndices[lightboxPosInEvents + 1];
+    const nextItem = flatItems[nextIdx];
+    if (nextItem.kind === 'event' && nextItem.event.link && imageCache.get(nextItem.event.link)) {
+      setLightboxEventIndex(nextIdx);
     }
-  }, [canNext, eventIndices, lightboxPosInEvents, hasImageAtPos]);
+  }, [canNext, eventIndices, lightboxPosInEvents, flatItems]);
 
   /* ---- sticky date header overlay ---- */
   const [stickyLabel, setStickyLabel] = useState<string | null>(null);
@@ -286,16 +243,8 @@ export const ListView = memo(function ListView({
 
     const scrollTop = scrollEl.scrollTop;
 
-    // Don't show sticky overlay when first in-flow date header is still visible
-    const virtualItems = virtualizer.getVirtualItems();
-    if (flatItems[0]?.kind === 'date-header') {
-      const firstVItem = virtualItems.find(v => v.index === 0);
-      if (firstVItem && scrollTop < firstVItem.start + firstVItem.size) {
-        setStickyLabel(null);
-        setStickyCount(0);
-        return;
-      }
-    } else if (scrollTop <= 10) {
+    // Don't show sticky overlay when not scrolled — the first in-flow header is still visible
+    if (scrollTop <= 10) {
       setStickyLabel(null);
       setStickyCount(0);
       return;
@@ -306,6 +255,8 @@ export const ListView = memo(function ListView({
 
     // Find the last date-header that has scrolled past the top
     let lastHeader: { label: string; eventCount: number } | null = null;
+
+    const virtualItems = virtualizer.getVirtualItems();
     for (const vItem of virtualItems) {
       const item = flatItems[vItem.index];
       if (item.kind === 'date-header') {
@@ -386,12 +337,12 @@ export const ListView = memo(function ListView({
     <div className="max-w-3xl mx-auto px-2 sm:px-4 pb-8 relative">
       {/* Overlay sticky date header */}
       {stickyLabel && (
-        <div className="sticky top-0 z-20 bg-[var(--theme-date-sep-bg)] py-2 -mx-2 px-2 sm:-mx-4 sm:px-4 border-b border-[var(--theme-date-sep-border)] rounded-lg">
+        <div className="sticky top-0 z-20 bg-[var(--theme-bg-primary)] py-2 -mx-2 px-2 sm:-mx-4 sm:px-4 border-b border-[var(--theme-border-secondary)]">
           <div className="flex items-center justify-between">
-            <h2 className="text-base font-bold text-[var(--theme-date-sep-text)]">
+            <h2 className="text-base font-bold text-[var(--theme-text-primary)]">
               {stickyLabel}
             </h2>
-            <span className="text-xs text-[var(--theme-date-sep-muted)] font-medium">
+            <span className="text-xs text-[var(--theme-text-muted)] font-medium">
               {stickyCount} event{stickyCount !== 1 ? 's' : ''}
             </span>
           </div>
@@ -424,12 +375,12 @@ export const ListView = memo(function ListView({
             >
               {item.kind === 'date-header' ? (
                 /* In-flow date header (hidden behind sticky overlay once scrolled past) */
-                <div className={`py-2 border-b border-[var(--theme-date-sep-border)] bg-[var(--theme-date-sep-bg)] -mx-2 px-2 sm:-mx-4 sm:px-4 rounded-lg ${virtualRow.index === 0 ? '' : 'mt-4'}`}>
+                <div className={`py-2 border-b border-[var(--theme-border-secondary)] ${virtualRow.index === 0 ? '' : 'mt-4'}`}>
                   <div className="flex items-center justify-between">
-                    <h2 className="text-base font-bold text-[var(--theme-date-sep-text)]">
+                    <h2 className="text-base font-bold text-[var(--theme-text-primary)]">
                       {item.label}
                     </h2>
-                    <span className="text-xs text-[var(--theme-date-sep-muted)] font-medium">
+                    <span className="text-xs text-[var(--theme-text-muted)] font-medium">
                       {item.eventCount} event{item.eventCount !== 1 ? 's' : ''}
                     </span>
                   </div>
@@ -462,8 +413,6 @@ export const ListView = memo(function ListView({
                     liveUrgency={liveEventIds?.get(item.event.id)}
                     userLocation={userLocation}
                     onOpenLightbox={() => setLightboxEventIndex(virtualRow.index)}
-                    rsvpStatus={getRsvpStatus?.(item.event.id)}
-                    onRsvp={item.event.link ? () => onRsvp?.(item.event.id, item.event.link!, item.event.name) : undefined}
                   />
                 </div>
               )}
@@ -473,19 +422,15 @@ export const ListView = memo(function ListView({
       </div>
 
       {/* Flyer lightbox with prev/next navigation */}
-      {lightboxEventIndex !== null && lightboxImageUrl && lightboxEvent?.kind === 'event' && (
+      {lightboxEventIndex !== null && lightboxImageUrl && (
         <FlyerLightbox
-          imageUrl={lightboxImageUrl!}
+          imageUrl={lightboxImageUrl}
           rsvpUrl={lightboxRsvpUrl}
           onClose={() => setLightboxEventIndex(null)}
           onPrev={canPrev ? handleLightboxPrev : undefined}
           onNext={canNext ? handleLightboxNext : undefined}
-          eventId={lightboxEvent.event.id}
-          isInItinerary={itinerary?.has(lightboxEvent.event.id)}
-          onItineraryToggle={onItineraryToggle}
-          friendsGoing={friendsByEvent?.get(lightboxEvent.event.id)}
         />
       )}
     </div>
   );
-});
+}
diff --git a/src/components/LockScreenModal.tsx b/src/components/LockScreenModal.tsx
deleted file mode 100644
index 199a2c1b..00000000
--- a/src/components/LockScreenModal.tsx
+++ /dev/null
@@ -1,490 +0,0 @@
-'use client';
-
-import { useState, useRef, useEffect, useCallback, useMemo } from 'react';
-import { createPortal } from 'react-dom';
-import { X, Download, Copy, Check, Loader2, ChevronDown } from 'lucide-react';
-import { trackLockScreenOpen, trackLockScreenCopy, trackLockScreenDownload } from '@/lib/analytics';
-import type { SocialLink } from '@/lib/social-urls';
-import LockScreenTemplate from './LockScreenTemplate';
-
-function PlatformIcon({ platform }: { platform: string }) {
-  const cls = "w-5 h-5 shrink-0";
-  switch (platform) {
-    case 'x':
-      return <svg viewBox="0 0 24 24" className={cls} fill="currentColor"><path d="M17.176 4h2.645l-5.78 6.606 6.8 8.994h-4.676l-4.17-5.453-4.77 5.453H4.58l6.18-7.066L4.2 4h4.795l3.77 4.984zm-.928 14.016h1.466L8.005 5.506H6.44z" /></svg>;
-    case 'telegram':
-      return <svg viewBox="0 0 24 24" className={cls} fill="currentColor"><path d="M11.944 3A9 9 0 0 0 3 12a9 9 0 0 0 9 9 9 9 0 0 0 9-9 9 9 0 0 0-9-9zm3.722 5.418c.075-.001.241.017.349.105a.38.38 0 0 1 .128.244c.012.07.027.23.015.354-.135 1.424-.721 4.877-1.02 6.47-.126.675-.374.901-.615.923-.522.049-.919-.345-1.425-.677-.792-.52-1.24-.843-2.009-1.35-.889-.585-.313-.908.194-1.433.133-.138 2.435-2.233 2.48-2.423.006-.024.011-.113-.042-.159s-.13-.031-.187-.018c-.08.018-1.345.856-3.796 2.51-.36.247-.685.367-.977.36-.321-.006-.939-.181-1.399-.33-.564-.184-1.012-.281-.973-.592.02-.162.244-.328.67-.498 2.624-1.143 4.372-1.897 5.249-2.261 2.499-1.04 3.019-1.221 3.357-1.226z" /></svg>;
-    case 'linkedin':
-      return <svg viewBox="0 0 24 24" className={cls} fill="currentColor"><path d="M19.336 19.339h-3.065v-4.805c0-1.146-.023-2.62-1.596-2.62-1.597 0-1.842 1.247-1.842 2.536v4.889h-3.065V9.75h2.943v1.347h.042c.41-.776 1.412-1.596 2.907-1.596 3.107 0 3.68 2.044 3.68 4.703v5.135zM6.749 8.397c-.985 0-1.78-.8-1.78-1.782S5.764 4.833 6.749 4.833c.983 0 1.78.8 1.78 1.782s-.797 1.782-1.78 1.782zm1.537 10.942H5.212V9.75h3.074v9.589z" /></svg>;
-    case 'friend':
-      return <svg viewBox="0 0 360 360" className={cls} fill="currentColor"><g transform="translate(50 40)"><rect y="71.62" width="260.39" height="9.16" /><rect x="65.86" y="3.83" width="18.38" height="51.31" rx="8.42" fill="none" stroke="currentColor" strokeWidth="7.66" /><rect x="176.14" y="3.83" width="18.38" height="51.31" rx="8.42" fill="none" stroke="currentColor" strokeWidth="7.66" /><path d="M56.67 40.16H23.04c-4.93 0-8.92 3.99-8.92 8.92v205.88c0 4.93 3.99 8.92 8.92 8.92h214.06c4.92 0 8.92-3.99 8.92-8.92V49.08c0-4.93-3.99-8.92-8.92-8.92h-33.38V26.04h33.38l.59.01c12.45.32 22.45 10.51 22.45 23.03v205.88l-.01.6c-.31 12.25-10.19 22.12-22.44 22.44l-.59.01H23.04l-.59-.01C10.19 277.68.32 267.81.01 255.55L0 254.96V49.08C0 36.55 10 26.36 22.45 26.05l.59-.01h33.63v14.12zm110.28 0H93.43V26.04h73.52v14.12z" /><rect x="58.2" y="106.45" width="37.99" height="37.99" rx="6.13" /><rect x="58.2" y="151.79" width="37.99" height="37.99" rx="6.13" /><rect x="110.89" y="151.79" width="37.99" height="37.99" rx="6.13" /><rect x="110.89" y="197.13" width="37.99" height="37.99" rx="6.13" /><rect x="163.58" y="151.79" width="37.99" height="37.99" rx="6.13" /><rect x="58.2" y="197.13" width="37.99" height="37.99" rx="6.13" /><rect x="110.89" y="106.45" width="37.99" height="37.99" rx="6.13" /><rect x="163.58" y="106.45" width="37.99" height="37.99" rx="6.13" /></g></svg>;
-    default:
-      return null;
-  }
-}
-
-const PHONE_PRESETS = [
-  { label: 'iPhone 16 Pro Max', w: 1320, h: 2868 },
-  { label: 'iPhone 16 Pro', w: 1206, h: 2622 },
-  { label: 'iPhone 16 / 15 / 14', w: 1170, h: 2532 },
-  { label: 'iPhone SE', w: 750, h: 1334 },
-  { label: 'Samsung Galaxy S24 Ultra', w: 1440, h: 3120 },
-  { label: 'Samsung Galaxy S24', w: 1080, h: 2340 },
-  { label: 'Google Pixel 9 Pro', w: 1280, h: 2856 },
-  { label: 'Google Pixel 9', w: 1080, h: 2424 },
-] as const;
-
-interface LockScreenModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  displayName: string | null;
-  company: string | null;
-  jobTitle: string | null;
-  avatarUrl: string | null;
-  xHandle: string | null;
-  socialLinks: SocialLink[];
-  friendCode: string | null;
-}
-
-export function LockScreenModal({
-  isOpen,
-  onClose,
-  displayName,
-  company,
-  jobTitle,
-  avatarUrl,
-  xHandle,
-  socialLinks,
-  friendCode,
-}: LockScreenModalProps) {
-  const [previewUrl, setPreviewUrl] = useState<string | null>(null);
-  const [generating, setGenerating] = useState(false);
-  const [copyStatus, setCopyStatus] = useState<'idle' | 'copying' | 'copied'>('idle');
-  const [logoDataUrl, setLogoDataUrl] = useState<string | null>(null);
-  const [resolvedAvatarDataUrl, setResolvedAvatarDataUrl] = useState<string | null>(null);
-  const cardRef = useRef<HTMLDivElement>(null);
-  const trackedRef = useRef(false);
-
-  // Desktop detection: non-touch primary pointer or wide screen
-  const isDesktop = useMemo(() => {
-    if (typeof window === 'undefined') return false;
-    return window.matchMedia('(pointer: fine)').matches && window.screen.width > 1024;
-  }, []);
-
-  // Phone picker state (only used on desktop)
-  const [selectedPreset, setSelectedPreset] = useState(2); // default: iPhone 16/15/14
-  const [customW, setCustomW] = useState('');
-  const [customH, setCustomH] = useState('');
-  const [useCustom, setUseCustom] = useState(false);
-  const [pickerDone, setPickerDone] = useState(false);
-
-  // Build full list of available QR items (social links + friend link)
-  const allLinks: SocialLink[] = useMemo(() => {
-    const links = [...socialLinks];
-    if (friendCode) {
-      links.push({
-        platform: 'friend',
-        label: 'plan.wtf',
-        url: `${typeof window !== 'undefined' ? window.location.origin : ''}?fc=${friendCode}`,
-      });
-    }
-    return links;
-  }, [socialLinks, friendCode]);
-
-  // QR selection state — which platforms are toggled on
-  const [enabledQrs, setEnabledQrs] = useState<Set<string>>(new Set());
-
-  // Reset enabled set when allLinks changes
-  useEffect(() => {
-    setEnabledQrs(new Set(allLinks.map(l => l.platform)));
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [allLinks.length]);
-
-  // Filtered links based on selection
-  const filteredLinks = useMemo(() => allLinks.filter(l => enabledQrs.has(l.platform)), [allLinks, enabledQrs]);
-
-  // Resolve final screen dimensions
-  const screenDims = useMemo(() => {
-    if (!isDesktop) {
-      // Mobile: auto-detect
-      const dpr = typeof window !== 'undefined' ? (window.devicePixelRatio || 1) : 1;
-      const sw = typeof window !== 'undefined' ? window.screen.width : 1170;
-      const sh = typeof window !== 'undefined' ? window.screen.height : 2532;
-      return { width: Math.round(sw * dpr), height: Math.round(sh * dpr) };
-    }
-    if (useCustom) {
-      const w = parseInt(customW, 10);
-      const h = parseInt(customH, 10);
-      if (w > 0 && h > 0) return { width: w, height: h };
-    }
-    const preset = PHONE_PRESETS[selectedPreset];
-    return { width: preset.w, height: preset.h };
-  }, [isDesktop, selectedPreset, useCustom, customW, customH]);
-
-  // Preload logo as data URL so html-to-image can embed it
-  useEffect(() => {
-    if (!isOpen) return;
-    const img = new Image();
-    img.crossOrigin = 'anonymous';
-    img.onload = () => {
-      const canvas = document.createElement('canvas');
-      canvas.width = img.naturalWidth;
-      canvas.height = img.naturalHeight;
-      const ctx = canvas.getContext('2d');
-      if (ctx) {
-        ctx.drawImage(img, 0, 0);
-        setLogoDataUrl(canvas.toDataURL('image/png'));
-      }
-    };
-    img.src = '/logo.png';
-  }, [isOpen]);
-
-  // Preload avatar as data URL so html-to-image can embed it
-  useEffect(() => {
-    if (!isOpen) { setResolvedAvatarDataUrl(null); return; }
-
-    const src = avatarUrl || (xHandle ? `https://unavatar.io/x/${xHandle}` : null);
-    if (!src) return;
-    if (src.startsWith('data:')) { setResolvedAvatarDataUrl(src); return; }
-
-    const img = new Image();
-    img.crossOrigin = 'anonymous';
-    img.onload = () => {
-      const canvas = document.createElement('canvas');
-      canvas.width = img.naturalWidth;
-      canvas.height = img.naturalHeight;
-      const ctx = canvas.getContext('2d');
-      if (ctx) {
-        ctx.drawImage(img, 0, 0);
-        setResolvedAvatarDataUrl(canvas.toDataURL('image/png'));
-      }
-    };
-    img.onerror = () => setResolvedAvatarDataUrl(null);
-    img.src = src;
-  }, [isOpen, avatarUrl, xHandle]);
-
-  // Generate preview image
-  const generatePreview = useCallback(async () => {
-    if (!cardRef.current) {
-      setPreviewUrl(null);
-      return;
-    }
-    setGenerating(true);
-    try {
-      const { toPng } = await import('html-to-image');
-      const dataUrl = await toPng(cardRef.current, {
-        pixelRatio: 1,
-        backgroundColor: '#0c0a09',
-        style: { position: 'static', left: '0' },
-      });
-      setPreviewUrl(dataUrl);
-    } catch (err) {
-      console.error('Lock screen preview generation failed:', err);
-    } finally {
-      setGenerating(false);
-    }
-  }, []);
-
-  // Generate preview when modal opens (mobile) or after picker done (desktop)
-  useEffect(() => {
-    if (!isOpen) return;
-    if (isDesktop && !pickerDone) return;
-    // Small delay to allow template to mount
-    const timer = setTimeout(() => {
-      generatePreview();
-    }, 200);
-    return () => clearTimeout(timer);
-  }, [isOpen, isDesktop, pickerDone, generatePreview, enabledQrs, resolvedAvatarDataUrl]);
-
-  // Track open event
-  useEffect(() => {
-    if (isOpen && !trackedRef.current) {
-      trackLockScreenOpen();
-      trackedRef.current = true;
-    }
-    if (!isOpen) {
-      trackedRef.current = false;
-    }
-  }, [isOpen]);
-
-  // Reset state when modal closes
-  useEffect(() => {
-    if (!isOpen) {
-      setPreviewUrl(null);
-      setCopyStatus('idle');
-      setPickerDone(false);
-      setLogoDataUrl(null);
-      setResolvedAvatarDataUrl(null);
-    }
-  }, [isOpen]);
-
-  const handleCopy = useCallback(async () => {
-    if (!cardRef.current) return;
-    setCopyStatus('copying');
-    try {
-      const { toBlob } = await import('html-to-image');
-      const blob = await toBlob(cardRef.current, {
-        pixelRatio: 1,
-        backgroundColor: '#0c0a09',
-        style: { position: 'static', left: '0' },
-      });
-      if (!blob) {
-        setCopyStatus('idle');
-        return;
-      }
-      await navigator.clipboard.write([
-        new ClipboardItem({ 'image/png': blob }),
-      ]);
-      trackLockScreenCopy();
-      setCopyStatus('copied');
-      setTimeout(() => setCopyStatus('idle'), 2000);
-    } catch (err) {
-      console.error('Copy to clipboard failed:', err);
-      setCopyStatus('idle');
-    }
-  }, []);
-
-  const handleDownload = useCallback(async () => {
-    if (!cardRef.current) return;
-    try {
-      const { toBlob } = await import('html-to-image');
-      const blob = await toBlob(cardRef.current, {
-        pixelRatio: 1,
-        backgroundColor: '#0c0a09',
-        style: { position: 'static', left: '0' },
-      });
-      if (!blob) return;
-      trackLockScreenDownload();
-      const safeName = (displayName || 'card').toLowerCase().replace(/\s+/g, '-');
-      const file = new File([blob], `lock-screen-${safeName}.png`, { type: 'image/png' });
-
-      // On mobile, use native share sheet so iOS saves to Camera Roll
-      if (navigator.share && navigator.canShare?.({ files: [file] })) {
-        await navigator.share({ files: [file] });
-      } else {
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement('a');
-        a.href = url;
-        a.download = file.name;
-        document.body.appendChild(a);
-        a.click();
-        document.body.removeChild(a);
-        URL.revokeObjectURL(url);
-      }
-    } catch (err) {
-      // User cancelled share sheet — not an error
-      if (err instanceof Error && err.name === 'AbortError') return;
-      console.error('Save failed:', err);
-    }
-  }, [displayName]);
-
-  if (!isOpen) return null;
-
-  return createPortal(
-    <>
-      {/* Backdrop */}
-      <div
-        className="fixed inset-0 z-[100] bg-black/50"
-        onClick={onClose}
-      />
-
-      {/* Modal */}
-      <div className="fixed inset-0 z-[110] flex items-center justify-center p-4">
-        <div
-          className="bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] rounded-xl shadow-2xl w-full max-w-sm max-h-[90vh] flex flex-col"
-          onClick={(e) => e.stopPropagation()}
-        >
-          {/* Header */}
-          <div className="flex items-center justify-between px-4 py-3 border-b border-[var(--theme-border-primary)] shrink-0">
-            <h2 className="text-base font-bold text-[var(--theme-text-primary)]">Generate Lock Screen</h2>
-            <button
-              onClick={onClose}
-              className="p-1 text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] transition-colors cursor-pointer"
-            >
-              <X className="w-4 h-4" />
-            </button>
-          </div>
-
-          {/* Scrollable content */}
-          <div className="flex-1 overflow-y-auto px-4 py-4 space-y-3 min-h-0">
-            <p className="text-xs text-[var(--theme-text-secondary)]">
-              Set this as your lock screen to make it easy for people to scan your contact info.
-            </p>
-
-            {/* QR code selection */}
-            {allLinks.length > 0 && (
-              <div className="space-y-1.5">
-                <p className="text-xs font-medium text-[var(--theme-text-primary)]">QR codes to include</p>
-                {allLinks.map((link) => (
-                  <label key={link.platform} className="flex items-center gap-2 cursor-pointer">
-                    <input
-                      type="checkbox"
-                      checked={enabledQrs.has(link.platform)}
-                      onChange={() => {
-                        setEnabledQrs(prev => {
-                          const next = new Set(prev);
-                          if (next.has(link.platform)) next.delete(link.platform);
-                          else next.add(link.platform);
-                          return next;
-                        });
-                      }}
-                      className="w-3.5 h-3.5 rounded accent-[var(--theme-accent)]"
-                    />
-                    <PlatformIcon platform={link.platform} />
-                    <span className="text-sm text-[var(--theme-text-secondary)]">
-                      {link.platform === 'friend' ? 'plan.wtf' : link.platform === 'x' ? `@${link.label.replace('@', '')}` : link.platform === 'telegram' ? link.label : 'LinkedIn'}
-                    </span>
-                  </label>
-                ))}
-              </div>
-            )}
-
-            {/* Phone picker (desktop only) */}
-            {isDesktop && !pickerDone && (
-              <div className="space-y-3">
-                <p className="text-xs font-medium text-[var(--theme-text-primary)]">Select your phone model</p>
-                <div className="grid grid-cols-1 gap-1.5">
-                  {PHONE_PRESETS.map((preset, i) => (
-                    <button
-                      key={i}
-                      onClick={() => { setSelectedPreset(i); setUseCustom(false); }}
-                      className={`text-left px-3 py-2 rounded-lg text-sm transition-colors cursor-pointer ${
-                        !useCustom && selectedPreset === i
-                          ? 'bg-[var(--theme-accent)] text-[var(--theme-accent-text)]'
-                          : 'bg-[var(--theme-bg-primary)] text-[var(--theme-text-secondary)] hover:bg-[var(--theme-bg-tertiary)]'
-                      }`}
-                    >
-                      <span className="font-medium">{preset.label}</span>
-                      <span className="ml-2 opacity-60">{preset.w}&times;{preset.h}</span>
-                    </button>
-                  ))}
-                </div>
-
-                {/* Custom size toggle */}
-                <button
-                  onClick={() => setUseCustom(!useCustom)}
-                  className={`w-full text-left px-3 py-2 rounded-lg text-sm transition-colors cursor-pointer flex items-center justify-between ${
-                    useCustom
-                      ? 'bg-[var(--theme-accent)] text-[var(--theme-accent-text)]'
-                      : 'bg-[var(--theme-bg-primary)] text-[var(--theme-text-secondary)] hover:bg-[var(--theme-bg-tertiary)]'
-                  }`}
-                >
-                  <span className="font-medium">Custom size</span>
-                  <ChevronDown className={`w-3.5 h-3.5 transition-transform ${useCustom ? 'rotate-180' : ''}`} />
-                </button>
-
-                {useCustom && (
-                  <div className="flex items-center gap-2">
-                    <input
-                      type="number"
-                      value={customW}
-                      onChange={(e) => setCustomW(e.target.value)}
-                      placeholder="Width"
-                      className="flex-1 bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg px-3 py-2 text-sm text-[var(--theme-text-primary)] focus:outline-none focus:border-[var(--theme-accent)] placeholder:text-[var(--theme-text-muted)]"
-                    />
-                    <span className="text-[var(--theme-text-muted)] text-sm">&times;</span>
-                    <input
-                      type="number"
-                      value={customH}
-                      onChange={(e) => setCustomH(e.target.value)}
-                      placeholder="Height"
-                      className="flex-1 bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg px-3 py-2 text-sm text-[var(--theme-text-primary)] focus:outline-none focus:border-[var(--theme-accent)] placeholder:text-[var(--theme-text-muted)]"
-                    />
-                  </div>
-                )}
-
-                <button
-                  onClick={() => setPickerDone(true)}
-                  disabled={useCustom && (!parseInt(customW, 10) || !parseInt(customH, 10))}
-                  className="w-full flex items-center justify-center gap-2 px-4 py-2.5 bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)] rounded-lg text-sm font-medium transition-colors cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed"
-                >
-                  Generate Card
-                </button>
-              </div>
-            )}
-
-            {/* Preview area */}
-            {(!isDesktop || pickerDone) && (
-              <div className="rounded-lg border border-[var(--theme-border-primary)] bg-[var(--theme-bg-primary)] overflow-hidden">
-                {generating && !previewUrl ? (
-                  <div className="flex items-center justify-center py-16">
-                    <Loader2 className="w-6 h-6 text-[var(--theme-text-secondary)] animate-spin" />
-                  </div>
-                ) : previewUrl ? (
-                  <div className="relative">
-                    {generating && (
-                      <div className="absolute inset-0 flex items-center justify-center bg-[var(--theme-bg-primary)]/60 z-10">
-                        <Loader2 className="w-5 h-5 text-[var(--theme-text-secondary)] animate-spin" />
-                      </div>
-                    )}
-                    <img
-                      src={previewUrl}
-                      alt="Lock screen card preview"
-                      className="w-full h-auto block"
-                    />
-                  </div>
-                ) : (
-                  <div className="flex items-center justify-center py-16 text-[var(--theme-text-muted)] text-sm">
-                    Generating preview...
-                  </div>
-                )}
-              </div>
-            )}
-          </div>
-
-          {/* Footer buttons */}
-          <div className={`px-4 py-3 border-t border-[var(--theme-border-primary)] flex items-center gap-2 shrink-0 ${isDesktop && !pickerDone ? 'hidden' : ''}`}>
-            <button
-              onClick={handleCopy}
-              disabled={!previewUrl || copyStatus === 'copying'}
-              className={`flex-1 flex items-center justify-center gap-2 px-4 py-2.5 rounded-lg text-sm font-medium transition-colors cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed ${
-                copyStatus === 'copied'
-                  ? 'bg-green-600 text-white'
-                  : 'bg-[var(--theme-accent)] hover:bg-[var(--theme-accent-hover)] text-[var(--theme-accent-text)]'
-              }`}
-            >
-              {copyStatus === 'copying' ? (
-                <>
-                  <Loader2 className="w-4 h-4 animate-spin" />
-                  Copying...
-                </>
-              ) : copyStatus === 'copied' ? (
-                <>
-                  <Check className="w-4 h-4" />
-                  Copied!
-                </>
-              ) : (
-                <>
-                  <Copy className="w-4 h-4" />
-                  Copy to Clipboard
-                </>
-              )}
-            </button>
-            <button
-              onClick={handleDownload}
-              disabled={!previewUrl}
-              className="flex items-center justify-center gap-2 px-4 py-2.5 bg-[var(--theme-bg-tertiary)] hover:bg-[var(--theme-bg-card-hover)] text-[var(--theme-text-primary)] rounded-lg text-sm font-medium transition-colors cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed"
-            >
-              <Download className="w-4 h-4" />
-              Save Image
-            </button>
-          </div>
-        </div>
-      </div>
-
-      {/* Offscreen template for image generation */}
-      <LockScreenTemplate
-        ref={cardRef}
-        displayName={displayName}
-        company={company}
-        jobTitle={jobTitle}
-        avatarUrl={resolvedAvatarDataUrl}
-        socialLinks={filteredLinks}
-        screenWidth={screenDims.width}
-        screenHeight={screenDims.height}
-        logoDataUrl={logoDataUrl ?? undefined}
-      />
-    </>,
-    document.body
-  );
-}
diff --git a/src/components/LockScreenTemplate.tsx b/src/components/LockScreenTemplate.tsx
deleted file mode 100644
index 29119639..00000000
--- a/src/components/LockScreenTemplate.tsx
+++ /dev/null
@@ -1,288 +0,0 @@
-'use client';
-
-import { forwardRef } from 'react';
-import { QRCodeSVG } from 'qrcode.react';
-import type { SocialLink } from '@/lib/social-urls';
-
-interface LockScreenTemplateProps {
-  displayName: string | null;
-  company: string | null;
-  jobTitle: string | null;
-  avatarUrl: string | null;
-  socialLinks: SocialLink[];
-  screenWidth?: number;
-  screenHeight?: number;
-  logoDataUrl?: string;
-}
-
-const PLATFORM_LABELS: Record<string, string> = {
-  x: 'X / Twitter',
-  telegram: 'Telegram',
-  linkedin: 'LinkedIn',
-  friend: 'plan.wtf',
-};
-
-const PLATFORM_LOGOS: Record<string, string> = {
-  x: `data:image/svg+xml,${encodeURIComponent('<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect width="24" height="24" rx="4" fill="#fafaf9"/><path d="M17.176 4h2.645l-5.78 6.606 6.8 8.994h-4.676l-4.17-5.453-4.77 5.453H4.58l6.18-7.066L4.2 4h4.795l3.77 4.984zm-.928 14.016h1.466L8.005 5.506H6.44z" fill="#0c0a09"/></svg>')}`,
-  telegram: `data:image/svg+xml,${encodeURIComponent('<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect width="24" height="24" rx="4" fill="#fafaf9"/><path d="M11.944 3A9 9 0 0 0 3 12a9 9 0 0 0 9 9 9 9 0 0 0 9-9 9 9 0 0 0-9-9zm3.722 5.418c.075-.001.241.017.349.105a.38.38 0 0 1 .128.244c.012.07.027.23.015.354-.135 1.424-.721 4.877-1.02 6.47-.126.675-.374.901-.615.923-.522.049-.919-.345-1.425-.677-.792-.52-1.24-.843-2.009-1.35-.889-.585-.313-.908.194-1.433.133-.138 2.435-2.233 2.48-2.423.006-.024.011-.113-.042-.159s-.13-.031-.187-.018c-.08.018-1.345.856-3.796 2.51-.36.247-.685.367-.977.36-.321-.006-.939-.181-1.399-.33-.564-.184-1.012-.281-.973-.592.02-.162.244-.328.67-.498 2.624-1.143 4.372-1.897 5.249-2.261 2.499-1.04 3.019-1.221 3.357-1.226z" fill="#0c0a09"/></svg>')}`,
-  linkedin: `data:image/svg+xml,${encodeURIComponent('<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect width="24" height="24" rx="4" fill="#fafaf9"/><path d="M19.336 19.339h-3.065v-4.805c0-1.146-.023-2.62-1.596-2.62-1.597 0-1.842 1.247-1.842 2.536v4.889h-3.065V9.75h2.943v1.347h.042c.41-.776 1.412-1.596 2.907-1.596 3.107 0 3.68 2.044 3.68 4.703v5.135zM6.749 8.397c-.985 0-1.78-.8-1.78-1.782S5.764 4.833 6.749 4.833c.983 0 1.78.8 1.78 1.782s-.797 1.782-1.78 1.782zm1.537 10.942H5.212V9.75h3.074v9.589z" fill="#0c0a09"/></svg>')}`,
-  friend: `data:image/svg+xml,${encodeURIComponent('<svg viewBox="0 0 360 360" xmlns="http://www.w3.org/2000/svg"><rect width="360" height="360" rx="60" fill="#fafaf9"/><g transform="translate(50 40)"><rect y="71.62" width="260.39" height="9.16" fill="#0c0a09"/><rect x="65.86" y="3.83" width="18.38" height="51.31" rx="8.42" stroke="#0c0a09" stroke-width="7.66" fill="none"/><rect x="176.14" y="3.83" width="18.38" height="51.31" rx="8.42" stroke="#0c0a09" stroke-width="7.66" fill="none"/><path d="M56.67 40.16H23.04c-4.93 0-8.92 3.99-8.92 8.92v205.88c0 4.93 3.99 8.92 8.92 8.92h214.06c4.92 0 8.92-3.99 8.92-8.92V49.08c0-4.93-3.99-8.92-8.92-8.92h-33.38V26.04h33.38l.59.01c12.45.32 22.45 10.51 22.45 23.03v205.88l-.01.6c-.31 12.25-10.19 22.12-22.44 22.44l-.59.01H23.04l-.59-.01C10.19 277.68.32 267.81.01 255.55L0 254.96V49.08C0 36.55 10 26.36 22.45 26.05l.59-.01h33.63v14.12zm110.28 0H93.43V26.04h73.52v14.12z" fill="#0c0a09"/><rect x="58.2" y="106.45" width="37.99" height="37.99" rx="6.13" fill="#0c0a09"/><rect x="58.2" y="151.79" width="37.99" height="37.99" rx="6.13" fill="#0c0a09"/><rect x="110.89" y="151.79" width="37.99" height="37.99" rx="6.13" fill="#0c0a09"/><rect x="110.89" y="197.13" width="37.99" height="37.99" rx="6.13" fill="#0c0a09"/><rect x="163.58" y="151.79" width="37.99" height="37.99" rx="6.13" fill="#0c0a09"/><rect x="58.2" y="197.13" width="37.99" height="37.99" rx="6.13" fill="#0c0a09"/><rect x="110.89" y="106.45" width="37.99" height="37.99" rx="6.13" fill="#0c0a09"/><rect x="163.58" y="106.45" width="37.99" height="37.99" rx="6.13" fill="#0c0a09"/></g></svg>')}`,
-};
-
-// Base design dimensions (iPhone 14/15)
-const BASE_W = 1170;
-const BASE_H = 2532;
-
-const LockScreenTemplate = forwardRef<HTMLDivElement, LockScreenTemplateProps>(
-  function LockScreenTemplate({ displayName, company, jobTitle, avatarUrl, socialLinks, screenWidth, screenHeight, logoDataUrl }, ref) {
-    const w = screenWidth || BASE_W;
-    const h = screenHeight || BASE_H;
-    const s = w / BASE_W; // scale factor based on width
-
-    // Protected zones (scaled) — keep content away from OS UI elements
-    const topSafe = Math.round(300 * s);       // clock / Dynamic Island
-    const bottomSafe = Math.round(200 * s);     // home indicator / flashlight+camera
-    const logoHeight = Math.round(88 * s);
-    const logoGap = Math.round(20 * s);
-
-    // Calculate available vertical space for profile + QR codes
-    // Avatar+name row (~140px) + company line (~36px) + gaps
-    const profileEstimate = Math.round(140 * s) + Math.round(36 * s) + Math.round(16 * s) * 2;
-    const fixedHeight = topSafe + profileEstimate + bottomSafe + logoHeight + logoGap + Math.round(80 * s) + Math.round(60 * s);
-    const availableForQr = h - fixedHeight;
-
-    const qrCount = socialLinks.length;
-    // Base QR sizes, then clamp to available vertical space
-    const baseQr = qrCount === 1 ? 1050 : qrCount === 2 ? 680 : qrCount >= 4 ? 460 : 560;
-    let qrSize = Math.round(baseQr * s);
-
-    // For stacked layouts, ensure QR codes fit vertically
-    if (qrCount === 2) {
-      const needed = qrSize * 2 + Math.round(30 * s) + Math.round(16 * s) * 2 + Math.round(28 * s) * 2;
-      if (needed > availableForQr) {
-        qrSize = Math.round((availableForQr - Math.round(30 * s) - Math.round(16 * s) * 2 - Math.round(28 * s) * 2) / 2);
-      }
-    } else if (qrCount >= 3) {
-      // 2 rows: need 2 QR heights + gaps + labels
-      const needed = qrSize * 2 + Math.round(40 * s) + Math.round(16 * s) * 2 + Math.round(28 * s) * 2;
-      if (needed > availableForQr) {
-        qrSize = Math.round((availableForQr - Math.round(40 * s) - Math.round(16 * s) * 2 - Math.round(28 * s) * 2) / 2);
-      }
-      // For 4 codes in 2x2 grid, also clamp to half the width minus gap
-      if (qrCount >= 4) {
-        const maxByWidth = Math.round((w - Math.round(40 * s) * 3) / 2); // 2 cols with padding+gap
-        qrSize = Math.min(qrSize, maxByWidth);
-      }
-    } else if (qrCount === 1) {
-      const needed = qrSize + Math.round(16 * s) + Math.round(28 * s);
-      if (needed > availableForQr) {
-        qrSize = availableForQr - Math.round(16 * s) - Math.round(28 * s);
-      }
-    }
-    qrSize = Math.max(qrSize, Math.round(100 * s)); // floor
-
-    return (
-      <div
-        ref={ref}
-        style={{
-          position: 'fixed',
-          left: '-9999px',
-          top: 0,
-          width: `${w}px`,
-          height: `${h}px`,
-          backgroundColor: '#0c0a09',
-          fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif',
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          boxSizing: 'border-box',
-        }}
-      >
-        {/* Top safe zone — clock / Dynamic Island */}
-        <div style={{ height: `${topSafe}px`, flexShrink: 0 }} />
-
-        {/* Push content group toward center */}
-        <div style={{ flex: 1 }} />
-
-        {/* Content group: profile + QR codes + branding */}
-        <div
-          style={{
-            display: 'flex',
-            flexDirection: 'column',
-            alignItems: 'center',
-            gap: `${Math.round(40 * s)}px`,
-          }}
-        >
-          {/* Profile section */}
-          <div
-            style={{
-              display: 'flex',
-              flexDirection: 'column',
-              alignItems: 'center',
-              gap: `${Math.round(16 * s)}px`,
-              paddingLeft: `${Math.round(60 * s)}px`,
-              paddingRight: `${Math.round(60 * s)}px`,
-            }}
-          >
-            {/* Avatar + Name row */}
-            <div
-              style={{
-                display: 'flex',
-                alignItems: 'center',
-                gap: `${Math.round(24 * s)}px`,
-              }}
-            >
-              {/* Avatar */}
-              {avatarUrl ? (
-                <img
-                  src={avatarUrl}
-                  alt=""
-                  crossOrigin="anonymous"
-                  style={{
-                    width: `${Math.round(140 * s)}px`,
-                    height: `${Math.round(140 * s)}px`,
-                    borderRadius: '50%',
-                    objectFit: 'cover',
-                    border: `${Math.round(4 * s)}px solid #292524`,
-                    flexShrink: 0,
-                  }}
-                />
-              ) : displayName ? (
-                <div
-                  style={{
-                    width: `${Math.round(140 * s)}px`,
-                    height: `${Math.round(140 * s)}px`,
-                    borderRadius: '50%',
-                    backgroundColor: '#292524',
-                    display: 'flex',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                    fontSize: `${Math.round(56 * s)}px`,
-                    fontWeight: 700,
-                    color: '#fbbf24',
-                    border: `${Math.round(4 * s)}px solid #292524`,
-                    flexShrink: 0,
-                  }}
-                >
-                  {displayName.charAt(0).toUpperCase()}
-                </div>
-              ) : null}
-
-              {/* Name */}
-              {displayName && (
-                <div
-                  style={{
-                    fontSize: `${Math.round(72 * s)}px`,
-                    fontWeight: 800,
-                    color: '#fafaf9',
-                    lineHeight: 1.2,
-                    letterSpacing: '-0.02em',
-                  }}
-                >
-                  {displayName}
-                </div>
-              )}
-            </div>
-
-            {/* Company / Job Title */}
-            {(company || jobTitle) && (
-              <div
-                style={{
-                  fontSize: `${Math.round(36 * s)}px`,
-                  fontWeight: 500,
-                  color: '#a8a29e',
-                  lineHeight: 1.3,
-                }}
-              >
-                {[company, jobTitle].filter(Boolean).join('  |  ')}
-              </div>
-            )}
-          </div>
-
-          {/* QR codes */}
-          <div
-            style={{
-              display: qrCount >= 4 ? 'grid' : 'flex',
-              ...(qrCount >= 4
-                ? {
-                    gridTemplateColumns: `repeat(2, ${qrSize}px)`,
-                    justifyContent: 'center',
-                    justifyItems: 'center',
-                    alignItems: 'start',
-                    gap: `${Math.round(30 * s)}px`,
-                    padding: `0 ${Math.round(40 * s)}px`,
-                  }
-                : {
-                    flexDirection: qrCount === 2 ? 'column' as const : 'row' as const,
-                    flexWrap: 'wrap' as const,
-                    justifyContent: 'center',
-                    alignItems: 'center',
-                    gap: qrCount === 1 ? '0px' : qrCount === 2 ? `${Math.round(30 * s)}px` : `${Math.round(40 * s)}px`,
-                    paddingLeft: qrCount === 3 ? '0px' : `${Math.round(24 * s)}px`,
-                    paddingRight: qrCount === 3 ? '0px' : `${Math.round(24 * s)}px`,
-                  }),
-            }}
-          >
-            {socialLinks.map((link) => (
-              <div
-                key={link.platform}
-                style={{
-                  display: 'flex',
-                  flexDirection: 'column',
-                  alignItems: 'center',
-                  gap: `${Math.round(16 * s)}px`,
-                }}
-              >
-                <QRCodeSVG
-                  value={link.url}
-                  size={qrSize}
-                  level={PLATFORM_LOGOS[link.platform] ? 'H' : 'M'}
-                  fgColor="#fafaf9"
-                  bgColor="#0c0a09"
-                  imageSettings={PLATFORM_LOGOS[link.platform] ? {
-                    src: PLATFORM_LOGOS[link.platform],
-                    height: Math.round(qrSize * 0.22),
-                    width: Math.round(qrSize * 0.22),
-                    excavate: true,
-                  } : undefined}
-                />
-                <div
-                  style={{
-                    fontSize: `${Math.round(28 * s)}px`,
-                    fontWeight: 600,
-                    color: '#a8a29e',
-                    textAlign: 'center',
-                  }}
-                >
-                  {link.label}
-                </div>
-              </div>
-            ))}
-          </div>
-
-          {/* Branding */}
-          {logoDataUrl && (
-            <img
-              src={logoDataUrl}
-              alt="plan.wtf"
-              style={{
-                height: `${logoHeight}px`,
-                objectFit: 'contain',
-                opacity: 0.4,
-                filter: 'brightness(0) invert(1)',
-              }}
-            />
-          )}
-        </div>
-
-        {/* Push content group toward center */}
-        <div style={{ flex: 1 }} />
-
-        {/* Bottom safe zone — home indicator / flashlight+camera */}
-        <div style={{ height: `${bottomSafe}px`, flexShrink: 0 }} />
-      </div>
-    );
-  }
-);
-
-export default LockScreenTemplate;
diff --git a/src/components/MapMarker.tsx b/src/components/MapMarker.tsx
index cb664e87..fbe1b7a5 100644
--- a/src/components/MapMarker.tsx
+++ b/src/components/MapMarker.tsx
@@ -23,12 +23,13 @@ interface MapMarkerProps {
   isFeatured?: boolean;
 }
 
-/** Get wedge color based on start hour: white (day), dark accent (evening) */
+/** Get pin color based on start hour: white (morning/afternoon), transparent white (evening) */
 function getPinColor(startMinutes: number | null | undefined): string {
-  if (startMinutes == null) return '#FFFFFF';
+  if (startMinutes == null) return '#FFFFFF'; // default white
   const hour = startMinutes / 60;
-  if (hour >= 18) return 'var(--theme-map-pin-night)';
-  return '#FFFFFF';
+  if (hour < 12) return '#FFFFFF'; // white — morning
+  if (hour < 18) return '#FFFFFF'; // white — afternoon
+  return 'rgba(255,255,255,0.4)'; // transparent white — evening
 }
 
 /** SVG clock-face pin with a black wedge representing the event time */
@@ -53,8 +54,8 @@ function ClockPin({
   if (isAllDay || startMinutes == null) {
     return (
       <svg width={size} height={size} viewBox={`0 0 ${size} ${size}`}>
-        <circle cx={cx} cy={cy} r={ir} fill="var(--theme-map-pin)" />
-        <circle cx={cx} cy={cy} r={ir} fill="none" stroke="var(--theme-map-pin-night)" strokeWidth={1.5} strokeOpacity={0.8} />
+        <circle cx={cx} cy={cy} r={ir} fill={color} />
+        <circle cx={cx} cy={cy} r={ir} fill="none" stroke="white" strokeWidth={1.5} strokeOpacity={0.8} />
         {/* Clock tick marks at 12, 3, 6, 9 */}
         <line x1={cx} y1={cy - ir} x2={cx} y2={cy - ir + 3} stroke="white" strokeWidth={1} strokeOpacity={0.7} />
         <line x1={cx + ir} y1={cy} x2={cx + ir - 3} y2={cy} stroke="white" strokeWidth={1} strokeOpacity={0.7} />
@@ -87,9 +88,9 @@ function ClockPin({
 
   return (
     <svg width={size} height={size} viewBox={`0 0 ${size} ${size}`}>
-      <circle cx={cx} cy={cy} r={ir} fill="var(--theme-map-pin)" />
+      <circle cx={cx} cy={cy} r={ir} fill="#1c1917" />
       <path d={wedgePath} fill={color} />
-      <circle cx={cx} cy={cy} r={ir} fill="none" stroke="var(--theme-map-pin-night)" strokeWidth={1.5} strokeOpacity={0.8} />
+      <circle cx={cx} cy={cy} r={ir} fill="none" stroke="white" strokeWidth={1.5} strokeOpacity={0.8} />
       {/* Clock tick marks at 12, 3, 6, 9 */}
       <line x1={cx} y1={cy - ir} x2={cx} y2={cy - ir + 3} stroke="white" strokeWidth={1} strokeOpacity={0.7} />
       <line x1={cx + ir} y1={cy} x2={cx + ir - 3} y2={cy} stroke="white" strokeWidth={1} strokeOpacity={0.7} />
@@ -198,10 +199,10 @@ export function MapMarker({
             }}
             onClick={handleClick}
           >
-            <div className={`px-2 py-0.5 rounded text-[10px] max-w-[140px] leading-tight transition-colors shadow-md border ${
+            <div className={`px-2 py-0.5 rounded text-[10px] max-w-[140px] leading-tight transition-colors ${
               isFeatured
-                ? 'bg-[var(--theme-bg-secondary)] border-[var(--theme-accent)]/50 group-hover:bg-[var(--theme-bg-tertiary)] group-hover:border-[var(--theme-accent)]/70 text-[var(--theme-text-primary)] border-2'
-                : 'bg-[var(--theme-bg-secondary)] border-[var(--theme-border-primary)] group-hover:bg-[var(--theme-bg-tertiary)] text-[var(--theme-text-primary)]'
+                ? 'bg-[var(--theme-bg-secondary)]/90 border-2 border-[var(--theme-accent)]/50 group-hover:bg-[var(--theme-bg-tertiary)]/90 group-hover:border-[var(--theme-accent)]/70 text-[var(--theme-text-primary)]'
+                : 'bg-[var(--theme-bg-secondary)]/90 group-hover:bg-[var(--theme-bg-tertiary)]/90 text-[var(--theme-text-primary)]'
             }`}>
               <div className="truncate whitespace-nowrap">{label}</div>
               {showOrganizer && organizer && (
diff --git a/src/components/MapView.tsx b/src/components/MapView.tsx
index 3e816344..18aeb595 100644
--- a/src/components/MapView.tsx
+++ b/src/components/MapView.tsx
@@ -44,8 +44,6 @@ interface MapViewProps {
   onCheckIn?: (eventId: string) => void;
   checkInLoading?: boolean;
   liveEventIds?: Map<string, 'green' | 'yellow' | 'red'>;
-  getRsvpStatus?: (eventId: string) => 'idle' | 'confirmed';
-  onRsvp?: (eventId: string, lumaUrl: string, eventName: string) => void;
 }
 
 /**
@@ -81,14 +79,12 @@ export function MapView({
   onCheckIn,
   checkInLoading,
   liveEventIds,
-  getRsvpStatus,
-  onRsvp,
 }: MapViewProps) {
   const mapCenter = getTabConfig(conference ?? '', conferenceTabs).center;
   const { user } = useAuth();
   const { theme } = useTheme();
-  const mapStyle = (theme === 'paper' || theme === 'light' || theme === 'light-blue')
-    ? 'mapbox://styles/mapbox/streets-v12'
+  const mapStyle = (theme === 'paper' || theme === 'light')
+    ? 'mapbox://styles/mapbox/light-v11'
     : 'mapbox://styles/mapbox/dark-v11';
   const mapRef = useRef<MapRef>(null);
   const hasFittedRef = useRef(false);
@@ -412,6 +408,14 @@ export function MapView({
     setSelectedPOI(null);
   }, []);
 
+  const handleMultiEventSelect = useCallback(
+    (event: ETHDenverEvent) => {
+      setPopupEvents(null);
+      setPopupEvent(event);
+      onEventSelect?.(event);
+    },
+    [onEventSelect]
+  );
 
   const handlePOISelect = useCallback((poi: POI) => {
     setPopupEvent(null);
@@ -567,8 +571,6 @@ export function MapView({
           onCheckIn={onCheckIn}
           checkInLoading={checkInLoading}
           liveUrgency={liveEventIds?.get(popupEvent.id)}
-          rsvpStatus={getRsvpStatus?.(popupEvent.id)}
-          onRsvp={popupEvent.link ? () => onRsvp?.(popupEvent.id, popupEvent.link!, popupEvent.name) : undefined}
         />
       )}
 
@@ -578,6 +580,7 @@ export function MapView({
           latitude={popupCoords.lat}
           longitude={popupCoords.lng}
           onClose={handlePopupClose}
+          onSelectEvent={handleMultiEventSelect}
           itinerary={itinerary}
           onItineraryToggle={onItineraryToggle}
           friendsCountByEvent={friendsCountByEvent}
diff --git a/src/components/MapViewWrapper.tsx b/src/components/MapViewWrapper.tsx
index 3163732f..e4a628f9 100644
--- a/src/components/MapViewWrapper.tsx
+++ b/src/components/MapViewWrapper.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { memo, useState, useMemo } from 'react';
+import { useState, useMemo } from 'react';
 import dynamic from 'next/dynamic';
 import { ChevronUp, ChevronDown, MapPinOff } from 'lucide-react';
 import type { ETHDenverEvent, POI, POICategory, ReactionEmoji, FriendLocation, FriendInfo } from '@/lib/types';
@@ -44,11 +44,9 @@ interface MapViewWrapperProps {
   onCheckIn?: (eventId: string) => void;
   checkInLoading?: boolean;
   liveEventIds?: Map<string, 'green' | 'yellow' | 'red'>;
-  getRsvpStatus?: (eventId: string) => 'idle' | 'confirmed';
-  onRsvp?: (eventId: string, lumaUrl: string, eventName: string) => void;
 }
 
-export const MapViewWrapper = memo(function MapViewWrapper({
+export function MapViewWrapper({
   events,
   onEventSelect,
   itinerary,
@@ -73,8 +71,6 @@ export const MapViewWrapper = memo(function MapViewWrapper({
   onCheckIn,
   checkInLoading,
   liveEventIds,
-  getRsvpStatus,
-  onRsvp,
 }: MapViewWrapperProps) {
   const [drawerOpen, setDrawerOpen] = useState(false);
 
@@ -112,8 +108,6 @@ export const MapViewWrapper = memo(function MapViewWrapper({
         onCheckIn={onCheckIn}
         checkInLoading={checkInLoading}
         liveEventIds={liveEventIds}
-        getRsvpStatus={getRsvpStatus}
-        onRsvp={onRsvp}
       />
 
       {/* No-location drawer */}
@@ -131,8 +125,6 @@ export const MapViewWrapper = memo(function MapViewWrapper({
                     onItineraryToggle={onItineraryToggle}
                     friendsCount={friendsCountByEvent?.get(event.id)}
                     friendsGoing={friendsByEvent?.get(event.id)}
-                    rsvpStatus={getRsvpStatus?.(event.id)}
-                    onRsvp={event.link ? () => onRsvp?.(event.id, event.link!, event.name) : undefined}
                   />
                 ))}
               </div>
@@ -152,4 +144,4 @@ export const MapViewWrapper = memo(function MapViewWrapper({
       )}
     </div>
   );
-});
+}
diff --git a/src/components/NativeAdCard.tsx b/src/components/NativeAdCard.tsx
index e4da595d..a429ff12 100644
--- a/src/components/NativeAdCard.tsx
+++ b/src/components/NativeAdCard.tsx
@@ -79,7 +79,7 @@ export default function NativeAdCard({ ad, conference, onImpression, onClick }:
       className="block group"
       onClick={handleClick}
     >
-      <div className="bg-[var(--theme-bg-card)] border border-[var(--theme-border-primary)] rounded-lg p-4 transition-colors hover:border-[var(--theme-accent)]">
+      <div className="bg-[var(--theme-bg-card)] border border-[var(--theme-border-primary)] rounded-lg p-4 transition-colors hover:border-amber-500/30">
         <div className="flex gap-4">
           {ad.imageUrl && (
             <div className="w-[90px] h-[90px] flex-shrink-0 rounded-lg overflow-hidden bg-[var(--theme-bg-tertiary)]">
@@ -97,7 +97,7 @@ export default function NativeAdCard({ ad, conference, onImpression, onClick }:
               <span className="text-sm font-semibold text-[var(--theme-text-primary)] truncate">
                 {ad.title}
               </span>
-              <span className="flex-shrink-0 text-[9px] uppercase tracking-wider px-1.5 py-0.5 rounded bg-[var(--theme-accent-muted)] text-[var(--theme-accent)] border border-[var(--theme-accent-muted)]">
+              <span className="flex-shrink-0 text-[9px] uppercase tracking-wider px-1.5 py-0.5 rounded bg-amber-500/15 text-amber-400 border border-amber-500/20">
                 Ad
               </span>
             </div>
@@ -119,7 +119,7 @@ export default function NativeAdCard({ ad, conference, onImpression, onClick }:
             <p className="text-xs text-[var(--theme-text-secondary)] line-clamp-2 mb-2">
               {ad.description}
             </p>
-            <span className="inline-flex items-center gap-1 text-[var(--theme-accent)] hover:text-[var(--theme-accent-hover)] text-xs font-medium transition-colors">
+            <span className="inline-flex items-center gap-1 text-amber-400 hover:text-amber-300 text-xs font-medium transition-colors">
               {ad.badge || 'Learn more'}
               <ArrowRight className="w-3 h-3" />
             </span>
diff --git a/src/components/OGImage.tsx b/src/components/OGImage.tsx
index 1512f54a..71837d6b 100644
--- a/src/components/OGImage.tsx
+++ b/src/components/OGImage.tsx
@@ -3,8 +3,6 @@
 import { useState, useEffect, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import { X, ChevronLeft, ChevronRight } from 'lucide-react';
-import type { FriendInfo } from '@/lib/types';
-import { StarButton } from './StarButton';
 
 interface OGImageProps {
   url: string;
@@ -12,15 +10,11 @@ interface OGImageProps {
   rsvpUrl?: string;
   /** If provided, clicking the thumbnail calls this instead of opening the built-in lightbox */
   onOpenLightbox?: (imageUrl: string, rsvpUrl?: string) => void;
-  /** Props for built-in lightbox (used when onOpenLightbox is not provided, e.g. map view) */
-  isInItinerary?: boolean;
-  onItineraryToggle?: (eventId: string) => void;
-  friendsGoing?: FriendInfo[];
 }
 
 export const imageCache = new Map<string, string | null>();
 
-export function OGImage({ url, eventId, rsvpUrl, onOpenLightbox, isInItinerary, onItineraryToggle, friendsGoing }: OGImageProps) {
+export function OGImage({ url, eventId, rsvpUrl, onOpenLightbox }: OGImageProps) {
   const [imageUrl, setImageUrl] = useState<string | null>(
     imageCache.get(url) ?? null
   );
@@ -133,48 +127,16 @@ export function OGImage({ url, eventId, rsvpUrl, onOpenLightbox, isInItinerary,
               alt=""
               className="max-w-[60vw] max-h-[60vh] object-contain rounded-lg"
             />
-            <div className="flex items-center gap-3">
-              {eventId && onItineraryToggle && (
-                <StarButton
-                  eventId={eventId}
-                  isStarred={isInItinerary ?? false}
-                  onToggle={onItineraryToggle}
-                />
-              )}
-              {rsvpUrl && (
-                <a
-                  href={rsvpUrl}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="px-6 py-2.5 bg-white/10 hover:bg-white/20 text-white rounded-lg text-sm font-medium transition-colors"
-                >
-                  Event Page &rarr;
-                </a>
-              )}
-              {friendsGoing && friendsGoing.length > 0 && (
-                <div className="flex items-center">
-                  {friendsGoing.slice(0, 3).map((friend, i) => (
-                    <div
-                      key={friend.userId}
-                      className={`w-6 h-6 rounded-full border-2 border-white/30 shrink-0 overflow-hidden ${i > 0 ? '-ml-2' : ''}`}
-                      style={{ zIndex: 3 - i }}
-                      title={friend.displayName}
-                    >
-                      {friend.avatarUrl ? (
-                        <img src={friend.avatarUrl} alt="" className="w-full h-full object-cover" />
-                      ) : (
-                        <div
-                          className="w-full h-full flex items-center justify-center text-[9px] font-bold text-white"
-                          style={{ backgroundColor: `hsl(${Math.abs(friend.userId.split('').reduce((a, c) => ((a << 5) - a + c.charCodeAt(0)) | 0, 0)) % 360}, 60%, 45%)` }}
-                        >
-                          {(friend.displayName || '?')[0].toUpperCase()}
-                        </div>
-                      )}
-                    </div>
-                  ))}
-                </div>
-              )}
-            </div>
+            {rsvpUrl && (
+              <a
+                href={rsvpUrl}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="px-6 py-2.5 bg-white/10 hover:bg-white/20 text-white rounded-lg text-sm font-medium transition-colors"
+              >
+                RSVP / Event Page &rarr;
+              </a>
+            )}
           </div>
         </div>,
         document.body
@@ -193,13 +155,9 @@ interface FlyerLightboxProps {
   onClose: () => void;
   onPrev?: () => void;
   onNext?: () => void;
-  eventId?: string;
-  isInItinerary?: boolean;
-  onItineraryToggle?: (eventId: string) => void;
-  friendsGoing?: FriendInfo[];
 }
 
-export function FlyerLightbox({ imageUrl, rsvpUrl, onClose, onPrev, onNext, eventId, isInItinerary, onItineraryToggle, friendsGoing }: FlyerLightboxProps) {
+export function FlyerLightbox({ imageUrl, rsvpUrl, onClose, onPrev, onNext }: FlyerLightboxProps) {
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
       if (e.key === 'Escape') onClose();
@@ -251,48 +209,16 @@ export function FlyerLightbox({ imageUrl, rsvpUrl, onClose, onPrev, onNext, even
           alt=""
           className="max-w-[60vw] max-h-[60vh] object-contain rounded-lg"
         />
-        <div className="flex items-center gap-3">
-          {eventId && onItineraryToggle && (
-            <StarButton
-              eventId={eventId}
-              isStarred={isInItinerary ?? false}
-              onToggle={onItineraryToggle}
-            />
-          )}
-          {rsvpUrl && (
-            <a
-              href={rsvpUrl}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="px-6 py-2.5 bg-white/10 hover:bg-white/20 text-white rounded-lg text-sm font-medium transition-colors"
-            >
-              Event Page &rarr;
-            </a>
-          )}
-          {friendsGoing && friendsGoing.length > 0 && (
-            <div className="flex items-center">
-              {friendsGoing.slice(0, 3).map((friend, i) => (
-                <div
-                  key={friend.userId}
-                  className={`w-6 h-6 rounded-full border-2 border-white/30 shrink-0 overflow-hidden ${i > 0 ? '-ml-2' : ''}`}
-                  style={{ zIndex: 3 - i }}
-                  title={friend.displayName}
-                >
-                  {friend.avatarUrl ? (
-                    <img src={friend.avatarUrl} alt="" className="w-full h-full object-cover" />
-                  ) : (
-                    <div
-                      className="w-full h-full flex items-center justify-center text-[9px] font-bold text-white"
-                      style={{ backgroundColor: `hsl(${Math.abs(friend.userId.split('').reduce((a, c) => ((a << 5) - a + c.charCodeAt(0)) | 0, 0)) % 360}, 60%, 45%)` }}
-                    >
-                      {(friend.displayName || '?')[0].toUpperCase()}
-                    </div>
-                  )}
-                </div>
-              ))}
-            </div>
-          )}
-        </div>
+        {rsvpUrl && (
+          <a
+            href={rsvpUrl}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="px-6 py-2.5 bg-white/10 hover:bg-white/20 text-white rounded-lg text-sm font-medium transition-colors"
+          >
+            RSVP / Event Page &rarr;
+          </a>
+        )}
       </div>
     </div>,
     document.body
diff --git a/src/components/OnboardingWizard.tsx b/src/components/OnboardingWizard.tsx
index eba0e83f..09be461e 100644
--- a/src/components/OnboardingWizard.tsx
+++ b/src/components/OnboardingWizard.tsx
@@ -189,7 +189,7 @@ export function OnboardingWizard({
       <div className="fixed inset-0 z-[100] bg-black/50" onClick={handleClose} />
 
       {/* Modal */}
-      <div className="fixed inset-0 z-[110] flex items-center justify-center p-4" onClick={handleClose}>
+      <div className="fixed inset-0 z-[110] flex items-center justify-center p-4">
         <div
           className="bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] rounded-xl shadow-2xl w-full max-w-md max-h-[90vh] flex flex-col"
           onClick={(e) => e.stopPropagation()}
@@ -226,7 +226,7 @@ export function OnboardingWizard({
                   alt="sheeets"
                   width={160}
                   height={44}
-                  style={{ filter: 'var(--theme-logo-filter)' }}
+                  className="invert"
                   priority
                 />
                 <div className="space-y-2">
diff --git a/src/components/RsvpButton.tsx b/src/components/RsvpButton.tsx
deleted file mode 100644
index 53302b27..00000000
--- a/src/components/RsvpButton.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-'use client';
-
-import { MailCheck, MailOpen } from 'lucide-react';
-import { isLumaUrl } from '@/lib/luma';
-
-interface RsvpButtonProps {
-  eventLink: string;
-  status: 'idle' | 'confirmed';
-  onClick: () => void;
-}
-
-export function RsvpButton({ eventLink, status, onClick }: RsvpButtonProps) {
-  if (!isLumaUrl(eventLink)) return null;
-
-  if (status === 'confirmed') {
-    return (
-      <div
-        className="p-1 text-green-400"
-        title="RSVP'd"
-        aria-label="RSVP'd"
-      >
-        <MailCheck className="w-4 h-4" />
-      </div>
-    );
-  }
-
-  return (
-    <button
-      onClick={(e) => { e.stopPropagation(); e.preventDefault(); onClick(); }}
-      className="p-1 text-[var(--theme-text-muted)] hover:text-orange-400 transition-colors cursor-pointer"
-      title="RSVP"
-      aria-label="RSVP"
-    >
-      <MailOpen className="w-4 h-4" />
-    </button>
-  );
-}
diff --git a/src/components/RsvpOverlay.tsx b/src/components/RsvpOverlay.tsx
deleted file mode 100644
index 63b7b827..00000000
--- a/src/components/RsvpOverlay.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-'use client';
-
-import { useEffect, useState, useCallback } from 'react';
-import { createPortal } from 'react-dom';
-import { X, Copy, Check, User, Mail, Send, Building2, Briefcase, Linkedin, ExternalLink } from 'lucide-react';
-
-interface RsvpOverlayProps {
-  eventName: string;
-  lumaUrl: string;
-  userName?: string | null;
-  userEmail?: string | null;
-  userXHandle?: string | null;
-  userTelegram?: string | null;
-  userCompany?: string | null;
-  userLinkedin?: string | null;
-  userJobTitle?: string | null;
-  onConfirm: () => void;
-  onClose: () => void;
-}
-
-function getLumaSlug(url: string): string | null {
-  try {
-    const u = new URL(url);
-    const h = u.hostname;
-    if (h !== 'lu.ma' && h !== 'luma.com' && h !== 'www.luma.com') return null;
-    const parts = u.pathname.split('/').filter(Boolean);
-    return parts[0] || null;
-  } catch {
-    return null;
-  }
-}
-
-function CopyField({ icon, value }: { icon: React.ReactNode; value: string }) {
-  const [copied, setCopied] = useState(false);
-
-  const handleCopy = useCallback(async () => {
-    try {
-      await navigator.clipboard.writeText(value);
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2000);
-    } catch {
-      // Fallback: do nothing if clipboard API unavailable
-    }
-  }, [value]);
-
-  return (
-    <button
-      onClick={handleCopy}
-      className="flex items-center gap-2 min-w-0 flex-1 rounded-md px-1.5 py-1 hover:bg-[var(--theme-bg-secondary)] transition-colors cursor-pointer text-left"
-      aria-label={`Copy ${value}`}
-    >
-      <span className="shrink-0 text-[var(--theme-text-muted)]">
-        {icon}
-      </span>
-      <span className="block text-xs text-[var(--theme-text-primary)] truncate min-w-0 flex-1">
-        {value}
-      </span>
-      <span className="shrink-0">
-        {copied ? (
-          <Check className="w-3.5 h-3.5 text-green-400" />
-        ) : (
-          <Copy className="w-3.5 h-3.5 text-[var(--theme-text-secondary)]" />
-        )}
-      </span>
-    </button>
-  );
-}
-
-export function RsvpOverlay({
-  eventName,
-  lumaUrl,
-  userName,
-  userEmail,
-  userXHandle,
-  userTelegram,
-  userCompany,
-  userLinkedin,
-  userJobTitle,
-  onConfirm,
-  onClose,
-}: RsvpOverlayProps) {
-  const slug = getLumaSlug(lumaUrl);
-
-  // Close on Escape key
-  useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') onClose();
-    };
-    document.addEventListener('keydown', handleKeyDown);
-    return () => document.removeEventListener('keydown', handleKeyDown);
-  }, [onClose]);
-
-  // Lock body scroll
-  useEffect(() => {
-    document.body.style.overflow = 'hidden';
-    return () => {
-      document.body.style.overflow = '';
-    };
-  }, []);
-
-  if (!slug) return null;
-
-  const hasCopyFields = userName || userEmail || userXHandle || userTelegram || userCompany || userLinkedin || userJobTitle;
-  const embedUrl = `https://lu.ma/embed/event/${slug}/simple`;
-
-  return createPortal(
-    <div
-      className="fixed inset-0 z-[90] flex items-end sm:items-center justify-center"
-      onClick={onClose}
-    >
-      {/* Dark backdrop */}
-      <div className="absolute inset-0 bg-black/60" />
-
-      {/* Modal container: bottom-sheet on mobile, centered on desktop */}
-      <div
-        className="relative w-full sm:max-w-lg bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] rounded-t-2xl sm:rounded-xl shadow-2xl flex flex-col"
-        style={{ height: '85vh', maxHeight: '85vh' }}
-        onClick={(e) => e.stopPropagation()}
-      >
-        {/* Use a CSS media query workaround via Tailwind for desktop height */}
-        <style>{`
-          @media (min-width: 640px) {
-            .rsvp-overlay-panel {
-              height: 80vh !important;
-              max-height: 80vh !important;
-            }
-          }
-        `}</style>
-        <div className="rsvp-overlay-panel flex flex-col h-full">
-          {/* Header */}
-          <div className="flex items-center justify-between px-4 py-3 border-b border-[var(--theme-border-primary)] shrink-0">
-            <div className="min-w-0 flex-1">
-              <h2 className="text-sm font-bold text-[var(--theme-text-primary)] truncate">
-                RSVP
-              </h2>
-              <a
-                href={lumaUrl}
-                target="_blank"
-                rel="noopener noreferrer"
-                className="inline-flex items-center gap-1 text-xs text-[var(--theme-text-secondary)] hover:underline truncate max-w-full"
-              >
-                <span className="truncate">{eventName}</span>
-                <ExternalLink className="w-3 h-3 shrink-0" />
-              </a>
-            </div>
-            <button
-              onClick={onClose}
-              className="p-1 text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] transition-colors cursor-pointer shrink-0 ml-2"
-              aria-label="Close"
-            >
-              <X className="w-5 h-5" />
-            </button>
-          </div>
-
-          {/* Sticky copy-fields bar */}
-          {hasCopyFields && (
-            <div className="grid grid-cols-2 gap-x-3 gap-y-1 px-4 py-2.5 border-b border-[var(--theme-border-primary)] bg-[var(--theme-bg-tertiary)] shrink-0">
-              {userName && <CopyField icon={<User className="w-3.5 h-3.5" />} value={userName} />}
-              {userEmail && <CopyField icon={<Mail className="w-3.5 h-3.5" />} value={userEmail} />}
-              {userXHandle && <CopyField icon={<span className="text-xs font-bold leading-none" style={{ fontSize: '13px' }}>𝕏</span>} value={`@${userXHandle}`} />}
-              {userTelegram && <CopyField icon={<Send className="w-3.5 h-3.5" />} value={`@${userTelegram}`} />}
-              {userCompany && <CopyField icon={<Building2 className="w-3.5 h-3.5" />} value={userCompany} />}
-              {userJobTitle && <CopyField icon={<Briefcase className="w-3.5 h-3.5" />} value={userJobTitle} />}
-              {userLinkedin && <CopyField icon={<Linkedin className="w-3.5 h-3.5" />} value={userLinkedin} />}
-            </div>
-          )}
-
-          {/* Luma iframe -- fills remaining space */}
-          <div className="flex-1 min-h-0">
-            <iframe
-              src={embedUrl}
-              className="w-full h-full border-0"
-              allow="payment"
-              title={`RSVP for ${eventName}`}
-            />
-          </div>
-
-          {/* Bottom action buttons */}
-          <div className="flex items-center gap-3 px-4 py-3 border-t border-[var(--theme-border-primary)] bg-[var(--theme-bg-secondary)] shrink-0">
-            <button
-              onClick={onClose}
-              className="flex-1 px-4 py-2.5 rounded-lg border border-[var(--theme-border-primary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] text-sm font-medium transition-colors cursor-pointer"
-            >
-              Cancel
-            </button>
-            <button
-              onClick={onConfirm}
-              className="flex-1 px-4 py-2.5 rounded-lg bg-green-600 hover:bg-green-500 text-white text-sm font-semibold transition-colors cursor-pointer"
-            >
-              Done — I RSVP'd
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>,
-    document.body
-  );
-}
diff --git a/src/components/SearchBar.tsx b/src/components/SearchBar.tsx
index 99842397..44f9bcc6 100644
--- a/src/components/SearchBar.tsx
+++ b/src/components/SearchBar.tsx
@@ -51,18 +51,18 @@ export function SearchBar({ value, onChange, eventCount }: SearchBarProps) {
 
   return (
     <div className="relative w-full max-w-md">
-      <Search className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-[var(--theme-filter-text)] pointer-events-none" />
+      <Search className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-[var(--theme-text-secondary)] pointer-events-none" />
       <input
         type="text"
         value={localValue}
         onChange={(e) => handleChange(e.target.value)}
         placeholder={eventCount != null ? `${eventCount} events` : 'Events'}
-        className="w-full pl-10 pr-9 py-2 bg-[var(--theme-filter-control-bg)] border border-[var(--theme-filter-control-border)] text-[var(--theme-filter-active)] placeholder-[var(--theme-filter-text)] rounded-lg text-sm focus:outline-none focus:border-[var(--theme-accent)] transition-colors"
+        className="w-full pl-10 pr-9 py-2 bg-[var(--theme-bg-input)] border border-[var(--theme-border-primary)] text-[var(--theme-text-primary)] placeholder-[var(--theme-text-muted)] rounded-lg text-sm focus:outline-none focus:border-[var(--theme-accent)] transition-colors"
       />
       {localValue && (
         <button
           onClick={handleClear}
-          className="absolute right-3 top-1/2 -translate-y-1/2 text-[var(--theme-filter-text)] hover:text-[var(--theme-filter-active)] transition-colors cursor-pointer"
+          className="absolute right-3 top-1/2 -translate-y-1/2 text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] transition-colors cursor-pointer"
           aria-label="Clear search"
         >
           <X className="w-4 h-4" />
diff --git a/src/components/ShareCardModal.tsx b/src/components/ShareCardModal.tsx
index 575b76fb..499586a5 100644
--- a/src/components/ShareCardModal.tsx
+++ b/src/components/ShareCardModal.tsx
@@ -7,7 +7,9 @@ import type { ETHDenverEvent } from '@/lib/types';
 import { formatDateLabel } from '@/lib/utils';
 import { sortByStartTime } from '@/lib/time-parse';
 import { trackShareCardOpen, trackShareCardCopy, trackShareCardDownload } from '@/lib/analytics';
+import { imageCache } from './OGImage';
 import ShareCardTemplate from './ShareCardTemplate';
+import type { ShareCardMode } from './ShareCardTemplate';
 
 interface ShareCardModalProps {
   isOpen: boolean;
@@ -32,18 +34,11 @@ export function ShareCardModal({
   const [showPastEvents, setShowPastEvents] = useState(false);
   const defaultTitle = displayName ? `${displayName}'s ${conferenceName} Plan` : `My ${conferenceName} Plan`;
   const [cardTitle, setCardTitle] = useState(defaultTitle);
-  const [hasUserEdited, setHasUserEdited] = useState(false);
-
-  // Update card title when displayName loads (profile is async)
-  useEffect(() => {
-    if (!hasUserEdited) {
-      setCardTitle(defaultTitle);
-    }
-  }, [defaultTitle, hasUserEdited]);
-
   const [previewUrl, setPreviewUrl] = useState<string | null>(null);
   const [generating, setGenerating] = useState(false);
   const [copyStatus, setCopyStatus] = useState<'idle' | 'copying' | 'copied'>('idle');
+  const [flyerImages, setFlyerImages] = useState<Map<string, string>>(new Map());
+  const [cardMode, setCardMode] = useState<ShareCardMode>('gallery');
   const cardRef = useRef<HTMLDivElement>(null);
   const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const trackedRef = useRef(false);
@@ -102,6 +97,64 @@ export function ShareCardModal({
     }
     setGenerating(true);
     try {
+      // --- Pre-fetch flyer images as data URLs (gallery mode only) ---
+      if (cardMode === 'gallery') {
+        const imageMap = new Map<string, string>();
+        const ogUrls = new Map<string, string>();
+        const uncachedItems: { eventId: string; url: string }[] = [];
+
+        for (const event of selectedEvents) {
+          if (!event.link) continue;
+          const cached = imageCache.get(event.link);
+          if (cached) {
+            ogUrls.set(event.id, cached);
+          } else if (cached === undefined) {
+            uncachedItems.push({ eventId: event.id, url: event.link });
+          }
+        }
+
+        if (uncachedItems.length > 0) {
+          try {
+            const res = await fetch('/api/og', {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({ items: uncachedItems.slice(0, 20) }),
+            });
+            if (res.ok) {
+              const data = await res.json();
+              const results = data.results as Record<string, string | null>;
+              for (const [eventId, imgUrl] of Object.entries(results)) {
+                if (imgUrl) ogUrls.set(eventId, imgUrl);
+                const item = uncachedItems.find(i => i.eventId === eventId);
+                if (item) imageCache.set(item.url, imgUrl ?? null);
+              }
+            }
+          } catch (err) {
+            console.error('Batch OG fetch failed:', err);
+          }
+        }
+
+        const proxyFetches = Array.from(ogUrls.entries()).map(async ([eventId, imgUrl]) => {
+          try {
+            const proxyRes = await fetch(`/api/image-proxy?url=${encodeURIComponent(imgUrl)}`);
+            if (!proxyRes.ok) return;
+            const blob = await proxyRes.blob();
+            const dataUrl = await new Promise<string>((resolve, reject) => {
+              const reader = new FileReader();
+              reader.onload = () => resolve(reader.result as string);
+              reader.onerror = reject;
+              reader.readAsDataURL(blob);
+            });
+            imageMap.set(eventId, dataUrl);
+          } catch { /* skip failed images */ }
+        });
+
+        await Promise.all(proxyFetches);
+        setFlyerImages(imageMap);
+      }
+
+      await new Promise(r => setTimeout(r, 50));
+
       const { toPng } = await import('html-to-image');
       const dataUrl = await toPng(cardRef.current, {
         pixelRatio: 2,
@@ -114,7 +167,7 @@ export function ShareCardModal({
     } finally {
       setGenerating(false);
     }
-  }, [selectedEvents.length]);
+  }, [selectedEvents, cardMode]);
 
   // Debounced preview regeneration when selection changes
   useEffect(() => {
@@ -126,7 +179,7 @@ export function ShareCardModal({
     return () => {
       if (debounceRef.current) clearTimeout(debounceRef.current);
     };
-  }, [isOpen, selectedEvents, cardTitle, generatePreview]);
+  }, [isOpen, selectedEvents, cardTitle, cardMode, generatePreview]);
 
   // Track open event
   useEffect(() => {
@@ -211,7 +264,7 @@ export function ShareCardModal({
       />
 
       {/* Modal */}
-      <div className="fixed inset-0 z-[110] flex items-center justify-center p-4" onClick={onClose}>
+      <div className="fixed inset-0 z-[110] flex items-center justify-center p-4">
         <div
           className="bg-[var(--theme-bg-secondary)] border border-[var(--theme-border-primary)] rounded-xl shadow-2xl w-full max-w-lg max-h-[90vh] flex flex-col"
           onClick={(e) => e.stopPropagation()}
@@ -237,12 +290,32 @@ export function ShareCardModal({
               <input
                 type="text"
                 value={cardTitle}
-                onChange={(e) => { setCardTitle(e.target.value); setHasUserEdited(true); }}
+                onChange={(e) => setCardTitle(e.target.value)}
                 className="w-full px-3 py-2 bg-[var(--theme-bg-primary)] border border-[var(--theme-border-primary)] rounded-lg text-[var(--theme-text-primary)] text-sm focus:outline-none focus:border-[var(--theme-accent)] transition-colors"
                 placeholder={defaultTitle}
               />
             </div>
 
+            {/* Card style toggle */}
+            <div className="flex rounded-lg border border-[var(--theme-border-primary)] overflow-hidden w-fit">
+              {([
+                { mode: 'gallery' as const, label: 'Flyers' },
+                { mode: 'text' as const, label: 'Text Only' },
+              ]).map(({ mode, label }) => (
+                <button
+                  key={mode}
+                  onClick={() => setCardMode(mode)}
+                  className={`px-3 py-1.5 text-xs font-medium transition-colors cursor-pointer ${
+                    cardMode === mode
+                      ? 'bg-[var(--theme-accent)] text-[var(--theme-accent-text)]'
+                      : 'bg-[var(--theme-bg-primary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)]'
+                  }`}
+                >
+                  {label}
+                </button>
+              ))}
+            </div>
+
             {/* Preview area */}
             <div className="rounded-lg border border-[var(--theme-border-primary)] bg-[var(--theme-bg-primary)] overflow-hidden">
               {generating && !previewUrl ? (
@@ -382,6 +455,8 @@ export function ShareCardModal({
         conferenceName={cardTitle || conferenceName}
         displayName={displayName}
         avatarUrl={avatarUrl}
+        flyerImages={flyerImages}
+        mode={cardMode}
       />
     </>,
     document.body
diff --git a/src/components/ShareCardTemplate.tsx b/src/components/ShareCardTemplate.tsx
index a1e05d11..49205802 100644
--- a/src/components/ShareCardTemplate.tsx
+++ b/src/components/ShareCardTemplate.tsx
@@ -5,17 +5,21 @@ import type { ETHDenverEvent } from '@/lib/types';
 import { formatDateLabel } from '@/lib/utils';
 import { sortByStartTime } from '@/lib/time-parse';
 
+export type ShareCardMode = 'gallery' | 'text';
+
 interface ShareCardTemplateProps {
   events: ETHDenverEvent[];
   conferenceName: string;
   displayName: string | null;
   avatarUrl?: string | null;
+  flyerImages?: Map<string, string>;
+  mode?: ShareCardMode;
 }
 
 const MAX_EVENTS = 15;
 
 const ShareCardTemplate = forwardRef<HTMLDivElement, ShareCardTemplateProps>(
-  function ShareCardTemplate({ events, conferenceName, displayName, avatarUrl }, ref) {
+  function ShareCardTemplate({ events, conferenceName, displayName, avatarUrl, flyerImages, mode = 'gallery' }, ref) {
     const dateGroups = useMemo(() => {
       const groupMap = new Map<string, ETHDenverEvent[]>();
       for (const event of events) {
@@ -32,10 +36,8 @@ const ShareCardTemplate = forwardRef<HTMLDivElement, ShareCardTemplateProps>(
         }));
     }, [events]);
 
-    // Truncate to MAX_EVENTS using reduce to avoid mutable variables
     const { truncatedGroups, truncated, remainingCount } = useMemo(() => {
       const remaining = events.length > MAX_EVENTS ? events.length - MAX_EVENTS : 0;
-
       const result = dateGroups.reduce<{
         groups: typeof dateGroups;
         count: number;
@@ -55,7 +57,6 @@ const ShareCardTemplate = forwardRef<HTMLDivElement, ShareCardTemplateProps>(
         },
         { groups: [], count: 0, isTruncated: false }
       );
-
       return {
         truncatedGroups: result.groups,
         truncated: result.isTruncated,
@@ -78,40 +79,19 @@ const ShareCardTemplate = forwardRef<HTMLDivElement, ShareCardTemplateProps>(
         }}
       >
         {/* Header */}
-        <div
-          style={{
-            display: 'flex',
-            alignItems: 'center',
-            gap: '18px',
-            marginBottom: '8px',
-          }}
-        >
+        <div style={{ display: 'flex', alignItems: 'center', gap: '18px', marginBottom: '8px' }}>
           {avatarUrl ? (
             <img
               src={avatarUrl}
               alt=""
-              style={{
-                width: '56px',
-                height: '56px',
-                borderRadius: '50%',
-                objectFit: 'cover',
-                flexShrink: 0,
-              }}
+              style={{ width: '56px', height: '56px', borderRadius: '50%', objectFit: 'cover', flexShrink: 0 }}
             />
           ) : displayName ? (
             <div
               style={{
-                width: '56px',
-                height: '56px',
-                borderRadius: '50%',
-                backgroundColor: '#292524',
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'center',
-                fontSize: '24px',
-                fontWeight: 700,
-                color: '#fbbf24',
-                flexShrink: 0,
+                width: '56px', height: '56px', borderRadius: '50%', backgroundColor: '#292524',
+                display: 'flex', alignItems: 'center', justifyContent: 'center',
+                fontSize: '24px', fontWeight: 700, color: '#fbbf24', flexShrink: 0,
               }}
             >
               {displayName.charAt(0).toUpperCase()}
@@ -119,13 +99,8 @@ const ShareCardTemplate = forwardRef<HTMLDivElement, ShareCardTemplateProps>(
           ) : null}
           <div
             style={{
-              fontSize: '44px',
-              fontWeight: 800,
-              color: '#fafaf9',
-              lineHeight: 1.2,
-              letterSpacing: '-0.02em',
-              flex: 1,
-              minWidth: 0,
+              fontSize: '44px', fontWeight: 800, color: '#fafaf9',
+              lineHeight: 1.2, letterSpacing: '-0.02em', flex: 1, minWidth: 0,
             }}
           >
             {conferenceName}
@@ -133,14 +108,7 @@ const ShareCardTemplate = forwardRef<HTMLDivElement, ShareCardTemplateProps>(
         </div>
 
         {/* Amber separator */}
-        <div
-          style={{
-            height: '3px',
-            backgroundColor: '#f59e0b',
-            borderRadius: '2px',
-            margin: '24px 0',
-          }}
-        />
+        <div style={{ height: '3px', backgroundColor: '#f59e0b', borderRadius: '2px', margin: '24px 0' }} />
 
         {/* Events block */}
         <div>
@@ -149,90 +117,119 @@ const ShareCardTemplate = forwardRef<HTMLDivElement, ShareCardTemplateProps>(
               {/* Day header */}
               <div
                 style={{
-                  fontSize: '20px',
-                  fontWeight: 700,
-                  color: '#fbbf24',
-                  textTransform: 'uppercase',
-                  letterSpacing: '0.08em',
-                  marginBottom: '14px',
-                  paddingBottom: '8px',
-                  borderBottom: '1px solid #292524',
+                  fontSize: '20px', fontWeight: 700, color: '#fbbf24',
+                  textTransform: 'uppercase', letterSpacing: '0.08em',
+                  marginBottom: '14px', paddingBottom: '8px', borderBottom: '1px solid #292524',
                 }}
               >
                 {group.label}
               </div>
 
-              {/* Event rows */}
-              {group.events.map((event) => {
-                const timeDisplay = event.isAllDay
-                  ? 'All Day'
-                  : `${event.startTime}${event.endTime ? ` - ${event.endTime}` : ''}`;
-
-                return (
-                  <div
-                    key={event.id}
-                    style={{
-                      display: 'flex',
-                      alignItems: 'baseline',
-                      padding: '10px 0',
-                      gap: '16px',
-                    }}
-                  >
-                    {/* Time */}
-                    <div
-                      style={{
-                        fontSize: '18px',
-                        color: '#a8a29e',
-                        minWidth: '140px',
-                        flexShrink: 0,
-                        whiteSpace: 'nowrap',
-                      }}
-                    >
-                      {timeDisplay}
-                    </div>
-
-                    {/* Event details */}
-                    <div style={{ flex: 1, minWidth: 0 }}>
+              {mode === 'gallery' ? (
+                /* Gallery grid */
+                <div style={{ display: 'flex', flexWrap: 'wrap', gap: '12px' }}>
+                  {group.events.map((event) => {
+                    const flyerDataUrl = flyerImages?.get(event.id);
+                    const timeDisplay = event.isAllDay
+                      ? 'All Day'
+                      : `${event.startTime || ''}${event.endTime ? ` - ${event.endTime}` : ''}`;
+
+                    return (
+                      <div key={event.id} style={{ width: '486px' }}>
+                        <div style={{ marginBottom: '6px', padding: '0 2px' }}>
+                          <div
+                            style={{
+                              fontSize: '22px', fontWeight: 700, color: '#fafaf9',
+                              lineHeight: 1.3, overflow: 'hidden',
+                              textOverflow: 'ellipsis', whiteSpace: 'nowrap',
+                            }}
+                          >
+                            {event.name}
+                          </div>
+                          {timeDisplay && (
+                            <div style={{ fontSize: '19px', fontWeight: 500, color: '#d6d3d1', marginTop: '2px' }}>
+                              {timeDisplay}
+                            </div>
+                          )}
+                        </div>
+                        {flyerDataUrl ? (
+                          <img
+                            src={flyerDataUrl}
+                            alt=""
+                            style={{
+                              width: '486px', height: '486px', objectFit: 'cover',
+                              borderRadius: '8px', display: 'block',
+                            }}
+                          />
+                        ) : (
+                          <div
+                            style={{
+                              width: '486px', height: '486px', backgroundColor: '#1c1917',
+                              borderRadius: '8px',
+                            }}
+                          />
+                        )}
+                      </div>
+                    );
+                  })}
+                </div>
+              ) : (
+                /* Text-only list */
+                <div>
+                  {group.events.map((event) => {
+                    const timeDisplay = event.isAllDay
+                      ? 'All Day'
+                      : `${event.startTime || ''}${event.endTime ? ` - ${event.endTime}` : ''}`;
+
+                    return (
                       <div
+                        key={event.id}
                         style={{
-                          fontSize: '22px',
-                          fontWeight: 600,
-                          color: '#fafaf9',
-                          lineHeight: 1.3,
+                          display: 'flex', alignItems: 'baseline',
+                          padding: '10px 0', gap: '16px',
                         }}
                       >
-                        {event.name}
-                      </div>
-                      {event.address && (
                         <div
                           style={{
-                            fontSize: '16px',
-                            color: '#78716c',
-                            marginTop: '3px',
-                            overflow: 'hidden',
-                            textOverflow: 'ellipsis',
-                            whiteSpace: 'nowrap',
+                            fontSize: '18px', color: '#a8a29e',
+                            minWidth: '140px', flexShrink: 0, whiteSpace: 'nowrap',
                           }}
                         >
-                          {event.address}
+                          {timeDisplay}
+                        </div>
+                        <div style={{ flex: 1, minWidth: 0 }}>
+                          <div
+                            style={{
+                              fontSize: '22px', fontWeight: 600, color: '#fafaf9',
+                              lineHeight: 1.3,
+                            }}
+                          >
+                            {event.name}
+                          </div>
+                          {event.address && (
+                            <div
+                              style={{
+                                fontSize: '16px', color: '#78716c', marginTop: '3px',
+                                overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',
+                              }}
+                            >
+                              {event.address}
+                            </div>
+                          )}
                         </div>
-                      )}
-                    </div>
-                  </div>
-                );
-              })}
+                      </div>
+                    );
+                  })}
+                </div>
+              )}
             </div>
           ))}
 
-          {/* Truncation notice */}
           {truncated && remainingCount > 0 && (
             <div
               style={{
-                fontSize: '18px',
-                color: '#a8a29e',
-                fontStyle: 'italic',
-                textAlign: 'center',
-                padding: '16px 0',
+                fontSize: '18px', color: '#a8a29e', fontStyle: 'italic',
+                textAlign: 'center', padding: '16px 0',
               }}
             >
               ... and {remainingCount} more event{remainingCount !== 1 ? 's' : ''}
@@ -241,22 +238,11 @@ const ShareCardTemplate = forwardRef<HTMLDivElement, ShareCardTemplateProps>(
         </div>
 
         {/* Footer */}
-        <div
-          style={{
-            marginTop: '32px',
-            paddingTop: '20px',
-            borderTop: '1px solid #292524',
-            textAlign: 'center',
-          }}
-        >
+        <div style={{ marginTop: '32px', paddingTop: '20px', borderTop: '1px solid #292524', textAlign: 'center' }}>
           <img
             src="/logo.png"
             alt="plan.wtf"
-            style={{
-              height: '28px',
-              filter: 'invert(1)',
-              opacity: 0.5,
-            }}
+            style={{ height: '28px', filter: 'invert(1)', opacity: 0.5 }}
           />
         </div>
       </div>
diff --git a/src/components/SponsorsTicker.tsx b/src/components/SponsorsTicker.tsx
index 9fd4500c..2a8dd731 100644
--- a/src/components/SponsorsTicker.tsx
+++ b/src/components/SponsorsTicker.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { memo, useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 import { SponsorEntry } from '@/lib/types';
 import { trackAdClick, trackAdImpression } from '@/lib/analytics';
 import { trackAdEvent, slugifySponsor } from '@/lib/ad-tracking';
@@ -24,7 +24,7 @@ interface SponsorsTickerProps {
   onSponsorClick?: (url: string) => void;
 }
 
-export const SponsorsTicker = memo(function SponsorsTicker({ sponsors, conference, onImpression, onSponsorClick }: SponsorsTickerProps) {
+export function SponsorsTicker({ sponsors, conference, onImpression, onSponsorClick }: SponsorsTickerProps) {
   const sponsorList = sponsors && sponsors.length > 0 ? sponsors : defaultSponsors;
 
   const tickerRef = useRef<HTMLDivElement>(null);
@@ -94,10 +94,10 @@ export const SponsorsTicker = memo(function SponsorsTicker({ sponsors, conferenc
   );
 
   return (
-    <div ref={tickerRef} className="w-full overflow-hidden border-b border-[var(--theme-ticker-border)] py-1.5 bg-[var(--theme-ticker-bg)]">
+    <div ref={tickerRef} className="w-full overflow-hidden border-b py-1.5" style={{ backgroundColor: 'color-mix(in srgb, var(--theme-bg-primary) 80%, transparent)', borderColor: 'color-mix(in srgb, var(--theme-border-secondary) 50%, transparent)' }}>
       <div className="sponsors-scroll inline-flex whitespace-nowrap text-xs text-[var(--theme-text-secondary)]">
         {item}{item}{item}{item}{item}{item}{item}{item}
       </div>
     </div>
   );
-});
+}
diff --git a/src/components/StarButton.tsx b/src/components/StarButton.tsx
index a8420bb5..dd83afc1 100644
--- a/src/components/StarButton.tsx
+++ b/src/components/StarButton.tsx
@@ -34,7 +34,7 @@ export function StarButton({
         containerSize,
         isStarred
           ? 'text-[var(--theme-accent)] border-[var(--theme-accent)] bg-[var(--theme-accent-muted)]'
-          : 'text-[var(--theme-text-secondary)] border-[var(--theme-border-primary)] hover:text-[var(--theme-text-primary)] hover:border-[var(--theme-text-secondary)] hover:bg-white',
+          : 'text-[var(--theme-text-secondary)] border-[var(--theme-border-primary)] hover:text-[var(--theme-text-primary)] hover:border-[var(--theme-text-secondary)]',
       )}
       aria-label={isStarred ? 'Remove from plan' : 'Add to plan'}
       title={
diff --git a/src/components/SubmitEventModal.tsx b/src/components/SubmitEventModal.tsx
index 79b2a07c..365621c3 100644
--- a/src/components/SubmitEventModal.tsx
+++ b/src/components/SubmitEventModal.tsx
@@ -547,7 +547,7 @@ export function SubmitEventModal({ isOpen, onClose, upsellCopy, initialConferenc
                 </div>
                 <p className="text-[var(--theme-text-primary)] font-medium">Event submitted!</p>
                 <p className="text-[var(--theme-text-secondary)] text-sm mt-1">
-                  Your submission is pending review and will appear once approved.
+                  It will appear on the schedule shortly.
                 </p>
 
                 {upsellCopy && (
diff --git a/src/components/TableView.tsx b/src/components/TableView.tsx
index b376bbc8..43bbd241 100644
--- a/src/components/TableView.tsx
+++ b/src/components/TableView.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { memo, useRef, useState, useEffect, useMemo, useCallback } from 'react';
+import { useRef, useState, useEffect, useMemo, useCallback } from 'react';
 import { createPortal } from 'react-dom';
 import { AlertTriangle, Download, ExternalLink, Plus, Check, X, Users } from 'lucide-react';
 import type { ETHDenverEvent, ReactionEmoji, FriendInfo } from '@/lib/types';
@@ -14,7 +14,6 @@ import { CalendarIcon } from './icons/CalendarIcon';
 import { FriendAvatarStack } from './FriendAvatarStack';
 import UserAvatar from './UserAvatar';
 import { distanceMeters } from '@/lib/geo';
-import { imageCache, FlyerLightbox } from './OGImage';
 
 interface TableViewProps {
   events: ETHDenverEvent[];
@@ -40,8 +39,6 @@ interface TableViewProps {
   liveEventIds?: Map<string, 'green' | 'yellow' | 'red'>;
   /** User's current location for distance display */
   userLocation?: { lat: number; lng: number } | null;
-  getRsvpStatus?: (eventId: string) => 'idle' | 'confirmed';
-  onRsvp?: (eventId: string, lumaUrl: string, eventName: string) => void;
 }
 
 /** Format a dateISO string like "2026-02-10" into "Mon Feb 10" */
@@ -116,7 +113,7 @@ function FriendsGoingModal({ eventName, friends, onClose }: { eventName: string;
 
 const COLUMN_COUNT = 7; // star, friends, time, organizer, event, location, tags
 
-export const TableView = memo(function TableView({
+export function TableView({
   events,
   totalCount,
   itinerary,
@@ -135,8 +132,6 @@ export const TableView = memo(function TableView({
   onSignIn,
   liveEventIds,
   userLocation,
-  getRsvpStatus,
-  onRsvp,
 }: TableViewProps) {
   const scrollContainerRef = useRef<HTMLDivElement>(null);
   const separatorRefs = useRef<Map<string, HTMLTableRowElement>>(new Map());
@@ -148,72 +143,6 @@ export const TableView = memo(function TableView({
 
   const groups = useMemo(() => groupByDate(events), [events]);
 
-  /* ---- flyer lightbox navigation ---- */
-  const [lightboxEventIndex, setLightboxEventIndex] = useState<number | null>(null);
-  const [, setImageLoadTick] = useState(0);
-
-  const allEvents = useMemo(() => groups.flatMap((g) => g.events), [groups]);
-
-  const lightboxEvent = lightboxEventIndex !== null ? allEvents[lightboxEventIndex] : null;
-  const lightboxImageUrl = lightboxEvent?.link
-    ? imageCache.get(lightboxEvent.link) ?? null
-    : null;
-  const lightboxRsvpUrl = lightboxEvent?.link;
-
-  const hasImage = useCallback((idx: number) => {
-    const ev = allEvents[idx];
-    return !!(ev?.link && imageCache.get(ev.link));
-  }, [allEvents]);
-
-  const canPrev = lightboxEventIndex !== null && allEvents.slice(0, lightboxEventIndex).some((ev) => ev.link && imageCache.get(ev.link));
-  const canNext = lightboxEventIndex !== null && allEvents.slice(lightboxEventIndex + 1).some((ev) => ev.link && imageCache.get(ev.link));
-
-  useEffect(() => {
-    if (lightboxEventIndex === null) return;
-    const toPreload: number[] = [lightboxEventIndex];
-    for (let d = 1; d <= 2; d++) {
-      if (lightboxEventIndex + d < allEvents.length) toPreload.push(lightboxEventIndex + d);
-      if (lightboxEventIndex - d >= 0) toPreload.push(lightboxEventIndex - d);
-    }
-    for (const pos of toPreload) {
-      const ev = allEvents[pos];
-      if (ev.link && !imageCache.has(ev.link)) {
-        const params = new URLSearchParams({ url: ev.link });
-        if (ev.id) params.set('eventId', ev.id);
-        fetch(`/api/og?${params.toString()}`)
-          .then((res) => res.json())
-          .then((data) => {
-            imageCache.set(ev.link!, data.imageUrl);
-            setImageLoadTick((n) => n + 1);
-          })
-          .catch(() => {
-            imageCache.set(ev.link!, null);
-            setImageLoadTick((n) => n + 1);
-          });
-      }
-    }
-  }, [lightboxEventIndex, allEvents]);
-
-  const handleLightboxPrev = useCallback(() => {
-    if (!canPrev) return;
-    setLightboxEventIndex((i) => {
-      for (let j = i! - 1; j >= 0; j--) {
-        if (hasImage(j)) return j;
-      }
-      return i;
-    });
-  }, [canPrev, hasImage]);
-
-  const handleLightboxNext = useCallback(() => {
-    if (!canNext) return;
-    setLightboxEventIndex((i) => {
-      for (let j = i! + 1; j < allEvents.length; j++) {
-        if (hasImage(j)) return j;
-      }
-      return i;
-    });
-  }, [canNext, hasImage, allEvents.length]);
-
   // Compute dynamic tags column width based on max tag count across visible events
   const tagsColWidth = useMemo(() => {
     const maxTags = Math.min(10, events.reduce((max, e) => Math.max(max, e.tags.length), 0));
@@ -399,7 +328,7 @@ export const TableView = memo(function TableView({
             <col style={{ width: `calc((100% - 36px - 44px - 100px - ${tagsColWidth}px) * 0.28)` }} />             {/* where */}
             <col style={{ width: tagsColWidth }} />                                                                {/* tags */}
           </colgroup>
-          <thead className="text-xs uppercase tracking-wider text-[var(--theme-table-header-text)] bg-[var(--theme-table-header-bg)] border-b border-[var(--theme-border-primary)] sticky top-0 z-20">
+          <thead className="text-xs uppercase tracking-wider text-[var(--theme-text-secondary)] bg-[var(--theme-bg-secondary)] border-b border-[var(--theme-border-primary)] sticky top-0 z-20">
             <tr>
               <th className="py-2.5"><div className="flex justify-center"><CalendarIcon className="w-5 h-5" /></div></th>
               <th className="px-1 py-2.5 text-center" title={!isSignedIn ? 'Sign in to add friends and see who\'s going' : 'Friends going'}><Users className="w-3.5 h-3.5 mx-auto" /></th>
@@ -407,7 +336,7 @@ export const TableView = memo(function TableView({
                 {currentDateLabel === 'Time' ? (
                   'WHEN'
                 ) : (
-                  <span className="text-[var(--theme-table-header-text)] font-semibold">
+                  <span className="text-[var(--theme-accent)] font-semibold" style={{ opacity: 0.8 }}>
                     {currentDateLabel.toUpperCase()}
                   </span>
                 )}
@@ -484,31 +413,9 @@ export const TableView = memo(function TableView({
           onToggleReaction={onToggleReaction}
           commentCount={commentCounts?.get(selectedEvent.id)}
           onClose={() => setSelectedEvent(null)}
-          rsvpStatus={getRsvpStatus?.(selectedEvent.id)}
-          onRsvp={selectedEvent.link ? () => onRsvp?.(selectedEvent.id, selectedEvent.link!, selectedEvent.name) : undefined}
-          onOpenLightbox={() => {
-            const idx = allEvents.findIndex((e) => e.id === selectedEvent.id);
-            if (idx >= 0) {
-              setSelectedEvent(null);
-              setLightboxEventIndex(idx);
-            }
-          }}
         />,
         document.body
       )}
-      {lightboxEventIndex !== null && lightboxImageUrl && lightboxEvent && (
-        <FlyerLightbox
-          imageUrl={lightboxImageUrl}
-          rsvpUrl={lightboxRsvpUrl}
-          onClose={() => setLightboxEventIndex(null)}
-          onPrev={canPrev ? handleLightboxPrev : undefined}
-          onNext={canNext ? handleLightboxNext : undefined}
-          eventId={lightboxEvent.id}
-          isInItinerary={itinerary?.has(lightboxEvent.id)}
-          onItineraryToggle={onItineraryToggle}
-          friendsGoing={friendsByEvent?.get(lightboxEvent.id)}
-        />
-      )}
       {friendsModalEvent && createPortal(
         <FriendsGoingModal
           eventName={friendsModalEvent.name}
@@ -519,7 +426,7 @@ export const TableView = memo(function TableView({
       )}
     </div>
   );
-});
+}
 
 /** Modal overlay showing full EventCard for a selected table row */
 function EventDetailModal({
@@ -533,9 +440,6 @@ function EventDetailModal({
   onToggleReaction,
   commentCount,
   onClose,
-  rsvpStatus,
-  onRsvp,
-  onOpenLightbox,
 }: {
   event: ETHDenverEvent;
   isInItinerary: boolean;
@@ -547,9 +451,6 @@ function EventDetailModal({
   onToggleReaction?: (eventId: string, emoji: ReactionEmoji) => void;
   commentCount?: number;
   onClose: () => void;
-  rsvpStatus?: 'idle' | 'confirmed';
-  onRsvp?: () => void;
-  onOpenLightbox?: () => void;
 }) {
   return (
     <>
@@ -568,9 +469,6 @@ function EventDetailModal({
             reactions={reactions}
             onToggleReaction={onToggleReaction}
             commentCount={commentCount}
-            rsvpStatus={rsvpStatus}
-            onRsvp={onRsvp}
-            onOpenLightbox={onOpenLightbox ? () => onOpenLightbox() : undefined}
           />
         </div>
       </div>
@@ -619,13 +517,14 @@ function DateGroup({
       {/* Date separator row */}
       <tr
         ref={(el) => setSeparatorRef(group.dateISO, el)}
-        className="bg-[var(--theme-date-sep-bg)]"
+        className="bg-[var(--theme-bg-secondary)]/80"
         data-date={group.dateISO}
       >
-        <td className="border-b border-[var(--theme-date-sep-border)]"></td>
+        <td className="border-b border-[var(--theme-border-primary)]/70"></td>
         <td
           colSpan={COLUMN_COUNT - 1}
-          className="px-3 py-1.5 text-xs font-semibold uppercase tracking-wider border-b border-[var(--theme-date-sep-border)] text-[var(--theme-date-sep-text)]"
+          className="px-3 py-1.5 text-xs font-semibold uppercase tracking-wider border-b border-[var(--theme-border-primary)]/70"
+          style={{ color: 'var(--theme-accent)', opacity: 0.8 }}
         >
           {group.label}
         </td>
diff --git a/src/components/TagBadge.tsx b/src/components/TagBadge.tsx
index e2e5646b..28949106 100644
--- a/src/components/TagBadge.tsx
+++ b/src/components/TagBadge.tsx
@@ -40,6 +40,7 @@ import {
   Projector,
   Sparkle,
   Laugh,
+  Pizza,
   Rocket,
   type LucideIcon,
 } from 'lucide-react';
@@ -121,7 +122,7 @@ export const TAG_ICONS: Record<string, IconComponent> = {
   'Film/TV': Clapperboard,
   'Screening': Projector,
   'Vibe': Sparkle,
-  'Food': UtensilsCrossed,
+  'Food': Pizza,
   'Drinks': Beer,
   'Comedy': Laugh,
 };
diff --git a/src/components/ViewToggle.tsx b/src/components/ViewToggle.tsx
index 9b91c0d9..ae43501c 100644
--- a/src/components/ViewToggle.tsx
+++ b/src/components/ViewToggle.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Map, List, Table, LayoutGrid } from 'lucide-react';
+import { Map, List, Table } from 'lucide-react';
 import { ViewMode } from '@/lib/types';
 import { trackViewChange } from '@/lib/analytics';
 import clsx from 'clsx';
@@ -14,12 +14,11 @@ const views: { mode: ViewMode; icon: typeof Map; label: string }[] = [
   { mode: 'map', icon: Map, label: 'Map' },
   { mode: 'list', icon: List, label: 'List' },
   { mode: 'table', icon: Table, label: 'Table' },
-  { mode: 'gallery', icon: LayoutGrid, label: 'Gallery' },
 ];
 
 export function ViewToggle({ viewMode, onViewChange }: ViewToggleProps) {
   return (
-    <div className="flex rounded-lg border border-[var(--theme-header-control-border)] overflow-hidden">
+    <div className="flex rounded-lg border border-[var(--theme-border-primary)] overflow-hidden">
       {views.map(({ mode, icon: Icon, label }) => (
         <button
           key={mode}
@@ -27,12 +26,10 @@ export function ViewToggle({ viewMode, onViewChange }: ViewToggleProps) {
           className={clsx(
             'flex items-center gap-1.5 px-3 py-1.5 text-sm font-medium transition-colors cursor-pointer',
             viewMode === mode
-              ? 'text-[var(--theme-header-accent)]'
-              : 'text-[var(--theme-header-text)] hover:text-[var(--theme-header-text-hover)] active:text-[var(--theme-header-text-hover)]'
+              ? 'text-[var(--theme-accent)]'
+              : 'bg-[var(--theme-bg-secondary)] text-[var(--theme-text-secondary)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] active:text-[var(--theme-text-primary)] active:bg-[var(--theme-bg-tertiary)]'
           )}
-          style={viewMode === mode
-            ? { backgroundColor: 'var(--theme-header-accent-muted)' }
-            : { backgroundColor: 'var(--theme-header-control-bg)' }}
+          style={viewMode === mode ? { backgroundColor: 'var(--theme-accent-muted)' } : undefined}
           aria-label={`${label} view`}
         >
           <Icon className="w-4 h-4" />
diff --git a/src/components/admin/SubmissionsTab.tsx b/src/components/admin/SubmissionsTab.tsx
deleted file mode 100644
index 6489babf..00000000
--- a/src/components/admin/SubmissionsTab.tsx
+++ /dev/null
@@ -1,434 +0,0 @@
-'use client';
-
-import { useState, useEffect, useCallback } from 'react';
-import { Loader2, Check, X, Pencil, ChevronDown, ChevronUp, ExternalLink } from 'lucide-react';
-import type { Submission } from '@/lib/types';
-
-interface TabConfig {
-  gid: number;
-  name: string;
-  slug: string;
-  timezone: string;
-  dates: string[];
-  center: { lat: number; lng: number };
-}
-
-interface Props {
-  allConferenceTabs: TabConfig[];
-  password: string;
-}
-
-const inputClass = 'bg-stone-800 border border-stone-600 rounded-lg px-3 py-2 text-white text-sm w-full focus:border-blue-500 focus:outline-none';
-const btnPrimary = 'bg-blue-600 hover:bg-blue-700 text-white rounded-lg px-4 py-2 text-sm font-medium transition-colors cursor-pointer';
-const btnDanger = 'bg-red-600 hover:bg-red-700 text-white rounded-lg px-3 py-2 text-sm font-medium transition-colors cursor-pointer';
-
-function timeAgo(date: string): string {
-  const now = Date.now();
-  const then = new Date(date).getTime();
-  const seconds = Math.floor((now - then) / 1000);
-
-  if (seconds < 60) return 'just now';
-  const minutes = Math.floor(seconds / 60);
-  if (minutes < 60) return `${minutes}m ago`;
-  const hours = Math.floor(minutes / 60);
-  if (hours < 24) return `${hours}h ago`;
-  const days = Math.floor(hours / 24);
-  if (days < 30) return `${days}d ago`;
-  const months = Math.floor(days / 30);
-  return `${months}mo ago`;
-}
-
-const STATUS_BADGE: Record<string, string> = {
-  pending: 'bg-amber-500/20 text-amber-400',
-  approved: 'bg-green-500/20 text-green-400',
-  rejected: 'bg-red-500/20 text-red-400',
-};
-
-type StatusFilter = 'pending' | 'approved' | 'rejected' | 'all';
-
-const EDITABLE_FIELDS: { key: string; label: string; type: 'text' | 'boolean' }[] = [
-  { key: 'event_name', label: 'Name', type: 'text' },
-  { key: 'event_date', label: 'Date', type: 'text' },
-  { key: 'start_time', label: 'Start Time', type: 'text' },
-  { key: 'end_time', label: 'End Time', type: 'text' },
-  { key: 'organizer', label: 'Organizer', type: 'text' },
-  { key: 'address', label: 'Address', type: 'text' },
-  { key: 'cost', label: 'Cost', type: 'text' },
-  { key: 'tags', label: 'Tags', type: 'text' },
-  { key: 'link', label: 'Link', type: 'text' },
-  { key: 'has_food', label: 'Food', type: 'boolean' },
-  { key: 'has_bar', label: 'Bar', type: 'boolean' },
-  { key: 'note', label: 'Note', type: 'text' },
-];
-
-export default function SubmissionsTab({ allConferenceTabs, password }: Props) {
-  const [submissions, setSubmissions] = useState<Submission[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [statusFilter, setStatusFilter] = useState<StatusFilter>('pending');
-  const [conferenceFilter, setConferenceFilter] = useState('');
-  const [expandedId, setExpandedId] = useState<string | null>(null);
-  const [editingId, setEditingId] = useState<string | null>(null);
-  const [editFields, setEditFields] = useState<Record<string, string | boolean>>({});
-  const [actionLoading, setActionLoading] = useState<string | null>(null);
-  const [rejectingId, setRejectingId] = useState<string | null>(null);
-  const [rejectReason, setRejectReason] = useState('');
-
-  const pendingCount = submissions.filter((s) => s.status === 'pending').length;
-
-  const fetchSubmissions = useCallback(async () => {
-    setLoading(true);
-    try {
-      const params = new URLSearchParams({ password, status: statusFilter });
-      if (conferenceFilter) params.set('conference', conferenceFilter);
-      const res = await fetch(`/api/admin/submissions?${params}`);
-      const json = await res.json();
-      if (json.submissions) {
-        setSubmissions(json.submissions);
-      }
-    } catch (err) {
-      console.error('Failed to fetch submissions:', err);
-    } finally {
-      setLoading(false);
-    }
-  }, [password, statusFilter, conferenceFilter]);
-
-  useEffect(() => {
-    fetchSubmissions();
-  }, [fetchSubmissions]);
-
-  const handleApprove = async (id: string, edits?: Record<string, string | boolean>) => {
-    setActionLoading(id);
-    try {
-      const body: Record<string, unknown> = { password, action: 'approve', id };
-      if (edits) body.edits = edits;
-      const res = await fetch('/api/admin/submissions', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(body),
-      });
-      const json = await res.json();
-      if (json.success) {
-        setEditingId(null);
-        setExpandedId(null);
-        await fetchSubmissions();
-      } else {
-        alert(`Failed: ${json.error}`);
-      }
-    } catch (err) {
-      alert(`Error: ${err instanceof Error ? err.message : 'Unknown'}`);
-    } finally {
-      setActionLoading(null);
-    }
-  };
-
-  const handleReject = async (id: string) => {
-    setActionLoading(id);
-    try {
-      const res = await fetch('/api/admin/submissions', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          password,
-          action: 'reject',
-          id,
-          rejection_reason: rejectReason || undefined,
-        }),
-      });
-      const json = await res.json();
-      if (json.success) {
-        setRejectingId(null);
-        setRejectReason('');
-        setExpandedId(null);
-        await fetchSubmissions();
-      } else {
-        alert(`Failed: ${json.error}`);
-      }
-    } catch (err) {
-      alert(`Error: ${err instanceof Error ? err.message : 'Unknown'}`);
-    } finally {
-      setActionLoading(null);
-    }
-  };
-
-  const startEditing = (sub: Submission) => {
-    setEditingId(sub.id);
-    const fields: Record<string, string | boolean> = {};
-    for (const f of EDITABLE_FIELDS) {
-      fields[f.key] = sub[f.key as keyof Submission] as string | boolean;
-    }
-    setEditFields(fields);
-  };
-
-  const cancelEditing = () => {
-    setEditingId(null);
-    setEditFields({});
-  };
-
-  return (
-    <div className="max-w-5xl mx-auto space-y-4">
-      {/* Top bar: status filters + conference dropdown */}
-      <div className="flex flex-wrap items-center gap-3">
-        <div className="flex gap-1 bg-stone-900 rounded-lg p-1">
-          {(['pending', 'approved', 'rejected', 'all'] as StatusFilter[]).map((s) => (
-            <button
-              key={s}
-              onClick={() => setStatusFilter(s)}
-              className={`px-3 py-1.5 rounded-md text-sm font-medium transition-colors cursor-pointer ${
-                statusFilter === s
-                  ? 'bg-stone-800 text-white'
-                  : 'text-stone-400 hover:text-white'
-              }`}
-            >
-              {s.charAt(0).toUpperCase() + s.slice(1)}
-              {s === 'pending' && statusFilter === 'pending' && pendingCount > 0 && (
-                <span className="ml-1.5 bg-amber-500/20 text-amber-400 text-xs px-1.5 py-0.5 rounded-full">
-                  {pendingCount}
-                </span>
-              )}
-            </button>
-          ))}
-        </div>
-
-        <select
-          value={conferenceFilter}
-          onChange={(e) => setConferenceFilter(e.target.value)}
-          className="bg-stone-800 border border-stone-600 rounded-lg px-3 py-1.5 text-sm text-white focus:border-blue-500 focus:outline-none"
-        >
-          <option value="">All conferences</option>
-          {allConferenceTabs.map((t) => (
-            <option key={t.gid} value={t.name}>{t.name}</option>
-          ))}
-        </select>
-      </div>
-
-      {/* Loading state */}
-      {loading && (
-        <div className="flex items-center justify-center py-12">
-          <Loader2 className="w-6 h-6 animate-spin text-stone-400" />
-        </div>
-      )}
-
-      {/* Empty state */}
-      {!loading && submissions.length === 0 && (
-        <div className="text-center py-12 text-stone-500">
-          <p className="text-lg">No {statusFilter === 'all' ? '' : statusFilter} submissions</p>
-          <p className="text-sm mt-1">Submissions from the Add Event form will appear here.</p>
-        </div>
-      )}
-
-      {/* Submissions list */}
-      {!loading && submissions.map((sub) => {
-        const isExpanded = expandedId === sub.id;
-        const isEditing = editingId === sub.id;
-        const isRejecting = rejectingId === sub.id;
-        const isActioning = actionLoading === sub.id;
-
-        return (
-          <div
-            key={sub.id}
-            className="bg-stone-900 border border-stone-800 rounded-xl overflow-hidden"
-          >
-            {/* Collapsed card header */}
-            <button
-              onClick={() => {
-                setExpandedId(isExpanded ? null : sub.id);
-                if (isExpanded) {
-                  setEditingId(null);
-                  setRejectingId(null);
-                }
-              }}
-              className="w-full px-4 py-3 flex items-center gap-3 text-left hover:bg-stone-800/50 transition-colors cursor-pointer"
-            >
-              <div className="flex-1 min-w-0">
-                <div className="flex items-center gap-2 mb-1">
-                  <span className="font-medium text-white truncate">{sub.event_name}</span>
-                  <span className={`text-xs px-2 py-0.5 rounded-full ${STATUS_BADGE[sub.status]}`}>
-                    {sub.status}
-                  </span>
-                  <span className="text-xs bg-stone-700 text-stone-300 px-2 py-0.5 rounded-full">
-                    {sub.conference}
-                  </span>
-                </div>
-                <div className="text-sm text-stone-400 truncate">
-                  {sub.event_date}{sub.start_time ? ` at ${sub.start_time}` : ''}{sub.organizer ? ` -- ${sub.organizer}` : ''}
-                </div>
-              </div>
-              <span className="text-xs text-stone-500 whitespace-nowrap">{timeAgo(sub.created_at)}</span>
-              {isExpanded ? (
-                <ChevronUp className="w-4 h-4 text-stone-500 shrink-0" />
-              ) : (
-                <ChevronDown className="w-4 h-4 text-stone-500 shrink-0" />
-              )}
-            </button>
-
-            {/* Expanded details */}
-            {isExpanded && (
-              <div className="border-t border-stone-800 px-4 py-4 space-y-4">
-                {/* Field grid */}
-                <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-                  {EDITABLE_FIELDS.map((f) => {
-                    const value = isEditing
-                      ? editFields[f.key]
-                      : (sub[f.key as keyof Submission] as string | boolean);
-
-                    return (
-                      <div key={f.key}>
-                        <label className="text-xs text-stone-500 uppercase tracking-wide mb-1 block">
-                          {f.label}
-                        </label>
-                        {isEditing ? (
-                          f.type === 'boolean' ? (
-                            <label className="flex items-center gap-2 cursor-pointer">
-                              <input
-                                type="checkbox"
-                                checked={value as boolean}
-                                onChange={(e) =>
-                                  setEditFields((prev) => ({ ...prev, [f.key]: e.target.checked }))
-                                }
-                                className="rounded border-stone-600 bg-stone-800"
-                              />
-                              <span className="text-sm text-white">{value ? 'Yes' : 'No'}</span>
-                            </label>
-                          ) : (
-                            <input
-                              type="text"
-                              value={value as string}
-                              onChange={(e) =>
-                                setEditFields((prev) => ({ ...prev, [f.key]: e.target.value }))
-                              }
-                              className={inputClass}
-                            />
-                          )
-                        ) : f.type === 'boolean' ? (
-                          <span className={`text-sm ${value ? 'text-green-400' : 'text-stone-500'}`}>
-                            {value ? 'Yes' : 'No'}
-                          </span>
-                        ) : f.key === 'link' && value ? (
-                          <a
-                            href={value as string}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            className="text-sm text-blue-400 hover:text-blue-300 flex items-center gap-1 truncate"
-                          >
-                            {value as string}
-                            <ExternalLink className="w-3 h-3 shrink-0" />
-                          </a>
-                        ) : (
-                          <span className="text-sm text-white">{(value as string) || '--'}</span>
-                        )}
-                      </div>
-                    );
-                  })}
-                </div>
-
-                {/* Coords info */}
-                {(sub.coords_lat || sub.coords_lng) && (
-                  <div className="text-xs text-stone-500">
-                    Coords: {sub.coords_lat}, {sub.coords_lng}
-                  </div>
-                )}
-
-                {/* Rejection reason (if rejected) */}
-                {sub.status === 'rejected' && sub.rejection_reason && (
-                  <div className="bg-red-500/10 border border-red-500/20 rounded-lg px-3 py-2">
-                    <span className="text-xs text-red-400 uppercase tracking-wide">Rejection reason:</span>
-                    <p className="text-sm text-red-300 mt-1">{sub.rejection_reason}</p>
-                  </div>
-                )}
-
-                {/* Approved info */}
-                {sub.status === 'approved' && sub.sheet_row && (
-                  <div className="text-xs text-green-400">
-                    Written to sheet row {sub.sheet_row}
-                    {sub.reviewed_at && ` -- ${timeAgo(sub.reviewed_at)}`}
-                  </div>
-                )}
-
-                {/* Action buttons (only for pending) */}
-                {sub.status === 'pending' && !isEditing && !isRejecting && (
-                  <div className="flex gap-2 pt-2 border-t border-stone-800">
-                    <button
-                      onClick={() => handleApprove(sub.id)}
-                      disabled={isActioning}
-                      className="bg-green-600 hover:bg-green-700 text-white rounded-lg px-4 py-2 text-sm font-medium transition-colors cursor-pointer disabled:opacity-50 flex items-center gap-1.5"
-                    >
-                      {isActioning ? <Loader2 className="w-4 h-4 animate-spin" /> : <Check className="w-4 h-4" />}
-                      Approve
-                    </button>
-                    <button
-                      onClick={() => startEditing(sub)}
-                      className={btnPrimary + ' flex items-center gap-1.5'}
-                    >
-                      <Pencil className="w-4 h-4" />
-                      Edit & Approve
-                    </button>
-                    <button
-                      onClick={() => setRejectingId(sub.id)}
-                      className={btnDanger + ' flex items-center gap-1.5'}
-                    >
-                      <X className="w-4 h-4" />
-                      Reject
-                    </button>
-                  </div>
-                )}
-
-                {/* Edit mode actions */}
-                {isEditing && (
-                  <div className="flex gap-2 pt-2 border-t border-stone-800">
-                    <button
-                      onClick={() => handleApprove(sub.id, editFields)}
-                      disabled={isActioning}
-                      className="bg-green-600 hover:bg-green-700 text-white rounded-lg px-4 py-2 text-sm font-medium transition-colors cursor-pointer disabled:opacity-50 flex items-center gap-1.5"
-                    >
-                      {isActioning ? <Loader2 className="w-4 h-4 animate-spin" /> : <Check className="w-4 h-4" />}
-                      Save & Approve
-                    </button>
-                    <button
-                      onClick={cancelEditing}
-                      className="bg-stone-700 hover:bg-stone-600 text-white rounded-lg px-4 py-2 text-sm font-medium transition-colors cursor-pointer"
-                    >
-                      Cancel
-                    </button>
-                  </div>
-                )}
-
-                {/* Reject mode */}
-                {isRejecting && (
-                  <div className="space-y-2 pt-2 border-t border-stone-800">
-                    <input
-                      type="text"
-                      value={rejectReason}
-                      onChange={(e) => setRejectReason(e.target.value)}
-                      placeholder="Reason for rejection (optional)"
-                      className={inputClass}
-                      autoFocus
-                    />
-                    <div className="flex gap-2">
-                      <button
-                        onClick={() => handleReject(sub.id)}
-                        disabled={isActioning}
-                        className={btnDanger + ' flex items-center gap-1.5 disabled:opacity-50'}
-                      >
-                        {isActioning ? <Loader2 className="w-4 h-4 animate-spin" /> : <X className="w-4 h-4" />}
-                        Confirm Reject
-                      </button>
-                      <button
-                        onClick={() => {
-                          setRejectingId(null);
-                          setRejectReason('');
-                        }}
-                        className="bg-stone-700 hover:bg-stone-600 text-white rounded-lg px-4 py-2 text-sm font-medium transition-colors cursor-pointer"
-                      >
-                        Cancel
-                      </button>
-                    </div>
-                  </div>
-                )}
-              </div>
-            )}
-          </div>
-        );
-      })}
-    </div>
-  );
-}
diff --git a/src/contexts/ThemeContext.tsx b/src/contexts/ThemeContext.tsx
index 0369f034..1fcbf213 100644
--- a/src/contexts/ThemeContext.tsx
+++ b/src/contexts/ThemeContext.tsx
@@ -1,11 +1,8 @@
 'use client';
 
-import { createContext, useContext, useEffect, useState, useCallback, useRef, type ReactNode } from 'react';
+import { createContext, useContext, useEffect, useState, useCallback, type ReactNode } from 'react';
 import { ThemeId, DEFAULT_THEME, THEME_OPTIONS } from '@/lib/themes';
 
-const STORAGE_KEY = 'user-theme-override';
-const validIds = THEME_OPTIONS.map(t => t.id) as string[];
-
 interface ThemeContextValue {
   theme: ThemeId;
   setTheme: (theme: ThemeId) => void;
@@ -26,23 +23,11 @@ interface ThemeProviderProps {
   conference?: string;
 }
 
-function readStoredTheme(): ThemeId | null {
-  try {
-    const stored = localStorage.getItem(STORAGE_KEY);
-    if (stored && validIds.includes(stored)) return stored as ThemeId;
-  } catch {}
-  return null;
-}
-
 export function ThemeProvider({ children, adminConfig, conference }: ThemeProviderProps) {
-  const [theme, setThemeState] = useState<ThemeId>(() => readStoredTheme() ?? DEFAULT_THEME);
-  const userOverride = useRef<boolean>(readStoredTheme() !== null);
+  const [theme, setThemeState] = useState<ThemeId>(DEFAULT_THEME);
 
-  // Read theme from admin config when conference changes,
-  // but only if user hasn't manually toggled
+  // Read theme from admin config when conference changes
   useEffect(() => {
-    if (userOverride.current) return;
-
     if (!adminConfig || !conference) {
       setThemeState(DEFAULT_THEME);
       return;
@@ -51,6 +36,7 @@ export function ThemeProvider({ children, adminConfig, conference }: ThemeProvid
     const configKey = `theme:${conference}`;
     const configTheme = adminConfig[configKey] as string | undefined;
 
+    const validIds = THEME_OPTIONS.map(t => t.id) as string[];
     if (configTheme && validIds.includes(configTheme)) {
       setThemeState(configTheme as ThemeId);
     } else {
@@ -67,11 +53,7 @@ export function ThemeProvider({ children, adminConfig, conference }: ThemeProvid
   }, [theme]);
 
   const setTheme = useCallback((newTheme: ThemeId) => {
-    userOverride.current = true;
     setThemeState(newTheme);
-    try {
-      localStorage.setItem(STORAGE_KEY, newTheme);
-    } catch {}
   }, []);
 
   return (
diff --git a/src/hooks/useCheckIns.ts b/src/hooks/useCheckIns.ts
index c10869d3..b72e13d2 100644
--- a/src/hooks/useCheckIns.ts
+++ b/src/hooks/useCheckIns.ts
@@ -1,4 +1,3 @@
-// @deprecated Use useFriendsDependentData instead. Kept for reference.
 'use client';
 
 import { useState, useEffect, useMemo } from 'react';
diff --git a/src/hooks/useDragReorder.ts b/src/hooks/useDragReorder.ts
index 00532635..a119bee1 100644
--- a/src/hooks/useDragReorder.ts
+++ b/src/hooks/useDragReorder.ts
@@ -71,10 +71,12 @@ export function useDragReorder({ onReorder }: UseDragReorderOptions) {
   const handleDragStart = useCallback((e: React.DragEvent, id: string) => {
     e.dataTransfer.effectAllowed = 'move';
     e.dataTransfer.setData('text/plain', id);
-    // Set a small drag image offset
+    // Use the full item element as drag image instead of the tiny handle
     if (e.dataTransfer.setDragImage) {
-      const target = e.currentTarget as HTMLElement;
-      e.dataTransfer.setDragImage(target, 20, 20);
+      const itemEl = itemRefs.current.get(id);
+      if (itemEl) {
+        e.dataTransfer.setDragImage(itemEl, 20, 20);
+      }
     }
     setDragState({ dragId: id, overId: null, position: 'below' });
   }, []);
diff --git a/src/hooks/useFilters.ts b/src/hooks/useFilters.ts
index e540ed02..105d803c 100644
--- a/src/hooks/useFilters.ts
+++ b/src/hooks/useFilters.ts
@@ -107,6 +107,7 @@ export function useFilters(initialConference?: string, conferenceTabs?: TabConfi
     if (filters.startDateTime !== currentDefaults.startDateTime || filters.endDateTime !== currentDefaults.endDateTime) count++;
     count += filters.vibes.length;
     if (filters.selectedFriends.length > 0) count++;
+    if (filters.searchQuery) count++;
     return count;
   }, [filters, conferenceTabs]);
 
diff --git a/src/hooks/useFriendCode.ts b/src/hooks/useFriendCode.ts
deleted file mode 100644
index 3173c180..00000000
--- a/src/hooks/useFriendCode.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-'use client';
-
-import { useState, useEffect, useRef, useCallback } from 'react';
-import { useAuth } from '@/contexts/AuthContext';
-import { supabase } from '@/lib/supabase';
-import { trackFriendCodeRedeemed } from '@/lib/analytics';
-
-export interface FriendCodeToast {
-  message: string;
-  type: 'success' | 'error';
-}
-
-interface UseFriendCodeOptions {
-  openAuth: () => void;
-  refreshFriends: () => Promise<void>;
-}
-
-/**
- * Reads ?fc={code} from the URL on mount, strips it, and sends a
- * friend request to the code owner. If the user is not logged in,
- * triggers the auth modal and retries after authentication.
- */
-export function useFriendCode({ openAuth, refreshFriends }: UseFriendCodeOptions) {
-  const { user, loading: authLoading } = useAuth();
-  const [toast, setToast] = useState<FriendCodeToast | null>(null);
-  const pendingCodeRef = useRef<string | null>(null);
-  const processedRef = useRef(false);
-
-  // Auto-dismiss toast after 4 seconds
-  useEffect(() => {
-    if (!toast) return;
-    const timer = setTimeout(() => setToast(null), 4000);
-    return () => clearTimeout(timer);
-  }, [toast]);
-
-  const redeemCode = useCallback(async (code: string) => {
-    if (!user) return;
-
-    // Look up the friend code to get the target user
-    const { data: codeRow, error: lookupError } = await supabase
-      .from('friend_codes')
-      .select('user_id')
-      .eq('code', code)
-      .single();
-
-    if (lookupError || !codeRow) {
-      setToast({ message: 'Invalid friend code', type: 'error' });
-      return;
-    }
-
-    const targetUserId = codeRow.user_id;
-
-    // Check if it's the user's own code
-    if (targetUserId === user.id) {
-      setToast({ message: "That's your own friend code!", type: 'error' });
-      return;
-    }
-
-    // Send the friend request via RPC
-    const { data, error } = await supabase.rpc('send_friend_request', {
-      receiver: targetUserId,
-    });
-
-    if (error) {
-      // Parse common error messages from the RPC
-      const msg = error.message.toLowerCase();
-      if (msg.includes('already friends')) {
-        // Fetch target name for a nicer message
-        const { data: profile } = await supabase
-          .from('profiles')
-          .select('display_name, x_handle')
-          .eq('user_id', targetUserId)
-          .single();
-        const name = profile?.display_name || (profile?.x_handle ? `@${profile.x_handle}` : 'this person');
-        setToast({ message: `Already friends with ${name}`, type: 'error' });
-      } else if (msg.includes('pending')) {
-        setToast({ message: 'Friend request already pending', type: 'error' });
-      } else {
-        setToast({ message: `Friend request failed: ${error.message}`, type: 'error' });
-      }
-      return;
-    }
-
-    // If data indicates already_friends or already_pending (some RPCs return status)
-    if (typeof data === 'string') {
-      if (data === 'already_friends') {
-        const { data: profile } = await supabase
-          .from('profiles')
-          .select('display_name, x_handle')
-          .eq('user_id', targetUserId)
-          .single();
-        const name = profile?.display_name || (profile?.x_handle ? `@${profile.x_handle}` : 'this person');
-        setToast({ message: `Already friends with ${name}`, type: 'error' });
-        return;
-      }
-      if (data === 'already_pending') {
-        setToast({ message: 'Friend request already pending', type: 'error' });
-        return;
-      }
-    }
-
-    trackFriendCodeRedeemed(code);
-    refreshFriends();
-    setToast({ message: 'Friend request sent!', type: 'success' });
-  }, [user, refreshFriends]);
-
-  // On mount: read ?fc= param, strip it from URL, and either redeem or queue for auth
-  useEffect(() => {
-    if (authLoading || processedRef.current) return;
-
-    const params = new URLSearchParams(window.location.search);
-    const code = params.get('fc');
-    if (!code) return;
-
-    processedRef.current = true;
-
-    // Strip ?fc= from URL immediately
-    params.delete('fc');
-    const newSearch = params.toString();
-    const newUrl = window.location.pathname + (newSearch ? `?${newSearch}` : '') + window.location.hash;
-    window.history.replaceState(null, '', newUrl);
-
-    if (user) {
-      redeemCode(code);
-    } else {
-      // Store pending code and trigger auth
-      pendingCodeRef.current = code;
-      openAuth();
-    }
-  }, [authLoading, user, redeemCode, openAuth]);
-
-  // After auth completes, redeem the pending code
-  useEffect(() => {
-    if (user && pendingCodeRef.current) {
-      const code = pendingCodeRef.current;
-      pendingCodeRef.current = null;
-      redeemCode(code);
-    }
-  }, [user, redeemCode]);
-
-  return { toast };
-}
diff --git a/src/hooks/useFriendLocations.ts b/src/hooks/useFriendLocations.ts
index 01b2eb85..d470a37c 100644
--- a/src/hooks/useFriendLocations.ts
+++ b/src/hooks/useFriendLocations.ts
@@ -1,4 +1,3 @@
-// @deprecated Use useFriendsDependentData instead. Kept for reference.
 'use client';
 
 import { useState, useEffect, useMemo } from 'react';
diff --git a/src/hooks/useFriendRequests.ts b/src/hooks/useFriendRequests.ts
index ad5c9869..1a97140d 100644
--- a/src/hooks/useFriendRequests.ts
+++ b/src/hooks/useFriendRequests.ts
@@ -10,7 +10,6 @@ import {
   trackFriendRequestAccepted,
   trackFriendRequestRejected,
 } from '@/lib/analytics';
-import { fetchProfiles } from '@/lib/profile-cache';
 
 interface UseFriendRequestsOptions {
   refreshFriends: () => Promise<void>;
@@ -51,9 +50,13 @@ export function useFriendRequests({ refreshFriends }: UseFriendRequestsOptions)
 
     let profileMap = new Map<string, { display_name: string | null; email: string | null; x_handle: string | null; avatar_url: string | null }>();
     if (userIds.size > 0) {
-      const cached = await fetchProfiles(supabase, [...userIds]);
+      const { data: profiles } = await supabase
+        .from('profiles')
+        .select('user_id, display_name, email, x_handle, avatar_url')
+        .in('user_id', [...userIds]);
+
       profileMap = new Map(
-        [...cached.entries()].map(([id, p]) => [id, { display_name: p.display_name, email: p.email, x_handle: p.x_handle, avatar_url: p.avatar_url }])
+        (profiles ?? []).map((p) => [p.user_id, { display_name: p.display_name, email: p.email, x_handle: p.x_handle, avatar_url: p.avatar_url }])
       );
     }
 
diff --git a/src/hooks/useFriends.ts b/src/hooks/useFriends.ts
index 5d7f6a84..c9d8e996 100644
--- a/src/hooks/useFriends.ts
+++ b/src/hooks/useFriends.ts
@@ -4,7 +4,6 @@ import { useState, useEffect, useCallback, useRef } from 'react';
 import { useAuth } from '@/contexts/AuthContext';
 import { supabase } from '@/lib/supabase';
 import type { Friend } from '@/lib/types';
-import { fetchProfiles } from '@/lib/profile-cache';
 
 export function useFriends() {
   const { user, loading: authLoading } = useAuth();
@@ -34,7 +33,14 @@ export function useFriends() {
       return;
     }
 
-    const profileMap = await fetchProfiles(supabase, [...friendIds]);
+    const { data: profiles } = await supabase
+      .from('profiles')
+      .select('user_id, email, display_name, x_handle, rsvp_name, avatar_url')
+      .in('user_id', [...friendIds]);
+
+    const profileMap = new Map(
+      (profiles ?? []).map((p) => [p.user_id, p])
+    );
 
     setFriends(
       [...friendIds].map((id) => {
diff --git a/src/hooks/useFriendsDependentData.ts b/src/hooks/useFriendsDependentData.ts
deleted file mode 100644
index fbbc4956..00000000
--- a/src/hooks/useFriendsDependentData.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-'use client';
-
-import { useState, useEffect, useMemo, useRef } from 'react';
-import { useAuth } from '@/contexts/AuthContext';
-import { supabase } from '@/lib/supabase';
-import type { Friend, FriendLocation } from '@/lib/types';
-import { getDisplayName } from '@/lib/user-display';
-
-interface FriendItinerary {
-  userId: string;
-  displayName: string;
-  avatarUrl?: string | null;
-  xHandle?: string | null;
-  eventIds: Set<string>;
-}
-
-interface FriendsDependentData {
-  friendItineraries: FriendItinerary[];
-  checkInCounts: Map<string, number>;
-  checkInUsersByEvent: Map<string, string[]>;
-  friendLocations: FriendLocation[];
-}
-
-export function useFriendsDependentData(friends: Friend[]): FriendsDependentData {
-  const { user, loading: authLoading } = useAuth();
-
-  const [rawItineraries, setRawItineraries] = useState<
-    { userId: string; eventIds: string[] }[]
-  >([]);
-  const [checkInCounts, setCheckInCounts] = useState<Map<string, number>>(new Map());
-  const [checkInUsersByEvent, setCheckInUsersByEvent] = useState<Map<string, string[]>>(new Map());
-  const [friendLocations, setFriendLocations] = useState<FriendLocation[]>([]);
-
-  const initialFetchDone = useRef(false);
-
-  // Single friendIds memo (sorted join)
-  const friendIds = useMemo(
-    () => friends.map((f) => f.user_id).sort().join(','),
-    [friends]
-  );
-
-  // ---- Batched fetch: itineraries + check-ins + locations ----
-  useEffect(() => {
-    if (authLoading) return;
-
-    if (!user || friends.length === 0) {
-      setRawItineraries([]);
-      setCheckInCounts(new Map());
-      setCheckInUsersByEvent(new Map());
-      setFriendLocations([]);
-      initialFetchDone.current = false;
-      return;
-    }
-
-    initialFetchDone.current = false;
-
-    async function fetchAll() {
-      const userIds = [user!.id, ...friends.map((f) => f.user_id)];
-
-      const [itinResult, checkInResult, locResult] = await Promise.all([
-        // 1. Friend itineraries
-        supabase.rpc('get_friends_itineraries'),
-        // 2. Check-in counts
-        supabase.rpc('get_check_in_counts', { p_user_ids: userIds }),
-        // 3. Friend locations
-        supabase.rpc('get_friends_locations'),
-      ]);
-
-      // --- Itineraries ---
-      if (itinResult.error) {
-        console.error('Failed to fetch friends itineraries:', itinResult.error);
-      } else {
-        setRawItineraries(
-          (itinResult.data ?? []).map((row: { user_id: string; event_ids: string[] }) => ({
-            userId: row.user_id,
-            eventIds: row.event_ids ?? [],
-          }))
-        );
-      }
-
-      // --- Check-ins ---
-      if (!checkInResult.error && checkInResult.data) {
-        const counts = new Map<string, number>();
-        const usersByEvent = new Map<string, string[]>();
-        for (const row of checkInResult.data as { event_id: string; checkin_count: number; user_ids: string[] }[]) {
-          counts.set(row.event_id, row.checkin_count);
-          const friendsOnly = row.user_ids.filter((uid) => uid !== user!.id);
-          if (friendsOnly.length > 0) {
-            usersByEvent.set(row.event_id, friendsOnly);
-          }
-        }
-        setCheckInCounts(counts);
-        setCheckInUsersByEvent(usersByEvent);
-      } else if (checkInResult.error) {
-        // Fallback: RPC doesn't exist (error code 42883) or other error
-        if (checkInResult.error.code !== '42883') {
-          console.error('RPC get_check_in_counts failed, falling back:', checkInResult.error);
-        }
-
-        // Legacy: fetch all rows and aggregate client-side
-        const { data, error } = await supabase
-          .from('check_ins')
-          .select('event_id, user_id')
-          .in('user_id', userIds);
-
-        if (error) {
-          console.error('Failed to fetch check-ins:', error);
-        } else {
-          const counts = new Map<string, number>();
-          const usersByEvent = new Map<string, string[]>();
-          for (const row of data ?? []) {
-            const { event_id: eid, user_id: uid } = row as { event_id: string; user_id: string };
-            counts.set(eid, (counts.get(eid) ?? 0) + 1);
-            if (uid !== user!.id) {
-              if (!usersByEvent.has(eid)) usersByEvent.set(eid, []);
-              usersByEvent.get(eid)!.push(uid);
-            }
-          }
-          setCheckInCounts(counts);
-          setCheckInUsersByEvent(usersByEvent);
-        }
-      }
-
-      // --- Friend locations ---
-      if (locResult.error) {
-        console.error('Failed to fetch friends locations:', locResult.error);
-      } else {
-        const friendMap = new Map(friends.map((f) => [f.user_id, f]));
-        const locations: FriendLocation[] = (locResult.data ?? []).map(
-          (row: { user_id: string; lat: number; lng: number; updated_at: string }) => {
-            const friend = friendMap.get(row.user_id);
-            return {
-              user_id: row.user_id,
-              lat: row.lat,
-              lng: row.lng,
-              updated_at: row.updated_at,
-              display_name: friend?.display_name ?? undefined,
-              x_handle: friend?.x_handle ?? undefined,
-              avatar_url: friend?.avatar_url ?? undefined,
-            };
-          }
-        );
-        setFriendLocations(locations);
-      }
-
-      initialFetchDone.current = true;
-    }
-
-    fetchAll();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [user, authLoading, friendIds]);
-
-  // ---- 5-min location polling interval ----
-  useEffect(() => {
-    if (authLoading || !user || friends.length === 0) return;
-
-    async function fetchLocations() {
-      const { data, error } = await supabase.rpc('get_friends_locations');
-
-      if (error) {
-        console.error('Failed to fetch friends locations:', error);
-        return;
-      }
-
-      const friendMap = new Map(friends.map((f) => [f.user_id, f]));
-      const locations: FriendLocation[] = (data ?? []).map(
-        (row: { user_id: string; lat: number; lng: number; updated_at: string }) => {
-          const friend = friendMap.get(row.user_id);
-          return {
-            user_id: row.user_id,
-            lat: row.lat,
-            lng: row.lng,
-            updated_at: row.updated_at,
-            display_name: friend?.display_name ?? undefined,
-            x_handle: friend?.x_handle ?? undefined,
-            avatar_url: friend?.avatar_url ?? undefined,
-          };
-        }
-      );
-      setFriendLocations(locations);
-    }
-
-    const interval = setInterval(fetchLocations, 5 * 60 * 1000);
-    return () => clearInterval(interval);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [user, authLoading, friendIds]);
-
-  // ---- Geolocation upsert (from useFriendLocations) ----
-  useEffect(() => {
-    if (authLoading || !user) return;
-    if (!navigator.geolocation) return;
-
-    navigator.geolocation.getCurrentPosition(
-      (pos) => {
-        supabase
-          .from('user_locations')
-          .upsert(
-            {
-              user_id: user.id,
-              lat: pos.coords.latitude,
-              lng: pos.coords.longitude,
-              updated_at: new Date().toISOString(),
-            },
-            { onConflict: 'user_id' }
-          )
-          .then(({ error }) => {
-            if (error) console.error('Failed to upsert location:', error);
-          });
-      },
-      (err) => {
-        console.warn('Geolocation unavailable:', err.message);
-      },
-      { enableHighAccuracy: false, timeout: 10000 }
-    );
-  }, [user, authLoading]);
-
-  // ---- Merge display names from friends array ----
-  const friendItineraries: FriendItinerary[] = useMemo(() => {
-    const friendMap = new Map(friends.map((f) => [f.user_id, f]));
-    return rawItineraries.map((ri) => {
-      const friend = friendMap.get(ri.userId);
-      return {
-        userId: ri.userId,
-        displayName: friend ? getDisplayName(friend, ri.userId.slice(0, 8)) : ri.userId.slice(0, 8),
-        avatarUrl: friend?.avatar_url,
-        xHandle: friend?.x_handle,
-        eventIds: new Set(ri.eventIds),
-      };
-    });
-  }, [rawItineraries, friends]);
-
-  return {
-    friendItineraries,
-    checkInCounts,
-    checkInUsersByEvent,
-    friendLocations,
-  };
-}
diff --git a/src/hooks/useFriendsItineraries.ts b/src/hooks/useFriendsItineraries.ts
index 765014f0..fc5bc596 100644
--- a/src/hooks/useFriendsItineraries.ts
+++ b/src/hooks/useFriendsItineraries.ts
@@ -1,4 +1,3 @@
-// @deprecated Use useFriendsDependentData instead. Kept for reference.
 'use client';
 
 import { useState, useEffect, useRef, useMemo } from 'react';
diff --git a/src/hooks/useProfile.ts b/src/hooks/useProfile.ts
index 5e328fc5..a2853532 100644
--- a/src/hooks/useProfile.ts
+++ b/src/hooks/useProfile.ts
@@ -1,108 +1,46 @@
 'use client';
 
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback, useRef } from 'react';
 import { useAuth } from '@/contexts/AuthContext';
 import { supabase } from '@/lib/supabase';
 import type { UserProfile } from '@/lib/types';
 import { trackProfileUpdate } from '@/lib/analytics';
 
-// ── Module-level shared state ──────────────────────────────────────────
-// All useProfile() instances share a single profile value and coordinate
-// via a simple listener/subscriber pattern so that an update in one
-// component (e.g. UserMenu) is immediately visible in every other
-// component (e.g. RsvpOverlay) without requiring a context provider.
-
-let sharedProfile: UserProfile | null = null;
-let sharedLoading = true;
-let sharedFetchDone = false;
-let sharedFetchingForUserId: string | null = null;
-const listeners = new Set<() => void>();
-
-function notify() {
-  listeners.forEach((l) => l());
-}
-
-function setSharedProfile(p: UserProfile | null) {
-  sharedProfile = p;
-  notify();
-}
-
-function setSharedLoading(l: boolean) {
-  sharedLoading = l;
-  notify();
-}
-
-function resetSharedState() {
-  sharedProfile = null;
-  sharedLoading = true;
-  sharedFetchDone = false;
-  sharedFetchingForUserId = null;
-  notify();
-}
-
-// ── Hook ───────────────────────────────────────────────────────────────
-
 export function useProfile() {
   const { user, loading: authLoading } = useAuth();
+  const [profile, setProfile] = useState<UserProfile | null>(null);
+  const [loading, setLoading] = useState(true);
+  const initialFetchDone = useRef(false);
 
-  // Local state that mirrors the shared module-level values.
-  // We subscribe to changes via `listeners` so every instance re-renders.
-  const [profile, setProfile] = useState<UserProfile | null>(sharedProfile);
-  const [loading, setLoading] = useState(sharedLoading);
-
-  // Subscribe to shared state changes
-  useEffect(() => {
-    const handler = () => {
-      setProfile(sharedProfile);
-      setLoading(sharedLoading);
-    };
-    listeners.add(handler);
-    // Sync immediately in case shared state changed before mount
-    handler();
-    return () => {
-      listeners.delete(handler);
-    };
-  }, []);
-
-  // Fetch / create profile once per user across all instances
   useEffect(() => {
     if (authLoading) return;
 
     if (!user) {
-      resetSharedState();
-      setSharedLoading(false);
+      setProfile(null);
+      setLoading(false);
+      initialFetchDone.current = false;
       return;
     }
 
-    // If we already fetched for this user, skip
-    if (sharedFetchDone && sharedFetchingForUserId === user.id) return;
-
-    // If a different user logged in, reset first
-    if (sharedFetchingForUserId && sharedFetchingForUserId !== user.id) {
-      resetSharedState();
-    }
-
-    // Mark that we are fetching for this user (prevents duplicate fetches
-    // across multiple hook instances)
-    if (sharedFetchingForUserId === user.id) return;
-    sharedFetchingForUserId = user.id;
+    // Avoid duplicate fetches for the same user
+    if (initialFetchDone.current) return;
 
     async function fetchOrCreateProfile() {
       try {
         const { data, error } = await supabase
           .from('profiles')
-          .select('user_id, email, display_name, x_handle, rsvp_name, avatar_url, telegram_handle, company, linkedin_url, job_title')
+          .select('user_id, email, display_name, x_handle, rsvp_name, avatar_url')
           .eq('user_id', user!.id)
           .maybeSingle();
 
         if (error) {
           console.error('Failed to fetch profile:', error);
-          setSharedLoading(false);
+          setLoading(false);
           return;
         }
 
         if (data) {
-          setSharedProfile(data);
+          setProfile(data);
         } else {
           // Lazy-create a blank profile row
           const newProfile: UserProfile = {
@@ -112,10 +50,6 @@ export function useProfile() {
             x_handle: null,
             rsvp_name: null,
             avatar_url: null,
-            telegram_handle: null,
-            company: null,
-            linkedin_url: null,
-            job_title: null,
           };
 
           const { error: insertError } = await supabase
@@ -126,31 +60,31 @@ export function useProfile() {
             // Could be a race condition — try fetching again
             const { data: retryData } = await supabase
               .from('profiles')
-              .select('user_id, email, display_name, x_handle, rsvp_name, avatar_url, telegram_handle, company, linkedin_url, job_title')
+              .select('user_id, email, display_name, x_handle, rsvp_name, avatar_url')
               .eq('user_id', user!.id)
               .maybeSingle();
 
             if (retryData) {
-              setSharedProfile(retryData);
+              setProfile(retryData);
             } else {
               console.error('Failed to create profile:', insertError);
             }
           } else {
-            setSharedProfile(newProfile);
+            setProfile(newProfile);
           }
         }
       } catch (err) {
         console.error('Profile fetch error:', err);
       }
-      sharedFetchDone = true;
-      setSharedLoading(false);
+      initialFetchDone.current = true;
+      setLoading(false);
     }
 
     fetchOrCreateProfile();
   }, [user, authLoading]);
 
   const updateProfile = useCallback(
-    async (fields: Partial<Pick<UserProfile, 'display_name' | 'x_handle' | 'rsvp_name' | 'telegram_handle' | 'company' | 'linkedin_url' | 'job_title'>>) => {
+    async (fields: Partial<Pick<UserProfile, 'display_name' | 'x_handle' | 'rsvp_name'>>) => {
       if (!user) return;
 
       const { error } = await supabase
@@ -163,7 +97,7 @@ export function useProfile() {
         return;
       }
 
-      setSharedProfile(sharedProfile ? { ...sharedProfile, ...fields } : sharedProfile);
+      setProfile((prev) => (prev ? { ...prev, ...fields } : prev));
       trackProfileUpdate();
     },
     [user]
@@ -195,7 +129,7 @@ export function useProfile() {
 
     if (updateError) throw updateError;
 
-    setSharedProfile(sharedProfile ? { ...sharedProfile, avatar_url: avatarUrl } : sharedProfile);
+    setProfile((prev) => prev ? { ...prev, avatar_url: avatarUrl } : prev);
   }, [user]);
 
   return { profile, loading, updateProfile, uploadAvatar };
diff --git a/src/hooks/useRsvp.ts b/src/hooks/useRsvp.ts
deleted file mode 100644
index 6a936f62..00000000
--- a/src/hooks/useRsvp.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-'use client';
-
-import { useState, useEffect, useCallback } from 'react';
-import { useAuth } from '@/contexts/AuthContext';
-import { supabase } from '@/lib/supabase';
-
-export function useRsvp() {
-  const { user } = useAuth();
-  const [confirmedIds, setConfirmedIds] = useState<Set<string>>(new Set());
-  const [activeRsvp, setActiveRsvp] = useState<{ eventId: string; lumaUrl: string; eventName: string } | null>(null);
-
-  // Load user's RSVPs on mount
-  useEffect(() => {
-    if (!user) { setConfirmedIds(new Set()); return; }
-    supabase
-      .from('rsvps')
-      .select('event_id')
-      .eq('user_id', user.id)
-      .eq('status', 'confirmed')
-      .then(({ data }) => {
-        if (data) setConfirmedIds(new Set(data.map(r => r.event_id)));
-      });
-  }, [user]);
-
-  const getRsvpStatus = useCallback(
-    (eventId: string): 'idle' | 'confirmed' =>
-      confirmedIds.has(eventId) ? 'confirmed' : 'idle',
-    [confirmedIds]
-  );
-
-  const openRsvp = useCallback((eventId: string, lumaUrl: string, eventName: string) => {
-    setActiveRsvp({ eventId, lumaUrl, eventName });
-  }, []);
-
-  const confirmRsvp = useCallback(async () => {
-    if (!user || !activeRsvp) return;
-    const { error } = await supabase.from('rsvps').insert({
-      user_id: user.id,
-      event_id: activeRsvp.eventId,
-      status: 'confirmed',
-      method: 'manual',
-    });
-    if (!error) {
-      setConfirmedIds(prev => new Set(prev).add(activeRsvp.eventId));
-    }
-    setActiveRsvp(null);
-  }, [user, activeRsvp]);
-
-  const closeRsvp = useCallback(() => setActiveRsvp(null), []);
-
-  return { getRsvpStatus, openRsvp, confirmRsvp, closeRsvp, activeRsvp };
-}
diff --git a/src/hooks/useViewMode.ts b/src/hooks/useViewMode.ts
index cb26798a..102b5a4a 100644
--- a/src/hooks/useViewMode.ts
+++ b/src/hooks/useViewMode.ts
@@ -17,7 +17,7 @@ export function useViewMode() {
   // Restore from localStorage after mount (avoids hydration mismatch)
   useEffect(() => {
     const saved = localStorage.getItem(STORAGE_KEYS.VIEW_MODE);
-    if (saved === 'map' || saved === 'list' || saved === 'table' || saved === 'gallery') {
+    if (saved === 'map' || saved === 'list' || saved === 'table') {
       setViewModeState(saved);
     } else {
       setViewModeState(window.innerWidth >= 768 ? 'table' : 'list');
diff --git a/src/lib/analytics.ts b/src/lib/analytics.ts
index 5af030f0..e476580e 100644
--- a/src/lib/analytics.ts
+++ b/src/lib/analytics.ts
@@ -185,46 +185,3 @@ export const trackABClick = (testId: string, variantId: string, metadata?: strin
   track('ab_click', { test_id: testId, variant_id: variantId, ...(metadata ? { metadata } : {}) });
 export const trackABConversion = (testId: string, variantId: string, metadata?: string) =>
   track('ab_conversion', { test_id: testId, variant_id: variantId, ...(metadata ? { metadata } : {}) });
-
-// Lock Screen Card
-export const trackLockScreenOpen = () => track('lock_screen_open');
-export const trackLockScreenDownload = () => track('lock_screen_download');
-export const trackLockScreenCopy = () => track('lock_screen_copy');
-
-// Friend Code Redemption
-export const trackFriendCodeRedeemed = (code: string) =>
-  track('friend_code_redeemed', { code });
-
-// RSVP
-export const trackRsvpOpen = (eventId: string, eventName: string) =>
-  track('rsvp_open', { event_id: eventId, event_name: eventName });
-export const trackRsvpConfirm = (eventId: string, eventName: string) =>
-  track('rsvp_confirm', { event_id: eventId, event_name: eventName });
-
-// User properties
-export function setUserProperties(props: Record<string, string | boolean>) {
-  if (typeof window !== 'undefined' && window.gtag) {
-    window.gtag('set', 'user_properties', props);
-  }
-}
-
-export const setConferenceProperty = (conference: string) =>
-  setUserProperties({ conference_slug: conference });
-
-export const setAuthProperty = (isAuthenticated: boolean) =>
-  setUserProperties({ is_authenticated: String(isAuthenticated) });
-
-export const setItineraryProperty = (hasItinerary: boolean) =>
-  setUserProperties({ has_itinerary: String(hasItinerary) });
-
-// Outbound clicks
-export const trackOutboundClick = (eventName: string, url: string) =>
-  track('outbound_click', { event_name: eventName, url });
-
-// Itinerary view
-export const trackItineraryView = () =>
-  track('itinerary_view');
-
-// Error tracking
-export const trackError = (message: string, source?: string) =>
-  track('error', { message: message.slice(0, 100), ...(source ? { source } : {}) });
diff --git a/src/lib/api-validation.ts b/src/lib/api-validation.ts
index b27b748b..01b138e6 100644
--- a/src/lib/api-validation.ts
+++ b/src/lib/api-validation.ts
@@ -117,25 +117,3 @@ export const ABTrackEventSchema = z.object({
   event_type: z.enum(['impression', 'click', 'conversion']),
   metadata: z.record(z.string(), z.unknown()).optional(),
 });
-
-/** Schema for POST /api/admin/submissions */
-export const SubmissionActionSchema = z.object({
-  password: z.string(),
-  action: z.enum(['approve', 'reject']),
-  id: z.string().uuid(),
-  rejection_reason: z.string().optional(),
-  edits: z.object({
-    event_name: z.string().optional(),
-    event_date: z.string().optional(),
-    start_time: z.string().optional(),
-    end_time: z.string().optional(),
-    organizer: z.string().optional(),
-    address: z.string().optional(),
-    cost: z.string().optional(),
-    tags: z.string().optional(),
-    link: z.string().optional(),
-    has_food: z.boolean().optional(),
-    has_bar: z.boolean().optional(),
-    note: z.string().optional(),
-  }).optional(),
-});
diff --git a/src/lib/calendar.ts b/src/lib/calendar.ts
index f4f0050e..8d67d457 100644
--- a/src/lib/calendar.ts
+++ b/src/lib/calendar.ts
@@ -19,7 +19,7 @@ export function parseTime(t: string): { hour: number; minute: number } | null {
   return { hour, minute };
 }
 
-export function toCalendarDateTime(dateISO: string, time: { hour: number; minute: number }): string {
+function toCalendarDateTime(dateISO: string, time: { hour: number; minute: number }): string {
   const date = dateISO.replace(/-/g, '');
   const h = time.hour.toString().padStart(2, '0');
   const m = time.minute.toString().padStart(2, '0');
diff --git a/src/lib/fetch-events.ts b/src/lib/fetch-events.ts
index 2cc6ac33..d3143c61 100644
--- a/src/lib/fetch-events.ts
+++ b/src/lib/fetch-events.ts
@@ -11,10 +11,6 @@ const TAG_ALIASES: Record<string, string> = {
   'Fitness/Wellness': 'Wellness',
   'Devs/Builders': 'Devs',
   'VCs/Angels': 'VCs',
-  'Jobs/Hiring': 'Jobs',
-  'Brunch': 'Food',
-  'Dinner': 'Food',
-  'Bar/Pub': 'Drinks',
 };
 
 function parseTags(raw: string): string[] {
@@ -132,7 +128,7 @@ export async function fetchEvents(runtimeAddresses?: GeoAddressMap, tabs?: TabCo
       if (foodBool) syntheticTags.push('Food');
       if (barBool) syntheticTags.push('Drinks');
 
-      const tags = [...new Set([...rawTags, ...syntheticTags])];
+      const tags = [...rawTags, ...syntheticTags];
 
       const address = getCellValue(row.c[5]);
       const staticAddresses = geocodedData.addresses as GeoAddressMap;
diff --git a/src/lib/google-sheets.ts b/src/lib/google-sheets.ts
index a4b23822..b3e9ad21 100644
--- a/src/lib/google-sheets.ts
+++ b/src/lib/google-sheets.ts
@@ -276,282 +276,3 @@ export async function appendEventRow(sheetName: string, event: EventRow): Promis
 
   return row;
 }
-
-const MONTH_MAP: Record<string, number> = {
-  jan: 0, feb: 1, mar: 2, apr: 3, may: 4, jun: 5,
-  jul: 6, aug: 7, sep: 8, oct: 9, nov: 10, dec: 11,
-};
-
-/** Parse a sheet date like "May 5", "Tue, May 5" → sortable number (month*100+day). */
-function parseSheetDate(raw: string): number | null {
-  const match = raw.match(/\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\w*\s+(\d{1,2})\b/i);
-  if (!match) return null;
-  const month = MONTH_MAP[match[1].toLowerCase().slice(0, 3)];
-  const day = parseInt(match[2], 10);
-  if (month === undefined || isNaN(day)) return null;
-  return month * 100 + day;
-}
-
-/** Parse a sheet time like "12:00p", "6:00 PM", "9:30 AM" → minutes since midnight. */
-function parseSheetTime(raw: string): number | null {
-  const match = raw.match(/(\d{1,2}):(\d{2})\s*(am|pm|a|p)?/i);
-  if (!match) return null;
-  let hours = parseInt(match[1], 10);
-  const minutes = parseInt(match[2], 10);
-  const ampm = match[3]?.toLowerCase();
-  if (ampm) {
-    if (ampm.startsWith('p') && hours !== 12) hours += 12;
-    if (ampm.startsWith('a') && hours === 12) hours = 0;
-  }
-  return hours * 60 + minutes;
-}
-
-/**
- * Insert an event row into the main section of a sheet tab (before the "Add Events Here" area).
- * Uses the Sheets batchUpdate API to insert a blank row, then writes the event data.
- * Inserts at the chronologically correct position by date/time.
- * Returns the 1-based row number where the event was inserted.
- */
-export async function insertEventRowSorted(sheetName: string, gid: number, event: EventRow): Promise<number> {
-  const token = await getAccessToken();
-
-  // 1. Read columns A:B to find the main section boundaries
-  const range = encodeURIComponent(`'${sheetName}'!A1:E`);
-  const readUrl = `https://sheets.googleapis.com/v4/spreadsheets/${SHEET_ID}/values/${range}`;
-  const readRes = await fetch(readUrl, { headers: { Authorization: `Bearer ${token}` } });
-  if (!readRes.ok) {
-    const text = await readRes.text();
-    throw new Error(`Failed to read sheet: ${readRes.status} ${text}`);
-  }
-  const readData = await readRes.json();
-  const rows: string[][] = readData.values || [];
-
-  // 2. Find the first header row (col B = "Start Time") — this is the main section header
-  let headerIdx = -1;
-  for (let i = 0; i < rows.length; i++) {
-    const colB = (rows[i]?.[1] || '').trim().toLowerCase();
-    if (colB === 'start time') {
-      headerIdx = i;
-      break;
-    }
-  }
-  if (headerIdx === -1) {
-    // Can't find main section header — fall back to appendEventRow
-    return appendEventRow(sheetName, event);
-  }
-
-  // 3. Find the end of the main events section:
-  //    first empty row or "Add Events Here" marker after the header
-  let mainSectionEnd = rows.length;
-  for (let i = headerIdx + 1; i < rows.length; i++) {
-    const cellA = (rows[i]?.[0] || '').trim();
-    const cellB = (rows[i]?.[1] || '').trim();
-    const cellE = (rows[i]?.[4] || '').trim();
-
-    // "Add Events Here" marker — stop before it
-    if (cellA.includes('Add Events Here')) {
-      mainSectionEnd = i;
-      break;
-    }
-
-    // Empty row (no date, no start time, no name) — end of main section
-    if (!cellA && !cellB && !cellE) {
-      mainSectionEnd = i;
-      break;
-    }
-  }
-
-  // Find chronologically correct insertion point
-  const newDate = parseSheetDate(event.date);
-  const newTime = parseSheetTime(event.startTime);
-
-  let insertIdx = mainSectionEnd; // default: end of section
-  if (newDate !== null) {
-    for (let i = headerIdx + 1; i < mainSectionEnd; i++) {
-      const rowDate = parseSheetDate((rows[i]?.[0] || '').trim());
-      if (rowDate === null) continue;
-
-      if (rowDate > newDate) {
-        insertIdx = i;
-        break;
-      }
-      if (rowDate === newDate) {
-        const rowTime = parseSheetTime((rows[i]?.[1] || '').trim());
-        if (rowTime !== null && newTime !== null && rowTime > newTime) {
-          insertIdx = i;
-          break;
-        }
-      }
-    }
-  }
-  const insertRow = insertIdx + 1; // 1-based sheet row
-
-  // 4. Insert a blank row using batchUpdate API
-  const batchUrl = `https://sheets.googleapis.com/v4/spreadsheets/${SHEET_ID}:batchUpdate`;
-  const insertRes = await fetch(batchUrl, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${token}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      requests: [{
-        insertDimension: {
-          range: {
-            sheetId: gid,
-            dimension: 'ROWS',
-            startIndex: insertIdx,
-            endIndex: insertIdx + 1,
-          },
-          inheritFromBefore: true,
-        },
-      }],
-    }),
-  });
-
-  if (!insertRes.ok) {
-    const text = await insertRes.text();
-    throw new Error(`Failed to insert row: ${insertRes.status} ${text}`);
-  }
-
-  // 5. Write event data to the newly inserted row
-  const writeRange = encodeURIComponent(`'${sheetName}'!A${insertRow}:L${insertRow}`);
-  const writeUrl = `https://sheets.googleapis.com/v4/spreadsheets/${SHEET_ID}/values/${writeRange}?valueInputOption=USER_ENTERED`;
-
-  const values = [
-    [
-      event.date,
-      event.startTime,
-      event.endTime,
-      event.organizer,
-      event.name,
-      event.address,
-      event.cost,
-      event.tags,
-      event.link,
-      event.food ? 'TRUE' : 'FALSE',
-      event.bar ? 'TRUE' : 'FALSE',
-      event.note,
-    ],
-  ];
-
-  const writeRes = await fetch(writeUrl, {
-    method: 'PUT',
-    headers: {
-      Authorization: `Bearer ${token}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({ values }),
-  });
-
-  if (!writeRes.ok) {
-    const text = await writeRes.text();
-    throw new Error(`Failed to write event data: ${writeRes.status} ${text}`);
-  }
-
-  return insertRow;
-}
-
-/**
- * Find a submitted event row in the review section (below "Add Events Here").
- * Searches by event name (col E, 0-indexed 4) and date (col A, 0-indexed 0).
- * Returns the 0-based row index, or null if not found.
- */
-export async function findReviewRow(
-  sheetName: string,
-  eventName: string,
-  eventDate: string
-): Promise<number | null> {
-  const token = await getAccessToken();
-  const range = encodeURIComponent(`'${sheetName}'!A1:M`);
-  const url = `https://sheets.googleapis.com/v4/spreadsheets/${SHEET_ID}/values/${range}`;
-
-  const res = await fetch(url, {
-    headers: { Authorization: `Bearer ${token}` },
-  });
-
-  if (!res.ok) {
-    const text = await res.text();
-    throw new Error(`Failed to read sheet: ${res.status} ${text}`);
-  }
-
-  const data = await res.json();
-  const rows: string[][] = data.values || [];
-
-  // Find the "Add Events Here" marker
-  let addEventsRow = -1;
-  for (let i = 0; i < rows.length; i++) {
-    const cellA = (rows[i]?.[0] || '').trim();
-    if (cellA.includes('Add Events Here')) {
-      addEventsRow = i;
-      break;
-    }
-  }
-
-  if (addEventsRow === -1) return null;
-
-  // Find the review header row (col B = "Start Time") after the marker
-  let headerRow = -1;
-  for (let i = addEventsRow + 1; i < rows.length; i++) {
-    const colB = (rows[i]?.[1] || '').trim().toLowerCase();
-    if (colB === 'start time') {
-      headerRow = i;
-      break;
-    }
-  }
-
-  if (headerRow === -1) return null;
-
-  // Scan review rows for matching name + date (case-insensitive)
-  const targetName = eventName.trim().toLowerCase();
-  const targetDate = eventDate.trim().toLowerCase();
-
-  for (let i = headerRow + 1; i < rows.length; i++) {
-    const row = rows[i] || [];
-    const cellDate = (row[0] || '').trim().toLowerCase();
-    const cellName = (row[4] || '').trim().toLowerCase();
-
-    // Skip empty rows
-    if (!cellDate && !cellName) continue;
-
-    if (cellName === targetName && cellDate === targetDate) {
-      return i; // 0-based row index
-    }
-  }
-
-  return null;
-}
-
-/**
- * Delete a single row from a sheet by 0-based row index.
- * Uses the Sheets batchUpdate API with deleteDimension.
- */
-export async function deleteSheetRow(gid: number, rowIndex: number): Promise<void> {
-  const token = await getAccessToken();
-  const url = `https://sheets.googleapis.com/v4/spreadsheets/${SHEET_ID}:batchUpdate`;
-
-  const res = await fetch(url, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${token}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      requests: [{
-        deleteDimension: {
-          range: {
-            sheetId: gid,
-            dimension: 'ROWS',
-            startIndex: rowIndex,
-            endIndex: rowIndex + 1,
-          },
-        },
-      }],
-    }),
-  });
-
-  if (!res.ok) {
-    const text = await res.text();
-    throw new Error(`Failed to delete row: ${res.status} ${text}`);
-  }
-}
diff --git a/src/lib/luma.ts b/src/lib/luma.ts
deleted file mode 100644
index 7451bb1c..00000000
--- a/src/lib/luma.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export function isLumaUrl(url: string): boolean {
-  try {
-    const h = new URL(url).hostname;
-    return h === 'lu.ma' || h === 'luma.com' || h === 'www.luma.com';
-  } catch {
-    return false;
-  }
-}
-
-export function getLumaSlug(url: string): string | null {
-  try {
-    const u = new URL(url);
-    const h = u.hostname;
-    if (h !== 'lu.ma' && h !== 'luma.com' && h !== 'www.luma.com') return null;
-    const parts = u.pathname.split('/').filter(Boolean);
-    return parts[0] || null;
-  } catch {
-    return null;
-  }
-}
diff --git a/src/lib/profile-cache.ts b/src/lib/profile-cache.ts
deleted file mode 100644
index e8e90f5c..00000000
--- a/src/lib/profile-cache.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import type { SupabaseClient } from '@supabase/supabase-js';
-
-export interface CachedProfile {
-  user_id: string;
-  email: string | null;
-  display_name: string | null;
-  x_handle: string | null;
-  rsvp_name: string | null;
-  avatar_url: string | null;
-}
-
-const cache = new Map<string, CachedProfile>();
-
-export async function fetchProfiles(
-  client: SupabaseClient,
-  userIds: string[]
-): Promise<Map<string, CachedProfile>> {
-  const result = new Map<string, CachedProfile>();
-  const uncached: string[] = [];
-
-  for (const id of userIds) {
-    const cached = cache.get(id);
-    if (cached) {
-      result.set(id, cached);
-    } else {
-      uncached.push(id);
-    }
-  }
-
-  if (uncached.length > 0) {
-    const { data } = await client
-      .from('profiles')
-      .select('user_id, email, display_name, x_handle, rsvp_name, avatar_url')
-      .in('user_id', uncached);
-
-    for (const p of data ?? []) {
-      const profile: CachedProfile = {
-        user_id: p.user_id,
-        email: p.email ?? null,
-        display_name: p.display_name ?? null,
-        x_handle: p.x_handle ?? null,
-        rsvp_name: p.rsvp_name ?? null,
-        avatar_url: p.avatar_url ?? null,
-      };
-      cache.set(p.user_id, profile);
-      result.set(p.user_id, profile);
-    }
-  }
-
-  return result;
-}
-
-export function invalidateProfiles(userIds?: string[]) {
-  if (!userIds) {
-    cache.clear();
-  } else {
-    for (const id of userIds) cache.delete(id);
-  }
-}
diff --git a/src/lib/reactions.ts b/src/lib/reactions.ts
index adbbcd37..78b104c9 100644
--- a/src/lib/reactions.ts
+++ b/src/lib/reactions.ts
@@ -1,4 +1 @@
-export const REACTION_EMOJIS = [
-  '🔥', '❤️', '🥳', '😋',
-  '👑', '🧠', '⛔', '💤',
-] as const;
+export const REACTION_EMOJIS = ['\uD83D\uDD25', '\u2764\uFE0F', '\uD83D\uDCAF', '\uD83D\uDC4D', '\uD83C\uDF89', '\uD83D\uDC40'] as const;
diff --git a/src/lib/social-urls.ts b/src/lib/social-urls.ts
deleted file mode 100644
index d0edae6c..00000000
--- a/src/lib/social-urls.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-export interface SocialLink {
-  platform: 'x' | 'telegram' | 'linkedin' | 'friend';
-  label: string;
-  url: string;
-}
-
-export function getSocialLinks(profile: {
-  x_handle?: string | null;
-  telegram_handle?: string | null;
-  linkedin_url?: string | null;
-}): SocialLink[] {
-  const links: SocialLink[] = [];
-
-  if (profile.x_handle) {
-    const handle = profile.x_handle.replace(/^@/, '');
-    links.push({
-      platform: 'x',
-      label: `@${handle}`,
-      url: `https://x.com/${handle}`,
-    });
-  }
-
-  if (profile.telegram_handle) {
-    const raw = profile.telegram_handle.replace(/^@/, '').replace(/^https?:\/\/t\.me\//, '');
-    const isGroup = raw.startsWith('+');
-    links.push({
-      platform: 'telegram',
-      label: isGroup ? raw : `@${raw}`,
-      url: `https://t.me/${raw}`,
-    });
-  }
-
-  if (profile.linkedin_url) {
-    const url = profile.linkedin_url.startsWith('http')
-      ? profile.linkedin_url
-      : `https://${profile.linkedin_url}`;
-    links.push({
-      platform: 'linkedin',
-      label: 'LinkedIn',
-      url,
-    });
-  }
-
-  return links;
-}
diff --git a/src/lib/tags.ts b/src/lib/tags.ts
index d1095d5d..6f647297 100644
--- a/src/lib/tags.ts
+++ b/src/lib/tags.ts
@@ -29,7 +29,6 @@ export const VIBE_COLORS: Record<string, string> = {
   'VCs': 'var(--tag-blue)',
   'Founders': 'var(--tag-blue)',
   'Jobs': 'var(--tag-blue)',
-  'Jobs/Hiring': 'var(--tag-blue)',
   // Yellow group -- crypto & topics
   'DePIN': 'var(--tag-yellow)',
   'AI': 'var(--tag-yellow)',
@@ -86,9 +85,9 @@ export interface TagGroup {
 
 export const TAG_GROUPS: TagGroup[] = [
   { label: 'Topics', tags: ['BTC', 'ETH', 'SOL', 'AI', 'DeFi', 'DAOs', 'NFTs', 'DePIN', 'RWA', 'Memecoins', 'Gaming'] },
-  { label: 'Vibe', tags: ['Party', 'Networking', 'Conference', 'Panel/Talk', 'Hackathon', 'Workshop', 'Wellness', 'Art', 'Performance'] },
+  { label: 'Vibe / Setting', tags: ['Party', 'Networking', 'Brunch', 'Conference', 'Panel/Talk', 'Hackathon', 'Workshop', 'Wellness', 'Art', 'Performance'] },
   { label: 'Audience', tags: ['Devs', 'VCs', 'Founders', 'Jobs'] },
-  { label: 'Amenities', tags: ['Food', 'Drinks'] },
+  { label: 'Perks', tags: ['Food', 'Drinks', '$$'] },
 ];
 
 export const GROUPED_TAGS = new Set(TAG_GROUPS.flatMap(g => g.tags));
@@ -97,7 +96,4 @@ export const GROUPED_TAGS = new Set(TAG_GROUPS.flatMap(g => g.tags));
  *  Key = alias tag on events, Value = canonical tag shown in filter UI */
 export const TAG_ALIASES: Record<string, string> = {
   'Dinner': 'Food',
-  'Brunch': 'Food',
-  'Bar/Pub': 'Drinks',
-  'Jobs/Hiring': 'Jobs',
 };
diff --git a/src/lib/themes.ts b/src/lib/themes.ts
index d55f2423..aadeb471 100644
--- a/src/lib/themes.ts
+++ b/src/lib/themes.ts
@@ -1,6 +1,6 @@
 export type ThemeId = 'dark' | 'paper' | 'light' | 'light-blue' | 'sxsw' | 'sxsw2' | 'gdc' | 'ethcc';
 
-export const DEFAULT_THEME: ThemeId = 'light-blue';
+export const DEFAULT_THEME: ThemeId = 'dark';
 
 export const THEME_OPTIONS: { id: ThemeId; label: string }[] = [
   { id: 'dark', label: 'Dark' },
diff --git a/src/lib/types.ts b/src/lib/types.ts
index fe8da153..93b6c336 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -52,7 +52,7 @@ export interface UserState {
   itinerary: string[];
 }
 
-export type ViewMode = 'map' | 'list' | 'table' | 'gallery';
+export type ViewMode = 'map' | 'list' | 'table';
 
 export interface UserProfile {
   user_id: string;
@@ -61,10 +61,6 @@ export interface UserProfile {
   x_handle: string | null;
   rsvp_name: string | null;
   avatar_url: string | null;
-  telegram_handle: string | null;
-  company: string | null;
-  linkedin_url: string | null;
-  job_title: string | null;
 }
 
 export interface Friend {
@@ -103,7 +99,7 @@ export interface UserSearchResult {
   request_status: 'pending_outgoing' | 'pending_incoming' | null;
 }
 
-export type ReactionEmoji = typeof import('./reactions').REACTION_EMOJIS[number];
+export type ReactionEmoji = '🔥' | '❤️' | '💯' | '👍' | '🎉' | '👀';
 
 export interface EventReaction {
   id: string;
@@ -332,31 +328,3 @@ export interface SponsorDataSummary {
   by_confidence: { high: number; medium: number; low: number };
   by_method: Record<string, number>;
 }
-
-/* ------------------------------------------------------------------ */
-/* Event Submissions (admin approval queue)                            */
-/* ------------------------------------------------------------------ */
-
-export interface Submission {
-  id: string;
-  conference: string;
-  status: 'pending' | 'approved' | 'rejected';
-  event_name: string;
-  event_date: string;
-  start_time: string;
-  end_time: string;
-  organizer: string;
-  address: string;
-  cost: string;
-  tags: string;
-  link: string;
-  has_food: boolean;
-  has_bar: boolean;
-  note: string;
-  coords_lat: number | null;
-  coords_lng: number | null;
-  rejection_reason: string | null;
-  reviewed_at: string | null;
-  sheet_row: number | null;
-  created_at: string;
-}
diff --git a/status.md b/status.md
index 28050f08..fe3b002f 100644
--- a/status.md
+++ b/status.md
@@ -1,56 +1,39 @@
 # Project Status
-*Last updated: 2026-04-26*
+*Last updated: 2026-02-16 (Session 10)*
 
 ## Open PRs
-| PR | Task | Preview | Status |
-|----|------|---------|--------|
-| #94 | capers-31744: Fix date header flash | [Preview](https://sheeets-git-capers-31744-date-header-flash-pizza-dao.vercel.app) | ✅ Ready |
-| #89 | Image Ad Column: Right sidebar for table view | [Preview](https://sheeets-git-image-ad-column-pizza-dao.vercel.app) | ✅ Ready |
-| #78 | Gmail-based Luma event importer | [Preview](https://sheeets-git-luma-gmail-importer-pizza-dao.vercel.app) | ✅ Ready |
-| #53 | Add tag count badges to filter pills | [Preview](https://sheeets-git-tag-count-badges-pizza-dao.vercel.app) | ✅ Ready |
-| #40 | Luma RSVP with in-page checkout | [Preview](https://sheeets-git-luma-rsvp-v2-pizza-dao.vercel.app) | ✅ Ready |
+| PR | Branch | Feature | Preview | Status |
+|----|--------|---------|---------|--------|
+| #40 | `luma-rsvp-v2` | Luma RSVP: in-page checkout + copy-paste fields | [Preview](https://sheeets-git-luma-rsvp-v2-pizza-dao.vercel.app) | ✓ Ready for review |
+| #41 | `geocode-api` | Runtime geocode API (fixes missing map pins) | [Preview](https://sheeets-git-geocode-api-pizza-dao.vercel.app) | ✓ Ready for review |
+| #39 | `api-docs-page` | API documentation page | [Preview](https://sheeets-git-api-docs-page-pizza-dao.vercel.app/api) | ✓ Ready for review |
+| #34 | `agent-api` | Agent API: Foundation + Events | - | Edge fn live v4. Safe to merge. |
+| #30 | `luma-rsvp` | Old Luma RSVP (superseded by #40) | - | Close — replaced by #40 |
 
-## Recently Shipped (master)
-| Commit | Change |
-|--------|--------|
-| `d2cb6f5` | Fix admin SponsorDataTab not loading on session restore |
-| `b095ebb` | Fullscreen event image lightbox on tap (#93) |
-| `38591c7` | Sponsor Data Admin Tab (#91) |
-| `c4998bc` | Sponsor crawling script with HTML extraction pipeline (#90) |
-| `3421beb` | Featured events section at top of views (#88) |
+## Just Pushed to Master
+- `1644a59` fix: POI address tap opens navigation drawer on mobile
+- Geocode script ran — 11 new addresses cached (goes live via PR #41)
 
-## In-Progress Tasks
-| ID | Task | Priority |
-|----|------|----------|
-| capers-31744 | Fix date header flash when scrolling to top | P1 |
-
-## Top Backlog
-| ID | Task | Priority |
-|----|------|----------|
-| pineapple-49198 | Sponsor extraction v2: AI-powered logo + text analysis | P1 |
-| tomato-78283 | Luma RSVP feature (redirect-based) | P2 |
-| mushroom-63880 | Build event host community | P2 |
-| brick-oven-71041 | Automate TG + X posting | P2 |
-| slice-63031 | Get user phone # | P2 |
-
-*Run `sheets-claude tasks` for full list*
+## Active Worktrees
+| Worktree | Branch | PR |
+|----------|--------|----|
+| `sheeets-luma-rsvp` | `luma-rsvp-v2` | #40 |
+| `sheeets-geocode-api` | `geocode-api` | #41 |
+| `sheeets-api-docs` | `api-docs-page` | #39 |
+| `sheeets-agent-api` | `agent-api` | #34 |
 
 ## Open Plans
-- `plans/admin-conference-management.md`
-- `plans/automated-testing.md`
-- `plans/checkin-friend-pins.md`
-- `plans/event-click-tracking.md`
-- `plans/featured-events.md` — shipped, PR #88
-- `plans/image-ad-column.md` — PR #89 open
-- `plans/instant-geocoding.md`
-- `plans/luma-gmail-importer.md` — PR #78 open
-- `plans/luma-rsvp.md`
-- `plans/salami-77082-landing-page.md` — shipped
-- `plans/sponsor-admin-ui.md` — shipped, PR #91
-- `plans/sponsor-crawling.md` — shipped, PR #90
+- `plans/luma-rsvp.md` — Implemented in #40
+- `plans/tomato-46571-theme-toggle.md` — Theme toggle
+
+## Edge Functions (Deployed)
+| Function | Version | Status |
+|----------|---------|--------|
+| `agent-api` | v4 | ✓ Live |
+| `resolve-luma-event` | v4 | ✓ Live |
+| `luma-rsvp` | v3 | ✓ Live (not needed with new approach) |
 
-## Next Steps
-1. Review & merge PR #94 (date header flash fix — Vercel passing)
-2. Review & merge PR #89 (image ad column)
-3. Pick up pineapple-49198 (sponsor extraction v2) — top P1
-4. Clean up shipped plans → move to `plans/done/`
+## Cleanup Needed
+- Close PR #30 (superseded by #40)
+- Delete `test-luma-rsvp` and `luma-rsvp` edge functions (no longer needed with embed widget approach)
+- Delete `luma_events` Supabase table (not needed)
diff --git a/supabase/migrations/20260502120000_event_submissions.sql b/supabase/migrations/20260502120000_event_submissions.sql
deleted file mode 100644
index 026c56e0..00000000
--- a/supabase/migrations/20260502120000_event_submissions.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-create table if not exists public.event_submissions (
-  id uuid primary key default gen_random_uuid(),
-  conference text not null,
-  status text not null default 'pending' check (status in ('pending', 'approved', 'rejected')),
-
-  -- Event fields (mirror EventRow from google-sheets.ts)
-  event_name text not null,
-  event_date text not null,
-  start_time text not null default '',
-  end_time text not null default '',
-  organizer text not null default '',
-  address text not null default '',
-  cost text not null default 'Free',
-  tags text not null default '',
-  link text not null default '',
-  has_food boolean not null default false,
-  has_bar boolean not null default false,
-  note text not null default '',
-
-  -- Geocoding coords captured at submit time
-  coords_lat double precision,
-  coords_lng double precision,
-
-  -- Review metadata
-  rejection_reason text,
-  reviewed_at timestamptz,
-  sheet_row integer,
-
-  created_at timestamptz not null default now()
-);
-
-alter table public.event_submissions enable row level security;
-
-create policy "Service role manages submissions"
-  on public.event_submissions for all using (auth.role() = 'service_role');
-
-create index idx_submissions_status on public.event_submissions (status);
-create index idx_submissions_conference on public.event_submissions (conference);
diff --git a/supabase/migrations/20260502_add_profile_fields.sql b/supabase/migrations/20260502_add_profile_fields.sql
deleted file mode 100644
index 0ed4c471..00000000
--- a/supabase/migrations/20260502_add_profile_fields.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE profiles ADD COLUMN IF NOT EXISTS telegram_handle text;
-ALTER TABLE profiles ADD COLUMN IF NOT EXISTS company text;
diff --git a/supabase/migrations/20260503_add_linkedin_jobtitle.sql b/supabase/migrations/20260503_add_linkedin_jobtitle.sql
deleted file mode 100644
index ddf760eb..00000000
--- a/supabase/migrations/20260503_add_linkedin_jobtitle.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE profiles ADD COLUMN IF NOT EXISTS linkedin_url text;
-ALTER TABLE profiles ADD COLUMN IF NOT EXISTS job_title text;

From 26960013c470cf2e36a4267586894f64974f3b63 Mon Sep 17 00:00:00 2001
From: snackman <samgold24@gmail.com>
Date: Mon, 4 May 2026 20:25:59 -0400
Subject: [PATCH 3/8] ui: itinerary FAB always visible, prompts sign-in when
 logged out

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/components/EventApp.tsx     |  9 +++++++--
 src/components/ItineraryFAB.tsx | 25 +++++++++++++++++++------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/components/EventApp.tsx b/src/components/EventApp.tsx
index 1d5ddfee..ada55e09 100644
--- a/src/components/EventApp.tsx
+++ b/src/components/EventApp.tsx
@@ -581,8 +581,13 @@ export function EventApp({ initialConference, initialEvents }: { initialConferen
         />
       )}
 
-      {itineraryCount > 0 && !hasNearbyLiveEvents && (
-        <ItineraryFAB count={itineraryCount} conference={filters.conference} />
+      {!hasNearbyLiveEvents && (
+        <ItineraryFAB
+          count={itineraryCount}
+          conference={filters.conference}
+          isSignedIn={!!authUser}
+          onSignInNeeded={() => setShowSignIn(true)}
+        />
       )}
 
       <AuthModal isOpen={showAuthForStar || showSignIn} onClose={() => { dismissAuth(); setShowSignIn(false); }} />
diff --git a/src/components/ItineraryFAB.tsx b/src/components/ItineraryFAB.tsx
index 9a1138db..30f2b85f 100644
--- a/src/components/ItineraryFAB.tsx
+++ b/src/components/ItineraryFAB.tsx
@@ -6,18 +6,31 @@ import { CalendarIcon } from './icons/CalendarIcon';
 interface ItineraryFABProps {
   count: number;
   conference?: string;
+  onSignInNeeded?: () => void;
+  isSignedIn: boolean;
 }
 
-export function ItineraryFAB({ count, conference }: ItineraryFABProps) {
+export function ItineraryFAB({ count, conference, onSignInNeeded, isSignedIn }: ItineraryFABProps) {
   const href = conference ? `/plan?conf=${encodeURIComponent(conference)}` : '/plan';
 
+  if (count > 0 || isSignedIn) {
+    return (
+      <Link
+        href={href}
+        className="fixed bottom-6 right-6 z-40 flex items-center gap-2 px-4 py-3 rounded-full bg-[var(--theme-accent)] text-[var(--theme-accent-text)] shadow-lg hover:bg-[var(--theme-accent-hover)] transition-colors"
+      >
+        <CalendarIcon className="w-5 h-5" />
+        {count > 0 && <span className="text-sm font-semibold">{count}</span>}
+      </Link>
+    );
+  }
+
   return (
-    <Link
-      href={href}
-      className="fixed bottom-6 right-6 z-40 flex items-center gap-2 px-4 py-3 rounded-full bg-[var(--theme-accent)] text-[var(--theme-accent-text)] shadow-lg hover:bg-[var(--theme-accent-hover)] transition-colors"
+    <button
+      onClick={onSignInNeeded}
+      className="fixed bottom-6 right-6 z-40 flex items-center gap-2 px-4 py-3 rounded-full bg-[var(--theme-accent)] text-[var(--theme-accent-text)] shadow-lg hover:bg-[var(--theme-accent-hover)] transition-colors cursor-pointer"
     >
       <CalendarIcon className="w-5 h-5" />
-      <span className="text-sm font-semibold">{count}</span>
-    </Link>
+    </button>
   );
 }

From 5db21be1d4c6a30db06a4d5d8f7faf47e6c65c67 Mon Sep 17 00:00:00 2001
From: snackman <samgold24@gmail.com>
Date: Mon, 4 May 2026 21:30:24 -0400
Subject: [PATCH 4/8] ui: FAB styled like filter buttons with orange count
 badge

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/components/ItineraryFAB.tsx | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/ItineraryFAB.tsx b/src/components/ItineraryFAB.tsx
index 30f2b85f..da708f7d 100644
--- a/src/components/ItineraryFAB.tsx
+++ b/src/components/ItineraryFAB.tsx
@@ -10,26 +10,32 @@ interface ItineraryFABProps {
   isSignedIn: boolean;
 }
 
+const fabClass =
+  'fixed bottom-6 right-6 z-40 flex items-center gap-2 h-10 px-3.5 rounded-lg ' +
+  'bg-[var(--theme-filter-control-bg)] border border-[var(--theme-filter-control-border)] ' +
+  'text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] ' +
+  'shadow-lg shadow-black/20 backdrop-blur-sm transition-colors';
+
 export function ItineraryFAB({ count, conference, onSignInNeeded, isSignedIn }: ItineraryFABProps) {
   const href = conference ? `/plan?conf=${encodeURIComponent(conference)}` : '/plan';
 
+  const badge = count > 0 ? (
+    <span className="text-[10px] font-bold min-w-[18px] h-[18px] flex items-center justify-center rounded-full px-1 bg-orange-500 text-white">
+      {count}
+    </span>
+  ) : null;
+
   if (count > 0 || isSignedIn) {
     return (
-      <Link
-        href={href}
-        className="fixed bottom-6 right-6 z-40 flex items-center gap-2 px-4 py-3 rounded-full bg-[var(--theme-accent)] text-[var(--theme-accent-text)] shadow-lg hover:bg-[var(--theme-accent-hover)] transition-colors"
-      >
+      <Link href={href} className={fabClass}>
         <CalendarIcon className="w-5 h-5" />
-        {count > 0 && <span className="text-sm font-semibold">{count}</span>}
+        {badge}
       </Link>
     );
   }
 
   return (
-    <button
-      onClick={onSignInNeeded}
-      className="fixed bottom-6 right-6 z-40 flex items-center gap-2 px-4 py-3 rounded-full bg-[var(--theme-accent)] text-[var(--theme-accent-text)] shadow-lg hover:bg-[var(--theme-accent-hover)] transition-colors cursor-pointer"
-    >
+    <button onClick={onSignInNeeded} className={`${fabClass} cursor-pointer`}>
       <CalendarIcon className="w-5 h-5" />
     </button>
   );

From 0e0c7b42d19cc36b399053501ffcf7eb653c16b1 Mon Sep 17 00:00:00 2001
From: snackman <samgold24@gmail.com>
Date: Mon, 4 May 2026 21:32:07 -0400
Subject: [PATCH 5/8] ui: FAB rounded-full with orange icon and border

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/components/ItineraryFAB.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ItineraryFAB.tsx b/src/components/ItineraryFAB.tsx
index da708f7d..336f9db3 100644
--- a/src/components/ItineraryFAB.tsx
+++ b/src/components/ItineraryFAB.tsx
@@ -11,9 +11,9 @@ interface ItineraryFABProps {
 }
 
 const fabClass =
-  'fixed bottom-6 right-6 z-40 flex items-center gap-2 h-10 px-3.5 rounded-lg ' +
-  'bg-[var(--theme-filter-control-bg)] border border-[var(--theme-filter-control-border)] ' +
-  'text-[var(--theme-filter-text)] hover:text-[var(--theme-text-primary)] hover:bg-[var(--theme-bg-tertiary)] ' +
+  'fixed bottom-6 right-6 z-40 flex items-center gap-2 h-10 px-3.5 rounded-full ' +
+  'bg-[var(--theme-filter-control-bg)] border border-orange-500 ' +
+  'text-orange-500 hover:bg-orange-500/10 ' +
   'shadow-lg shadow-black/20 backdrop-blur-sm transition-colors';
 
 export function ItineraryFAB({ count, conference, onSignInNeeded, isSignedIn }: ItineraryFABProps) {

From 6312417bf36cf5dbb66e7550ba9ac8b95027cdce Mon Sep 17 00:00:00 2001
From: snackman <samgold24@gmail.com>
Date: Mon, 4 May 2026 21:38:18 -0400
Subject: [PATCH 6/8] ui: FAB as circle with larger icon, theme accent colors

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/components/ItineraryFAB.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/ItineraryFAB.tsx b/src/components/ItineraryFAB.tsx
index 336f9db3..ef8fcda9 100644
--- a/src/components/ItineraryFAB.tsx
+++ b/src/components/ItineraryFAB.tsx
@@ -11,16 +11,16 @@ interface ItineraryFABProps {
 }
 
 const fabClass =
-  'fixed bottom-6 right-6 z-40 flex items-center gap-2 h-10 px-3.5 rounded-full ' +
-  'bg-[var(--theme-filter-control-bg)] border border-orange-500 ' +
-  'text-orange-500 hover:bg-orange-500/10 ' +
+  'fixed bottom-6 right-6 z-40 flex items-center justify-center w-12 h-12 rounded-full ' +
+  'bg-[var(--theme-accent-muted)] border border-[var(--theme-accent)] ' +
+  'text-[var(--theme-accent)] hover:bg-[var(--theme-accent)] hover:text-[var(--theme-accent-text)] ' +
   'shadow-lg shadow-black/20 backdrop-blur-sm transition-colors';
 
 export function ItineraryFAB({ count, conference, onSignInNeeded, isSignedIn }: ItineraryFABProps) {
   const href = conference ? `/plan?conf=${encodeURIComponent(conference)}` : '/plan';
 
   const badge = count > 0 ? (
-    <span className="text-[10px] font-bold min-w-[18px] h-[18px] flex items-center justify-center rounded-full px-1 bg-orange-500 text-white">
+    <span className="absolute -top-1 -right-1 text-[10px] font-bold min-w-[18px] h-[18px] flex items-center justify-center rounded-full px-1 bg-[var(--theme-accent)] text-[var(--theme-accent-text)]">
       {count}
     </span>
   ) : null;
@@ -28,7 +28,7 @@ export function ItineraryFAB({ count, conference, onSignInNeeded, isSignedIn }:
   if (count > 0 || isSignedIn) {
     return (
       <Link href={href} className={fabClass}>
-        <CalendarIcon className="w-5 h-5" />
+        <CalendarIcon className="w-6 h-6" />
         {badge}
       </Link>
     );
@@ -36,7 +36,7 @@ export function ItineraryFAB({ count, conference, onSignInNeeded, isSignedIn }:
 
   return (
     <button onClick={onSignInNeeded} className={`${fabClass} cursor-pointer`}>
-      <CalendarIcon className="w-5 h-5" />
+      <CalendarIcon className="w-6 h-6" />
     </button>
   );
 }

From 2cfb914ac4a752502bc2766fd44ca94aaf793b72 Mon Sep 17 00:00:00 2001
From: snackman <samgold24@gmail.com>
Date: Mon, 4 May 2026 21:44:47 -0400
Subject: [PATCH 7/8] ui: My Plan badge in header, back FAB on /plan page

- "My Plan" pill badge in header so it's clear you're viewing your plan
- Back arrow FAB (lower-right) links back to main browse view
- Matches the itinerary FAB style from the main page

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/app/plan/page.tsx | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/app/plan/page.tsx b/src/app/plan/page.tsx
index f9713c5e..4cd5543e 100644
--- a/src/app/plan/page.tsx
+++ b/src/app/plan/page.tsx
@@ -5,7 +5,7 @@ import { useSearchParams } from 'next/navigation';
 import Link from 'next/link';
 import dynamic from 'next/dynamic';
 import { EventCard } from '@/components/EventCard';
-import { Trash2, Share2, GripVertical, Eye, EyeOff } from 'lucide-react';
+import { Trash2, Share2, GripVertical, Eye, EyeOff, ArrowLeft } from 'lucide-react';
 import { useEvents } from '@/hooks/useEvents';
 import { useItinerary } from '@/hooks/useItinerary';
 
@@ -273,7 +273,11 @@ function ItineraryContent() {
         itinerary={itinerary}
         onOpenFriends={() => {}}
         activeConference={activeConference}
-      />
+      >
+        <span className="px-2.5 py-1 rounded-full text-xs font-semibold bg-[var(--theme-accent-muted)] text-[var(--theme-accent)] border border-[var(--theme-accent)]">
+          My Plan
+        </span>
+      </Header>
 
       <SponsorsTicker
         sponsors={resolvedSponsors}
@@ -494,6 +498,16 @@ function ItineraryContent() {
         avatarUrl={profile?.avatar_url}
         hiddenEventIds={hiddenEvents}
       />
+
+      {/* Back to browse FAB */}
+      <Link
+        href={activeConference ? `/?conf=${encodeURIComponent(activeConference)}` : '/'}
+        className="fixed bottom-6 right-6 z-40 flex items-center justify-center w-12 h-12 rounded-full bg-[var(--theme-accent-muted)] border border-[var(--theme-accent)] text-[var(--theme-accent)] hover:bg-[var(--theme-accent)] hover:text-[var(--theme-accent-text)] shadow-lg shadow-black/20 backdrop-blur-sm transition-colors"
+        aria-label="Back to events"
+        title="Back to events"
+      >
+        <ArrowLeft className="w-6 h-6" />
+      </Link>
     </div>
   );
 }

From 115a7836892d844fb9609420a208352939c0f76f Mon Sep 17 00:00:00 2001
From: snackman <samgold24@gmail.com>
Date: Mon, 4 May 2026 21:49:30 -0400
Subject: [PATCH 8/8] feat: enforce chronological order in /plan drag reorder

Events that end before another event starts cannot be sorted below it.
The drag hook clamps insertion position based on date/time constraints.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/app/plan/page.tsx       | 15 +++++++++-
 src/hooks/useDragReorder.ts | 57 +++++++++++++++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/src/app/plan/page.tsx b/src/app/plan/page.tsx
index 4cd5543e..ac2338f8 100644
--- a/src/app/plan/page.tsx
+++ b/src/app/plan/page.tsx
@@ -16,6 +16,7 @@ import type { ETHDenverEvent } from '@/lib/types';
 import { Loading } from '@/components/Loading';
 import { useEventCheckIn } from '@/hooks/useEventCheckIn';
 import { useDragReorder } from '@/hooks/useDragReorder';
+import { parseTimeToMinutes } from '@/lib/time-parse';
 import { useProfile } from '@/hooks/useProfile';
 import { Header } from '@/components/Header';
 import { FilterBar } from '@/components/FilterBar';
@@ -241,6 +242,18 @@ function ItineraryContent() {
     [itinerary, flatEventIds, reorderItinerary]
   );
 
+  const eventMap = useMemo(() => new Map(events.map(e => [e.id, e])), [events]);
+
+  const getEventTime = useCallback((id: string) => {
+    const ev = eventMap.get(id);
+    if (!ev) return null;
+    return {
+      dateISO: ev.dateISO,
+      startMinutes: parseTimeToMinutes(ev.startTime),
+      endMinutes: parseTimeToMinutes(ev.endTime),
+    };
+  }, [eventMap]);
+
   const {
     setOrderedIds,
     registerItemRef,
@@ -248,7 +261,7 @@ function ItineraryContent() {
     getItemProps,
     getDropIndicator,
     dragId,
-  } = useDragReorder({ onReorder: handleReorder });
+  } = useDragReorder({ onReorder: handleReorder, getEventTime });
 
   // Keep ordered IDs in sync
   useEffect(() => {
diff --git a/src/hooks/useDragReorder.ts b/src/hooks/useDragReorder.ts
index a119bee1..9454b4d5 100644
--- a/src/hooks/useDragReorder.ts
+++ b/src/hooks/useDragReorder.ts
@@ -2,9 +2,17 @@
 
 import { useState, useRef, useCallback } from 'react';
 
+interface EventTime {
+  dateISO: string;
+  startMinutes: number | null;
+  endMinutes: number | null;
+}
+
 interface UseDragReorderOptions {
   /** Called with the new ordered array when a drop completes */
   onReorder: (orderedIds: string[]) => void;
+  /** Optional: return time info for an event ID to enforce chronological constraints */
+  getEventTime?: (id: string) => EventTime | null;
 }
 
 interface DragState {
@@ -31,7 +39,45 @@ interface TouchDragState {
   position: 'above' | 'below';
 }
 
-export function useDragReorder({ onReorder }: UseDragReorderOptions) {
+/** Check if event A ends before event B starts (different day or earlier time) */
+function endsBefore(a: EventTime, b: EventTime): boolean {
+  if (a.dateISO < b.dateISO) return true;
+  if (a.dateISO > b.dateISO) return false;
+  // Same day: check if A's end <= B's start
+  if (a.endMinutes == null || b.startMinutes == null) return false;
+  return a.endMinutes <= b.startMinutes;
+}
+
+/** Clamp insertion index so the source event can't be placed after events it ends before */
+function clampInsertIndex(ids: string[], sourceId: string, insertIndex: number, getEventTime: (id: string) => EventTime | null): number {
+  const sourceTime = getEventTime(sourceId);
+  if (!sourceTime) return insertIndex;
+
+  // Don't allow placing below an event that starts after this event ends
+  // Find the latest valid position
+  let clamped = insertIndex;
+  for (let i = 0; i < ids.length; i++) {
+    if (ids[i] === sourceId) continue;
+    const t = getEventTime(ids[i]);
+    if (t && endsBefore(sourceTime, t) && i < clamped) {
+      // Source ends before this event starts, can't go below it
+      clamped = Math.min(clamped, i);
+    }
+  }
+
+  // Also don't allow placing above an event that ends before this one starts
+  for (let i = ids.length - 1; i >= 0; i--) {
+    if (ids[i] === sourceId) continue;
+    const t = getEventTime(ids[i]);
+    if (t && endsBefore(t, sourceTime) && i >= clamped) {
+      clamped = Math.max(clamped, i + 1);
+    }
+  }
+
+  return clamped;
+}
+
+export function useDragReorder({ onReorder, getEventTime }: UseDragReorderOptions) {
   const [dragState, setDragState] = useState<DragState>({
     dragId: null,
     overId: null,
@@ -138,10 +184,14 @@ export function useDragReorder({ onReorder }: UseDragReorderOptions) {
       targetIndex += 1;
     }
 
+    if (getEventTime) {
+      targetIndex = clampInsertIndex(ids, sourceId, targetIndex, getEventTime);
+    }
+
     ids.splice(targetIndex, 0, sourceId);
     onReorderRef.current(ids);
     setDragState({ dragId: null, overId: null, position: 'below' });
-  }, []);
+  }, [getEventTime]);
 
   const handleDragEnd = useCallback(() => {
     setDragState({ dragId: null, overId: null, position: 'below' });
@@ -280,6 +330,9 @@ export function useDragReorder({ onReorder }: UseDragReorderOptions) {
           if (position === 'below') {
             targetIndex += 1;
           }
+          if (getEventTime) {
+            targetIndex = clampInsertIndex(ids, sourceId, targetIndex, getEventTime);
+          }
           ids.splice(targetIndex, 0, sourceId);
           onReorderRef.current(ids);
         }