diff --git a/package.json b/package.json
index efa6a9c3..5a587055 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "turndown-plugin-gfm": "^1.0.2"
   },
   "devDependencies": {
+    "@alpinejs/csp": "^3.15.8",
     "@playwright/test": "^1.64.1",
     "@tailwindcss/forms": "^0.5.11",
     "@tailwindcss/typography": "^0.5.19",
diff --git a/templates/admin.templ b/templates/admin.templ
index 48260890..38b8c609 100644
--- a/templates/admin.templ
+++ b/templates/admin.templ
@@ -10,7 +10,7 @@ templ Admin(user User, stats AdminStats) {
 			<link href="/static/style.css" rel="stylesheet"/>
 			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
 		</head>
-		<body x-data="admin" x-init="loadWatchStatus(); checkActiveScans()" class={ "theme-" + user.Theme }>
+		<body x-data="admin" class={ "theme-" + user.Theme }>
 			@Header(user, "/admin")
 			<main class="p-8">
 				<div class="max-w-4xl">
diff --git a/templates/audio_reader.templ b/templates/audio_reader.templ
index 1bbfabcf..043a337c 100644
--- a/templates/audio_reader.templ
+++ b/templates/audio_reader.templ
@@ -246,7 +246,7 @@ templ AudioReader(user User, metadata ReaderMetadata) {
 							:value="scrubbing ? scrubValue : currentTime"
 							class="relative w-full"
 							@input="scrubbing = true; scrubValue = Number($event.target.value)"
-							@change="seekTo(scrubValue); scrubbing = false"
+							@change="commitScrub()"
 							aria-label="Seek position"
 						/>
 						<!-- Hover tooltip: time + chapter under the pointer -->
@@ -395,7 +395,7 @@ templ AudioReader(user User, metadata ReaderMetadata) {
 						<template x-for="secs in skipChoices" :key="'skip' + secs">
 							<button
 								type="button"
-								@click="setSkip(secs); skipOpen = false"
+								@click="pickSkip(secs)"
 								class="w-full text-left px-3 py-1.5 rounded-md text-sm"
 								:class="Number(skipSeconds) === secs ? 'font-semibold' : ''"
 								:style="Number(skipSeconds) === secs ? 'background-color: var(--accent-muted); color: var(--text-primary);' : 'color: var(--text-secondary);'"
@@ -425,7 +425,7 @@ templ AudioReader(user User, metadata ReaderMetadata) {
 						<template x-for="rate in speeds" :key="'speed' + rate">
 							<button
 								type="button"
-								@click="setSpeed(rate); speedOpen = false"
+								@click="pickSpeed(rate)"
 								class="w-full text-left px-3 py-1.5 rounded-md text-sm"
 								:class="Number(speed) === rate ? 'font-semibold' : ''"
 								:style="Number(speed) === rate ? 'background-color: var(--accent-muted); color: var(--text-primary);' : 'color: var(--text-secondary);'"
@@ -437,7 +437,7 @@ templ AudioReader(user User, metadata ReaderMetadata) {
 						<button
 							type="button"
 							x-show="!isDefaultSpeed(speed)"
-							@click="setDefaultSpeed(speed); speedOpen = false"
+							@click="pickDefaultSpeed(speed)"
 							class="w-full text-left px-3 py-1.5 mt-1 rounded-md text-xs border-t"
 							style="border-color: var(--border); color: var(--text-secondary);"
 							x-text="'Make ' + speed + '× my default'"
@@ -481,7 +481,7 @@ templ AudioReader(user User, metadata ReaderMetadata) {
 						<template x-for="opt in sleepChoices" :key="opt.key">
 							<button
 								type="button"
-								@click="chooseSleep(opt); sleepOpen = false"
+								@click="chooseSleepOption(opt)"
 								class="w-full text-left px-3 py-1.5 rounded-md text-sm"
 								:class="isSleepActive(opt.key) ? 'font-semibold' : ''"
 								:style="isSleepActive(opt.key) ? 'background-color: var(--accent-muted); color: var(--text-primary);' : 'color: var(--text-secondary);'"
@@ -500,7 +500,7 @@ templ AudioReader(user User, metadata ReaderMetadata) {
 							/>
 							<button
 								type="button"
-								@click="chooseSleepClock(); sleepOpen = false"
+								@click="chooseSleepClockMode()"
 								class="text-xs px-2.5 py-1 rounded-md font-semibold"
 								:style="sleepArmedChoiceKey === 'clock' ? 'background-color: var(--accent-muted); color: var(--text-primary);' : 'background-color: var(--surface-hover); color: var(--text-secondary);'"
 							>Arm</button>
diff --git a/templates/bookshelf.templ b/templates/bookshelf.templ
index d0515a11..1760325e 100644
--- a/templates/bookshelf.templ
+++ b/templates/bookshelf.templ
@@ -177,7 +177,7 @@ templ BookShelf(
 									innerHTML templating). Rows are a flat projection of
 									the tree (depth = indent); groups nest via + group. -->
 								<div x-data="filterBuilderExtra" x-cloak
-									x-effect="if (filtersOpen === true) { ensureReadyRule(); }"
+									x-effect="filtersOpen === true && ensureReadyRule()"
 								>
 									<template x-for="row in builderRows" :key="row.key">
 										<div>
diff --git a/templates/docs.templ b/templates/docs.templ
index 64c7bd92..96f75dbb 100644
--- a/templates/docs.templ
+++ b/templates/docs.templ
@@ -23,7 +23,7 @@ templ DocsLayout(nav Navigation, doc Document, user User, currentPath string) {
 			<link href="/static/style.css" rel="stylesheet"/>
 			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
 		</head>
-		<body x-data="docs" x-init="scrollSidebarToActive(); initializeSearch(); initializeCodeCopyButtons()" class={ "theme-" + user.Theme + " page-docs font-sans antialiased" }>
+		<body x-data="docs" class={ "theme-" + user.Theme + " page-docs font-sans antialiased" }>
 			@DocsTopbar(user)
 			<!-- Mobile drawer backdrop -->
 			<div id="docs-overlay" class="hidden fixed inset-0 z-40 lg:hidden" style="background: var(--surface-overlay);" onclick="document.getElementById('docs-sidebar').classList.add('-translate-x-full'); this.classList.add('hidden')"></div>
diff --git a/templates/header.templ b/templates/header.templ
index be1b22a3..25fce8b3 100644
--- a/templates/header.templ
+++ b/templates/header.templ
@@ -3,7 +3,6 @@ package templates
 templ Header(user User, currentPath string) {
 	<div
 		x-data="header"
-		x-init="initializeSearch(); initializeTheme(); loadWoodPaneling(); updateWoodPanelingIndicators(); restoreLibrarySelection(); initializeScanListener()"
 	>
 		<!-- Mobile backdrop -->
 		<div
@@ -84,8 +83,7 @@ templ Header(user User, currentPath string) {
 			</nav>
 			<!-- Bottom: theme picker + user -->
 			<div
-				x-data={ "{ openPanel: (function () { try { var v = localStorage.getItem('sidebar-open-panel'); if (v !== null) { return v === '' ? null : v; } } catch (e) {} return window.location.pathname.startsWith('/admin') ? 'admin' : null; })(), themeMode: '" + string(ThemeModeOf(user.Theme)) + "' }" }
-				x-init="$watch('openPanel', function (v) { try { localStorage.setItem('sidebar-open-panel', v === null ? '' : v); } catch (e) {} })"
+				x-data={ "sidebarShell('" + string(ThemeModeOf(user.Theme)) + "')" }
 				class="shrink-0 px-3 py-3 space-y-2 border-t"
 				style="border-color: color-mix(in srgb, var(--text-primary) 7%, transparent);"
 			>
@@ -98,7 +96,7 @@ templ Header(user User, currentPath string) {
 				<div class="sidebar-panel">
 					<button
 						type="button"
-						@click={ "openPanel = openPanel === 'appearance' ? null : 'appearance'; if (openPanel === 'appearance') $nextTick(() => revealCurrentTheme(themeMode))" }
+						@click="toggleAppearancePanel()"
 						class="w-full flex items-center gap-3 px-3 py-2 rounded-lg text-sm font-medium transition-colors text-content-muted hover:text-content hover:bg-surface-hover"
 					>
 						@Icon("palette", "h-5 w-5 shrink-0")
@@ -112,7 +110,7 @@ templ Header(user User, currentPath string) {
 						<div class="grid grid-cols-2 gap-1 px-2 pt-1">
 							<button
 								type="button"
-								@click="themeMode = 'dark'; $nextTick(() => revealCurrentTheme('dark'))"
+								@click="setThemeMode('dark')"
 								class="flex items-center justify-center gap-1.5 py-1.5 rounded-md text-xs font-medium transition-colors"
 								:class={ "themeMode === 'dark' ? 'mode-toggle-active' : 'text-content-muted hover:text-content'" }
 							>
@@ -122,7 +120,7 @@ templ Header(user User, currentPath string) {
 							</button>
 							<button
 								type="button"
-								@click="themeMode = 'light'; $nextTick(() => revealCurrentTheme('light'))"
+								@click="setThemeMode('light')"
 								class="flex items-center justify-center gap-1.5 py-1.5 rounded-md text-xs font-medium transition-colors"
 								:class={ "themeMode === 'light' ? 'mode-toggle-active' : 'text-content-muted hover:text-content'" }
 							>
@@ -136,7 +134,7 @@ templ Header(user User, currentPath string) {
 							for _, opt := range ThemeOptions {
 								<button
 									type="button"
-									@click={ "changeTheme('" + opt.Name + "'); openPanel = null" }
+									@click="selectTheme(opt.Name)"
 									class="theme-btn w-full flex items-center gap-2.5 px-3 py-1.5 rounded-lg text-sm transition-colors hover:bg-surface-hover"
 									x-show={ "themeMode === '" + string(opt.Mode) + "'" }
 									data-theme={ opt.Name }
diff --git a/templates/index.templ b/templates/index.templ
index a49a6955..b7532839 100644
--- a/templates/index.templ
+++ b/templates/index.templ
@@ -13,7 +13,7 @@ templ Index(loggedIn bool, registrationEnabled bool) {
 			<link href="/static/style.css" rel="stylesheet"/>
 			<link rel="icon" type="image/svg+xml" href="/static/favicon.svg"/>
 		</head>
-		<body x-data="index" x-init="initIndexTheme(); checkAuthRedirect()">
+		<body x-data="index">
 			<div class="absolute top-4 right-4 z-10">
 				<select
 					id="theme-select"
diff --git a/templates/reader.templ b/templates/reader.templ
index bdc0601f..81f68bcc 100644
--- a/templates/reader.templ
+++ b/templates/reader.templ
@@ -554,7 +554,7 @@ templ ReaderChrome(metadata ReaderMetadata) {
 					</div>
 					<div class="reader-tools-row" x-show="comicFlow !== 'webtoon'">
 						<span>Night mode</span>
-						<button @click="fxInvert = !fxInvert; applyFxFilter(true)" class="reader-popover-btn text-xs px-2" :class="fxInvert ? 'text-blue-400' : ''" x-text="fxInvert ? 'On' : 'Off'">Off</button>
+						<button @click="toggleFxInvert()" class="reader-popover-btn text-xs px-2" :class="fxInvert ? 'text-blue-400' : ''" x-text="fxInvert ? 'On' : 'Off'">Off</button>
 					</div>
 					<div class="reader-tools-row" x-show="isPDF && !treatAsComic">
 						<span>Pointer</span>
@@ -593,7 +593,7 @@ templ ReaderTOCDrawer() {
 		<button :class="tocTab === 'contents' ? 'active' : ''" @click="tocTab = 'contents'">
 			Contents <span class="reader-tab-count" x-text="tocItems.length">0</span>
 		</button>
-		<button :class="tocTab === 'pages' ? 'active' : ''" @click="tocTab = 'pages'; initPageThumbs()">
+		<button :class="tocTab === 'pages' ? 'active' : ''" @click="openPageThumbs()">
 			Pages <span class="reader-tab-count" x-text="pageThumbList.length || ''">0</span>
 		</button>
 	</div>
@@ -691,7 +691,7 @@ templ ReaderAnnotationsDrawer() {
 				x-text="noteCountLabel(newNoteText)"
 			></div>
 			<button
-				@click="addNote(newNoteText); newNoteText = ''"
+				@click="submitNote()"
 				:disabled="noteOverLimit(newNoteText)"
 				class="w-full py-1.5 mt-1 mb-3 text-sm bg-blue-600 text-white rounded hover:bg-blue-700 disabled:opacity-50 disabled:cursor-not-allowed"
 			>
@@ -820,7 +820,7 @@ templ ReaderSearchDrawer() {
 		/>
 		<button
 			x-show="searchQuery || searchGroups.length"
-			@click="searchQuery = ''; clearSearchResults()"
+			@click="clearSearch()"
 			class="p-2 rounded-lg hover:bg-gray-700 shrink-0"
 			title="Clear results"
 			aria-label="Clear results"
@@ -908,7 +908,7 @@ templ ReaderSettingsDrawer() {
 				<template x-for="sw in themeSwatches" :key="sw.value">
 					<button
 						type="button"
-						@click="readingTheme = sw.value; applyTheme()"
+						@click="pickReadingTheme(sw.value)"
 						class="theme-swatch"
 						:class="readingTheme === sw.value ? 'ring-2 ring-blue-500' : ''"
 						:style="'background-color:' + sw.bg + '; color:' + sw.fg"
diff --git a/web/src/admin.ts b/web/src/admin.ts
index f93a2995..81cc3102 100644
--- a/web/src/admin.ts
+++ b/web/src/admin.ts
@@ -596,6 +596,8 @@ function bindDeleteLibraryModalClose(): void {
 Alpine.data("admin", () => ({
   init() {
     bindDeleteLibraryModalClose();
+    this.loadWatchStatus();
+    this.checkActiveScans();
   },
   cancelAllScans,
   checkActiveScans,
diff --git a/web/src/alpine.ts b/web/src/alpine.ts
index 7d6a4602..b9622a9e 100644
--- a/web/src/alpine.ts
+++ b/web/src/alpine.ts
@@ -1,4 +1,4 @@
-import Alpine from "alpinejs";
+import Alpine from "@alpinejs/csp";
 
 // Extend Window interface to include Alpine. The `htmx` member is declared
 // once in shims.d.ts — redeclaring it here with a different shape is a
diff --git a/web/src/audio.ts b/web/src/audio.ts
index 951f5a45..63516f7f 100644
--- a/web/src/audio.ts
+++ b/web/src/audio.ts
@@ -678,6 +678,31 @@ Alpine.data("audioReader", () => ({
       })
       .catch(() => showToast("Default speed not saved", "error"));
   },
+  // Popover option handlers (CSP-safe: single method calls from templ).
+  commitScrub() {
+    this.seekTo(this.scrubValue);
+    this.scrubbing = false;
+  },
+  pickSkip(seconds: number) {
+    this.setSkip(seconds);
+    this.skipOpen = false;
+  },
+  pickSpeed(rate: number) {
+    this.setSpeed(rate);
+    this.speedOpen = false;
+  },
+  pickDefaultSpeed(rate: number) {
+    this.setDefaultSpeed(rate);
+    this.speedOpen = false;
+  },
+  chooseSleepOption(choice: SleepChoice) {
+    this.chooseSleep(choice);
+    this.sleepOpen = false;
+  },
+  chooseSleepClockMode() {
+    this.chooseSleepClock();
+    this.sleepOpen = false;
+  },
 
   isDefaultSpeed(rate: number): boolean {
     return Number(this.defaultSpeed) === rate;
diff --git a/web/src/docs.ts b/web/src/docs.ts
index 57510356..fd9fa936 100644
--- a/web/src/docs.ts
+++ b/web/src/docs.ts
@@ -153,6 +153,11 @@ function initializeCodeCopyButtons(): void {
 }
 
 Alpine.data("docs", () => ({
+  init() {
+    this.scrollSidebarToActive();
+    this.initializeSearch();
+    this.initializeCodeCopyButtons();
+  },
   toggleSidebar,
   toggleCollapsible,
   initializeSearch: initializeDocsSearch,
diff --git a/web/src/header.ts b/web/src/header.ts
index a9545b89..3babcbd9 100644
--- a/web/src/header.ts
+++ b/web/src/header.ts
@@ -121,7 +121,60 @@ const initializeScanListener = function (this: any) {
 export { logout, restoreLibrarySelection };
 
 Alpine.data("header", () => ({
+  init() {
+    // Shared panel state: one open panel across all sidebar panels. Default
+    // to the persisted panel (or the admin section on /admin pages).
+    try {
+      const v = localStorage.getItem("sidebar-open-panel");
+      this.openPanel =
+        v !== null
+          ? v === ""
+            ? null
+            : v
+          : window.location.pathname.startsWith("/admin")
+            ? "admin"
+            : null;
+    } catch {
+      this.openPanel = window.location.pathname.startsWith("/admin") ? "admin" : null;
+    }
+    initializeSearch();
+    this.initializeTheme();
+    this.loadWoodPaneling();
+    this.updateWoodPanelingIndicators();
+    this.restoreLibrarySelection();
+    this.initializeScanListener();
+    // Persist the sidebar's open panel across navigations (was an inline
+    // x-init $watch on the panel element).
+    this.$watch("openPanel", (v: unknown) => {
+      try {
+        localStorage.setItem("sidebar-open-panel", v === null ? "" : String(v));
+      } catch {
+        /* private-mode localStorage failures are non-fatal */
+      }
+    });
+  },
+  openPanel: null as string | null,
+  // Shadow copy for the root-level toggleAppearancePanel: the sidebar shell's
+  // own themeMode (initialized from the server) is the one that matters at
+  // runtime — the merged Alpine scope reads the nearest declaration.
+  themeMode: "",
   mobileMenuOpen: false,
+  // Shared panel toggles: invoked from the sidebar shell's scope, so `this`
+  // is the merged data stack (shell themeMode + root openPanel).
+  toggleAppearancePanel() {
+    this.openPanel = this.openPanel === "appearance" ? null : "appearance";
+    if (this.openPanel === "appearance") {
+      this.$nextTick(() => this.revealCurrentTheme(this.themeMode));
+    }
+  },
+  setThemeMode(mode: string) {
+    this.themeMode = mode;
+    this.$nextTick(() => this.revealCurrentTheme(mode));
+  },
+  selectTheme(name: string) {
+    changeTheme(name);
+    this.openPanel = null;
+  },
   logout,
   initializeSearch,
   initializeTheme,
@@ -137,3 +190,25 @@ Alpine.data("header", () => ({
   scanNewItems: 0,
   scanFilesScanned: 0,
 }));
+
+// Sidebar shell: owns the appearance panel's theme-mode state. The shared
+// openPanel lives on the header root (one open panel across all panels).
+// Registered (not inline x-data) so its methods work under the CSP-safe
+// Alpine build, which cannot evaluate arbitrary inline sentences.
+Alpine.data("sidebarShell", (initialThemeMode: string) => ({
+  themeMode: initialThemeMode,
+  toggleAppearancePanel() {
+    this.openPanel = this.openPanel === "appearance" ? null : "appearance";
+    if (this.openPanel === "appearance") {
+      this.$nextTick(() => this.revealCurrentTheme(this.themeMode));
+    }
+  },
+  setThemeMode(mode: string) {
+    this.themeMode = mode;
+    this.$nextTick(() => this.revealCurrentTheme(mode));
+  },
+  selectTheme(name: string) {
+    changeTheme(name);
+    this.openPanel = null;
+  },
+}));
diff --git a/web/src/index.ts b/web/src/index.ts
index 5c657f97..7c77d05d 100644
--- a/web/src/index.ts
+++ b/web/src/index.ts
@@ -44,6 +44,10 @@ async function checkAuthRedirect(): Promise<void> {
 export { changeTheme, checkAuthRedirect, initIndexTheme };
 
 Alpine.data("index", () => ({
+  init() {
+    initIndexTheme();
+    checkAuthRedirect();
+  },
   changeTheme,
   checkAuthRedirect,
   initIndexTheme,
diff --git a/web/src/reader/reader.ts b/web/src/reader/reader.ts
index bd16a208..e4cf0a2f 100644
--- a/web/src/reader/reader.ts
+++ b/web/src/reader/reader.ts
@@ -3587,6 +3587,27 @@ document.addEventListener("alpine:init", () => {
       this.readingMode = this.readingMode === "dark" ? "light" : "dark";
       this.applyTheme();
     },
+    // Popover/toolbar handlers (CSP-safe: single method calls from templ).
+    toggleFxInvert() {
+      this.fxInvert = !this.fxInvert;
+      this.applyFxFilter(true);
+    },
+    openPageThumbs() {
+      this.tocTab = "pages";
+      this.initPageThumbs();
+    },
+    submitNote() {
+      this.addNote(this.newNoteText);
+      this.newNoteText = "";
+    },
+    clearSearch() {
+      this.searchQuery = "";
+      this.clearSearchResults();
+    },
+    pickReadingTheme(value: string) {
+      this.readingTheme = value;
+      this.applyTheme();
+    },
     detectChromeDarkMode(): boolean {
       const darkChromeThemes = [
         "theme-tokyo-night",