diff --git a/.gitignore b/.gitignore
index a5388c7..6cea500 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,11 @@
 node_modules/
 .agent/
+internal/spa/dist/
+frontend/node_modules/
+frontend/dist/
+frontend/bun.lock
+frontend/bun.lockb
+frontend/package-lock.json
 *.exe
 *.exe~
 *.dll
diff --git a/CLAUDE.md b/CLAUDE.md
index b7f254e..e136dd7 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Project Overview
 
-kafka is a privacy-respecting metasearch engine written in Go. It provides a SearXNG-compatible `/search` API and an HTML frontend (HTMX + Go templates). 9 engines are implemented natively in Go; unlisted engines can be proxied to an upstream metasearch instance. Responses from multiple engines are merged into a single JSON/CSV/RSS/HTML response.
+samsa is a privacy-respecting metasearch engine written in Go. It provides a SearXNG-compatible `/search` API and an HTML frontend (HTMX + Go templates). 9 engines are implemented natively in Go; unlisted engines can be proxied to an upstream metasearch instance. Responses from multiple engines are merged into a single JSON/CSV/RSS/HTML response.
 
 ## Build & Run Commands
 
@@ -22,7 +22,7 @@ go test -run TestWikipedia ./internal/engines/
 go test -v ./internal/engines/
 
 # Run the server (requires config.toml)
-go run ./cmd/kafka -config config.toml
+go run ./cmd/samsa -config config.toml
 ```
 
 There is no Makefile. There is no linter configured.
@@ -43,7 +43,7 @@ There is no Makefile. There is no linter configured.
 - `internal/cache` — Valkey/Redis-backed cache with SHA-256 cache keys. No-op if unconfigured.
 - `internal/middleware` — Three rate limiters (per-IP sliding window, burst+sustained, global) and CORS. All disabled by default.
 - `internal/views` — HTML templates and static files embedded via `//go:embed`. Renders full pages or HTMX fragments. Templates: `base.html`, `index.html`, `results.html`, `results_inner.html`, `result_item.html`.
-- `cmd/kafka` — Entry point. Loads TOML config, seeds env vars for engine code, wires up middleware chain, starts HTTP server.
+- `cmd/samsa` — Entry point. Loads TOML config, seeds env vars for engine code, wires up middleware chain, starts HTTP server.
 
 **Engine interface** (`internal/engines/engine.go`):
 ```go
@@ -66,7 +66,7 @@ Config is loaded from `config.toml` (see `config.example.toml`). All fields can
 
 ## Conventions
 
-- Module path: `github.com/metamorphosis-dev/kafka`
+- Module path: `github.com/metamorphosis-dev/samsa`
 - Tests use shared mock helpers in `internal/engines/http_mock_test.go` (`roundTripperFunc`, `httpResponse`)
 - Engine implementations are single files under `internal/engines/` (e.g., `wikipedia.go`, `duckduckgo.go`)
 - Response merging de-duplicates by `engine|title|url` key; suggestions/corrections are merged as sets
diff --git a/Dockerfile b/Dockerfile
index e21960f..9f3443f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN apk add --no-cache ca-certificates tzdata
 COPY --from=builder /kafka /usr/local/bin/kafka
 COPY config.example.toml /etc/kafka/config.example.toml
 
-EXPOSE 8080
+EXPOSE 5355
 
 ENTRYPOINT ["kafka"]
 CMD ["-config", "/etc/kafka/config.toml"]
diff --git a/README.md b/README.md
index 25c1c29..7427922 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,23 @@
-# kafka
+# samsa
+
+*samsa — named for Gregor Samsa, who woke to find himself transformed. You wanted results; you got a metasearch engine.*
 
 A privacy-respecting, open metasearch engine written in Go. SearXNG-compatible API with an HTML frontend, designed to be fast, lightweight, and deployable anywhere.
 
-**9 engines. No JavaScript. No tracking. One binary.**
+**11 engines. No JavaScript required. No tracking. One binary.**
 
 ## Features
 
 - **SearXNG-compatible API** — drop-in replacement for existing integrations
-- **9 search engines** — Wikipedia, arXiv, Crossref, Brave, Qwant, DuckDuckGo, GitHub, Reddit, Bing
-- **HTML frontend** — HTMX + Go templates with instant search, dark mode, responsive design
+- **11 search engines** — Wikipedia, arXiv, Crossref, Brave Search API, Brave (scraping), Qwant, DuckDuckGo, GitHub, Reddit, Bing, Google, YouTube
+- **Stack Overflow** — bonus engine, not enabled by default
+- **HTML frontend** — Go templates + HTMX with instant search, dark mode, responsive design
 - **Valkey cache** — optional Redis-compatible caching with configurable TTL
 - **Rate limiting** — three layers: per-IP, burst, and global (all disabled by default)
 - **CORS** — configurable origins for browser-based clients
-- **OpenSearch** — browsers can add kafka as a search engine from the address bar
+- **OpenSearch** — browsers can add samsa as a search engine from the address bar
 - **Graceful degradation** — individual engine failures don't kill the whole search
-- **Docker** — multi-stage build, ~20MB runtime image
+- **Docker** — multi-stage build, static binary, ~20MB runtime image
 - **NixOS** — native NixOS module with systemd service
 
 ## Quick Start
@@ -22,17 +25,17 @@ A privacy-respecting, open metasearch engine written in Go. SearXNG-compatible A
 ### Binary
 
 ```bash
-git clone https://git.ashisgreat.xyz/penal-colony/gosearch.git
-cd kafka
-go build ./cmd/kafka
-./kafka -config config.toml
+git clone https://git.ashisgreat.xyz/penal-colony/samsa.git
+cd samsa
+go build ./cmd/samsa
+./samsa -config config.toml
 ```
 
 ### Docker Compose
 
 ```bash
 cp config.example.toml config.toml
-# Edit config.toml — set your Brave API key, etc.
+# Edit config.toml — set your Brave API key, YouTube API key, etc.
 docker compose up -d
 ```
 
@@ -41,28 +44,28 @@ docker compose up -d
 Add to your flake inputs:
 
 ```nix
-inputs.kafka.url = "git+https://git.ashisgreat.xyz/penal-colony/gosearch.git";
+inputs.samsa.url = "git+https://git.ashisgreat.xyz/penal-colony/samsa.git";
 ```
 
 Enable in your configuration:
 
 ```nix
-imports = [ inputs.kafka.nixosModules.default ];
+imports = [ inputs.samsa.nixosModules.default ];
 
-services.kafka = {
+services.samsa = {
   enable = true;
   openFirewall = true;
   baseUrl = "https://search.example.com";
-  # config = "/etc/kafka/config.toml";  # default
+  # config = "/etc/samsa/config.toml";  # default
 };
 ```
 
 Write your config:
 
 ```bash
-sudo mkdir -p /etc/kafka
-sudo cp config.example.toml /etc/kafka/config.toml
-sudo $EDITOR /etc/kafka/config.toml
+sudo mkdir -p /etc/samsa
+sudo cp config.example.toml /etc/samsa/config.toml
+sudo $EDITOR /etc/samsa/config.toml
 ```
 
 Deploy:
@@ -76,7 +79,7 @@ sudo nixos-rebuild switch --flake .#
 ```bash
 nix develop
 go test ./...
-go run ./cmd/kafka -config config.toml
+go run ./cmd/samsa -config config.toml
 ```
 
 ## Endpoints
@@ -107,7 +110,7 @@ go run ./cmd/kafka -config config.toml
 ### Example
 
 ```bash
-curl "http://localhost:8080/search?q=golang&format=json&engines=github,duckduckgo"
+curl "http://localhost:5355/search?q=golang&format=json&engines=github,duckduckgo"
 ```
 
 ### Response (JSON)
@@ -140,6 +143,8 @@ Copy `config.example.toml` to `config.toml` and edit. All settings can also be o
 - **`[server]`** — port, timeout, public base URL for OpenSearch
 - **`[upstream]`** — optional upstream metasearch proxy for unported engines
 - **`[engines]`** — which engines run locally, engine-specific settings
+- **`[engines.brave]`** — Brave Search API key
+- **`[engines.youtube]`** — YouTube Data API v3 key
 - **`[cache]`** — Valkey/Redis address, password, TTL
 - **`[cors]`** — allowed origins and methods
 - **`[rate_limit]`** — per-IP sliding window (30 req/min default)
@@ -150,13 +155,14 @@ Copy `config.example.toml` to `config.toml` and edit. All settings can also be o
 
 | Variable | Description |
 |---|---|
-| `PORT` | Listen port (default: 8080) |
+| `PORT` | Listen port (default: 5355) |
 | `BASE_URL` | Public URL for OpenSearch XML |
 | `UPSTREAM_SEARXNG_URL` | Upstream instance URL |
 | `LOCAL_PORTED_ENGINES` | Comma-separated local engine list |
 | `HTTP_TIMEOUT` | Upstream request timeout |
 | `BRAVE_API_KEY` | Brave Search API key |
 | `BRAVE_ACCESS_TOKEN` | Gate requests with token |
+| `YOUTUBE_API_KEY` | YouTube Data API v3 key |
 | `VALKEY_ADDRESS` | Valkey/Redis address |
 | `VALKEY_PASSWORD` | Valkey/Redis password |
 | `VALKEY_CACHE_TTL` | Cache TTL |
@@ -170,55 +176,64 @@ See `config.example.toml` for the full list including rate limiting and CORS var
 | Wikipedia | MediaWiki API | General knowledge |
 | arXiv | arXiv API | Academic papers |
 | Crossref | Crossref API | Academic metadata |
-| Brave | Brave Search API | General web (requires API key) |
+| Brave Search API | Brave API | General web (requires API key) |
+| Brave | Brave Lite HTML | General web (no key needed) |
 | Qwant | Qwant Lite HTML | General web |
 | DuckDuckGo | DDG Lite HTML | General web |
 | GitHub | GitHub Search API v3 | Code and repositories |
 | Reddit | Reddit JSON API | Discussions |
 | Bing | Bing RSS | General web |
+| Google | GSA User-Agent scraping | General web (no API key) |
+| YouTube | YouTube Data API v3 | Videos (requires API key) |
+| Stack Overflow | Stack Exchange API | Q&A (registered, not enabled by default) |
 
 Engines not listed in `engines.local_ported` are proxied to an upstream metasearch instance if `upstream.url` is configured.
 
+### API Keys
+
+Brave Search API and YouTube Data API require keys. If omitted, those engines are silently skipped. Brave Lite (scraping) and Google (GSA UA scraping) work without keys.
+
 ## Architecture
 
 ```
-┌─────────────────────────────────────┐
-│           HTTP Handler              │
-│  /search  /  /opensearch.xml       │
-├─────────────────────────────────────┤
-│         Middleware Chain             │
-│  Global → Burst → Per-IP → CORS    │
-├─────────────────────────────────────┤
-│         Search Service              │
-│  Parallel engine execution          │
-│  WaitGroup + graceful degradation   │
-├─────────────────────────────────────┤
-│           Cache Layer               │
-│  Valkey/Redis (optional, no-op if   │
-│  unconfigured)                      │
-├─────────────────────────────────────┤
-│          Engines (×9)               │
-│  Each runs in its own goroutine     │
-│  Failures → unresponsive_engines    │
-└─────────────────────────────────────┘
+┌───────────────────────────────────────┐
+│             HTTP Handler                     │
+│      /search  /  /opensearch.xml             │
+├───────────────────────────────────────┤
+│            Middleware Chain                  │
+│   Global → Burst → Per-IP → CORS           │
+├───────────────────────────────────────┤
+│            Search Service                    │
+│     Parallel engine execution                │
+│   WaitGroup + graceful degradation           │
+├───────────────────────────────────────┤
+│             Cache Layer                      │
+│  Valkey/Redis (optional; no-op if            │
+│              unconfigured)                   │
+├───────────────────────────────────────┤
+│        Engines (×11 default)                 │
+│    Each runs in its own goroutine            │
+│   Failures → unresponsive_engines           │
+└───────────────────────────────────────┘
 ```
 
 ## Docker
 
-The Dockerfile uses a multi-stage build:
-
-```dockerfile
-# Build stage: golang:1.24-alpine
-# Runtime stage: alpine:3.21 (~20MB)
-# CGO_ENABLED=0 — static binary
-```
+The Dockerfile uses a multi-stage build with a static Go binary on alpine Linux:
 
 ```bash
+# Build: golang:1.24-alpine
+# Runtime: alpine:3.21 (~20MB)
+# CGO_ENABLED=0 — fully static
 docker compose up -d
 ```
 
 Includes Valkey 8 with health checks out of the box.
 
+## Contributing
+
+See [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md) for a walkthrough of adding a new engine. The interface is two methods: `Name()` and `Search(context, request)`.
+
 ## License
 
 [AGPLv3](https://www.gnu.org/licenses/agpl-3.0.html)
diff --git a/cmd/kafka/main.go b/cmd/samsa/main.go
similarity index 87%
rename from cmd/kafka/main.go
rename to cmd/samsa/main.go
index f691665..199033b 100644
--- a/cmd/kafka/main.go
+++ b/cmd/samsa/main.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -25,13 +25,13 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/metamorphosis-dev/kafka/internal/autocomplete"
-	"github.com/metamorphosis-dev/kafka/internal/cache"
-	"github.com/metamorphosis-dev/kafka/internal/config"
-	"github.com/metamorphosis-dev/kafka/internal/httpapi"
-	"github.com/metamorphosis-dev/kafka/internal/middleware"
-	"github.com/metamorphosis-dev/kafka/internal/search"
-	"github.com/metamorphosis-dev/kafka/internal/views"
+	"github.com/metamorphosis-dev/samsa/internal/autocomplete"
+	"github.com/metamorphosis-dev/samsa/internal/cache"
+	"github.com/metamorphosis-dev/samsa/internal/config"
+	"github.com/metamorphosis-dev/samsa/internal/httpapi"
+	"github.com/metamorphosis-dev/samsa/internal/middleware"
+	"github.com/metamorphosis-dev/samsa/internal/search"
+	"github.com/metamorphosis-dev/samsa/internal/views"
 )
 
 func main() {
@@ -77,15 +77,20 @@ func main() {
 
 	acSvc := autocomplete.NewService(cfg.Upstream.URL, cfg.HTTPTimeout())
 
-	h := httpapi.NewHandler(svc, acSvc.Suggestions, cfg.Server.SourceURL)
+	h := httpapi.NewHandler(svc, acSvc.Suggestions, cfg.Server.SourceURL, searchCache)
 
 	mux := http.NewServeMux()
+
+	// HTML template routes
 	mux.HandleFunc("/", h.Index)
-	mux.HandleFunc("/healthz", h.Healthz)
 	mux.HandleFunc("/search", h.Search)
-	mux.HandleFunc("/autocompleter", h.Autocompleter)
 	mux.HandleFunc("/preferences", h.Preferences)
+
+	// API routes
+	mux.HandleFunc("/healthz", h.Healthz)
+	mux.HandleFunc("/autocompleter", h.Autocompleter)
 	mux.HandleFunc("/opensearch.xml", h.OpenSearch(cfg.Server.BaseURL))
+	mux.HandleFunc("/favicon/", h.Favicon)
 
 	// Serve embedded static files (CSS, JS, images).
 	staticFS, err := views.StaticFS()
@@ -123,7 +128,7 @@ func main() {
 	}, logger)(handler)
 
 	addr := fmt.Sprintf(":%d", cfg.Server.Port)
-	logger.Info("kafka starting",
+	logger.Info("samsa starting",
 		"addr", addr,
 		"cache", searchCache.Enabled(),
 		"rate_limit", cfg.RateLimit.Requests > 0,
diff --git a/config.example.toml b/config.example.toml
index 042bb63..7fed53e 100644
--- a/config.example.toml
+++ b/config.example.toml
@@ -1,22 +1,22 @@
-# kafka configuration
+# samsa configuration
 # Copy to config.toml and adjust as needed.
 # Environment variables are used as fallbacks when a config field is empty/unset.
 
 [server]
 # Listen port (env: PORT)
-port = 8080
+port = 5355
 
 # HTTP timeout for engine and upstream calls (env: HTTP_TIMEOUT)
 http_timeout = "10s"
 
 # Public base URL for OpenSearch XML (env: BASE_URL)
-# Set this so browsers can add kafka as a search engine.
+# Set this so browsers can add samsa as a search engine.
 # Example: "https://search.example.com"
 base_url = ""
 
 # Link to the source code (shown in footer as "Source" link)
-# Defaults to the upstream kafka repo if not set.
-# Example: "https://git.example.com/my-kafka-fork"
+# Defaults to the upstream samsa repo if not set.
+# Example: "https://git.example.com/my-samsa-fork"
 source_url = ""
 
 [upstream]
@@ -27,7 +27,8 @@ url = ""
 [engines]
 # Comma-separated list of engines to execute locally in Go (env: LOCAL_PORTED_ENGINES)
 # Engines not listed here will be proxied to the upstream instance.
-local_ported = ["wikipedia", "arxiv", "crossref", "braveapi", "qwant", "duckduckgo", "github", "reddit", "bing", "google", "youtube"]
+# Include bing_images, ddg_images, qwant_images for image search when [upstream].url is empty.
+local_ported = ["wikipedia", "wikidata", "arxiv", "crossref", "braveapi", "qwant", "duckduckgo", "github", "reddit", "bing", "google", "youtube", "bing_images", "ddg_images", "qwant_images"]
 
 [engines.brave]
 # Brave Search API key (env: BRAVE_API_KEY)
@@ -56,6 +57,12 @@ db = 0
 # Cache TTL for search results (env: VALKEY_CACHE_TTL)
 default_ttl = "5m"
 
+[cache.ttl_overrides]
+# Per-engine TTL overrides (uncomment to use):
+# wikipedia = "48h"
+# reddit = "15m"
+# braveapi = "2h"
+
 [cors]
 # CORS configuration for browser-based clients.
 # Allowed origins: use "*" for all, or specific domains (env: CORS_ALLOWED_ORIGINS)
diff --git a/docker-compose.yml b/docker-compose.yml
index 98eae96..538713f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
   kafka:
     build: .
     ports:
-      - "8080:8080"
+      - "5355:5355"
     volumes:
       - ./config.toml:/etc/kafka/config.toml:ro
     depends_on:
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
new file mode 100644
index 0000000..bada2e2
--- /dev/null
+++ b/docs/CONTRIBUTING.md
@@ -0,0 +1,218 @@
+# Contributing — Adding a New Engine
+
+This guide walks through adding a new search engine to samsa. The minimal engine needs only an HTTP client, a query, and a result parser.
+
+---
+
+## 1. Create the engine file
+
+Place it in `internal/engines/`:
+
+```
+internal/engines/
+  myengine.go        ← your engine
+  myengine_test.go   ← tests (required)
+```
+
+Name the struct after the engine, e.g. `WolframEngine` for "wolfram". The `Name()` method returns the engine key used throughout samsa.
+
+## 2. Implement the Engine interface
+
+```go
+package engines
+
+import (
+    "context"
+    "github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+type MyEngine struct {
+    client *http.Client
+}
+
+func (e *MyEngine) Name() string { return "myengine" }
+
+func (e *MyEngine) Search(ctx context.Context, req contracts.SearchRequest) (contracts.SearchResponse, error) {
+    // ...
+}
+```
+
+### The SearchRequest fields you'll use most:
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `Query` | `string` | The search query |
+| `Pageno` | `int` | Current page number (1-based) |
+| `Safesearch` | `int` | 0=off, 1=moderate, 2=strict |
+| `Language` | `string` | ISO language code (e.g. `"en"`) |
+
+### The SearchResponse to return:
+
+```go
+contracts.SearchResponse{
+    Query:               req.Query,
+    NumberOfResults:     len(results),
+    Results:             results,       // []MainResult
+    Answers:             []map[string]any{},
+    Corrections:         []string{},
+    Infoboxes:           []map[string]any{},
+    Suggestions:         []string{},
+    UnresponsiveEngines: [][2]string{},
+}
+```
+
+### Empty query — return early:
+
+```go
+if strings.TrimSpace(req.Query) == "" {
+    return contracts.SearchResponse{Query: req.Query}, nil
+}
+```
+
+### Engine unavailable / error — graceful degradation:
+
+```go
+// Rate limited or blocked
+return contracts.SearchResponse{
+    Query:               req.Query,
+    UnresponsiveEngines: [][2]string{{"myengine", "reason"}},
+    Results:             []contracts.MainResult{},
+    // ... empty other fields
+}, nil
+
+// Hard error — return it
+return contracts.SearchResponse{}, fmt.Errorf("myengine upstream error: status %d", resp.StatusCode)
+```
+
+## 3. Build the result
+
+```go
+urlPtr := "https://example.com/result"
+result := contracts.MainResult{
+    Title:    "Result Title",
+    Content:  "Snippet or description text",
+    URL:      &urlPtr,       // pointer to string, required
+    Engine:   "myengine",
+    Category: "general",     // or "it", "science", "videos", "images", "social media"
+    Score:    0,             // used for relevance ranking during merge
+    Engines:  []string{"myengine"},
+}
+```
+
+### Template field
+
+The template system checks for `"videos"` and `"images"`. Everything else renders via `result_item.html`. Set `Template` only if you have a custom template; omit it for the default result card.
+
+### Category field
+
+Controls which category tab the result appears under and which engines are triggered:
+
+| Category | Engines used |
+|----------|-------------|
+| `general` | google, bing, ddg, brave, braveapi, qwant, wikipedia |
+| `it` | github, stackoverflow |
+| `science` | arxiv, crossref |
+| `videos` | youtube |
+| `images` | bing_images, ddg_images, qwant_images |
+| `social media` | reddit |
+
+## 4. Wire it into the factory
+
+In `internal/engines/factory.go`, add your engine to the map returned by `NewDefaultPortedEngines`:
+
+```go
+"myengine": &MyEngine{client: client},
+```
+
+If your engine needs an API key, read it from config or the environment (see `braveapi` or `youtube` in factory.go for the pattern).
+
+## 5. Register defaults
+
+In `internal/engines/planner.go`:
+
+**Add to `defaultPortedEngines`:**
+```go
+var defaultPortedEngines = []string{
+    // ... existing ...
+    "myengine",
+}
+```
+
+**Add to category mapping in `inferFromCategories`** (if applicable):
+```go
+case "general":
+    set["myengine"] = true
+```
+
+**Update the sort order map** so results maintain consistent ordering:
+```go
+order := map[string]int{
+    // ... existing ...
+    "myengine": N,  // pick a slot
+}
+```
+
+## 6. Add tests
+
+At minimum, test:
+- `Name()` returns the correct string
+- Nil engine returns an error
+- Empty query returns zero results
+- Successful API response parses correctly
+- Rate limit / error cases return `UnresponsiveEngines` with a reason
+
+Use `httptest.NewServer` to mock the upstream API. See `arxiv_test.go` or `reddit_test.go` for examples.
+
+## 7. Build and test
+
+```bash
+go build ./...
+go test ./internal/engines/ -run MyEngine -v
+go test ./...
+```
+
+## Example: Adding an RSS-based engine
+
+If the engine provides an RSS feed, the parsing is straightforward:
+
+```go
+type rssItem struct {
+    Title       string `xml:"title"`
+    Link        string `xml:"link"`
+    Description string `xml:"description"`
+}
+
+type rssFeed struct {
+    Channel struct {
+        Items []rssItem `xml:"item"`
+    } `xml:"channel"`
+}
+
+dec := xml.NewDecoder(resp.Body)
+var feed rssFeed
+dec.Decode(&feed)
+
+for _, item := range feed.Channel.Items {
+    urlPtr := item.Link
+    results = append(results, contracts.MainResult{
+        Title:   item.Title,
+        Content: stripHTML(item.Description),
+        URL:     &urlPtr,
+        Engine:  "myengine",
+        // ...
+    })
+}
+```
+
+## Checklist
+
+- [ ] Engine file created in `internal/engines/`
+- [ ] `Engine` interface implemented (`Name()` + `Search()`)
+- [ ] Empty query handled (return early, no error)
+- [ ] Graceful degradation for errors and rate limits
+- [ ] Results use `Category` to group with related engines
+- [ ] Factory updated with new engine
+- [ ] Planner updated (defaults + category mapping + sort order)
+- [ ] Tests written covering main paths
+- [ ] `go build ./...` succeeds
+- [ ] `go test ./...` passes
diff --git a/docs/superpowers/plans/2026-03-22-brave-search-frontend-redesign.md b/docs/superpowers/plans/2026-03-22-brave-search-frontend-redesign.md
deleted file mode 100644
index 28b98a1..0000000
--- a/docs/superpowers/plans/2026-03-22-brave-search-frontend-redesign.md
+++ /dev/null
@@ -1,1222 +0,0 @@
-# Brave Search Frontend Redesign — Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Redesign the kafka frontend to match Brave Search's layout: three-column results page, category tiles on homepage, and a hybrid preferences system with full-page `/preferences` route.
-
-**Architecture:** CSS Grid for page-level layouts (three-column results, two-column preferences). JavaScript popover for quick settings (theme + engines only). Server-rendered full preferences page with localStorage persistence. Category tiles are static links with category query params.
-
-**Tech Stack:** Go (Go templates), CSS Grid/Flexbox, Vanilla JavaScript (HTMX for search), localStorage for preferences
-
----
-
-## File Map
-
-| File | Responsibility |
-|------|----------------|
-| `internal/views/static/css/kafka.css` | Add layout grids, category tiles, sidebar styles, mobile breakpoints |
-| `internal/views/templates/index.html` | Add category tiles below search box |
-| `internal/views/templates/results.html` | Add left sidebar, restructure for three-column grid |
-| `internal/views/templates/preferences.html` | **New** — full preferences page with nav |
-| `internal/views/templates/base.html` | No structural changes needed |
-| `internal/views/static/js/settings.js` | Reduce popover to theme + engines; add preferences page JS |
-| `internal/httpapi/handlers.go` | Add `GET /preferences` and `POST /preferences` handlers |
-| `internal/views/views.go` | Add `RenderPreferences` and `tmplPreferences` template |
-
----
-
-## PHASE 1: CSS Layout Framework
-
-### Task 1: Add CSS Grid Layouts and Breakpoints
-
-**Files:**
-- Modify: `internal/views/static/css/kafka.css`
-
-- [ ] **Step 1: Add three-column results layout CSS**
-
-Append to end of `kafka.css`, before the `@media print` block:
-
-```css
-/* ============================================================
-   Three-Column Results Layout
-   ============================================================ */
-
-.results-layout {
-  display: grid;
-  grid-template-columns: 200px 1fr 240px;
-  gap: 2rem;
-  align-items: start;
-}
-
-.results-layout .left-sidebar {
-  position: sticky;
-  top: calc(var(--header-height) + 1.5rem);
-  max-height: calc(100vh - var(--header-height) - 3rem);
-  overflow-y: auto;
-}
-
-.results-layout .right-sidebar {
-  position: sticky;
-  top: calc(var(--header-height) + 1.5rem);
-  max-height: calc(100vh - var(--header-height) - 3rem);
-  overflow-y: auto;
-}
-
-.results-layout .results-column {
-  min-width: 0;
-}
-```
-
-- [ ] **Step 2: Add mobile breakpoints**
-
-```css
-/* Tablet: hide left sidebar, two columns */
-@media (min-width: 769px) and (max-width: 1024px) {
-  .results-layout {
-    grid-template-columns: 1fr 220px;
-  }
-  .results-layout .left-sidebar {
-    display: none;
-  }
-}
-
-/* Mobile: single column, no sidebars */
-@media (max-width: 768px) {
-  .results-layout {
-    grid-template-columns: 1fr;
-  }
-  .results-layout .left-sidebar,
-  .results-layout .right-sidebar {
-    display: none;
-  }
-}
-```
-
-- [ ] **Step 3: Add preferences page layout CSS**
-
-```css
-/* ============================================================
-   Preferences Page Layout
-   ============================================================ */
-
-.preferences-layout {
-  display: grid;
-  grid-template-columns: 200px 1fr;
-  gap: 2rem;
-  align-items: start;
-  padding: 2rem 0;
-}
-
-.preferences-nav {
-  position: sticky;
-  top: calc(var(--header-height) + 1.5rem);
-}
-
-.preferences-nav-item {
-  display: flex;
-  align-items: center;
-  gap: 0.6rem;
-  padding: 0.6rem 0.75rem;
-  border-radius: var(--radius-sm);
-  color: var(--text-secondary);
-  text-decoration: none;
-  font-size: 0.9rem;
-  transition: background 0.15s, color 0.15s;
-  cursor: pointer;
-}
-
-.preferences-nav-item:hover {
-  background: var(--bg-tertiary);
-  color: var(--text-primary);
-}
-
-.preferences-nav-item.active {
-  background: var(--accent-soft);
-  color: var(--accent);
-  font-weight: 500;
-}
-
-.preferences-content {
-  background: var(--bg);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-lg);
-  padding: 1.5rem;
-}
-
-@media (max-width: 768px) {
-  .preferences-layout {
-    grid-template-columns: 1fr;
-  }
-  .preferences-nav {
-    position: static;
-    display: flex;
-    overflow-x: auto;
-    gap: 0.5rem;
-    padding-bottom: 0.5rem;
-  }
-  .preferences-nav-item {
-    white-space: nowrap;
-  }
-}
-```
-
-- [ ] **Step 4: Add category tiles CSS**
-
-```css
-/* ============================================================
-   Category Tiles
-   ============================================================ */
-
-.category-tiles {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
-  gap: 1rem;
-  margin-top: 2rem;
-}
-
-.category-tile {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 0.5rem;
-  padding: 1rem 0.5rem;
-  border-radius: var(--radius-md);
-  text-decoration: none;
-  color: var(--text-secondary);
-  font-size: 0.85rem;
-  transition: background 0.15s, color 0.15s, transform 0.15s, box-shadow 0.15s;
-}
-
-.category-tile:hover {
-  background: var(--bg-tertiary);
-  color: var(--text-primary);
-  transform: translateY(-2px);
-  box-shadow: var(--shadow-sm);
-}
-
-.category-tile-icon {
-  font-size: 1.5rem;
-  line-height: 1;
-}
-
-.category-tile.disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-  pointer-events: none;
-}
-
-@media (max-width: 768px) {
-  .category-tiles {
-    grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
-    gap: 0.75rem;
-  }
-  .category-tile {
-    padding: 0.75rem 0.25rem;
-    font-size: 0.75rem;
-  }
-  .category-tile-icon {
-    font-size: 1.25rem;
-  }
-}
-```
-
-- [ ] **Step 5: Add left sidebar navigation styles**
-
-```css
-/* ============================================================
-   Left Sidebar (Results Page)
-   ============================================================ */
-
-.left-sidebar {
-  padding: 0;
-}
-
-.sidebar-nav {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-}
-
-.sidebar-nav-title {
-  font-size: 0.7rem;
-  font-weight: 600;
-  text-transform: uppercase;
-  letter-spacing: 0.06em;
-  color: var(--text-muted);
-  padding: 0.5rem 0.75rem;
-  margin-top: 0.5rem;
-}
-
-.sidebar-nav-item {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  padding: 0.5rem 0.75rem;
-  border-radius: var(--radius-sm);
-  color: var(--text-secondary);
-  text-decoration: none;
-  font-size: 0.875rem;
-  transition: background 0.15s, color 0.15s;
-}
-
-.sidebar-nav-item:hover {
-  background: var(--bg-tertiary);
-  color: var(--text-primary);
-}
-
-.sidebar-nav-item.active {
-  background: var(--accent-soft);
-  color: var(--accent);
-  font-weight: 500;
-}
-
-.sidebar-nav-item-icon {
-  font-size: 1rem;
-  width: 20px;
-  text-align: center;
-}
-
-.sidebar-filters {
-  margin-top: 1rem;
-  padding-top: 1rem;
-  border-top: 1px solid var(--border);
-}
-
-.sidebar-filter-group {
-  margin-bottom: 0.75rem;
-}
-
-.sidebar-filter-label {
-  font-size: 0.75rem;
-  font-weight: 500;
-  color: var(--text-muted);
-  padding: 0 0.75rem;
-  margin-bottom: 0.25rem;
-}
-
-.sidebar-filter-option {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  padding: 0.35rem 0.75rem;
-  font-size: 0.8rem;
-  color: var(--text-secondary);
-  cursor: pointer;
-  border-radius: var(--radius-sm);
-  transition: background 0.15s;
-}
-
-.sidebar-filter-option:hover {
-  background: var(--bg-tertiary);
-}
-
-.sidebar-filter-option input[type="radio"] {
-  accent-color: var(--accent);
-}
-
-/* Mobile filter chips */
-.mobile-filter-chips {
-  display: none;
-  overflow-x: auto;
-  gap: 0.5rem;
-  padding: 0.75rem 0;
-  -webkit-overflow-scrolling: touch;
-}
-
-.mobile-filter-chips::-webkit-scrollbar {
-  display: none;
-}
-
-.mobile-filter-chip {
-  display: inline-flex;
-  align-items: center;
-  padding: 0.4rem 0.75rem;
-  border: 1px solid var(--border);
-  border-radius: var(--radius-full);
-  font-size: 0.8rem;
-  color: var(--text-secondary);
-  white-space: nowrap;
-  text-decoration: none;
-  transition: background 0.15s, border-color 0.15s;
-}
-
-.mobile-filter-chip:hover,
-.mobile-filter-chip.active {
-  background: var(--accent-soft);
-  border-color: var(--accent);
-  color: var(--accent);
-}
-
-@media (max-width: 768px) {
-  .mobile-filter-chips {
-    display: flex;
-  }
-}
-```
-
-- [ ] **Step 6: Verify Go compilation**
-
-Run: `go build ./...`
-Expected: No errors
-
-Note: CSS is embedded as static files and not processed by the Go compiler. CSS changes must be tested manually in a browser.
-
-- [ ] **Step 7: Commit**
-
-```bash
-git add internal/views/static/css/kafka.css
-git commit -m "feat(frontend): add CSS layout framework for three-column results and preferences page"
-```
-
----
-
-## PHASE 2: Results Page Three-Column Layout
-
-### Task 2: Restructure Results Template
-
-**Files:**
-- Modify: `internal/views/templates/results.html`
-- Modify: `internal/views/views.go`
-
-- [ ] **Step 1: Read current results.html to understand exact content**
-
-Current structure has `.results-layout` grid with `.search-compact` spanning full width, `.results-column`, and `.sidebar`. Need to add left sidebar and restructure grid.
-
-- [ ] **Step 2: Replace results.html content**
-
-Replace the entire file content:
-
-```html
-{{define "title"}}{{if .Query}}{{.Query}} — {{end}}{{end}}
-{{define "content"}}
-<div class="results-layout">
-  <!-- Left Sidebar -->
-  <aside class="left-sidebar" id="left-sidebar">
-    <nav class="sidebar-nav">
-      <div class="sidebar-nav-title">Categories</div>
-      {{range .Categories}}
-      <a href="/search?q={{$.Query | urlquery}}&category={{.}}" class="sidebar-nav-item {{if eq $.ActiveCategory .}}active{{end}}">
-        <span class="sidebar-nav-item-icon">{{index $.CategoryIcons .}}</span>
-        <span>{{.}}</span>
-      </a>
-      {{end}}
-    </nav>
-
-    <div class="sidebar-filters">
-      <div class="sidebar-filter-group">
-        <div class="sidebar-filter-label">Time</div>
-        {{range .TimeFilters}}
-        <label class="sidebar-filter-option">
-          <input type="radio" name="time" value="{{.Value}}" {{if eq $.ActiveTime .Value}}checked{{end}}>
-          <span>{{.Label}}</span>
-        </label>
-        {{end}}
-      </div>
-      <div class="sidebar-filter-group">
-        <div class="sidebar-filter-label">Type</div>
-        {{range .TypeFilters}}
-        <label class="sidebar-filter-option">
-          <input type="radio" name="type" value="{{.Value}}" {{if eq $.ActiveType .Value}}checked{{end}}>
-          <span>{{.Label}}</span>
-        </label>
-        {{end}}
-      </div>
-    </div>
-  </aside>
-
-  <!-- Center Column -->
-  <div class="results-column">
-    <!-- Compact search bar -->
-    <div class="search-compact">
-      <div class="search-box">
-        <form method="GET" action="/search" role="search" id="search-form">
-          <input type="text" name="q" id="q" value="{{.Query}}" autocomplete="off" autofocus
-            hx-get="/search" hx-target="#results" hx-trigger="keyup changed delay:500ms" hx-include="this">
-          <button type="submit" class="search-box-submit" aria-label="Search">
-            <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
-              <circle cx="11" cy="11" r="8"/>
-              <path d="m21 21-4.35-4.35"/>
-            </svg>
-          </button>
-        </form>
-      </div>
-    </div>
-
-    <!-- Mobile filter chips -->
-    <div class="mobile-filter-chips">
-      <a href="/search?q={{.Query | urlquery}}" class="mobile-filter-chip {{if not .ActiveCategory}}active{{end}}">All</a>
-      {{range .Categories}}
-      <a href="/search?q={{$.Query | urlquery}}&category={{.}}" class="mobile-filter-chip {{if eq $.ActiveCategory .}}active{{end}}">{{.}}</a>
-      {{end}}
-    </div>
-
-    <!-- Results inner -->
-    {{template "results_inner" .}}
-  </div>
-
-  <!-- Right Sidebar -->
-  <aside class="right-sidebar" id="sidebar">
-    {{if .Suggestions}}
-    <div class="sidebar-card">
-      <div class="sidebar-title">Related Searches</div>
-      <div class="suggestion-list">
-        {{range .Suggestions}}<span class="suggestion"><a href="/search?q={{. | urlquery}}">{{.}}</a></span>{{end}}
-      </div>
-    </div>
-    {{end}}
-
-    {{if .UnresponsiveEngines}}
-    <div class="sidebar-card">
-      <div class="sidebar-title">Engines with issues</div>
-      <ul class="unresponsive-engines">
-        {{range .UnresponsiveEngines}}<li>{{index . 0}}: {{index . 1}}</li>{{end}}
-      </ul>
-    </div>
-    {{end}}
-  </aside>
-</div>
-{{end}}
-```
-
-- [ ] **Step 3: Add FilterOption struct and update PageData struct**
-
-Add `FilterOption` struct at package level in `views.go` (near `PageNumber` struct):
-
-```go
-// FilterOption represents a filter radio option for the sidebar.
-type FilterOption struct {
-    Label string
-    Value string
-}
-```
-
-Then update `PageData` struct to include new fields:
-
-```go
-type PageData struct {
-    // ... existing fields (SourceURL, Query, Pageno, etc.) ...
-
-    // New fields for three-column layout
-    Categories         []string
-    CategoryIcons     map[string]string
-    DisabledCategories []string
-    ActiveCategory    string
-    TimeFilters       []FilterOption
-    TypeFilters       []FilterOption
-    ActiveTime        string
-    ActiveType        string
-}
-```
-
-- [ ] **Step 4: Update FromResponse signature and body**
-
-Update `FromResponse` signature to accept filter params and set defaults:
-
-```go
-func FromResponse(resp contracts.SearchResponse, query string, pageno int, activeCategory, activeTime, activeType string) PageData {
-    // Set defaults
-    if activeCategory == "" {
-        activeCategory = "all"
-    }
-
-    pd := PageData{
-        // ... existing initialization (NumberOfResults, Results, etc.) ...
-
-        // New: categories with icons
-        Categories: []string{"all", "news", "images", "videos", "maps"},
-        DisabledCategories: []string{"shopping", "music", "weather"},
-        CategoryIcons: map[string]string{
-            "all":      "🌐",
-            "news":     "📰",
-            "images":   "🖼️",
-            "videos":   "🎬",
-            "maps":     "🗺️",
-            "shopping": "🛒",
-            "music":    "🎵",
-            "weather":  "🌤️",
-        },
-        ActiveCategory: activeCategory,
-
-        // Time filters
-        TimeFilters: []FilterOption{
-            {Label: "Any time", Value: ""},
-            {Label: "Past hour", Value: "h"},
-            {Label: "Past 24 hours", Value: "d"},
-            {Label: "Past week", Value: "w"},
-            {Label: "Past month", Value: "m"},
-            {Label: "Past year", Value: "y"},
-        },
-        ActiveTime: activeTime,
-
-        // Type filters
-        TypeFilters: []FilterOption{
-            {Label: "All results", Value: ""},
-            {Label: "News", Value: "news"},
-            {Label: "Videos", Value: "video"},
-            {Label: "Images", Value: "image"},
-        },
-        ActiveType: activeType,
-    }
-    // ... rest of function ...
-}
-```
-
-Update the `Search` handler in `handlers.go` to pass filter params:
-
-```go
-pd := views.FromResponse(resp, req.Query, req.Pageno,
-    r.FormValue("category"), r.FormValue("time"), r.FormValue("type"))
-```
-
-- [ ] **Step 5: Update results.html sidebar to show disabled state**
-
-Update the sidebar category loop to conditionally apply `disabled` class:
-
-```html
-{{range .Categories}}
-<a href="/search?q={{$.Query | urlquery}}&category={{.}}" class="sidebar-nav-item {{if eq $.ActiveCategory .}}active{{end}}">
-  <span class="sidebar-nav-item-icon">{{index $.CategoryIcons .}}</span>
-  <span>{{.}}</span>
-</a>
-{{end}}
-<!-- Disabled categories with no links -->
-{{range .DisabledCategories}}
-<span class="sidebar-nav-item disabled">
-  <span class="sidebar-nav-item-icon">{{index $.CategoryIcons .}}</span>
-  <span>{{.}}</span>
-</span>
-{{end}}
-```
-
-- [ ] **Step 6: Test compilation**
-
-Run: `go build ./...`
-Expected: No errors
-
-- [ ] **Step 7: Commit**
-
-```bash
-git add internal/views/views.go internal/views/templates/results.html
-git commit -m "feat(frontend): add three-column results layout with left sidebar navigation"
-```
-
----
-
-## PHASE 3: Homepage Category Tiles
-
-### Task 3: Add Category Tiles to Homepage
-
-**Files:**
-- Modify: `internal/views/templates/index.html`
-
-- [ ] **Step 1: Read current index.html**
-
-- [ ] **Step 2: Replace index.html with tiles**
-
-```html
-{{define "title"}}{{end}}
-{{define "content"}}
-<div class="search-hero">
-  <div class="hero-logo">
-    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
-      <circle cx="11" cy="11" r="8"/>
-      <path d="m21 21-4.35-4.35"/>
-    </svg>
-  </div>
-  <p class="hero-tagline">Search the web privately, without tracking or censorship.</p>
-  <div class="search-box">
-    <form method="GET" action="/search" role="search" id="search-form">
-      <input type="text" name="q" id="q" placeholder="Search the web…" autocomplete="off" autofocus>
-      <button type="submit" class="search-box-submit" aria-label="Search">
-        <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
-          <circle cx="11" cy="11" r="8"/>
-          <path d="m21 21-4.35-4.35"/>
-        </svg>
-      </button>
-    </form>
-  </div>
-
-  <!-- Category Tiles -->
-  <div class="category-tiles">
-    <a href="/search" class="category-tile">
-      <span class="category-tile-icon">🌐</span>
-      <span>All</span>
-    </a>
-    <a href="/search?category=images" class="category-tile">
-      <span class="category-tile-icon">🖼️</span>
-      <span>Images</span>
-    </a>
-    <a href="/search?category=news" class="category-tile">
-      <span class="category-tile-icon">📰</span>
-      <span>News</span>
-    </a>
-    <a href="/search?category=videos" class="category-tile">
-      <span class="category-tile-icon">🎬</span>
-      <span>Videos</span>
-    </a>
-    <a href="/search?category=maps" class="category-tile">
-      <span class="category-tile-icon">🗺️</span>
-      <span>Maps</span>
-    </a>
-    <a href="/search?category=shopping" class="category-tile disabled" title="Coming soon">
-      <span class="category-tile-icon">🛒</span>
-      <span>Shopping</span>
-    </a>
-    <a href="/search?category=music" class="category-tile disabled" title="Coming soon">
-      <span class="category-tile-icon">🎵</span>
-      <span>Music</span>
-    </a>
-    <a href="/search?category=weather" class="category-tile disabled" title="Coming soon">
-      <span class="category-tile-icon">🌤️</span>
-      <span>Weather</span>
-    </a>
-  </div>
-</div>
-<div id="results"></div>
-{{end}}
-```
-
-- [ ] **Step 3: Test compilation**
-
-Run: `go build ./...`
-Expected: No errors
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add internal/views/templates/index.html
-git commit -m "feat(frontend): add category tiles to homepage"
-```
-
----
-
-## PHASE 4: Preferences Page
-
-### Task 4: Create Preferences Template
-
-**Files:**
-- Create: `internal/views/templates/preferences.html`
-
-- [ ] **Step 1: Create preferences.html**
-
-```html
-{{define "title"}}Preferences{{end}}
-{{define "content"}}
-<div class="preferences-layout">
-  <!-- Preferences Navigation -->
-  <nav class="preferences-nav" id="preferences-nav">
-    <div class="preferences-nav-title">Settings</div>
-    <button class="preferences-nav-item active" data-section="search">🔍 Search</button>
-    <button class="preferences-nav-item" data-section="privacy">🔒 Privacy</button>
-    <button class="preferences-nav-item" data-section="tabs">📑 Tabs</button>
-    <button class="preferences-nav-item" data-section="appearance">🎨 Appearance</button>
-    <button class="preferences-nav-item" data-section="sidebar">📐 Sidebar</button>
-    <button class="preferences-nav-item" data-section="content">📄 Content</button>
-    <button class="preferences-nav-item" data-section="languages">🌍 Languages</button>
-    <button class="preferences-nav-item" data-section="regional">📍 Regional</button>
-  </nav>
-
-  <!-- Preferences Content -->
-  <div class="preferences-content">
-    <!-- Search Section -->
-    <section class="pref-section" id="section-search">
-      <h2 class="pref-section-title">Search</h2>
-      <div class="pref-row">
-        <label for="pref-default-engine">Default engine</label>
-        <select id="pref-default-engine">
-          <option value="">All engines</option>
-          <option value="wikipedia">Wikipedia</option>
-          <option value="arxiv">arXiv</option>
-          <option value="braveapi">Brave API</option>
-          <option value="duckduckgo">DuckDuckGo</option>
-          <option value="github">GitHub</option>
-          <option value="reddit">Reddit</option>
-          <option value="bing">Bing</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-safesearch">Safe search</label>
-        <select id="pref-safesearch">
-          <option value="moderate">Moderate</option>
-          <option value="strict">Strict</option>
-          <option value="off">Off</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-search-lang">Search language</label>
-        <select id="pref-search-lang">
-          <option value="">All languages</option>
-          <option value="en">English</option>
-          <option value="de">Deutsch</option>
-          <option value="fr">Français</option>
-          <option value="es">Español</option>
-          <option value="zh">中文</option>
-        </select>
-      </div>
-    </section>
-
-    <!-- Privacy Section -->
-    <section class="pref-section" id="section-privacy" style="display:none;">
-      <h2 class="pref-section-title">Privacy</h2>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>Tracking protection</label>
-          <p class="pref-desc">Block trackers and scripts that follow you across the web.</p>
-        </div>
-        <input type="checkbox" id="pref-tracking" checked disabled>
-      </div>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>Send Do Not Track header</label>
-          <p class="pref-desc">Ask websites not to track you.</p>
-        </div>
-        <input type="checkbox" id="pref-dnt">
-      </div>
-    </section>
-
-    <!-- Tabs Section -->
-    <section class="pref-section" id="section-tabs" style="display:none;">
-      <h2 class="pref-section-title">Tabs</h2>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>New tab behavior</label>
-          <p class="pref-desc">Choose what happens when you open a new tab.</p>
-        </div>
-        <select id="pref-newtab">
-          <option value="blank">Blank page</option>
-          <option value="home">Homepage</option>
-        </select>
-      </div>
-    </section>
-
-    <!-- Appearance Section -->
-    <section class="pref-section" id="section-appearance" style="display:none;">
-      <h2 class="pref-section-title">Appearance</h2>
-      <div class="pref-row">
-        <label for="pref-theme">Theme</label>
-        <select id="pref-theme">
-          <option value="system">System</option>
-          <option value="light">Light</option>
-          <option value="dark">Dark</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-fontsize">Results font size</label>
-        <select id="pref-fontsize">
-          <option value="small">Small</option>
-          <option value="medium" selected>Medium</option>
-          <option value="large">Large</option>
-        </select>
-      </div>
-    </section>
-
-    <!-- Sidebar Section -->
-    <section class="pref-section" id="section-sidebar" style="display:none;">
-      <h2 class="pref-section-title">Sidebar</h2>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>Show sidebar on results page</label>
-          <p class="pref-desc">Display the left navigation sidebar on search results.</p>
-        </div>
-        <input type="checkbox" id="pref-show-sidebar" checked>
-      </div>
-    </section>
-
-    <!-- Content Section -->
-    <section class="pref-section" id="section-content" style="display:none;">
-      <h2 class="pref-section-title">Content</h2>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>Filter explicit results</label>
-          <p class="pref-desc">Hide explicit content from search results (SafeSearch).</p>
-        </div>
-        <input type="checkbox" id="pref-explicit-filter" checked>
-      </div>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>Auto-play media</label>
-          <p class="pref-desc">Automatically play video content when visible.</p>
-        </div>
-        <input type="checkbox" id="pref-autoplay">
-      </div>
-    </section>
-
-    <!-- Languages Section -->
-    <section class="pref-section" id="section-languages" style="display:none;">
-      <h2 class="pref-section-title">Languages</h2>
-      <div class="pref-row">
-        <label for="pref-ui-lang">Interface language</label>
-        <select id="pref-ui-lang">
-          <option value="en" selected>English</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-search-lang-full">Search language</label>
-        <select id="pref-search-lang-full">
-          <option value="">All languages</option>
-          <option value="en">English</option>
-          <option value="de">Deutsch</option>
-          <option value="fr">Français</option>
-          <option value="es">Español</option>
-          <option value="zh">中文</option>
-        </select>
-      </div>
-    </section>
-
-    <!-- Regional Section -->
-    <section class="pref-section" id="section-regional" style="display:none;">
-      <h2 class="pref-section-title">Regional</h2>
-      <div class="pref-row">
-        <label for="pref-region">Country/Region</label>
-        <select id="pref-region">
-          <option value="">All regions</option>
-          <option value="us">United States</option>
-          <option value="uk">United Kingdom</option>
-          <option value="de">Germany</option>
-          <option value="fr">France</option>
-          <option value="cn">China</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-timezone">Timezone</label>
-        <select id="pref-timezone">
-          <option value="">Auto-detect</option>
-          <option value="utc">UTC</option>
-          <option value="us-eastern">US/Eastern</option>
-          <option value="us-pacific">US/Pacific</option>
-          <option value="europe">Europe</option>
-        </select>
-      </div>
-    </section>
-  </div>
-</div>
-{{end}}
-```
-
-- [ ] **Step 2: Add preferences section CSS styles**
-
-Append to `kafka.css`:
-
-```css
-/* ============================================================
-   Preferences Page Styles
-   ============================================================ */
-
-.pref-section {
-  margin-bottom: 2rem;
-}
-
-.pref-section:last-child {
-  margin-bottom: 0;
-}
-
-.pref-section-title {
-  font-size: 1rem;
-  font-weight: 600;
-  color: var(--text-primary);
-  margin-bottom: 1rem;
-  padding-bottom: 0.5rem;
-  border-bottom: 1px solid var(--border);
-}
-
-.pref-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 1rem;
-  padding: 0.75rem 0;
-  border-bottom: 1px solid var(--border);
-}
-
-.pref-row:last-child {
-  border-bottom: none;
-}
-
-.pref-row label {
-  font-size: 0.9rem;
-  color: var(--text-primary);
-}
-
-.pref-row-info {
-  flex: 1;
-}
-
-.pref-row-info label {
-  font-weight: 500;
-}
-
-.pref-desc {
-  font-size: 0.8rem;
-  color: var(--text-muted);
-  margin-top: 0.25rem;
-}
-
-.pref-row select {
-  padding: 0.5rem 0.75rem;
-  font-size: 0.85rem;
-  font-family: inherit;
-  border: 1px solid var(--border);
-  border-radius: var(--radius-sm);
-  background: var(--bg);
-  color: var(--text-primary);
-  cursor: pointer;
-  min-width: 150px;
-}
-
-.pref-row select:focus {
-  outline: none;
-  border-color: var(--accent);
-}
-
-.pref-row input[type="checkbox"] {
-  width: 18px;
-  height: 18px;
-  accent-color: var(--accent);
-  cursor: pointer;
-  flex-shrink: 0;
-}
-
-.pref-row input[type="checkbox"]:disabled {
-  opacity: 0.6;
-  cursor: not-allowed;
-}
-```
-
-- [ ] **Step 3: Register preferences template in views.go**
-
-Add `tmplPreferences` variable and initialize it in `init()`. Also add `RenderPreferences` function:
-
-```go
-// In views.go, add to var block:
-var (
-    tmplFull        *template.Template
-    tmplIndex       *template.Template
-    tmplFragment    *template.Template
-    tmplPreferences *template.Template
-)
-
-// In init(), after existing template parsing, add:
-tmplPreferences = template.Must(template.New("").Funcs(funcMap).ParseFS(tmplFS,
-    "base.html", "preferences.html",
-))
-
-// Add RenderPreferences function:
-func RenderPreferences(w http.ResponseWriter, sourceURL string) error {
-    w.Header().Set("Content-Type", "text/html; charset=utf-8")
-    return tmplPreferences.ExecuteTemplate(w, "base", PageData{ShowHeader: true, SourceURL: sourceURL})
-}
-```
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add internal/views/templates/preferences.html internal/views/static/css/kafka.css internal/views/views.go
-git commit -m "feat(frontend): add preferences page template and styles"
-```
-
----
-
-### Task 5: Add Preferences Route
-
-**Files:**
-- Modify: `internal/httpapi/handlers.go`
-- Modify: `cmd/kafka/main.go`
-
-- [ ] **Step 1: Add GET and POST handlers for /preferences**
-
-Add to `handlers.go`:
-
-```go
-// Preferences renders the preferences page.
-func (h *Handler) Preferences(w http.ResponseWriter, r *http.Request) {
-    if r.URL.Path != "/preferences" {
-        http.NotFound(w, r)
-        return
-    }
-    if err := views.RenderPreferences(w, h.sourceURL); err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-    }
-}
-
-// PreferencesPOST handles form submission from the preferences page.
-// NOTE: This is a no-op. All preferences are stored in localStorage on the client
-// via JavaScript. This handler exists only for form submission completeness (e.g.,
-// if a form POSTs without JS). The JavaScript in settings.js handles all saves.
-func (h *Handler) PreferencesPOST(w http.ResponseWriter, r *http.Request) {
-    if r.URL.Path != "/preferences" {
-        http.NotFound(w, r)
-        return
-    }
-    http.Redirect(w, r, "/preferences", http.StatusFound)
-}
-```
-
-- [ ] **Step 2: Register the route in main**
-
-Find where routes are registered (likely in `cmd/kafka/main.go`) and add:
-
-```go
-mux.HandleFunc("GET /preferences", handler.Preferences)
-mux.HandleFunc("POST /preferences", handler.PreferencesPOST)
-```
-
-- [ ] **Step 3: Test compilation**
-
-Run: `go build ./...`
-Expected: No errors
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add internal/httpapi/handlers.go cmd/kafka/main.go
-git commit -m "feat: add GET and POST /preferences route"
-```
-
----
-
-### Task 6: Update Settings JavaScript
-
-**Files:**
-- Modify: `internal/views/static/js/settings.js`
-
-- [ ] **Step 1: Reduce popover to theme + engines only**
-
-Update the `renderPanel` function to remove SafeSearch and Format options. Keep only theme buttons and engine toggles.
-
-- [ ] **Step 2: Add preferences page navigation JavaScript**
-
-Add to end of `settings.js`:
-
-```javascript
-// Preferences page navigation
-function initPreferences() {
-  var nav = document.getElementById('preferences-nav');
-  if (!nav) return;
-
-  var sections = document.querySelectorAll('.pref-section');
-  var navItems = nav.querySelectorAll('.preferences-nav-item');
-
-  function showSection(id) {
-    sections.forEach(function(sec) {
-      sec.style.display = sec.id === 'section-' + id ? 'block' : 'none';
-    });
-    navItems.forEach(function(item) {
-      item.classList.toggle('active', item.getAttribute('data-section') === id);
-    });
-  }
-
-  navItems.forEach(function(item) {
-    item.addEventListener('click', function() {
-      showSection(item.getAttribute('data-section'));
-    });
-  });
-
-  // Load saved preferences
-  var prefs = loadPrefs();
-  var themeEl = document.getElementById('pref-theme');
-  if (themeEl) themeEl.value = prefs.theme || 'system';
-
-  var ssEl = document.getElementById('pref-safesearch');
-  if (ssEl) ssEl.value = prefs.safeSearch || 'moderate';
-
-  var fmtEl = document.getElementById('pref-format');
-  if (fmtEl) fmtEl.value = prefs.format || 'html';
-
-  // Save handlers
-  if (themeEl) {
-    themeEl.addEventListener('change', function() {
-      prefs.theme = themeEl.value;
-      savePrefs(prefs);
-      applyTheme(prefs.theme);
-    });
-  }
-
-  if (ssEl) {
-    ssEl.addEventListener('change', function() {
-      prefs.safeSearch = ssEl.value;
-      savePrefs(prefs);
-    });
-  }
-
-  if (fmtEl) {
-    fmtEl.addEventListener('change', function() {
-      prefs.format = fmtEl.value;
-      savePrefs(prefs);
-    });
-  }
-
-  // Show first section by default
-  showSection('search');
-}
-
-document.addEventListener('DOMContentLoaded', initPreferences);
-```
-
-- [ ] **Step 3: Test with browser**
-
-Manual verification needed — cannot test browser JS with `go build`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add internal/views/static/js/settings.js
-git commit -m "feat(frontend): reduce popover to theme+engines, add preferences page JS"
-```
-
----
-
-## PHASE 5: Polish and Mobile Responsiveness
-
-### Task 7: Mobile Filter Chips Integration
-
-**Files:**
-- Modify: `internal/views/templates/results.html`
-
-- [ ] **Step 1: Ensure mobile filter chips have working category links**
-
-The current results.html has mobile filter chips with category links. These should preserve existing query params for pagination/HTMX navigation.
-
-- [ ] **Step 2: Add filter form submission via HTMX**
-
-Update the filter radio buttons to submit via HTMX when changed.
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add internal/views/templates/results.html
-git commit -m "fix(frontend): add HTMX filter submission"
-```
-
----
-
-### Task 8: Final Mobile Responsiveness Audit
-
-**Files:**
-- Review: `internal/views/static/css/kafka.css`
-
-- [ ] **Step 1: Test all breakpoints manually**
-
-- [ ] **Step 2: Fix any layout issues found**
-
-- [ ] **Step 3: Commit any fixes**
-
-```bash
-git add internal/views/static/css/kafka.css
-git commit -m "fix(frontend): improve mobile responsiveness"
-```
-
----
-
-## Summary
-
-| Phase | Task | Files |
-|-------|------|-------|
-| 1 | CSS Layout Framework | `kafka.css` |
-| 2 | Results Three-Column | `results.html`, `views.go` |
-| 3 | Homepage Tiles | `index.html` |
-| 4 | Preferences Page | `preferences.html` (new), `handlers.go`, `settings.js` |
-| 5 | Polish | Various |
-
-**Total: 8 tasks across 5 phases**
-
-Run `go test ./...` after each phase to verify nothing is broken.
diff --git a/docs/superpowers/plans/2026-03-22-settings-ui.md b/docs/superpowers/plans/2026-03-22-settings-ui.md
deleted file mode 100644
index cf34df5..0000000
--- a/docs/superpowers/plans/2026-03-22-settings-ui.md
+++ /dev/null
@@ -1,747 +0,0 @@
-# Settings UI Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** A preferences popover panel (top-right on desktop, bottom sheet on mobile) that lets users set theme, enabled engines, safe search, and default format. All changes auto-save to `localStorage` and apply immediately to the DOM.
-
-**Architecture:** Pure client-side JS + CSS added alongside existing templates. No Go changes. Settings persist via `localStorage` key `kafka_prefs`. Theme applies via `data-theme` attribute on `<html>`.
-
-**Tech Stack:** Vanilla JS (no framework), existing `kafka.css` custom properties, HTMX for search.
-
----
-
-## File Map
-
-| Action | File |
-|--------|------|
-| Create | `internal/views/static/js/settings.js` |
-| Modify | `internal/views/static/css/kafka.css` |
-| Modify | `internal/views/templates/base.html` |
-| Modify | `internal/views/templates/index.html` |
-| Modify | `internal/views/templates/results.html` |
-| Modify | `internal/views/views.go` |
-
-**Key insight on engine preferences:** `ParseSearchRequest` reads `engines` as a CSV form value (`r.FormValue("engines")`). The search forms in `index.html` and `results.html` will get a hidden `#engines-input` field that is kept in sync with localStorage. On submit, the engines preference is sent as a normal form field. HTMX `hx-include="this"` already includes the form element, so the hidden input is automatically included in the request.
-
----
-
-## Task 1: CSS — Popover, toggles, bottom sheet
-
-**Files:**
-- Modify: `internal/views/static/css/kafka.css`
-
-- [ ] **Step 1: Add CSS for popover, triggers, toggles, bottom sheet**
-
-Append the following to `kafka.css`:
-
-```css
-/* ============================================
-   Settings Panel
-   ============================================ */
-
-/* Header */
-.site-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0.6rem 1rem;
-  background: var(--color-header-background);
-  border-bottom: 1px solid var(--color-header-border);
-}
-.site-title {
-  font-size: 1rem;
-  font-weight: 600;
-  color: var(--color-base-font);
-}
-
-/* Gear trigger button */
-.settings-trigger {
-  background: none;
-  border: none;
-  font-size: 1.1rem;
-  cursor: pointer;
-  padding: 0.3rem 0.5rem;
-  border-radius: var(--radius);
-  color: var(--color-base-font);
-  opacity: 0.7;
-  transition: opacity 0.2s, background 0.2s;
-  line-height: 1;
-}
-.settings-trigger:hover,
-.settings-trigger[aria-expanded="true"] {
-  opacity: 1;
-  background: var(--color-sidebar-background);
-}
-
-/* Popover panel */
-.settings-popover {
-  position: absolute;
-  top: 100%;
-  right: 0;
-  width: 280px;
-  max-height: 420px;
-  overflow-y: auto;
-  background: var(--color-base-background);
-  border: 1px solid var(--color-sidebar-border);
-  border-radius: var(--radius);
-  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
-  z-index: 200;
-  display: none;
-  flex-direction: column;
-}
-.settings-popover[data-open="true"] {
-  display: flex;
-  animation: settings-slide-in 0.2s ease;
-}
-@keyframes settings-slide-in {
-  from { opacity: 0; transform: translateY(-8px); }
-  to   { opacity: 1; transform: translateY(0); }
-}
-
-.settings-popover-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0.75rem 1rem;
-  border-bottom: 1px solid var(--color-sidebar-border);
-  font-weight: 600;
-  font-size: 0.9rem;
-  flex-shrink: 0;
-}
-.settings-popover-close {
-  background: none;
-  border: none;
-  font-size: 1.2rem;
-  cursor: pointer;
-  color: var(--color-base-font);
-  opacity: 0.6;
-  padding: 0 0.25rem;
-  line-height: 1;
-}
-.settings-popover-close:hover { opacity: 1; }
-
-.settings-popover-body {
-  padding: 0.8rem;
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-}
-
-.settings-section-title {
-  font-size: 0.7rem;
-  font-weight: 600;
-  text-transform: uppercase;
-  letter-spacing: 0.05em;
-  color: var(--color-suggestion);
-  margin-bottom: 0.5rem;
-}
-
-/* Theme buttons */
-.theme-buttons {
-  display: flex;
-  gap: 0.4rem;
-}
-.theme-btn {
-  flex: 1;
-  padding: 0.35rem 0.5rem;
-  border: 1px solid var(--color-sidebar-border);
-  border-radius: var(--radius);
-  background: var(--color-btn-background);
-  color: var(--color-base-font);
-  cursor: pointer;
-  font-size: 0.75rem;
-  text-align: center;
-  transition: background 0.15s, border-color 0.15s;
-}
-.theme-btn:hover { background: var(--color-btn-hover); }
-.theme-btn.active {
-  background: var(--color-link);
-  color: #fff;
-  border-color: var(--color-link);
-}
-
-/* Engine toggles — 2-column grid */
-.engine-grid {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 0.4rem;
-}
-.engine-toggle {
-  display: flex;
-  align-items: center;
-  gap: 0.4rem;
-  padding: 0.3rem 0.5rem;
-  border-radius: var(--radius);
-  background: var(--color-sidebar-background);
-  font-size: 0.78rem;
-  cursor: pointer;
-}
-.engine-toggle input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-  margin: 0;
-  cursor: pointer;
-  accent-color: var(--color-link);
-}
-.engine-toggle span {
-  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-/* Search defaults */
-.setting-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 0.5rem;
-  margin-top: 0.4rem;
-}
-.setting-row label {
-  font-size: 0.85rem;
-  flex: 1;
-}
-.setting-row select {
-  width: 110px;
-  padding: 0.3rem 0.4rem;
-  font-size: 0.8rem;
-  border: 1px solid var(--color-sidebar-border);
-  border-radius: var(--radius);
-  background: var(--color-base-background);
-  color: var(--color-base-font);
-  cursor: pointer;
-}
-
-/* Mid-search notice */
-.settings-notice {
-  font-size: 0.72rem;
-  color: var(--color-suggestion);
-  margin-top: 0.3rem;
-  font-style: italic;
-}
-
-/* Dark theme via data-theme attribute */
-html[data-theme="dark"] {
-  --color-base: #222;
-  --color-base-font: #dcdcdc;
-  --color-base-background: #2b2b2b;
-  --color-header-background: #333;
-  --color-header-border: #444;
-  --color-search-border: #555;
-  --color-search-focus: #5dade2;
-  --color-result-url: #8ab4f8;
-  --color-result-url-visited: #b39ddb;
-  --color-result-content: #b0b0b0;
-  --color-result-title: #8ab4f8;
-  --color-result-title-visited: #b39ddb;
-  --color-result-engine: #999;
-  --color-result-border: #3a3a3a;
-  --color-link: #5dade2;
-  --color-link-visited: #b39ddb;
-  --color-sidebar-background: #333;
-  --color-sidebar-border: #444;
-  --color-infobox-background: #333;
-  --color-infobox-border: #444;
-  --color-pagination-current: #5dade2;
-  --color-pagination-border: #444;
-  --color-error: #e74c3c;
-  --color-error-background: #3b1a1a;
-  --color-suggestion: #999;
-  --color-footer: #666;
-  --color-btn-background: #333;
-  --color-btn-border: #555;
-  --color-btn-hover: #444;
-}
-
-/* Mobile: Bottom sheet + FAB trigger */
-@media (max-width: 768px) {
-  /* Hide desktop trigger, show FAB */
-  .settings-trigger-desktop {
-    display: none;
-  }
-  .settings-trigger-mobile {
-    display: block;
-  }
-  .settings-popover {
-    position: fixed;
-    top: auto;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    width: 100%;
-    max-height: 70vh;
-    border-radius: var(--radius) var(--radius) 0 0;
-    border-bottom: none;
-  }
-  /* FAB: fixed bottom-right button visible only on mobile */
-  .settings-trigger-mobile {
-    display: block;
-    position: fixed;
-    bottom: 1.5rem;
-    right: 1.5rem;
-    width: 48px;
-    height: 48px;
-    border-radius: 50%;
-    background: var(--color-link);
-    color: #fff;
-    border: none;
-    box-shadow: 0 4px 12px rgba(0,0,0,0.2);
-    font-size: 1.2rem;
-    z-index: 199;
-    opacity: 1;
-  }
-}
-```
-
-Note: The existing `:root` and `@media (prefers-color-scheme: dark)` blocks provide the "system" theme. `html[data-theme="dark"]` overrides only apply when the user explicitly picks dark mode. When `theme === 'system'`, the `data-theme` attribute is removed and the browser's `prefers-color-scheme` media query kicks in via the existing CSS.
-
-- [ ] **Step 2: Verify existing tests still pass**
-
-Run: `go test ./...`
-Expected: all pass
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add internal/views/static/css/kafka.css
-git commit -m "feat(settings): add popover, toggle, and bottom-sheet CSS"
-```
-
----
-
-## Task 2: JS — Settings logic
-
-**Files:**
-- Create: `internal/views/static/js/settings.js`
-
-- [ ] **Step 1: Write the settings JS module**
-
-Create `internal/views/static/js/settings.js`:
-
-```javascript
-'use strict';
-
-var ALL_ENGINES = [
-  'wikipedia', 'arxiv', 'crossref', 'braveapi',
-  'qwant', 'duckduckgo', 'github', 'reddit', 'bing'
-];
-
-var DEFAULT_PREFS = {
-  theme: 'system',
-  engines: ALL_ENGINES.slice(),
-  safeSearch: 'moderate',
-  format: 'html'
-};
-
-var STORAGE_KEY = 'kafka_prefs';
-
-// ── Persistence ──────────────────────────────────────────────────────────────
-
-function loadPrefs() {
-  try {
-    var raw = localStorage.getItem(STORAGE_KEY);
-    if (!raw) return { theme: DEFAULT_PREFS.theme, engines: DEFAULT_PREFS.engines.slice(), safeSearch: DEFAULT_PREFS.safeSearch, format: DEFAULT_PREFS.format };
-    var saved = JSON.parse(raw);
-    return { theme: saved.theme || DEFAULT_PREFS.theme, engines: saved.engines || DEFAULT_PREFS.engines.slice(), safeSearch: saved.safeSearch || DEFAULT_PREFS.safeSearch, format: saved.format || DEFAULT_PREFS.format };
-  } catch (e) {
-    return { theme: DEFAULT_PREFS.theme, engines: DEFAULT_PREFS.engines.slice(), safeSearch: DEFAULT_PREFS.safeSearch, format: DEFAULT_PREFS.format };
-  }
-}
-
-function savePrefs(prefs) {
-  try {
-    localStorage.setItem(STORAGE_KEY, JSON.stringify({ theme: prefs.theme, engines: prefs.engines, safeSearch: prefs.safeSearch, format: prefs.format }));
-  } catch (e) { /* quota or private mode */ }
-}
-
-// ── Theme application ────────────────────────────────────────────────────────
-
-function applyTheme(theme) {
-  if (theme === 'system') {
-    document.documentElement.removeAttribute('data-theme');
-  } else {
-    document.documentElement.setAttribute('data-theme', theme);
-  }
-}
-
-// ── Engine input sync ─────────────────────────────────────────────────────────
-
-function syncEngineInput(prefs) {
-  var input = document.getElementById('engines-input');
-  if (input) input.value = prefs.engines.join(',');
-}
-
-// ── Panel open / close ────────────────────────────────────────────────────────
-
-function closePanel() {
-  var panel = document.getElementById('settings-popover');
-  var trigger = document.getElementById('settings-trigger');
-  if (!panel) return;
-  panel.setAttribute('data-open', 'false');
-  if (trigger) trigger.setAttribute('aria-expanded', 'false');
-  if (trigger) trigger.focus();
-}
-
-function openPanel() {
-  var panel = document.getElementById('settings-popover');
-  var trigger = document.getElementById('settings-trigger');
-  if (!panel) return;
-  panel.setAttribute('data-open', 'true');
-  if (trigger) trigger.setAttribute('aria-expanded', 'true');
-  var focusable = panel.querySelector('button, input, select');
-  if (focusable) focusable.focus();
-}
-
-// ── Escape key ───────────────────────────────────────────────────────────────
-
-document.addEventListener('keydown', function(e) {
-  if (e.key !== 'Escape') return;
-  var panel = document.getElementById('settings-popover');
-  if (!panel || panel.getAttribute('data-open') !== 'true') return;
-  closePanel();
-});
-
-// ── Click outside ─────────────────────────────────────────────────────────────
-
-document.addEventListener('click', function(e) {
-  var panel = document.getElementById('settings-popover');
-  var trigger = document.getElementById('settings-trigger');
-  if (!panel || panel.getAttribute('data-open') !== 'true') return;
-  if (!panel.contains(e.target) && (!trigger || !trigger.contains(e.target))) {
-    closePanel();
-  }
-});
-
-// ── Focus trap ────────────────────────────────────────────────────────────────
-
-document.addEventListener('keydown', function(e) {
-  if (e.key !== 'Tab') return;
-  var panel = document.getElementById('settings-popover');
-  if (!panel || panel.getAttribute('data-open') !== 'true') return;
-  var focusable = Array.prototype.slice.call(panel.querySelectorAll('button, input, select, [tabindex]:not([tabindex="-1"])'));
-  if (!focusable.length) return;
-  var first = focusable[0];
-  var last = focusable[focusable.length - 1];
-  if (e.shiftKey) {
-    if (document.activeElement === first) { e.preventDefault(); last.focus(); }
-  } else {
-    if (document.activeElement === last) { e.preventDefault(); first.focus(); }
-  }
-});
-
-// ── Render ────────────────────────────────────────────────────────────────────
-
-function escapeHtml(str) {
-  return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-}
-
-function renderPanel(prefs) {
-  var panel = document.getElementById('settings-popover');
-  if (!panel) return;
-  var body = panel.querySelector('.settings-popover-body');
-  if (!body) return;
-
-  var themeBtns = '';
-  ['light', 'dark', 'system'].forEach(function(t) {
-    var icons = { light: '\u2600', dark: '\u263D', system: '\u2318' };
-    var labels = { light: 'Light', dark: 'Dark', system: 'System' };
-    var active = prefs.theme === t ? ' active' : '';
-    themeBtns += '<button class="theme-btn' + active + '" data-theme="' + t + '">' + icons[t] + ' ' + labels[t] + '</button>';
-  });
-
-  var engineToggles = '';
-  ALL_ENGINES.forEach(function(name) {
-    var checked = prefs.engines.indexOf(name) !== -1 ? ' checked' : '';
-    engineToggles += '<label class="engine-toggle"><input type="checkbox" value="' + escapeHtml(name) + '"' + checked + '><span>' + escapeHtml(name) + '</span></label>';
-  });
-
-  var ssOptions = [
-    { val: 'moderate', label: 'Moderate' },
-    { val: 'strict',   label: 'Strict' },
-    { val: 'off',      label: 'Off' }
-  ];
-  var fmtOptions = [
-    { val: 'html', label: 'HTML' },
-    { val: 'json', label: 'JSON' },
-    { val: 'csv',  label: 'CSV' },
-    { val: 'rss',  label: 'RSS' }
-  ];
-  var ssOptionsHtml = '';
-  var fmtOptionsHtml = '';
-  ssOptions.forEach(function(o) {
-    var sel = prefs.safeSearch === o.val ? ' selected' : '';
-    ssOptionsHtml += '<option value="' + o.val + '"' + sel + '>' + o.label + '</option>';
-  });
-  fmtOptions.forEach(function(o) {
-    var sel = prefs.format === o.val ? ' selected' : '';
-    fmtOptionsHtml += '<option value="' + o.val + '"' + sel + '>' + o.label + '</option>';
-  });
-
-  body.innerHTML =
-    '<div class="settings-section">' +
-      '<div class="settings-section-title">Appearance</div>' +
-      '<div class="theme-buttons">' + themeBtns + '</div>' +
-    '</div>' +
-    '<div class="settings-section">' +
-      '<div class="settings-section-title">Engines</div>' +
-      '<div class="engine-grid">' + engineToggles + '</div>' +
-      '<p class="settings-notice">Engine changes apply to your next search.</p>' +
-    '</div>' +
-    '<div class="settings-section">' +
-      '<div class="settings-section-title">Search Defaults</div>' +
-      '<div class="setting-row">' +
-        '<label for="pref-safesearch">Safe search</label>' +
-        '<select id="pref-safesearch">' + ssOptionsHtml + '</select>' +
-      '</div>' +
-      '<div class="setting-row">' +
-        '<label for="pref-format">Default format</label>' +
-        '<select id="pref-format">' + fmtOptionsHtml + '</select>' +
-      '</div>' +
-    '</div>';
-
-  // Theme buttons
-  var themeBtnEls = panel.querySelectorAll('.theme-btn');
-  for (var i = 0; i < themeBtnEls.length; i++) {
-    themeBtnEls[i].addEventListener('click', (function(btn) {
-      return function() {
-        prefs.theme = btn.getAttribute('data-theme');
-        savePrefs(prefs);
-        applyTheme(prefs.theme);
-        syncEngineInput(prefs);
-        renderPanel(prefs);
-      };
-    })(themeBtnEls[i]));
-  }
-
-  // Engine checkboxes
-  var checkboxes = panel.querySelectorAll('.engine-toggle input[type="checkbox"]');
-  for (var j = 0; j < checkboxes.length; j++) {
-    checkboxes[j].addEventListener('change', (function(cb) {
-      return function() {
-        var checked = Array.prototype.slice.call(panel.querySelectorAll('.engine-toggle input[type="checkbox"]:checked')).map(function(el) { return el.value; });
-        if (checked.length === 0) { cb.checked = true; return; }
-        prefs.engines = checked;
-        savePrefs(prefs);
-        syncEngineInput(prefs);
-      };
-    })(checkboxes[j]));
-  }
-
-  // Safe search
-  var ssEl = panel.querySelector('#pref-safesearch');
-  if (ssEl) {
-    ssEl.addEventListener('change', function() {
-      prefs.safeSearch = ssEl.value;
-      savePrefs(prefs);
-    });
-  }
-
-  // Format
-  var fmtEl = panel.querySelector('#pref-format');
-  if (fmtEl) {
-    fmtEl.addEventListener('change', function() {
-      prefs.format = fmtEl.value;
-      savePrefs(prefs);
-    });
-  }
-
-  // Close button
-  var closeBtn = panel.querySelector('.settings-popover-close');
-  if (closeBtn) closeBtn.addEventListener('click', closePanel);
-}
-
-// ── Init ─────────────────────────────────────────────────────────────────────
-
-function initSettings() {
-  var prefs = loadPrefs();
-  applyTheme(prefs.theme);
-  syncEngineInput(prefs);
-
-  var panel = document.getElementById('settings-popover');
-  var trigger = document.getElementById('settings-trigger');
-  var mobileTrigger = document.getElementById('settings-trigger-mobile');
-
-  if (panel) {
-    renderPanel(prefs);
-
-    function togglePanel() {
-      var isOpen = panel.getAttribute('data-open') === 'true';
-      if (isOpen) closePanel(); else openPanel();
-    }
-
-    if (trigger) trigger.addEventListener('click', togglePanel);
-    if (mobileTrigger) mobileTrigger.addEventListener('click', togglePanel);
-  }
-}
-
-if (document.readyState === 'loading') {
-  document.addEventListener('DOMContentLoaded', initSettings);
-} else {
-  initSettings();
-}
-```
-
-- [ ] **Step 2: Verify JS syntax**
-
-Run: `node --check internal/views/static/js/settings.js`
-Expected: no output (exit 0)
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add internal/views/static/js/settings.js
-git commit -m "feat(settings): add JS module for localStorage preferences and panel"
-```
-
----
-
-## Task 3: HTML — Gear trigger, panel markup, header in base
-
-**Files:**
-- Modify: `internal/views/templates/base.html`
-- Modify: `internal/views/views.go`
-
-- [ ] **Step 1: Add ShowHeader to PageData**
-
-In `views.go`, add `ShowHeader bool` to `PageData` struct.
-
-- [ ] **Step 2: Set ShowHeader in render functions**
-
-In `RenderIndex` and `RenderSearch`, set `PageData.ShowHeader = true`.
-
-- [ ] **Step 3: Update base.html — add header and settings markup**
-
-In `base.html`, update the `<body>` to:
-
-```html
-<body class="{{if .Query}}search_on_results{{end}}">
-  {{if .ShowHeader}}
-  <header class="site-header">
-    <span class="site-title">kafka</span>
-    <!-- Desktop trigger (hidden on mobile) -->
-    <button id="settings-trigger" class="settings-trigger settings-trigger-desktop"
-      aria-label="Preferences" aria-expanded="false" aria-controls="settings-popover">&#9881;</button>
-  </header>
-  <!-- Mobile FAB trigger (hidden on desktop, shown via CSS on mobile) -->
-  <button id="settings-trigger-mobile" class="settings-trigger settings-trigger-mobile"
-    aria-label="Preferences" aria-expanded="false" aria-controls="settings-popover"
-    style="display:none;">&#9881;</button>
-  {{end}}
-  <main>
-    {{template "content" .}}
-  </main>
-  <footer>
-    <p>Powered by <a href="https://git.ashisgreat.xyz/penal-colony/kafka">kafka</a> — a privacy-respecting, open metasearch engine</p>
-  </footer>
-  <script src="/static/js/settings.js"></script>
-  <div id="settings-popover" data-open="false" role="dialog" aria-label="Preferences" aria-modal="true">
-    <div class="settings-popover-header">
-      Preferences
-      <button class="settings-popover-close" aria-label="Close">&#215;</button>
-    </div>
-    <div class="settings-popover-body"></div>
-  </div>
-  <script>
-  (function () {
-    'use strict';
-    var input = document.getElementById('q');
-    var dropdown = document.getElementById('autocomplete-dropdown');
-    var form = document.getElementById('search-form');
-    var debounceTimer = null;
-    var suggestions = [];
-    var activeIndex = -1;
-    var fetchController = null;
-    // ... existing autocomplete JS stays unchanged ...
-  }());
-  </script>
-</body>
-```
-
-**Note:** The existing autocomplete `<script>` block is preserved as-is. Only the body wrapper and settings elements are added.
-
-- [ ] **Step 4: Run tests**
-
-Run: `go test ./...`
-Expected: all pass
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add internal/views/templates/base.html internal/views/views.go
-git commit -m "feat(settings): add gear trigger and panel markup to base template"
-```
-
----
-
-## Task 4: Search form — Inject engine preferences
-
-**Files:**
-- Modify: `internal/views/templates/index.html`
-- Modify: `internal/views/templates/results.html`
-
-- [ ] **Step 1: Add hidden engines input to both search forms**
-
-In `index.html`, add inside the `<form>`:
-
-```html
-<input type="hidden" name="engines" id="engines-input" value="">
-```
-
-In `results.html`, add inside the `<form>`:
-
-```html
-<input type="hidden" name="engines" id="engines-input" value="">
-```
-
-The `value` is populated by `syncEngineInput(prefs)` on page load. When the form submits (regular GET or HTMX), the `engines` parameter is included as a CSV string, which `ParseSearchRequest` reads correctly via `r.FormValue("engines")`.
-
-- [ ] **Step 2: Verify existing search works**
-
-Run: `go run ./cmd/kafka -config config.toml`
-Open: `http://localhost:8080`
-Search for "golang" — results should appear as normal.
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add internal/views/templates/index.html internal/views/templates/results.html
-git commit -m "feat(settings): add hidden engines input to search forms"
-```
-
----
-
-## Task 5: End-to-end verification
-
-- [ ] **Step 1: Start server**
-
-Run: `go run ./cmd/kafka -config config.toml`
-Open: `http://localhost:8080`
-
-- [ ] **Step 2: Verify gear icon and panel**
-
-Click the gear icon in the header — panel drops down from top-right with Appearance, Engines, and Search Defaults sections.
-
-- [ ] **Step 3: Verify theme persistence**
-
-Click Dark → page colors change immediately. Refresh → dark theme persists.
-
-- [ ] **Step 4: Verify engine toggle persistence**
-
-Uncheck "wikipedia", refresh → "wikipedia" stays unchecked.
-
-- [ ] **Step 5: Verify engines appear in search query**
-
-With wikipedia unchecked, open DevTools → Network tab, search "golang". Verify request URL includes `&engines=arxiv,crossref,...` (no wikipedia).
-
-- [ ] **Step 6: Verify mobile bottom sheet**
-
-Resize to <768px or use mobile device emulation. Click gear → full-width sheet slides up from bottom.
-
-- [ ] **Step 7: Final commit**
-
-```bash
-git add -A
-git commit -m "feat: complete settings UI — popover, auto-save, theme, engines, mobile bottom-sheet"
-```
diff --git a/docs/superpowers/plans/2026-03-24-per-engine-ttl-cache.md b/docs/superpowers/plans/2026-03-24-per-engine-ttl-cache.md
new file mode 100644
index 0000000..d9ca154
--- /dev/null
+++ b/docs/superpowers/plans/2026-03-24-per-engine-ttl-cache.md
@@ -0,0 +1,789 @@
+# Per-Engine TTL Cache — Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Replace the merged-response cache with per-engine response caching, enabling tier-based TTLs and stale-while-revalidate semantics.
+
+**Architecture:** Each engine's raw response is cached independently with its tier-based TTL. On stale hits, return cached data immediately and refresh in background. Query hash is computed from shared params (query, pageno, safesearch, language, time_range) and prefixed with engine name for the cache key.
+
+**Tech Stack:** Go 1.24, Valkey/Redis (go-redis/v9), existing samsa contracts
+
+---
+
+## File Map
+
+| Action | File | Responsibility |
+|--------|------|----------------|
+| Create | `internal/cache/tiers.go` | Tier definitions, `EngineTier()` function |
+| Create | `internal/cache/tiers_test.go` | Tests for EngineTier |
+| Create | `internal/cache/engine_cache.go` | `EngineCache` struct with tier-aware Get/Set |
+| Create | `internal/cache/engine_cache_test.go` | Tests for EngineCache |
+| Modify | `internal/cache/cache.go` | Add `QueryHash()`, add `CachedEngineResponse` type |
+| Modify | `internal/cache/cache_test.go` | Add tests for `QueryHash()` |
+| Modify | `internal/config/config.go` | Add `TTLOverrides` to `CacheConfig` |
+| Modify | `internal/search/service.go` | Use `EngineCache`, parallel lookups, background refresh |
+
+---
+
+## Task 1: Add QueryHash and CachedEngineResponse to cache.go
+
+**Files:**
+- Modify: `internal/cache/cache.go`
+- Modify: `internal/cache/cache_test.go`
+
+- [ ] **Step 1: Write failing test for QueryHash()**
+
+```go
+// In cache_test.go, add:
+
+func TestQueryHash(t *testing.T) {
+    // Same params should produce same hash
+    hash1 := QueryHash("golang", 1, 0, "en", "")
+    hash2 := QueryHash("golang", 1, 0, "en", "")
+    if hash1 != hash2 {
+        t.Errorf("QueryHash: same params should produce same hash, got %s != %s", hash1, hash2)
+    }
+
+    // Different query should produce different hash
+    hash3 := QueryHash("rust", 1, 0, "en", "")
+    if hash1 == hash3 {
+        t.Errorf("QueryHash: different queries should produce different hash")
+    }
+
+    // Different pageno should produce different hash
+    hash4 := QueryHash("golang", 2, 0, "en", "")
+    if hash1 == hash4 {
+        t.Errorf("QueryHash: different pageno should produce different hash")
+    }
+
+    // time_range should affect hash
+    hash5 := QueryHash("golang", 1, 0, "en", "day")
+    if hash1 == hash5 {
+        t.Errorf("QueryHash: different time_range should produce different hash")
+    }
+
+    // Hash should be 16 characters (truncated SHA-256)
+    if len(hash1) != 16 {
+        t.Errorf("QueryHash: expected 16 char hash, got %d", len(hash1))
+    }
+}
+```
+
+- [ ] **Step 2: Run test to verify it fails**
+
+Run: `nix develop --command bash -c "go test -run TestQueryHash ./internal/cache/ -v"`
+Expected: FAIL — "QueryHash not defined"
+
+- [ ] **Step 3: Implement QueryHash() and CachedEngineResponse in cache.go**
+
+Add to `cache.go` (the imports `crypto/sha256` and `encoding/hex` are already present in cache.go from the existing `Key()` function):
+
+```go
+// QueryHash computes a deterministic hash from shared request parameters
+// (query, pageno, safesearch, language, time_range) for use as a cache key suffix.
+// The hash is a truncated SHA-256 (16 hex chars).
+func QueryHash(query string, pageno int, safesearch int, language, timeRange string) string {
+    h := sha256.New()
+    fmt.Fprintf(h, "q=%s|", query)
+    fmt.Fprintf(h, "pageno=%d|", pageno)
+    fmt.Fprintf(h, "safesearch=%d|", safesearch)
+    fmt.Fprintf(h, "lang=%s|", language)
+    if timeRange != "" {
+        fmt.Fprintf(h, "tr=%s|", timeRange)
+    }
+    return hex.EncodeToString(h.Sum(nil))[:16]
+}
+
+// CachedEngineResponse wraps an engine's cached response with metadata.
+type CachedEngineResponse struct {
+    Engine   string
+    Response []byte
+    StoredAt time.Time
+}
+```
+
+- [ ] **Step 4: Run test to verify it passes**
+
+Run: `nix develop --command bash -c "go test -run TestQueryHash ./internal/cache/ -v"`
+Expected: PASS
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add internal/cache/cache.go internal/cache/cache_test.go
+git commit -m "cache: add QueryHash and CachedEngineResponse type"
+```
+
+---
+
+## Task 2: Create tiers.go with tier definitions
+
+**Files:**
+- Create: `internal/cache/tiers.go`
+
+- [ ] **Step 1: Create tiers.go with tier definitions and EngineTier function**
+
+```go
+package cache
+
+import "time"
+
+// TTLTier represents a cache TTL tier with a name and duration.
+type TTLTier struct {
+    Name     string
+    Duration time.Duration
+}
+
+// defaultTiers maps engine names to their default TTL tiers.
+var defaultTiers = map[string]TTLTier{
+    // Static knowledge engines — rarely change
+    "wikipedia":     {Name: "static", Duration: 24 * time.Hour},
+    "wikidata":      {Name: "static", Duration: 24 * time.Hour},
+    "arxiv":         {Name: "static", Duration: 24 * time.Hour},
+    "crossref":      {Name: "static", Duration: 24 * time.Hour},
+    "stackoverflow": {Name: "static", Duration: 24 * time.Hour},
+    "github":        {Name: "static", Duration: 24 * time.Hour},
+
+    // API-based general search — fresher data
+    "braveapi": {Name: "api_general", Duration: 1 * time.Hour},
+    "youtube":  {Name: "api_general", Duration: 1 * time.Hour},
+
+    // Scraped general search — moderately stable
+    "google":      {Name: "scraped_general", Duration: 2 * time.Hour},
+    "bing":        {Name: "scraped_general", Duration: 2 * time.Hour},
+    "duckduckgo":  {Name: "scraped_general", Duration: 2 * time.Hour},
+    "qwant":       {Name: "scraped_general", Duration: 2 * time.Hour},
+    "brave":       {Name: "scraped_general", Duration: 2 * time.Hour},
+
+    // News/social — changes frequently
+    "reddit": {Name: "news_social", Duration: 30 * time.Minute},
+
+    // Image search
+    "bing_images":  {Name: "images", Duration: 1 * time.Hour},
+    "ddg_images":   {Name: "images", Duration: 1 * time.Hour},
+    "qwant_images": {Name: "images", Duration: 1 * time.Hour},
+}
+
+// EngineTier returns the TTL tier for an engine, applying overrides if provided.
+// If the engine has no defined tier, returns a default of 1 hour.
+func EngineTier(engineName string, overrides map[string]time.Duration) TTLTier {
+    // Check override first — override tier name is just the engine name
+    if override, ok := overrides[engineName]; ok && override > 0 {
+        return TTLTier{Name: engineName, Duration: override}
+    }
+
+    // Fall back to default tier
+    if tier, ok := defaultTiers[engineName]; ok {
+        return tier
+    }
+
+    // Unknown engines get a sensible default
+    return TTLTier{Name: "unknown", Duration: 1 * time.Hour}
+}
+```
+
+- [ ] **Step 2: Run go vet to verify it compiles**
+
+Run: `nix develop --command bash -c "go vet ./internal/cache/tiers.go"`
+Expected: no output (success)
+
+- [ ] **Step 3: Write a basic test for EngineTier**
+
+```go
+// In internal/cache/tiers_test.go:
+
+package cache
+
+import "testing"
+
+func TestEngineTier(t *testing.T) {
+    // Test default static tier
+    tier := EngineTier("wikipedia", nil)
+    if tier.Name != "static" || tier.Duration != 24*time.Hour {
+        t.Errorf("wikipedia: expected static/24h, got %s/%v", tier.Name, tier.Duration)
+    }
+
+    // Test default api_general tier
+    tier = EngineTier("braveapi", nil)
+    if tier.Name != "api_general" || tier.Duration != 1*time.Hour {
+        t.Errorf("braveapi: expected api_general/1h, got %s/%v", tier.Name, tier.Duration)
+    }
+
+    // Test override takes precedence — override tier name is just the engine name
+    override := 48 * time.Hour
+    tier = EngineTier("wikipedia", map[string]time.Duration{"wikipedia": override})
+    if tier.Name != "wikipedia" || tier.Duration != 48*time.Hour {
+        t.Errorf("wikipedia override: expected wikipedia/48h, got %s/%v", tier.Name, tier.Duration)
+    }
+
+    // Test unknown engine gets default
+    tier = EngineTier("unknown_engine", nil)
+    if tier.Name != "unknown" || tier.Duration != 1*time.Hour {
+        t.Errorf("unknown engine: expected unknown/1h, got %s/%v", tier.Name, tier.Duration)
+    }
+}
+```
+
+- [ ] **Step 4: Run test to verify it passes**
+
+Run: `nix develop --command bash -c "go test -run TestEngineTier ./internal/cache/ -v"`
+Expected: PASS
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add internal/cache/tiers.go internal/cache/tiers_test.go
+git commit -m "cache: add tier definitions and EngineTier function"
+```
+
+---
+
+## Task 3: Create EngineCache in engine_cache.go
+
+**Files:**
+- Create: `internal/cache/engine_cache.go`
+- Create: `internal/cache/engine_cache_test.go`
+
+**Note:** The existing `Key()` function in `cache.go` is still used for favicon caching. The new `QueryHash()` and `EngineCache` are separate and only for per-engine search response caching.
+
+- [ ] **Step 1: Write failing test for EngineCache.Get/Set**
+
+```go
+package cache
+
+import (
+    "context"
+    "testing"
+
+    "github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+func TestEngineCacheGetSet(t *testing.T) {
+    // Create a disabled cache for unit testing (nil client)
+    c := &Cache{logger: slog.Default()}
+    ec := NewEngineCache(c, nil)
+
+    ctx := context.Background()
+    cached, ok := ec.Get(ctx, "wikipedia", "abc123")
+    if ok {
+        t.Errorf("Get on disabled cache: expected false, got %v", ok)
+    }
+    _ = cached // unused when ok=false
+}
+
+func TestEngineCacheKeyFormat(t *testing.T) {
+    key := engineCacheKey("wikipedia", "abc123")
+    if key != "samsa:resp:wikipedia:abc123" {
+        t.Errorf("engineCacheKey: expected samsa:resp:wikipedia:abc123, got %s", key)
+    }
+}
+
+func TestEngineCacheIsStale(t *testing.T) {
+    c := &Cache{logger: slog.Default()}
+    ec := NewEngineCache(c, nil)
+
+    // Fresh response (stored 1 minute ago, wikipedia has 24h TTL)
+    fresh := CachedEngineResponse{
+        Engine:   "wikipedia",
+        Response: []byte(`{}`),
+        StoredAt: time.Now().Add(-1 * time.Minute),
+    }
+    if ec.IsStale(fresh, "wikipedia") {
+        t.Errorf("IsStale: 1-minute-old wikipedia should NOT be stale")
+    }
+
+    // Stale response (stored 25 hours ago)
+    stale := CachedEngineResponse{
+        Engine:   "wikipedia",
+        Response: []byte(`{}`),
+        StoredAt: time.Now().Add(-25 * time.Hour),
+    }
+    if !ec.IsStale(stale, "wikipedia") {
+        t.Errorf("IsStale: 25-hour-old wikipedia SHOULD be stale (24h TTL)")
+    }
+
+    // Override: 30 minute TTL for reddit
+    overrides := map[string]time.Duration{"reddit": 30 * time.Minute}
+    ec2 := NewEngineCache(c, overrides)
+
+    // 20 minutes old with 30m override should NOT be stale
+    redditFresh := CachedEngineResponse{
+        Engine:   "reddit",
+        Response: []byte(`{}`),
+        StoredAt: time.Now().Add(-20 * time.Minute),
+    }
+    if ec2.IsStale(redditFresh, "reddit") {
+        t.Errorf("IsStale: 20-min reddit with 30m override should NOT be stale")
+    }
+
+    // 45 minutes old with 30m override SHOULD be stale
+    redditStale := CachedEngineResponse{
+        Engine:   "reddit",
+        Response: []byte(`{}`),
+        StoredAt: time.Now().Add(-45 * time.Minute),
+    }
+    if !ec2.IsStale(redditStale, "reddit") {
+        t.Errorf("IsStale: 45-min reddit with 30m override SHOULD be stale")
+    }
+}
+```
+
+- [ ] **Step 2: Run test to verify it fails**
+
+Run: `nix develop --command bash -c "go test -run TestEngineCache ./internal/cache/ -v"`
+Expected: FAIL — "EngineCache not defined" or "CachedEngineResponse not defined"
+
+- [ ] **Step 3: Implement EngineCache using GetBytes/SetBytes**
+
+The `EngineCache` uses the existing `GetBytes`/`SetBytes` public methods on `Cache` (the `client` field is unexported so we must use those methods).
+
+```go
+package cache
+
+import (
+    "context"
+    "encoding/json"
+    "log/slog"
+    "time"
+
+    "github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+// EngineCache wraps Cache with per-engine tier-aware Get/Set operations.
+type EngineCache struct {
+    cache     *Cache
+    overrides map[string]time.Duration
+}
+
+// NewEngineCache creates a new EngineCache with optional TTL overrides.
+// If overrides is nil, default tier durations are used.
+func NewEngineCache(cache *Cache, overrides map[string]time.Duration) *EngineCache {
+    return &EngineCache{
+        cache:     cache,
+        overrides: overrides,
+    }
+}
+
+// Get retrieves a cached engine response. Returns (zero value, false) if not
+// found or if cache is disabled.
+func (ec *EngineCache) Get(ctx context.Context, engine, queryHash string) (CachedEngineResponse, bool) {
+    key := engineCacheKey(engine, queryHash)
+
+    data, ok := ec.cache.GetBytes(ctx, key)
+    if !ok {
+        return CachedEngineResponse{}, false
+    }
+
+    var cached CachedEngineResponse
+    if err := json.Unmarshal(data, &cached); err != nil {
+        ec.cache.logger.Warn("engine cache hit but unmarshal failed", "key", key, "error", err)
+        return CachedEngineResponse{}, false
+    }
+
+    ec.cache.logger.Debug("engine cache hit", "key", key, "engine", engine)
+    return cached, true
+}
+
+// Set stores an engine response in the cache with the engine's tier TTL.
+func (ec *EngineCache) Set(ctx context.Context, engine, queryHash string, resp contracts.SearchResponse) {
+    if !ec.cache.Enabled() {
+        return
+    }
+
+    data, err := json.Marshal(resp)
+    if err != nil {
+        ec.cache.logger.Warn("engine cache set: marshal failed", "engine", engine, "error", err)
+        return
+    }
+
+    tier := EngineTier(engine, ec.overrides)
+    key := engineCacheKey(engine, queryHash)
+
+    cached := CachedEngineResponse{
+        Engine:   engine,
+        Response: data,
+        StoredAt: time.Now(),
+    }
+
+    cachedData, err := json.Marshal(cached)
+    if err != nil {
+        ec.cache.logger.Warn("engine cache set: wrap marshal failed", "key", key, "error", err)
+        return
+    }
+
+    ec.cache.SetBytes(ctx, key, cachedData, tier.Duration)
+}
+
+// IsStale returns true if the cached response is older than the tier's TTL.
+func (ec *EngineCache) IsStale(cached CachedEngineResponse, engine string) bool {
+    tier := EngineTier(engine, ec.overrides)
+    return time.Since(cached.StoredAt) > tier.Duration
+}
+
+// Logger returns the logger for background refresh logging.
+func (ec *EngineCache) Logger() *slog.Logger {
+    return ec.cache.logger
+}
+
+// engineCacheKey builds the cache key for an engine+query combination.
+func engineCacheKey(engine, queryHash string) string {
+    return "samsa:resp:" + engine + ":" + queryHash
+}
+```
+
+- [ ] **Step 4: Run tests to verify they pass**
+
+Run: `nix develop --command bash -c "go test -run TestEngineCache ./internal/cache/ -v"`
+Expected: PASS
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add internal/cache/engine_cache.go internal/cache/engine_cache_test.go
+git commit -m "cache: add EngineCache with tier-aware Get/Set"
+```
+
+---
+
+## Task 4: Add TTLOverrides to config
+
+**Files:**
+- Modify: `internal/config/config.go`
+
+- [ ] **Step 1: Add TTLOverrides to CacheConfig**
+
+In `CacheConfig` struct, add:
+
+```go
+type CacheConfig struct {
+    Address       string            `toml:"address"`
+    Password      string            `toml:"password"`
+    DB            int               `toml:"db"`
+    DefaultTTL    string            `toml:"default_ttl"`
+    TTLOverrides  map[string]string `toml:"ttl_overrides"` // engine -> duration string
+}
+```
+
+- [ ] **Step 2: Add TTLOverridesParsed() method to Config**
+
+Add after `CacheTTL()`:
+
+```go
+// CacheTTLOverrides returns parsed TTL overrides from config.
+func (c *Config) CacheTTLOverrides() map[string]time.Duration {
+    if len(c.Cache.TTLOverrides) == 0 {
+        return nil
+    }
+    out := make(map[string]time.Duration, len(c.Cache.TTLOverrides))
+    for engine, durStr := range c.Cache.TTLOverrides {
+        if d, err := time.ParseDuration(durStr); err == nil && d > 0 {
+            out[engine] = d
+        }
+    }
+    return out
+}
+```
+
+- [ ] **Step 3: Run tests to verify nothing breaks**
+
+Run: `nix develop --command bash -c "go test ./internal/config/ -v"`
+Expected: PASS
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add internal/config/config.go
+git commit -m "config: add TTLOverrides to CacheConfig"
+```
+
+---
+
+## Task 5: Wire EngineCache into search service
+
+**Files:**
+- Modify: `internal/search/service.go`
+
+- [ ] **Step 1: Read the current service.go to understand wiring**
+
+The service currently takes `*Cache` in `ServiceConfig`. We need to change it to take `*EngineCache` or change the field type.
+
+- [ ] **Step 2: Modify Service struct and NewService to use EngineCache**
+
+Change `Service`:
+
+```go
+type Service struct {
+    upstreamClient *upstream.Client
+    planner        *engines.Planner
+    localEngines   map[string]engines.Engine
+    engineCache    *cache.EngineCache
+}
+```
+
+Change `NewService`:
+
+```go
+func NewService(cfg ServiceConfig) *Service {
+    timeout := cfg.HTTPTimeout
+    if timeout <= 0 {
+        timeout = 10 * time.Second
+    }
+
+    httpClient := httpclient.NewClient(timeout)
+
+    var up *upstream.Client
+    if cfg.UpstreamURL != "" {
+        c, err := upstream.NewClient(cfg.UpstreamURL, timeout)
+        if err == nil {
+            up = c
+        }
+    }
+
+    var engineCache *cache.EngineCache
+    if cfg.Cache != nil {
+        engineCache = cache.NewEngineCache(cfg.Cache, cfg.CacheTTLOverrides)
+    }
+
+    return &Service{
+        upstreamClient: up,
+        planner:        engines.NewPlannerFromEnv(),
+        localEngines:   engines.NewDefaultPortedEngines(httpClient, cfg.EnginesConfig),
+        engineCache:    engineCache,
+    }
+}
+```
+
+Add `CacheTTLOverrides` to `ServiceConfig`:
+
+```go
+type ServiceConfig struct {
+    UpstreamURL       string
+    HTTPTimeout       time.Duration
+    Cache             *cache.Cache
+    CacheTTLOverrides map[string]time.Duration
+    EnginesConfig     *config.Config
+}
+```
+
+- [ ] **Step 3: Rewrite Search() with correct stale-while-revalidate logic**
+
+The stale-while-revalidate flow:
+
+1. **Cache lookup (Phase 1)**: Check cache for each engine in parallel. Classify each as:
+   - Fresh hit: cache has data AND not stale → deserialize, mark as `fresh`
+   - Stale hit: cache has data AND stale → keep in `cached`, no `fresh` yet
+   - Miss: cache has no data → `hit=false`, no `cached` or `fresh`
+
+2. **Fetch (Phase 2)**: For each engine:
+   - Fresh hit: return immediately, no fetch needed
+   - Stale hit: return stale data immediately, fetch fresh in background
+   - Miss: fetch fresh synchronously, cache result
+
+3. **Collect (Phase 3)**: Collect all responses for merge.
+
+```go
+// Search executes the request against local engines (in parallel) and
+// optionally the upstream instance for unported engines.
+func (s *Service) Search(ctx context.Context, req SearchRequest) (SearchResponse, error) {
+    queryHash := cache.QueryHash(
+        req.Query,
+        int(req.Pageno),
+        int(req.Safesearch),
+        req.Language,
+        derefString(req.TimeRange),
+    )
+
+    localEngineNames, upstreamEngineNames, _ := s.planner.Plan(req)
+
+    // Phase 1: Parallel cache lookups — classify each engine as fresh/stale/miss
+    type cacheResult struct {
+        engine       string
+        cached       cache.CachedEngineResponse
+        hit          bool
+        fresh        contracts.SearchResponse
+        fetchErr     error
+        unmarshalErr bool // true if hit but unmarshal failed (treat as miss)
+    }
+
+    cacheResults := make([]cacheResult, len(localEngineNames))
+
+    var lookupWg sync.WaitGroup
+    for i, name := range localEngineNames {
+        lookupWg.Add(1)
+        go func(i int, name string) {
+            defer lookupWg.Done()
+
+            result := cacheResult{engine: name}
+
+            if s.engineCache != nil {
+                cached, ok := s.engineCache.Get(ctx, name, queryHash)
+                if ok {
+                    result.hit = true
+                    result.cached = cached
+                    if !s.engineCache.IsStale(cached, name) {
+                        // Fresh cache hit — deserialize and use directly
+                        var resp contracts.SearchResponse
+                        if err := json.Unmarshal(cached.Response, &resp); err == nil {
+                            result.fresh = resp
+                        } else {
+                            // Unmarshal failed — treat as cache miss (will fetch fresh synchronously)
+                            result.unmarshalErr = true
+                            result.hit = false // treat as miss
+                        }
+                    }
+                    // If stale: result.fresh stays zero, result.cached has stale data
+                }
+            }
+
+            cacheResults[i] = result
+        }(i, name)
+    }
+    lookupWg.Wait()
+
+    // Phase 2: Fetch fresh for misses and stale entries
+    var fetchWg sync.WaitGroup
+    for i, name := range localEngineNames {
+        cr := cacheResults[i]
+
+        // Fresh hit — nothing to do in phase 2
+        if cr.hit && cr.fresh.Response != nil {
+            continue
+        }
+
+        // Stale hit — return stale immediately, refresh in background
+        if cr.hit && cr.cached.Response != nil && s.engineCache != nil && s.engineCache.IsStale(cr.cached, name) {
+            fetchWg.Add(1)
+            go func(name string) {
+                defer fetchWg.Done()
+                eng, ok := s.localEngines[name]
+                if !ok {
+                    return
+                }
+                freshResp, err := eng.Search(ctx, req)
+                if err != nil {
+                    s.engineCache.Logger().Debug("background refresh failed", "engine", name, "error", err)
+                    return
+                }
+                s.engineCache.Set(ctx, name, queryHash, freshResp)
+            }(name)
+            continue
+        }
+
+        // Cache miss — fetch fresh synchronously
+        if !cr.hit {
+            fetchWg.Add(1)
+            go func(i int, name string) {
+                defer fetchWg.Done()
+
+                eng, ok := s.localEngines[name]
+                if !ok {
+                    cacheResults[i] = cacheResult{
+                        engine:   name,
+                        fetchErr: fmt.Errorf("engine not registered: %s", name),
+                    }
+                    return
+                }
+
+                freshResp, err := eng.Search(ctx, req)
+                if err != nil {
+                    cacheResults[i] = cacheResult{
+                        engine:   name,
+                        fetchErr: err,
+                    }
+                    return
+                }
+
+                // Cache the fresh response
+                if s.engineCache != nil {
+                    s.engineCache.Set(ctx, name, queryHash, freshResp)
+                }
+
+                cacheResults[i] = cacheResult{
+                    engine: name,
+                    fresh:  freshResp,
+                    hit:    false,
+                }
+            }(i, name)
+        }
+    }
+    fetchWg.Wait()
+
+    // Phase 3: Collect responses for merge
+    responses := make([]contracts.SearchResponse, 0, len(cacheResults))
+
+    for _, cr := range cacheResults {
+        if cr.fetchErr != nil {
+            responses = append(responses, unresponsiveResponse(req.Query, cr.engine, cr.fetchErr.Error()))
+            continue
+        }
+        // Use fresh data if available (fresh hit or freshly fetched), otherwise use stale cached
+        if cr.fresh.Response != nil {
+            responses = append(responses, cr.fresh)
+        } else if cr.hit && cr.cached.Response != nil {
+            var resp contracts.SearchResponse
+            if err := json.Unmarshal(cr.cached.Response, &resp); err == nil {
+                responses = append(responses, resp)
+            }
+        }
+    }
+
+    // ... rest of upstream proxy and merge logic (unchanged) ...
+}
+```
+
+Note: The imports need `encoding/json` and `fmt` added. The existing imports in service.go already include `sync` and `time`.
+
+- [ ] **Step 4: Run tests to verify compilation**
+
+Run: `nix develop --command bash -c "go build ./internal/search/"`
+Expected: no output (success)
+
+- [ ] **Step 5: Run full test suite**
+
+Run: `nix develop --command bash -c "go test ./..."`
+Expected: All pass
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add internal/search/service.go
+git commit -m "search: wire per-engine cache with tier-aware TTLs"
+```
+
+---
+
+## Task 6: Update config.example.toml
+
+**Files:**
+- Modify: `config.example.toml`
+
+- [ ] **Step 1: Add TTL overrides section to config.example.toml**
+
+Add after the `[cache]` section:
+
+```toml
+[cache.ttl_overrides]
+# Per-engine TTL overrides (uncomment to use):
+# wikipedia = "48h"
+# reddit = "15m"
+# braveapi = "2h"
+```
+
+- [ ] **Step 2: Commit**
+
+```bash
+git add config.example.toml
+git commit -m "config: add cache.ttl_overrides example"
+```
+
+---
+
+## Verification
+
+After all tasks complete, run:
+
+```bash
+nix develop --command bash -c "go test ./... -v 2>&1 | tail -50"
+```
+
+All tests should pass. The search service should now cache each engine's response independently with tier-based TTLs.
diff --git a/docs/superpowers/specs/2026-03-22-brave-search-frontend-redesign.md b/docs/superpowers/specs/2026-03-22-brave-search-frontend-redesign.md
deleted file mode 100644
index d30ab99..0000000
--- a/docs/superpowers/specs/2026-03-22-brave-search-frontend-redesign.md
+++ /dev/null
@@ -1,328 +0,0 @@
-# Brave Search Frontend Redesign — Design Specification
-
-## Overview
-
-Redesign the kafka frontend to match Brave Search's clean, functional aesthetic with emphasis on layout changes: three-column results page, category tiles on homepage, and a hybrid preferences system with full-page `/preferences` route.
-
-## Design Principles
-
-1. **Brave-like layout** — Three-column results, full-page preferences, homepage tiles
-2. **Preserve existing design tokens** — Keep current CSS variables (colors, spacing, radii)
-3. **CSS Grid for layout** — Three-column grid for results, flexible layouts elsewhere
-4. **Hybrid preferences** — Quick popover for common settings (theme + engines), full `/preferences` page for all options
-5. **Minimal HTML changes** — Restructure templates where needed for layout, reuse existing partials
-6. **localStorage-only preferences** — No server-side persistence; all preferences stored in browser localStorage
-
----
-
-## 1. Homepage Redesign
-
-### Current State
-- Centered hero with logo, tagline, and search box
-- No visual categorization of search types
-
-### New Layout
-```
-┌─────────────────────────────────────────────────────────────┐
-│  [Logo]                                      [⚙ Preferences]│
-├─────────────────────────────────────────────────────────────┤
-│                                                             │
-│                      [🔍 Search Box]                        │
-│                                                             │
-│    ┌────────┐ ┌────────┐ ┌────────┐ ┌────────┐            │
-│    │  News  │ │ Images │ │ Videos │ │  Maps  │  ...       │
-│    └────────┘ └────────┘ └────────┘ └────────┘            │
-│                                                             │
-│              "Search the web privately..."                  │
-│                                                             │
-└─────────────────────────────────────────────────────────────┘
-```
-
-### Implementation
-- **File:** `internal/views/templates/index.html`
-- **Structure:** Search hero + category tiles grid
-- **Tiles:** Static links to `/search?q=...` with category parameter (e.g., `&category=images`)
-- **Styling:** Grid of icon+label cards below search box, subtle hover effects
-
-### Category Tiles
-| Category | Icon | Notes |
-|----------|------|-------|
-| All | 🌐 | Default, no category param |
-| News | 📰 | |
-| Images | 🖼️ | |
-| Videos | 🎬 | |
-| Maps | 🗺️ | |
-| Shopping | 🛒 | Future: connect to shopping engine |
-| Music | 🎵 | Future: connect to music engine |
-| Weather | 🌤️ | Future: connect to weather API |
-| Sports | ⚽ | Future |
-| Cryptocurrency | ₿ | Future |
-
-Categories marked "Future" are included in the UI but may not have backend support yet. Category tiles that lack backend support display grayed out with a "Coming soon" tooltip.
-
----
-
-## 2. Results Page — Three-Column Layout
-
-### Current State
-- Two columns: compact search bar spanning top, main results + right sidebar
-
-### New Layout
-```
-┌─────────────────────────────────────────────────────────────┐
-│  [Logo]                                      [⚙ Preferences]│
-├─────────────────────────────────────────────────────────────┤
-│  ┌─────────┐  ┌────────────────────────────┐  ┌──────────┐│
-│  │ Nav     │  │ 🔍 [    Search Input     ]  │  │ Related  ││
-│  │ ───────  │  └────────────────────────────┘  │ Searches ││
-│  │ All     │  About 1,240 results (0.42s)    │          ││
-│  │ Images  │  ┌──────────────────────────┐ │  │ ───────  ││
-│  │ Videos  │  │ Result Card             │ │  │ Suggestions│
-│  │ News    │  │ Title, URL, Description  │ │  │          ││
-│  │ Maps    │  └──────────────────────────┘ │  └──────────┘│
-│  │ Shopping│  ┌──────────────────────────┐ │              │
-│  │ ...     │  │ Result Card             │ │              │
-│  │         │  │ ...                     │ │              │
-│  │ ───────  │  └──────────────────────────┘ │              │
-│  │ Filters │  ...                            │              │
-│  │ Time    │                                │              │
-│  │ Type    │  [Pagination]                  │              │
-│  └─────────┘                                │              │
-└─────────────────────────────────────────────────────────────┘
-```
-
-### Implementation
-- **Files:** `internal/views/templates/results.html`, `internal/views/templates/base.html`
-- **Left Sidebar (desktop, sticky):**
-  - Category navigation links (All, Images, Videos, News, Maps, Shopping, Music, Weather)
-  - Filters section (Time range, Result type) — collapsible
-  - Hidden on mobile (< 768px)
-
-- **Center Column:**
-  - Compact search bar
-  - Results count meta: "About {n} results ({time}s)"
-  - Result cards (unchanged markup)
-  - Pagination
-
-- **Right Sidebar:**
-  - Related searches (existing suggestions)
-  - Additional panels as needed
-
-### Filters
-**Time Range Options:**
-| Label | Query Param |
-|-------|-------------|
-| Any time | (none) |
-| Past hour | `&time=h` |
-| Past 24 hours | `&time=d` |
-| Past week | `&time=w` |
-| Past month | `&time=m` |
-| Past year | `&time=y` |
-
-**Result Type Options:**
-| Label | Query Param |
-|-------|-------------|
-| All results | (none) |
-| News | `&type=news` |
-| Videos | `&type=video` |
-| Images | `&type=image` |
-
-Filter state persists in URL query params and is preserved across HTMX navigation via `hx-include`.
-
-### Mobile Behavior
-| Breakpoint | Layout |
-|------------|--------|
-| < 768px | Single column, no left sidebar |
-| 768px - 1024px | Two columns (center + right sidebar), no left nav |
-| > 1024px | Full three columns |
-
-On mobile (< 768px):
-- Category filters accessible via a horizontal scrollable chip row above results
-- Both sidebars hidden
-- Search bar full-width
-
----
-
-## 3. Preferences Page — Full-Page Hybrid
-
-### Current State
-- Popover triggered by gear icon in header
-- JavaScript-rendered from localStorage
-- Sections: Appearance, Engines, Search Defaults
-
-### New Layout
-```
-┌─────────────────────────────────────────────────────────────┐
-│  [Logo]                                      [⚙ Preferences]│
-├─────────────────────────────────────────────────────────────┤
-│  ┌────────────────┐  ┌─────────────────────────────────────┐│
-│  │ Nav            │  │ Content                            ││
-│  │ ─────────────  │  │                                    ││
-│  │ Search         │  │ [Section Content]                   ││
-│  │ Privacy        │  │                                    ││
-│  │ Tabs           │  │                                    ││
-│  │ Appearance     │  │                                    ││
-│  │ Sidebar        │  │                                    ││
-│  │ Content        │  │                                    ││
-│  │ Languages      │  │                                    ││
-│  │ Regional       │  │                                    ││
-│  └────────────────┘  └─────────────────────────────────────┘│
-└─────────────────────────────────────────────────────────────┘
-```
-
-### Sections (Brave-style)
-1. **Search** — Default engine, safe search, language
-2. **Privacy** — Tracking protection toggle (UI only, always on), request DNT header toggle
-3. **Tabs** — New tab behavior (placeholder section)
-4. **Appearance** — Theme (Light/Dark/System), results font size
-5. **Sidebar** — Sidebar visibility toggle
-6. **Content** — Filter explicit results (SafeSearch), auto-play media toggle
-7. **Languages** — UI language (English only for now), search language
-8. **Regional** — Region/Country, timezone (placeholder)
-
-### Implementation
-- **Route:** Add `GET /preferences` and `POST /preferences` to `internal/httpapi/`
-- **Template:** `internal/views/templates/preferences.html`
-- **Storage:** localStorage-only. GET handler renders page shell, JavaScript populates form values from localStorage. POST handler receives form data, writes to localStorage, re-renders page.
-- **Quick Settings Popover:** Keep existing popover for **theme toggle and engine toggles only** (lightweight, localStorage). SafeSearch and Format settings move exclusively to full preferences page.
-- **Styling:** Match existing design tokens, section headers, form controls
-
-### Preferences Nav (Mobile)
-- Horizontal scrollable nav on mobile (< 768px)
-- Active section highlighted
-
----
-
-## 4. Component Changes
-
-### Header
-- Logo + site name (unchanged)
-- Preferences button (unchanged)
-
-### Search Box
-- Homepage: Larger, prominent, centered
-- Results page: Compact, full-width within center column
-
-### Result Cards
-- Keep existing structure
-- Consider subtle styling improvements (spacing, typography)
-
-### Category Tiles (Homepage)
-- Icon + label per category
-- Hover: slight scale + shadow
-
-### Left Sidebar (Results Page)
-- Sticky positioning (`position: sticky; top: calc(var(--header-height) + 1rem)`)
-- Category links with active state indicator
-- Collapsible filter sections
-
-### Preferences Nav
-- Vertical nav with section icons
-- Active state indicator
-- Mobile: horizontal scroll
-
----
-
-## 5. CSS Architecture
-
-### Existing (Retain)
-- CSS custom properties (design tokens)
-- Component-level styles
-- Dark mode via `[data-theme="dark"]`
-
-### New
-
-**Layout Grid for three-column results:**
-```css
-.results-layout {
-  display: grid;
-  grid-template-columns: 200px 1fr 240px;
-  gap: 2rem;
-  align-items: start;
-}
-```
-
-**Sticky Left Sidebar:**
-```css
-.results-layout .left-sidebar {
-  position: sticky;
-  top: calc(var(--header-height) + 1.5rem);
-  max-height: calc(100vh - var(--header-height) - 3rem);
-  overflow-y: auto;
-}
-```
-
-**Preferences page layout:**
-```css
-.preferences-layout {
-  display: grid;
-  grid-template-columns: 200px 1fr;
-  gap: 2rem;
-}
-```
-
-**Category tiles grid:**
-```css
-.category-tiles {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
-  gap: 1rem;
-}
-```
-
-**Mobile breakpoints:**
-```css
-@media (max-width: 768px) {
-  .results-layout {
-    grid-template-columns: 1fr;
-  }
-  .results-layout .left-sidebar,
-  .results-layout .right-sidebar {
-    display: none;
-  }
-}
-
-@media (min-width: 769px) and (max-width: 1024px) {
-  .results-layout {
-    grid-template-columns: 1fr 220px;
-  }
-  .results-layout .left-sidebar {
-    display: none;
-  }
-}
-```
-
----
-
-## 6. Files to Modify
-
-| File | Change |
-|------|--------|
-| `internal/views/templates/index.html` | Add category tiles |
-| `internal/views/templates/results.html` | Add left sidebar, restructure for three columns |
-| `internal/views/templates/base.html` | Minimal changes (no structural changes needed) |
-| `internal/views/templates/preferences.html` | **New** — full preferences page |
-| `internal/views/static/css/kafka.css` | Add layout grids, category tiles, sidebar styles, sticky positioning, mobile breakpoints |
-| `internal/views/static/js/settings.js` | Reduce popover to theme + engines; add preferences page JS |
-| `internal/httpapi/httpapi.go` | Add `/preferences` route (GET + POST) |
-| `internal/views/views.go` | Add preferences template rendering |
-
----
-
-## 7. Priority Order
-
-1. **Phase 1:** CSS layout framework (three-column grid, new variables, breakpoints)
-2. **Phase 2:** Results page three-column layout
-3. **Phase 3:** Homepage category tiles
-4. **Phase 4:** Preferences page (quick popover first, then full page)
-5. **Phase 5:** Polish and mobile responsiveness
-
----
-
-## Out of Scope
-
-- Backend search logic changes
-- New engine implementations (category tiles for future engines are UI placeholders only)
-- Caching or performance improvements
-- User authentication/account system
-- Server-side preference storage
diff --git a/docs/superpowers/specs/2026-03-22-settings-ui-design.md b/docs/superpowers/specs/2026-03-22-settings-ui-design.md
deleted file mode 100644
index 8029dc8..0000000
--- a/docs/superpowers/specs/2026-03-22-settings-ui-design.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# Settings UI Design — kafka
-
-**Date:** 2026-03-22
-**Status:** Approved
-
-## Overview
-
-A lightweight preferences popover anchored to the top-right, just below the header. Triggered by a gear icon, it lets users adjust theme, enabled engines, and search defaults without leaving their current page. All changes auto-save to `localStorage` on every interaction.
-
-## Layout & Structure
-
-- **Trigger**: Gear icon (⚙️) in the top-right header, aligned with the header's right edge
-- **Panel**: 280px wide, max-height 420px, scrollable internally, rounded corners, subtle shadow, anchored top-right (drops down from trigger, like a dropdown)
-- **Close**: × button in panel header, click outside the panel, or pressing Escape
-- **No Save button** — every interaction immediately writes to `localStorage`
-
-## Interaction Flow
-
-1. User clicks ⚙️ → panel drops down from top-right (200ms ease)
-2. User toggles/clicks → changes apply instantly to DOM + write to `localStorage`
-3. User clicks × or outside or Escape → panel closes, settings persist
-4. **Accessibility**: Focus is trapped within the panel while open. Trigger button uses `aria-expanded` and `aria-controls`. Escape key closes the panel.
-
-## Mid-Search Changes
-
-When opened during an active search on `results.html`:
-- Engine toggles update `localStorage` immediately, but **current results remain unchanged**
-- A subtle inline note below the engines section: *"Engine changes apply to your next search"*
-
-## Sections
-
-### Appearance
-
-- Three theme buttons: ☀️ Light / 🌙 Dark / 💻 System
-- Clicking immediately applies via `document.body.classList` + writes to localStorage
-- "System" reads `prefers-color-scheme` and updates on change
-
-### Engines
-
-- 2-column grid of toggle switches for all 9 engines
-- Each row: engine name + toggle switch
-- Enabled = filled accent color; Disabled = gray outline
-
-### Search Defaults
-
-- Safe search: dropdown (Moderate / Strict / Off)
-- Default format: dropdown (HTML / JSON / CSV)
-
-## Default State
-
-```js
-const DEFAULT_PREFS = {
-  theme: "system",
-  engines: ["wikipedia", "arxiv", "crossref", "braveapi", "qwant", "duckduckgo", "github", "reddit", "bing"],
-  safeSearch: "moderate",
-  format: "html"
-};
-```
-
-## Persistence
-
-```js
-// Written on every interaction
-localStorage.setItem('kafka_prefs', JSON.stringify({ ... }));
-
-// Read on page load — merge with DEFAULT_PREFS
-const saved = JSON.parse(localStorage.getItem('kafka_prefs') || '{}');
-const prefs = { ...DEFAULT_PREFS, ...saved };
-```
-
-## Responsive Behavior
-
-- **Mobile (<768px)**: Panel becomes a **bottom sheet** — 100% width, slides up from the bottom, top corners rounded, max-height 70vh. Trigger moves to a fixed bottom-right FAB button.
-- Panel never covers the search input
-
-## Applied to Existing Code
-
-- `base.html` — add gear button in header, panel markup at end of `<body>`
-- `kafka.css` — popover styles, toggle switch styles, bottom sheet styles for mobile
-- `settings.js` — localStorage read/write, theme application, panel toggle, aria attributes, focus trap
diff --git a/docs/superpowers/specs/2026-03-24-per-engine-ttl-cache-design.md b/docs/superpowers/specs/2026-03-24-per-engine-ttl-cache-design.md
new file mode 100644
index 0000000..5890190
--- /dev/null
+++ b/docs/superpowers/specs/2026-03-24-per-engine-ttl-cache-design.md
@@ -0,0 +1,219 @@
+# Per-Engine TTL Cache — Design
+
+## Overview
+
+Replace the current merged-response cache with a per-engine response cache. Each engine's raw response is cached independently with a tier-based TTL, enabling stale-while-revalidate semantics and more granular freshness control.
+
+## Cache Key Structure
+
+```
+samsa:resp:{engine}:{query_hash}
+```
+
+Where `query_hash` = SHA-256 of shared request params (query, pageno, safesearch, language, time_range), truncated to 16 hex chars.
+
+Example:
+- `samsa:resp:wikipedia:a3f1b2c3d4e5f678`
+- `samsa:resp:duckduckgo:a3f1b2c3d4e5f678`
+
+The same query to Wikipedia and DuckDuckGo produce different cache keys, enabling independent TTLs per engine.
+
+## Query Hash
+
+Compute from shared request parameters:
+
+```go
+func QueryHash(query string, pageno int, safesearch int, language, timeRange string) string {
+    h := sha256.New()
+    fmt.Fprintf(h, "q=%s|", query)
+    fmt.Fprintf(h, "pageno=%d|", pageno)
+    fmt.Fprintf(h, "safesearch=%d|", safesearch)
+    fmt.Fprintf(h, "lang=%s|", language)
+    if timeRange != "" {
+        fmt.Fprintf(h, "tr=%s|", timeRange)
+    }
+    return hex.EncodeToString(h.Sum(nil))[:16]
+}
+```
+
+Note: `engines` is NOT included because each engine has its own cache key prefix.
+
+## Cached Data Format
+
+Each cache entry stores:
+
+```go
+type CachedEngineResponse struct {
+    Engine   string    // engine name
+    Response []byte    // JSON-marshaled contracts.SearchResponse
+    StoredAt time.Time // when cached (for staleness check)
+}
+```
+
+## TTL Tiers
+
+### Default Tier Assignments
+
+| Tier | Engines | Default TTL |
+|------|---------|-------------|
+| `static` | wikipedia, wikidata, arxiv, crossref, stackoverflow, github | 24h |
+| `api_general` | braveapi, youtube | 1h |
+| `scraped_general` | google, bing, duckduckgo, qwant, brave | 2h |
+| `news_social` | reddit | 30m |
+| `images` | bing_images, ddg_images, qwant_images | 1h |
+
+### TOML Override Format
+
+```toml
+[cache.ttl_overrides]
+wikipedia = "48h"    # override default 24h
+reddit = "15m"       # override default 30m
+```
+
+## Search Flow
+
+### 1. Parse Request
+Extract engine list from planner, compute shared `queryHash`.
+
+### 2. Parallel Cache Lookups
+For each engine, spawn a goroutine to check cache:
+
+```go
+type engineCacheResult struct {
+    engine  string
+    resp    contracts.SearchResponse
+    fromCache bool
+    err     error
+}
+
+// For each engine, concurrently:
+cached, hit := engineCache.Get(ctx, engine, queryHash)
+if hit && !isStale(cached) {
+    return cached.Response, nil // fresh cache hit
+}
+if hit && isStale(cached) {
+    go refreshInBackground(engine, queryHash) // stale-while-revalidate
+    return cached.Response, nil // return stale immediately
+}
+// cache miss
+fresh, err := engine.Search(ctx, req)
+engineCache.Set(ctx, engine, queryHash, fresh)
+return fresh, err
+```
+
+### 3. Classify Each Engine
+- **Cache miss** → fetch fresh immediately
+- **Cache hit, fresh** → use cached
+- **Cache hit, stale** → use cached, fetch fresh in background (stale-while-revalidate)
+
+### 4. Background Refresh
+When a stale cache hit occurs:
+1. Return stale data immediately
+2. Spawn goroutine to fetch fresh data
+3. On success, overwrite cache with fresh data
+4. On failure, log and discard (stale data already returned)
+
+### 5. Merge
+Collect all engine responses (cached + fresh), merge via existing `MergeResponses`.
+
+### 6. Write Fresh to Cache
+For engines that were fetched fresh, write to cache with their tier TTL.
+
+## Staleness Check
+
+```go
+func isStale(cached CachedEngineResponse, tier TTLTier) bool {
+    return time.Since(cached.StoredAt) > tier.Duration
+}
+```
+
+## Tier Resolution
+
+```go
+type TTLTier struct {
+    Name      string
+    Duration  time.Duration
+}
+
+func EngineTier(engineName string) TTLTier {
+    if override := ttlOverrides[engineName]; override > 0 {
+        return TTLTier{Name: engineName, Duration: override}
+    }
+    return defaultTiers[engineName] // from hardcoded map above
+}
+```
+
+## New Files
+
+### `internal/cache/engine_cache.go`
+`EngineCache` struct wrapping `*Cache` with tier-aware `Get/Set` methods:
+
+```go
+type EngineCache struct {
+    cache     *Cache
+    overrides map[string]time.Duration
+    tiers     map[string]TTLTier
+}
+
+func (ec *EngineCache) Get(ctx context.Context, engine, queryHash string) (CachedEngineResponse, bool)
+func (ec *EngineCache) Set(ctx context.Context, engine, queryHash string, resp contracts.SearchResponse)
+```
+
+### `internal/cache/tiers.go`
+Tier definitions and `EngineTier(engineName string)` function.
+
+## Modified Files
+
+### `internal/cache/cache.go`
+- Rename `Key()` to `QueryHash()` and add `Engine` prefix externally
+- `Get/Set` remain for favicon caching (unchanged)
+
+### `internal/search/service.go`
+- Replace `*Cache` with `*EngineCache`
+- Parallel cache lookups with goroutines
+- Stale-while-revalidate background refresh
+- Merge collected responses
+
+### `internal/config/config.go`
+Add `TTLOverrides` field:
+
+```go
+type CacheConfig struct {
+    // ... existing fields ...
+    TTLOverrides map[string]time.Duration
+}
+```
+
+## Config Example
+
+```toml
+[cache]
+enabled = true
+url = "valkey://localhost:6379/0"
+default_ttl = "5m"
+
+[cache.ttl_overrides]
+wikipedia = "48h"
+reddit = "15m"
+braveapi = "2h"
+```
+
+## Error Handling
+
+- **Cache read failure**: Treat as cache miss, fetch fresh
+- **Cache write failure**: Log warning, continue without caching for that engine
+- **Background refresh failure**: Log error, discard (stale data already returned)
+- **Engine failure**: Continue with other engines, report in `unresponsive_engines`
+
+## Testing
+
+1. **Unit tests** for `QueryHash()` consistency
+2. **Unit tests** for `EngineTier()` with overrides
+3. **Unit tests** for `isStale()` boundary conditions
+4. **Integration tests** for cache hit/miss/stale scenarios using mock Valkey
+
+## Out of Scope
+
+- Cache invalidation API (future work)
+- Dog-pile prevention (future work)
+- Per-engine cache size limits (future work)
diff --git a/flake.nix b/flake.nix
index 3552728..9ff4c83 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,7 +61,7 @@
 
             port = lib.mkOption {
               type = lib.types.port;
-              default = 8080;
+              default = 5355;
               description = "Port to listen on.";
             };
 
diff --git a/go.mod b/go.mod
index 67a0956..6dff3c8 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/metamorphosis-dev/kafka
+module github.com/metamorphosis-dev/samsa
 
 go 1.24
 
diff --git a/img/screenshot1.png b/img/screenshot1.png
new file mode 100644
index 0000000..dfcec4f
Binary files /dev/null and b/img/screenshot1.png differ
diff --git a/internal/autocomplete/service.go b/internal/autocomplete/service.go
index 23473d5..fd3d8ea 100644
--- a/internal/autocomplete/service.go
+++ b/internal/autocomplete/service.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -25,6 +25,8 @@ import (
 	"net/url"
 	"strings"
 	"time"
+
+	"github.com/metamorphosis-dev/samsa/internal/httpclient"
 )
 
 // Service fetches search suggestions from upstream or Wikipedia OpenSearch.
@@ -39,7 +41,7 @@ func NewService(upstreamURL string, timeout time.Duration) *Service {
 	}
 	return &Service{
 		upstreamURL: strings.TrimRight(upstreamURL, "/"),
-		http: &http.Client{Timeout: timeout},
+		http: httpclient.NewClient(timeout),
 	}
 }
 
@@ -102,7 +104,7 @@ func (s *Service) wikipediaSuggestions(ctx context.Context, query string) ([]str
 	}
 	req.Header.Set(
 		"User-Agent",
-		"gosearch-go/0.1 (compatible; +https://github.com/metamorphosis-dev/kafka)",
+		"gosearch-go/0.1 (compatible; +https://github.com/metamorphosis-dev/samsa)",
 	)
 
 	resp, err := s.http.Do(req)
diff --git a/internal/cache/cache.go b/internal/cache/cache.go
index 78bd0ea..79d3c8b 100644
--- a/internal/cache/cache.go
+++ b/internal/cache/cache.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 	"github.com/redis/go-redis/v9"
 )
 
@@ -97,7 +97,7 @@ func (c *Cache) Get(ctx context.Context, key string) (contracts.SearchResponse,
 		return contracts.SearchResponse{}, false
 	}
 
-	fullKey := "kafka:" + key
+	fullKey := "samsa:" + key
 
 	data, err := c.client.Get(ctx, fullKey).Bytes()
 	if err != nil {
@@ -129,7 +129,7 @@ func (c *Cache) Set(ctx context.Context, key string, resp contracts.SearchRespon
 		return
 	}
 
-	fullKey := "kafka:" + key
+	fullKey := "samsa:" + key
 	if err := c.client.Set(ctx, fullKey, data, c.ttl).Err(); err != nil {
 		c.logger.Warn("cache set failed", "key", fullKey, "error", err)
 	}
@@ -140,10 +140,42 @@ func (c *Cache) Invalidate(ctx context.Context, key string) {
 	if !c.Enabled() {
 		return
 	}
-	fullKey := "kafka:" + key
+	fullKey := "samsa:" + key
 	c.client.Del(ctx, fullKey)
 }
 
+// GetBytes retrieves a raw byte slice from the cache. Returns (data, true) on hit,
+// (nil, false) on miss or error.
+func (c *Cache) GetBytes(ctx context.Context, key string) ([]byte, bool) {
+	if !c.Enabled() {
+		return nil, false
+	}
+	fullKey := "samsa:" + key
+	data, err := c.client.Get(ctx, fullKey).Bytes()
+	if err != nil {
+		if err != redis.Nil {
+			c.logger.Debug("cache bytes miss (error)", "key", fullKey, "error", err)
+		}
+		return nil, false
+	}
+	return data, true
+}
+
+// SetBytes stores a raw byte slice with a custom TTL.
+// If ttl <= 0, the cache's default TTL is used.
+func (c *Cache) SetBytes(ctx context.Context, key string, data []byte, ttl time.Duration) {
+	if !c.Enabled() {
+		return
+	}
+	if ttl <= 0 {
+		ttl = c.ttl
+	}
+	fullKey := "samsa:" + key
+	if err := c.client.Set(ctx, fullKey, data, ttl).Err(); err != nil {
+		c.logger.Warn("cache set bytes failed", "key", fullKey, "error", err)
+	}
+}
+
 // Close closes the Valkey connection.
 func (c *Cache) Close() error {
 	if c.client == nil {
@@ -176,3 +208,25 @@ func Key(req contracts.SearchRequest) string {
 
 	return hex.EncodeToString(h.Sum(nil))[:32]
 }
+
+// QueryHash computes a deterministic hash from shared request parameters
+// (query, pageno, safesearch, language, time_range) for use as a cache key suffix.
+// The hash is a truncated SHA-256 (16 hex chars).
+func QueryHash(query string, pageno int, safesearch int, language, timeRange string) string {
+	h := sha256.New()
+	fmt.Fprintf(h, "q=%s|", query)
+	fmt.Fprintf(h, "pageno=%d|", pageno)
+	fmt.Fprintf(h, "safesearch=%d|", safesearch)
+	fmt.Fprintf(h, "lang=%s|", language)
+	if timeRange != "" {
+		fmt.Fprintf(h, "tr=%s|", timeRange)
+	}
+	return hex.EncodeToString(h.Sum(nil))[:16]
+}
+
+// CachedEngineResponse wraps an engine's cached response with metadata.
+type CachedEngineResponse struct {
+	Engine   string
+	Response []byte
+	StoredAt time.Time
+}
diff --git a/internal/cache/cache_test.go b/internal/cache/cache_test.go
index 3cbb9eb..6857f05 100644
--- a/internal/cache/cache_test.go
+++ b/internal/cache/cache_test.go
@@ -3,13 +3,13 @@ package cache
 import (
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestKey_Deterministic(t *testing.T) {
 	req := contracts.SearchRequest{
 		Format:     contracts.FormatJSON,
-		Query:      "kafka metamorphosis",
+		Query:      "samsa metamorphosis",
 		Pageno:     1,
 		Safesearch: 0,
 		Language:   "auto",
@@ -29,7 +29,7 @@ func TestKey_Deterministic(t *testing.T) {
 }
 
 func TestKey_DifferentQueries(t *testing.T) {
-	reqA := contracts.SearchRequest{Query: "kafka", Format: contracts.FormatJSON}
+	reqA := contracts.SearchRequest{Query: "samsa", Format: contracts.FormatJSON}
 	reqB := contracts.SearchRequest{Query: "orwell", Format: contracts.FormatJSON}
 
 	if Key(reqA) == Key(reqB) {
@@ -75,3 +75,35 @@ func TestNew_NopWithoutAddress(t *testing.T) {
 }
 
 func strPtr(s string) *string { return &s }
+
+func TestQueryHash(t *testing.T) {
+	// Same params should produce same hash
+	hash1 := QueryHash("golang", 1, 0, "en", "")
+	hash2 := QueryHash("golang", 1, 0, "en", "")
+	if hash1 != hash2 {
+		t.Errorf("QueryHash: same params should produce same hash, got %s != %s", hash1, hash2)
+	}
+
+	// Different query should produce different hash
+	hash3 := QueryHash("rust", 1, 0, "en", "")
+	if hash1 == hash3 {
+		t.Errorf("QueryHash: different queries should produce different hash")
+	}
+
+	// Different pageno should produce different hash
+	hash4 := QueryHash("golang", 2, 0, "en", "")
+	if hash1 == hash4 {
+		t.Errorf("QueryHash: different pageno should produce different hash")
+	}
+
+	// time_range should affect hash
+	hash5 := QueryHash("golang", 1, 0, "en", "day")
+	if hash1 == hash5 {
+		t.Errorf("QueryHash: different time_range should produce different hash")
+	}
+
+	// Hash should be 16 characters (truncated SHA-256)
+	if len(hash1) != 16 {
+		t.Errorf("QueryHash: expected 16 char hash, got %d", len(hash1))
+	}
+}
diff --git a/internal/cache/engine_cache.go b/internal/cache/engine_cache.go
new file mode 100644
index 0000000..edbebdd
--- /dev/null
+++ b/internal/cache/engine_cache.go
@@ -0,0 +1,91 @@
+package cache
+
+import (
+	"context"
+	"encoding/json"
+	"log/slog"
+	"time"
+
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+// EngineCache wraps Cache with per-engine tier-aware Get/Set operations.
+type EngineCache struct {
+	cache     *Cache
+	overrides map[string]time.Duration
+}
+
+// NewEngineCache creates a new EngineCache with optional TTL overrides.
+// If overrides is nil, default tier durations are used.
+func NewEngineCache(cache *Cache, overrides map[string]time.Duration) *EngineCache {
+	return &EngineCache{
+		cache:     cache,
+		overrides: overrides,
+	}
+}
+
+// Get retrieves a cached engine response. Returns (zero value, false) if not
+// found or if cache is disabled.
+func (ec *EngineCache) Get(ctx context.Context, engine, queryHash string) (CachedEngineResponse, bool) {
+	key := engineCacheKey(engine, queryHash)
+
+	data, ok := ec.cache.GetBytes(ctx, key)
+	if !ok {
+		return CachedEngineResponse{}, false
+	}
+
+	var cached CachedEngineResponse
+	if err := json.Unmarshal(data, &cached); err != nil {
+		ec.cache.logger.Warn("engine cache hit but unmarshal failed", "key", key, "error", err)
+		return CachedEngineResponse{}, false
+	}
+
+	ec.cache.logger.Debug("engine cache hit", "key", key, "engine", engine)
+	return cached, true
+}
+
+// Set stores an engine response in the cache with the engine's tier TTL.
+func (ec *EngineCache) Set(ctx context.Context, engine, queryHash string, resp contracts.SearchResponse) {
+	if !ec.cache.Enabled() {
+		return
+	}
+
+	data, err := json.Marshal(resp)
+	if err != nil {
+		ec.cache.logger.Warn("engine cache set: marshal failed", "engine", engine, "error", err)
+		return
+	}
+
+	tier := EngineTier(engine, ec.overrides)
+	key := engineCacheKey(engine, queryHash)
+
+	cached := CachedEngineResponse{
+		Engine:   engine,
+		Response: data,
+		StoredAt: time.Now(),
+	}
+
+	cachedData, err := json.Marshal(cached)
+	if err != nil {
+		ec.cache.logger.Warn("engine cache set: wrap marshal failed", "key", key, "error", err)
+		return
+	}
+
+	ec.cache.SetBytes(ctx, key, cachedData, tier.Duration)
+}
+
+// IsStale returns true if the cached response is older than the tier's TTL.
+func (ec *EngineCache) IsStale(cached CachedEngineResponse, engine string) bool {
+	tier := EngineTier(engine, ec.overrides)
+	return time.Since(cached.StoredAt) > tier.Duration
+}
+
+// Logger returns the logger for background refresh logging.
+func (ec *EngineCache) Logger() *slog.Logger {
+	return ec.cache.logger
+}
+
+// engineCacheKey builds the cache key for an engine+query combination.
+func engineCacheKey(engine, queryHash string) string {
+	return "samsa:resp:" + engine + ":" + queryHash
+}
\ No newline at end of file
diff --git a/internal/cache/engine_cache_test.go b/internal/cache/engine_cache_test.go
new file mode 100644
index 0000000..721e1eb
--- /dev/null
+++ b/internal/cache/engine_cache_test.go
@@ -0,0 +1,95 @@
+package cache
+
+import (
+	"context"
+	"log/slog"
+	"testing"
+	"time"
+
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+func TestEngineCacheGetSet(t *testing.T) {
+	// Create a disabled cache for unit testing (nil client)
+	c := &Cache{logger: slog.Default()}
+	ec := NewEngineCache(c, nil)
+
+	ctx := context.Background()
+	cached, ok := ec.Get(ctx, "wikipedia", "abc123")
+	if ok {
+		t.Errorf("Get on disabled cache: expected false, got %v", ok)
+	}
+	_ = cached // unused when ok=false
+}
+
+func TestEngineCacheKeyFormat(t *testing.T) {
+	key := engineCacheKey("wikipedia", "abc123")
+	if key != "samsa:resp:wikipedia:abc123" {
+		t.Errorf("engineCacheKey: expected samsa:resp:wikipedia:abc123, got %s", key)
+	}
+}
+
+func TestEngineCacheIsStale(t *testing.T) {
+	c := &Cache{logger: slog.Default()}
+	ec := NewEngineCache(c, nil)
+
+	// Fresh response (stored 1 minute ago, wikipedia has 24h TTL)
+	fresh := CachedEngineResponse{
+		Engine:   "wikipedia",
+		Response: []byte(`{}`),
+		StoredAt: time.Now().Add(-1 * time.Minute),
+	}
+	if ec.IsStale(fresh, "wikipedia") {
+		t.Errorf("IsStale: 1-minute-old wikipedia should NOT be stale")
+	}
+
+	// Stale response (stored 25 hours ago)
+	stale := CachedEngineResponse{
+		Engine:   "wikipedia",
+		Response: []byte(`{}`),
+		StoredAt: time.Now().Add(-25 * time.Hour),
+	}
+	if !ec.IsStale(stale, "wikipedia") {
+		t.Errorf("IsStale: 25-hour-old wikipedia SHOULD be stale (24h TTL)")
+	}
+
+	// Override: 30 minute TTL for reddit
+	overrides := map[string]time.Duration{"reddit": 30 * time.Minute}
+	ec2 := NewEngineCache(c, overrides)
+
+	// 20 minutes old with 30m override should NOT be stale
+	redditFresh := CachedEngineResponse{
+		Engine:   "reddit",
+		Response: []byte(`{}`),
+		StoredAt: time.Now().Add(-20 * time.Minute),
+	}
+	if ec2.IsStale(redditFresh, "reddit") {
+		t.Errorf("IsStale: 20-min reddit with 30m override should NOT be stale")
+	}
+
+	// 45 minutes old with 30m override SHOULD be stale
+	redditStale := CachedEngineResponse{
+		Engine:   "reddit",
+		Response: []byte(`{}`),
+		StoredAt: time.Now().Add(-45 * time.Minute),
+	}
+	if !ec2.IsStale(redditStale, "reddit") {
+		t.Errorf("IsStale: 45-min reddit with 30m override SHOULD be stale")
+	}
+}
+
+func TestEngineCacheSetResponseType(t *testing.T) {
+	c := &Cache{logger: slog.Default()}
+	ec := NewEngineCache(c, nil)
+
+	ctx := context.Background()
+	urlStr := "https://example.com"
+	resp := contracts.SearchResponse{
+		Results: []contracts.MainResult{
+			{Title: "Test", URL: &urlStr},
+		},
+	}
+
+	// Should not panic on disabled cache
+	ec.Set(ctx, "wikipedia", "abc123", resp)
+}
\ No newline at end of file
diff --git a/internal/cache/tiers.go b/internal/cache/tiers.go
new file mode 100644
index 0000000..6df07ab
--- /dev/null
+++ b/internal/cache/tiers.go
@@ -0,0 +1,56 @@
+package cache
+
+import "time"
+
+// TTLTier represents a cache TTL tier with a name and duration.
+type TTLTier struct {
+	Name     string
+	Duration time.Duration
+}
+
+// defaultTiers maps engine names to their default TTL tiers.
+var defaultTiers = map[string]TTLTier{
+	// Static knowledge engines — rarely change
+	"wikipedia":     {Name: "static", Duration: 24 * time.Hour},
+	"wikidata":      {Name: "static", Duration: 24 * time.Hour},
+	"arxiv":         {Name: "static", Duration: 24 * time.Hour},
+	"crossref":      {Name: "static", Duration: 24 * time.Hour},
+	"stackoverflow": {Name: "static", Duration: 24 * time.Hour},
+	"github":        {Name: "static", Duration: 24 * time.Hour},
+
+	// API-based general search — fresher data
+	"braveapi": {Name: "api_general", Duration: 1 * time.Hour},
+	"youtube":  {Name: "api_general", Duration: 1 * time.Hour},
+
+	// Scraped general search — moderately stable
+	"google":     {Name: "scraped_general", Duration: 2 * time.Hour},
+	"bing":       {Name: "scraped_general", Duration: 2 * time.Hour},
+	"duckduckgo": {Name: "scraped_general", Duration: 2 * time.Hour},
+	"qwant":      {Name: "scraped_general", Duration: 2 * time.Hour},
+	"brave":      {Name: "scraped_general", Duration: 2 * time.Hour},
+
+	// News/social — changes frequently
+	"reddit": {Name: "news_social", Duration: 30 * time.Minute},
+
+	// Image search
+	"bing_images":  {Name: "images", Duration: 1 * time.Hour},
+	"ddg_images":   {Name: "images", Duration: 1 * time.Hour},
+	"qwant_images": {Name: "images", Duration: 1 * time.Hour},
+}
+
+// EngineTier returns the TTL tier for an engine, applying overrides if provided.
+// If the engine has no defined tier, returns a default of 1 hour.
+func EngineTier(engineName string, overrides map[string]time.Duration) TTLTier {
+	// Check override first — override tier name is just the engine name
+	if override, ok := overrides[engineName]; ok && override > 0 {
+		return TTLTier{Name: engineName, Duration: override}
+	}
+
+	// Fall back to default tier
+	if tier, ok := defaultTiers[engineName]; ok {
+		return tier
+	}
+
+	// Unknown engines get a sensible default
+	return TTLTier{Name: "unknown", Duration: 1 * time.Hour}
+}
\ No newline at end of file
diff --git a/internal/cache/tiers_test.go b/internal/cache/tiers_test.go
new file mode 100644
index 0000000..b9419a9
--- /dev/null
+++ b/internal/cache/tiers_test.go
@@ -0,0 +1,33 @@
+package cache
+
+import (
+	"testing"
+	"time"
+)
+
+func TestEngineTier(t *testing.T) {
+	// Test default static tier
+	tier := EngineTier("wikipedia", nil)
+	if tier.Name != "static" || tier.Duration != 24*time.Hour {
+		t.Errorf("wikipedia: expected static/24h, got %s/%v", tier.Name, tier.Duration)
+	}
+
+	// Test default api_general tier
+	tier = EngineTier("braveapi", nil)
+	if tier.Name != "api_general" || tier.Duration != 1*time.Hour {
+		t.Errorf("braveapi: expected api_general/1h, got %s/%v", tier.Name, tier.Duration)
+	}
+
+	// Test override takes precedence — override tier name is just the engine name
+	override := 48 * time.Hour
+	tier = EngineTier("wikipedia", map[string]time.Duration{"wikipedia": override})
+	if tier.Name != "wikipedia" || tier.Duration != 48*time.Hour {
+		t.Errorf("wikipedia override: expected wikipedia/48h, got %s/%v", tier.Name, tier.Duration)
+	}
+
+	// Test unknown engine gets default
+	tier = EngineTier("unknown_engine", nil)
+	if tier.Name != "unknown" || tier.Duration != 1*time.Hour {
+		t.Errorf("unknown engine: expected unknown/1h, got %s/%v", tier.Name, tier.Duration)
+	}
+}
\ No newline at end of file
diff --git a/internal/config/config.go b/internal/config/config.go
index f5a8b9a..c834016 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -23,10 +23,10 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/metamorphosis-dev/kafka/internal/util"
+	"github.com/metamorphosis-dev/samsa/internal/util"
 )
 
-// Config is the top-level configuration for the kafka service.
+// Config is the top-level configuration for the samsa service.
 type Config struct {
 	Server        ServerConfig         `toml:"server"`
 	Upstream      UpstreamConfig       `toml:"upstream"`
@@ -50,18 +50,24 @@ type UpstreamConfig struct {
 }
 
 type EnginesConfig struct {
-	LocalPorted []string    `toml:"local_ported"`
-	Brave       BraveConfig `toml:"brave"`
-	Qwant       QwantConfig `toml:"qwant"`
-	YouTube     YouTubeConfig `toml:"youtube"`
+	LocalPorted  []string            `toml:"local_ported"`
+	Brave        BraveConfig         `toml:"brave"`
+	Qwant        QwantConfig         `toml:"qwant"`
+	YouTube      YouTubeConfig       `toml:"youtube"`
+	StackOverflow *StackOverflowConfig `toml:"stackoverflow"`
+}
+
+type StackOverflowConfig struct {
+	APIKey string `toml:"api_key"`
 }
 
 // CacheConfig holds Valkey/Redis cache settings.
 type CacheConfig struct {
-	Address    string `toml:"address"`     // Valkey server address (e.g. "localhost:6379")
-	Password   string `toml:"password"`    // Auth password (empty = none)
-	DB         int    `toml:"db"`          // Database index (default 0)
-	DefaultTTL string `toml:"default_ttl"` // Cache TTL (e.g. "5m", default "5m")
+	Address      string            `toml:"address"`       // Valkey server address (e.g. "localhost:6379")
+	Password     string            `toml:"password"`      // Auth password (empty = none)
+	DB           int               `toml:"db"`            // Database index (default 0)
+	DefaultTTL   string            `toml:"default_ttl"`   // Cache TTL (e.g. "5m", default "5m")
+	TTLOverrides map[string]string `toml:"ttl_overrides"` // engine -> duration string
 }
 
 // CORSConfig holds CORS middleware settings.
@@ -155,12 +161,12 @@ func validateConfig(cfg *Config) error {
 func defaultConfig() *Config {
 	return &Config{
 		Server: ServerConfig{
-			Port:        8080,
+			Port:        5355,
 			HTTPTimeout: "10s",
 		},
 		Upstream: UpstreamConfig{},
 		Engines: EnginesConfig{
-			LocalPorted: []string{"wikipedia", "arxiv", "crossref", "braveapi", "qwant", "duckduckgo", "github", "reddit", "bing", "google", "youtube"},
+			LocalPorted: []string{"wikipedia", "wikidata", "arxiv", "crossref", "braveapi", "qwant", "duckduckgo", "github", "reddit", "bing", "google", "youtube", "bing_images", "ddg_images", "qwant_images"},
 			Qwant: QwantConfig{
 				Category:       "web-lite",
 				ResultsPerPage: 10,
@@ -205,6 +211,12 @@ func applyEnvOverrides(cfg *Config) {
 	if v := os.Getenv("YOUTUBE_API_KEY"); v != "" {
 		cfg.Engines.YouTube.APIKey = v
 	}
+	if v := os.Getenv("STACKOVERFLOW_KEY"); v != "" {
+		if cfg.Engines.StackOverflow == nil {
+			cfg.Engines.StackOverflow = &StackOverflowConfig{}
+		}
+		cfg.Engines.StackOverflow.APIKey = v
+	}
 	if v := os.Getenv("VALKEY_ADDRESS"); v != "" {
 		cfg.Cache.Address = v
 	}
@@ -273,6 +285,20 @@ func (c *Config) CacheTTL() time.Duration {
 	return 5 * time.Minute
 }
 
+// CacheTTLOverrides returns parsed TTL overrides from config.
+func (c *Config) CacheTTLOverrides() map[string]time.Duration {
+	if len(c.Cache.TTLOverrides) == 0 {
+		return nil
+	}
+	out := make(map[string]time.Duration, len(c.Cache.TTLOverrides))
+	for engine, durStr := range c.Cache.TTLOverrides {
+		if d, err := time.ParseDuration(durStr); err == nil && d > 0 {
+			out[engine] = d
+		}
+	}
+	return out
+}
+
 // RateLimitWindow parses the rate limit window into a time.Duration.
 func (c *Config) RateLimitWindow() time.Duration {
 	if d, err := time.ParseDuration(c.RateLimit.Window); err == nil && d > 0 {
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index 07bddef..993f466 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -11,11 +11,11 @@ func TestLoadDefaults(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Load with missing file should return defaults: %v", err)
 	}
-	if cfg.Server.Port != 8080 {
-		t.Errorf("expected default port 8080, got %d", cfg.Server.Port)
+	if cfg.Server.Port != 5355 {
+		t.Errorf("expected default port 5355, got %d", cfg.Server.Port)
 	}
-	if len(cfg.Engines.LocalPorted) != 11 {
-		t.Errorf("expected 11 default engines, got %d", len(cfg.Engines.LocalPorted))
+	if len(cfg.Engines.LocalPorted) != 15 {
+		t.Errorf("expected 15 default engines, got %d", len(cfg.Engines.LocalPorted))
 	}
 }
 
diff --git a/internal/contracts/main_result.go b/internal/contracts/main_result.go
index 02fb29c..12d2d22 100644
--- a/internal/contracts/main_result.go
+++ b/internal/contracts/main_result.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/internal/contracts/types.go b/internal/contracts/types.go
index 40ed6bc..d77a6a5 100644
--- a/internal/contracts/types.go
+++ b/internal/contracts/types.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/internal/engines/arxiv.go b/internal/engines/arxiv.go
index 2f9cca0..d82605e 100644
--- a/internal/engines/arxiv.go
+++ b/internal/engines/arxiv.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 const (
diff --git a/internal/engines/arxiv_test.go b/internal/engines/arxiv_test.go
index a59fe3c..e0eaa9a 100644
--- a/internal/engines/arxiv_test.go
+++ b/internal/engines/arxiv_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestArxivEngine_Search(t *testing.T) {
diff --git a/internal/engines/bing.go b/internal/engines/bing.go
index 3b18f7b..085e41d 100644
--- a/internal/engines/bing.go
+++ b/internal/engines/bing.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 // BingEngine searches Bing via the public Bing API.
diff --git a/internal/engines/bing_images.go b/internal/engines/bing_images.go
new file mode 100644
index 0000000..6115c7b
--- /dev/null
+++ b/internal/engines/bing_images.go
@@ -0,0 +1,123 @@
+// samsa — a privacy-respecting metasearch engine
+// Copyright (C) 2026-present metamorphosis-dev
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+package engines
+
+import (
+	"context"
+	"encoding/xml"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+// BingImagesEngine searches Bing Images via their public RSS endpoint.
+type BingImagesEngine struct {
+	client *http.Client
+}
+
+func (e *BingImagesEngine) Name() string { return "bing_images" }
+
+func (e *BingImagesEngine) Search(ctx context.Context, req contracts.SearchRequest) (contracts.SearchResponse, error) {
+	if e == nil || e.client == nil {
+		return contracts.SearchResponse{}, errors.New("bing_images engine not initialized")
+	}
+	q := strings.TrimSpace(req.Query)
+	if q == "" {
+		return contracts.SearchResponse{Query: req.Query}, nil
+	}
+
+	offset := (req.Pageno - 1) * 10
+	endpoint := fmt.Sprintf(
+		"https://www.bing.com/images/search?q=%s&count=10&offset=%d&format=rss",
+		url.QueryEscape(q),
+		offset,
+	)
+
+	httpReq, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	httpReq.Header.Set("User-Agent", "kafka/0.1 (compatible; +https://git.ashisgreat.xyz/penal-colony/kafka)")
+
+	resp, err := e.client.Do(httpReq)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		io.Copy(io.Discard, io.LimitReader(resp.Body, 4096))
+		return contracts.SearchResponse{}, fmt.Errorf("bing_images upstream error: status %d", resp.StatusCode)
+	}
+
+	return parseBingImagesRSS(resp.Body, req.Query)
+}
+
+// parseBingImagesRSS parses Bing's RSS image search results.
+// The description field contains HTML with an <img> tag whose src is the
+// thumbnail and whose enclosing <a> tag links to the source page.
+func parseBingImagesRSS(r io.Reader, query string) (contracts.SearchResponse, error) {
+	type bingImageItem struct {
+		Title   string `xml:"title"`
+		Link    string `xml:"link"`
+		Descrip string `xml:"description"`
+	}
+
+	type rssFeed struct {
+		XMLName xml.Name `xml:"rss"`
+		Channel struct {
+			Items []bingImageItem `xml:"item"`
+		} `xml:"channel"`
+	}
+
+	var rss rssFeed
+	if err := xml.NewDecoder(r).Decode(&rss); err != nil {
+		return contracts.SearchResponse{}, fmt.Errorf("bing_images RSS parse error: %w", err)
+	}
+
+	results := make([]contracts.MainResult, 0, len(rss.Channel.Items))
+	for _, item := range rss.Channel.Items {
+		if item.Link == "" {
+			continue
+		}
+
+		// Extract thumbnail URL from the description HTML.
+		thumbnail := extractImgSrc(item.Descrip)
+		content := stripHTML(item.Descrip)
+
+		linkPtr := item.Link
+		results = append(results, contracts.MainResult{
+			Template:  "images",
+			Title:     item.Title,
+			Content:   content,
+			URL:       &linkPtr,
+			Thumbnail: thumbnail,
+			Engine:    "bing_images",
+			Score:     0,
+			Category:  "images",
+			Engines:   []string{"bing_images"},
+		})
+	}
+
+	return contracts.SearchResponse{
+		Query:               query,
+		NumberOfResults:    len(results),
+		Results:             results,
+		Answers:             []map[string]any{},
+		Corrections:         []string{},
+		Infoboxes:           []map[string]any{},
+		Suggestions:         []string{},
+		UnresponsiveEngines: [][2]string{},
+	}, nil
+}
diff --git a/internal/engines/bing_test.go b/internal/engines/bing_test.go
index bb09c64..b72cc71 100644
--- a/internal/engines/bing_test.go
+++ b/internal/engines/bing_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestBingEngine_EmptyQuery(t *testing.T) {
diff --git a/internal/engines/brave.go b/internal/engines/brave.go
index da25630..6b06f7d 100644
--- a/internal/engines/brave.go
+++ b/internal/engines/brave.go
@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 type BraveEngine struct {
diff --git a/internal/engines/braveapi.go b/internal/engines/braveapi.go
index 830b010..8386547 100644
--- a/internal/engines/braveapi.go
+++ b/internal/engines/braveapi.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 // BraveEngine implements the Brave Web Search API.
diff --git a/internal/engines/braveapi_test.go b/internal/engines/braveapi_test.go
index ed710ff..8b645ed 100644
--- a/internal/engines/braveapi_test.go
+++ b/internal/engines/braveapi_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestBraveEngine_GatingAndHeader(t *testing.T) {
diff --git a/internal/engines/crossref.go b/internal/engines/crossref.go
index 79e6ab5..625c328 100644
--- a/internal/engines/crossref.go
+++ b/internal/engines/crossref.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 type CrossrefEngine struct {
diff --git a/internal/engines/crossref_test.go b/internal/engines/crossref_test.go
index 070e85b..a2f950b 100644
--- a/internal/engines/crossref_test.go
+++ b/internal/engines/crossref_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestCrossrefEngine_Search(t *testing.T) {
diff --git a/internal/engines/ddg_images.go b/internal/engines/ddg_images.go
new file mode 100644
index 0000000..0feedc7
--- /dev/null
+++ b/internal/engines/ddg_images.go
@@ -0,0 +1,207 @@
+// samsa — a privacy-respecting metasearch engine
+// Copyright (C) 2026-present metamorphosis-dev
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+package engines
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+// DuckDuckGoImagesEngine searches DuckDuckGo Images via their vql API.
+type DuckDuckGoImagesEngine struct {
+	client *http.Client
+}
+
+func (e *DuckDuckGoImagesEngine) Name() string { return "ddg_images" }
+
+func (e *DuckDuckGoImagesEngine) Search(ctx context.Context, req contracts.SearchRequest) (contracts.SearchResponse, error) {
+	if e == nil || e.client == nil {
+		return contracts.SearchResponse{}, errors.New("ddg_images engine not initialized")
+	}
+	q := strings.TrimSpace(req.Query)
+	if q == "" {
+		return contracts.SearchResponse{Query: req.Query}, nil
+	}
+
+	// Step 1: Get a VQD token from the initial search page.
+	vqd, err := e.getVQD(ctx, q)
+	if err != nil {
+		return contracts.SearchResponse{
+			Query:               req.Query,
+			UnresponsiveEngines: [][2]string{{"ddg_images", "vqd_fetch_failed"}},
+			Results:             []contracts.MainResult{},
+			Answers:             []map[string]any{},
+			Corrections:         []string{},
+			Infoboxes:           []map[string]any{},
+			Suggestions:         []string{},
+		}, nil
+	}
+
+	// Step 2: Fetch image results using the VQD token.
+	endpoint := fmt.Sprintf(
+		"https://duckduckgo.com/i.js?q=%s&kl=wt-wt&l=wt-wt&p=1&s=%d&vqd=%s",
+		url.QueryEscape(q),
+		(req.Pageno-1)*50,
+		url.QueryEscape(vqd),
+	)
+
+	httpReq, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	httpReq.Header.Set("User-Agent", "kafka/0.1 (compatible; +https://git.ashisgreat.xyz/penal-colony/kafka)")
+	httpReq.Header.Set("Referer", "https://duckduckgo.com/")
+
+	resp, err := e.client.Do(httpReq)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		io.Copy(io.Discard, io.LimitReader(resp.Body, 16*1024))
+		return contracts.SearchResponse{}, fmt.Errorf("ddg_images upstream error: status %d", resp.StatusCode)
+	}
+
+	body, err := io.ReadAll(io.LimitReader(resp.Body, 2*1024*1024))
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+
+	return parseDDGImages(body, req.Query)
+}
+
+// getVQD fetches a VQD token from DuckDuckGo's search page.
+func (e *DuckDuckGoImagesEngine) getVQD(ctx context.Context, query string) (string, error) {
+	endpoint := "https://duckduckgo.com/?q=" + url.QueryEscape(query)
+
+	httpReq, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
+	if err != nil {
+		return "", err
+	}
+	httpReq.Header.Set("User-Agent", "kafka/0.1 (compatible; +https://git.ashisgreat.xyz/penal-colony/kafka)")
+
+	resp, err := e.client.Do(httpReq)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(io.LimitReader(resp.Body, 512*1024))
+	if err != nil {
+		return "", err
+	}
+
+	// Extract VQD from the HTML: vqd='...'
+	vqd := extractVQD(string(body))
+	if vqd == "" {
+		return "", fmt.Errorf("vqd token not found in response")
+	}
+	return vqd, nil
+}
+
+// extractVQD extracts the VQD token from DuckDuckGo's HTML response.
+func extractVQD(html string) string {
+	// Look for: vqd='...' or vqd="..."
+	for _, prefix := range []string{"vqd='", `vqd="`} {
+		idx := strings.Index(html, prefix)
+		if idx == -1 {
+			continue
+		}
+		start := idx + len(prefix)
+		end := start
+		for end < len(html) && html[end] != '\'' && html[end] != '"' {
+			end++
+		}
+		if end > start {
+			return html[start:end]
+		}
+	}
+	return ""
+}
+
+// ddgImageResult represents a single image result from DDG's JSON API.
+type ddgImageResult struct {
+	Title   string `json:"title"`
+	URL     string `json:"url"`
+	Thumbnail string `json:"thumbnail"`
+	Image   string `json:"image"`
+	Width   int    `json:"width"`
+	Height  int    `json:"height"`
+	Source  string `json:"source"`
+}
+
+func parseDDGImages(body []byte, query string) (contracts.SearchResponse, error) {
+	var results struct {
+		Results []ddgImageResult `json:"results"`
+	}
+
+	if err := json.Unmarshal(body, &results); err != nil {
+		return contracts.SearchResponse{}, fmt.Errorf("ddg_images JSON parse error: %w", err)
+	}
+
+	out := make([]contracts.MainResult, 0, len(results.Results))
+	for _, img := range results.Results {
+		if img.URL == "" {
+			continue
+		}
+
+		// Prefer the full image URL as thumbnail, fall back to the thumbnail field.
+		thumb := img.Image
+		if thumb == "" {
+			thumb = img.Thumbnail
+		}
+
+		// Build a simple content string showing dimensions.
+		content := ""
+		if img.Width > 0 && img.Height > 0 {
+			content = strconv.Itoa(img.Width) + " × " + strconv.Itoa(img.Height)
+		}
+		if img.Source != "" {
+			if content != "" {
+				content += " — " + img.Source
+			} else {
+				content = img.Source
+			}
+		}
+
+		urlPtr := img.URL
+		out = append(out, contracts.MainResult{
+			Template:  "images",
+			Title:     img.Title,
+			Content:   content,
+			URL:       &urlPtr,
+			Thumbnail: thumb,
+			Engine:    "ddg_images",
+			Score:     0,
+			Category:  "images",
+			Engines:   []string{"ddg_images"},
+		})
+	}
+
+	return contracts.SearchResponse{
+		Query:               query,
+		NumberOfResults:    len(out),
+		Results:             out,
+		Answers:             []map[string]any{},
+		Corrections:         []string{},
+		Infoboxes:           []map[string]any{},
+		Suggestions:         []string{},
+		UnresponsiveEngines: [][2]string{},
+	}, nil
+}
diff --git a/internal/engines/duckduckgo.go b/internal/engines/duckduckgo.go
index 7a71ef4..b260f1e 100644
--- a/internal/engines/duckduckgo.go
+++ b/internal/engines/duckduckgo.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 // DuckDuckGoEngine searches DuckDuckGo's Lite/HTML endpoint.
diff --git a/internal/engines/duckduckgo_parse.go b/internal/engines/duckduckgo_parse.go
index 407029c..223ef09 100644
--- a/internal/engines/duckduckgo_parse.go
+++ b/internal/engines/duckduckgo_parse.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 // parseDuckDuckGoHTML parses DuckDuckGo Lite's HTML response for search results.
diff --git a/internal/engines/duckduckgo_test.go b/internal/engines/duckduckgo_test.go
index 5379bf2..1162a8d 100644
--- a/internal/engines/duckduckgo_test.go
+++ b/internal/engines/duckduckgo_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestDuckDuckGoEngine_EmptyQuery(t *testing.T) {
diff --git a/internal/engines/engine.go b/internal/engines/engine.go
index 729af2b..3ae2e38 100644
--- a/internal/engines/engine.go
+++ b/internal/engines/engine.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@ package engines
 import (
 	"context"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 // Engine is a Go-native implementation of a search engine.
diff --git a/internal/engines/factory.go b/internal/engines/factory.go
index 68f66eb..38d14d1 100644
--- a/internal/engines/factory.go
+++ b/internal/engines/factory.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -21,14 +21,15 @@ import (
 	"os"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/config"
+	"github.com/metamorphosis-dev/samsa/internal/config"
+	"github.com/metamorphosis-dev/samsa/internal/httpclient"
 )
 
 // NewDefaultPortedEngines returns the Go-native engine registry.
 // If cfg is nil, API keys fall back to environment variables.
 func NewDefaultPortedEngines(client *http.Client, cfg *config.Config) map[string]Engine {
 	if client == nil {
-		client = &http.Client{Timeout: 10 * time.Second}
+		client = httpclient.NewClient(10 * time.Second)
 	}
 
 	var braveAPIKey, braveAccessToken, youtubeAPIKey string
@@ -49,6 +50,7 @@ func NewDefaultPortedEngines(client *http.Client, cfg *config.Config) map[string
 
 	return map[string]Engine{
 		"wikipedia": &WikipediaEngine{client: client},
+		"wikidata":  &WikidataEngine{client: client},
 		"arxiv":     &ArxivEngine{client: client},
 		"crossref":  &CrossrefEngine{client: client},
 		"braveapi": &BraveAPIEngine{
@@ -73,5 +75,18 @@ func NewDefaultPortedEngines(client *http.Client, cfg *config.Config) map[string
 			apiKey:  youtubeAPIKey,
 			baseURL: "https://www.googleapis.com",
 		},
+		"stackoverflow": &StackOverflowEngine{client: client, apiKey: stackoverflowAPIKey(cfg)},
+		// Image engines
+		"bing_images":  &BingImagesEngine{client: client},
+		"ddg_images":   &DuckDuckGoImagesEngine{client: client},
+		"qwant_images": &QwantImagesEngine{client: client},
 	}
 }
+
+// stackoverflowAPIKey returns the Stack Overflow API key from config or env var.
+func stackoverflowAPIKey(cfg *config.Config) string {
+	if cfg != nil && cfg.Engines.StackOverflow != nil && cfg.Engines.StackOverflow.APIKey != "" {
+		return cfg.Engines.StackOverflow.APIKey
+	}
+	return os.Getenv("STACKOVERFLOW_KEY")
+}
diff --git a/internal/engines/github.go b/internal/engines/github.go
index d0c9fcc..3bfd27e 100644
--- a/internal/engines/github.go
+++ b/internal/engines/github.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 // GitHubEngine searches GitHub repositories and code via the public search API.
diff --git a/internal/engines/github_test.go b/internal/engines/github_test.go
index 9b569eb..15b2d3b 100644
--- a/internal/engines/github_test.go
+++ b/internal/engines/github_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestGitHubEngine_EmptyQuery(t *testing.T) {
diff --git a/internal/engines/google.go b/internal/engines/google.go
index cea4bd5..4358761 100644
--- a/internal/engines/google.go
+++ b/internal/engines/google.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -25,13 +25,13 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 // googleUserAgent is an honest User-Agent identifying the metasearch engine.
 // Using a spoofed GSA User-Agent violates Google's Terms of Service and
 // risks permanent IP blocking.
-var googleUserAgent = "Kafka/0.1 (compatible; +https://github.com/metamorphosis-dev/kafka)"
+var googleUserAgent = "Kafka/0.1 (compatible; +https://github.com/metamorphosis-dev/samsa)"
 
 type GoogleEngine struct {
 	client *http.Client
diff --git a/internal/engines/html_helpers.go b/internal/engines/html_helpers.go
index 66690c3..3051314 100644
--- a/internal/engines/html_helpers.go
+++ b/internal/engines/html_helpers.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -72,3 +72,14 @@ func htmlUnescape(s string) string {
 	s = strings.ReplaceAll(s, "&nbsp;", " ")
 	return s
 }
+
+// extractImgSrc finds the first <img src="..."> in an HTML string and returns
+// the src attribute value.
+func extractImgSrc(html string) string {
+	idx := strings.Index(html, "<img")
+	if idx == -1 {
+		return ""
+	}
+	remaining := html[idx:]
+	return extractAttr(remaining, "src")
+}
diff --git a/internal/engines/planner.go b/internal/engines/planner.go
index 270885b..54a1827 100644
--- a/internal/engines/planner.go
+++ b/internal/engines/planner.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -20,10 +20,16 @@ import (
 	"os"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
-var defaultPortedEngines = []string{"wikipedia", "arxiv", "crossref", "braveapi", "brave", "qwant", "duckduckgo", "github", "reddit", "bing", "google", "youtube"}
+var defaultPortedEngines = []string{
+	"wikipedia", "wikidata", "arxiv", "crossref", "braveapi",
+	"brave", "qwant", "duckduckgo", "github", "reddit",
+	"bing", "google", "youtube", "stackoverflow",
+	// Image engines
+	"bing_images", "ddg_images", "qwant_images",
+}
 
 type Planner struct {
 	PortedSet  map[string]bool
@@ -100,6 +106,7 @@ func inferFromCategories(categories []string) []string {
 		switch strings.TrimSpace(strings.ToLower(c)) {
 		case "general":
 			set["wikipedia"] = true
+			set["wikidata"] = true
 			set["braveapi"] = true
 			set["qwant"] = true
 			set["duckduckgo"] = true
@@ -110,10 +117,15 @@ func inferFromCategories(categories []string) []string {
 			set["crossref"] = true
 		case "it":
 			set["github"] = true
+			set["stackoverflow"] = true
 		case "social media":
 			set["reddit"] = true
 		case "videos":
 			set["youtube"] = true
+		case "images":
+			set["bing_images"] = true
+			set["ddg_images"] = true
+			set["qwant_images"] = true
 		}
 	}
 
@@ -122,7 +134,11 @@ func inferFromCategories(categories []string) []string {
 		out = append(out, e)
 	}
 	// stable order
-	order := map[string]int{"wikipedia": 0, "braveapi": 1, "brave": 2, "qwant": 3, "duckduckgo": 4, "bing": 5, "google": 6, "arxiv": 7, "crossref": 8, "github": 9, "reddit": 10, "youtube": 11}
+	order := map[string]int{
+		"wikipedia": 0, "wikidata": 1, "braveapi": 2, "brave": 3, "qwant": 4, "duckduckgo": 5, "bing": 6, "google": 7,
+		"arxiv": 8, "crossref": 9, "github": 10, "stackoverflow": 11, "reddit": 12, "youtube": 13,
+		"bing_images": 14, "ddg_images": 15, "qwant_images": 16,
+	}
 	sortByOrder(out, order)
 	return out
 }
diff --git a/internal/engines/qwant.go b/internal/engines/qwant.go
index 7fa963b..d1ccd14 100644
--- a/internal/engines/qwant.go
+++ b/internal/engines/qwant.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 	"github.com/PuerkitoBio/goquery"
 )
 
diff --git a/internal/engines/qwant_images.go b/internal/engines/qwant_images.go
new file mode 100644
index 0000000..dcae55a
--- /dev/null
+++ b/internal/engines/qwant_images.go
@@ -0,0 +1,199 @@
+// samsa — a privacy-respecting metasearch engine
+// Copyright (C) 2026-present metamorphosis-dev
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+package engines
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+// QwantImagesEngine searches Qwant Images via the v3 search API.
+type QwantImagesEngine struct {
+	client *http.Client
+}
+
+func (e *QwantImagesEngine) Name() string { return "qwant_images" }
+
+func (e *QwantImagesEngine) Search(ctx context.Context, req contracts.SearchRequest) (contracts.SearchResponse, error) {
+	if e == nil || e.client == nil {
+		return contracts.SearchResponse{}, errors.New("qwant_images engine not initialized")
+	}
+	q := strings.TrimSpace(req.Query)
+	if q == "" {
+		return contracts.SearchResponse{Query: req.Query}, nil
+	}
+
+	args := url.Values{}
+	args.Set("q", req.Query)
+	args.Set("count", "20")
+	args.Set("locale", qwantLocale(req.Language))
+	args.Set("safesearch", fmt.Sprintf("%d", req.Safesearch))
+	args.Set("offset", fmt.Sprintf("%d", (req.Pageno-1)*20))
+
+	endpoint := "https://api.qwant.com/v3/search/images?" + args.Encode()
+
+	httpReq, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	httpReq.Header.Set("User-Agent", "kafka/0.1 (compatible; +https://git.ashisgreat.xyz/penal-colony/kafka)")
+
+	resp, err := e.client.Do(httpReq)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusForbidden {
+		return contracts.SearchResponse{
+			Query:               req.Query,
+			UnresponsiveEngines: [][2]string{{"qwant_images", "captcha_or_js_block"}},
+			Results:             []contracts.MainResult{},
+			Answers:             []map[string]any{},
+			Corrections:         []string{},
+			Infoboxes:           []map[string]any{},
+			Suggestions:         []string{},
+		}, nil
+	}
+
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		io.Copy(io.Discard, io.LimitReader(resp.Body, 16*1024))
+		return contracts.SearchResponse{}, fmt.Errorf("qwant_images upstream error: status %d", resp.StatusCode)
+	}
+
+	body, err := io.ReadAll(io.LimitReader(resp.Body, 2*1024*1024))
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+
+	return parseQwantImages(body, req.Query)
+}
+
+func parseQwantImages(body []byte, query string) (contracts.SearchResponse, error) {
+	var top map[string]any
+	if err := json.Unmarshal(body, &top); err != nil {
+		return contracts.SearchResponse{}, fmt.Errorf("qwant_images JSON parse error: %w", err)
+	}
+
+	status, _ := top["status"].(string)
+	if status != "success" {
+		return contracts.SearchResponse{
+			Query:               query,
+			UnresponsiveEngines: [][2]string{{"qwant_images", "api_error"}},
+			Results:             []contracts.MainResult{},
+			Answers:             []map[string]any{},
+			Corrections:         []string{},
+			Infoboxes:           []map[string]any{},
+			Suggestions:         []string{},
+		}, nil
+	}
+
+	data, _ := top["data"].(map[string]any)
+	result, _ := data["result"].(map[string]any)
+	items, _ := result["items"].(map[string]any)
+	mainline := items["mainline"]
+
+	rows := toSlice(mainline)
+	if len(rows) == 0 {
+		return contracts.SearchResponse{
+			Query:               query,
+			NumberOfResults:    0,
+			Results:             []contracts.MainResult{},
+			Answers:             []map[string]any{},
+			Corrections:         []string{},
+			Infoboxes:           []map[string]any{},
+			Suggestions:         []string{},
+			UnresponsiveEngines: [][2]string{},
+		}, nil
+	}
+
+	out := make([]contracts.MainResult, 0)
+	for _, row := range rows {
+		rowMap, ok := row.(map[string]any)
+		if !ok {
+			continue
+		}
+		rowType, _ := rowMap["type"].(string)
+		if rowType != "images" {
+			continue
+		}
+
+		rowItems := toSlice(rowMap["items"])
+		for _, it := range rowItems {
+			itemMap, ok := it.(map[string]any)
+			if !ok {
+				continue
+			}
+			title := toString(itemMap["title"])
+			resURL := toString(itemMap["url"])
+			thumb := toString(itemMap["thumbnail"])
+			fullImg := toString(itemMap["media"])
+			source := toString(itemMap["source"])
+
+			if resURL == "" && fullImg == "" {
+				continue
+			}
+
+			// Use the source page URL for the link, full image for thumbnail display.
+			linkPtr := resURL
+			if linkPtr == "" {
+				linkPtr = fullImg
+			}
+			displayThumb := fullImg
+			if displayThumb == "" {
+				displayThumb = thumb
+			}
+
+			content := source
+			if width, ok := itemMap["width"]; ok {
+				w := toString(width)
+				if h, ok2 := itemMap["height"]; ok2 {
+					h2 := toString(h)
+					if w != "" && h2 != "" {
+						content = w + " × " + h2
+						if source != "" {
+							content += " — " + source
+						}
+					}
+				}
+			}
+
+			out = append(out, contracts.MainResult{
+				Template:  "images",
+				Title:     title,
+				Content:   content,
+				URL:       &linkPtr,
+				Thumbnail: displayThumb,
+				Engine:    "qwant_images",
+				Score:     0,
+				Category:  "images",
+				Engines:   []string{"qwant_images"},
+			})
+		}
+	}
+
+	return contracts.SearchResponse{
+		Query:               query,
+		NumberOfResults:    len(out),
+		Results:             out,
+		Answers:             []map[string]any{},
+		Corrections:         []string{},
+		Infoboxes:           []map[string]any{},
+		Suggestions:         []string{},
+		UnresponsiveEngines: [][2]string{},
+	}, nil
+}
diff --git a/internal/engines/qwant_lite_test.go b/internal/engines/qwant_lite_test.go
index 63903a4..0f61bba 100644
--- a/internal/engines/qwant_lite_test.go
+++ b/internal/engines/qwant_lite_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestQwantEngine_WebLite(t *testing.T) {
diff --git a/internal/engines/qwant_test.go b/internal/engines/qwant_test.go
index b3a5517..ecc7db8 100644
--- a/internal/engines/qwant_test.go
+++ b/internal/engines/qwant_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestQwantEngine_Web(t *testing.T) {
diff --git a/internal/engines/reddit.go b/internal/engines/reddit.go
index 699e7b2..c689a42 100644
--- a/internal/engines/reddit.go
+++ b/internal/engines/reddit.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 // RedditEngine searches Reddit posts via the public JSON API.
diff --git a/internal/engines/reddit_test.go b/internal/engines/reddit_test.go
index fce61f3..2eaf1ae 100644
--- a/internal/engines/reddit_test.go
+++ b/internal/engines/reddit_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestRedditEngine_EmptyQuery(t *testing.T) {
diff --git a/internal/engines/stackoverflow.go b/internal/engines/stackoverflow.go
new file mode 100644
index 0000000..467204d
--- /dev/null
+++ b/internal/engines/stackoverflow.go
@@ -0,0 +1,226 @@
+// samsa — a privacy-respecting metasearch engine
+// Copyright (C) 2026-present metamorphosis-dev
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package engines
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+const stackOverflowAPIBase = "https://api.stackexchange.com/2.3"
+
+// StackOverflowEngine searches Stack Overflow via the public API.
+// No API key is required, but providing one via STACKOVERFLOW_KEY env var
+// or config raises the rate limit from 300 to 10,000 requests/day.
+type StackOverflowEngine struct {
+	client *http.Client
+	apiKey string
+}
+
+func (e *StackOverflowEngine) Name() string { return "stackoverflow" }
+
+func (e *StackOverflowEngine) Search(ctx context.Context, req contracts.SearchRequest) (contracts.SearchResponse, error) {
+	if e == nil || e.client == nil {
+		return contracts.SearchResponse{}, errors.New("stackoverflow engine not initialized")
+	}
+	q := strings.TrimSpace(req.Query)
+	if q == "" {
+		return contracts.SearchResponse{Query: req.Query}, nil
+	}
+
+	page := req.Pageno
+	if page < 1 {
+		page = 1
+	}
+	args := url.Values{}
+	args.Set("order", "desc")
+	args.Set("sort", "relevance")
+	args.Set("site", "stackoverflow")
+	args.Set("page", fmt.Sprintf("%d", page))
+	args.Set("pagesize", "20")
+	args.Set("filter", "!9_bDDxJY5")
+	if e.apiKey != "" {
+		args.Set("key", e.apiKey)
+	}
+
+	endpoint := stackOverflowAPIBase + "/search/advanced?" + args.Encode() + "&q=" + url.QueryEscape(q)
+
+	httpReq, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	httpReq.Header.Set("User-Agent", "kafka/0.1 (compatible; +https://git.ashisgreat.xyz/penal-colony/kafka)")
+	httpReq.Header.Set("Accept", "application/json")
+
+	resp, err := e.client.Do(httpReq)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusTooManyRequests {
+		return contracts.SearchResponse{
+			Query:               req.Query,
+			UnresponsiveEngines: [][2]string{{"stackoverflow", "rate_limited"}},
+			Results:             []contracts.MainResult{},
+			Answers:             []map[string]any{},
+			Corrections:         []string{},
+			Infoboxes:           []map[string]any{},
+			Suggestions:         []string{},
+		}, nil
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		io.Copy(io.Discard, io.LimitReader(resp.Body, 4*1024))
+		return contracts.SearchResponse{}, fmt.Errorf("stackoverflow upstream error: status %d", resp.StatusCode)
+	}
+
+	body, err := io.ReadAll(io.LimitReader(resp.Body, 2*1024*1024))
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+
+	return parseStackOverflow(body, req.Query)
+}
+
+// soQuestion represents a question item from the Stack Exchange API.
+type soQuestion struct {
+	QuestionID    int           `json:"question_id"`
+	Title         string        `json:"title"`
+	Link          string        `json:"link"`
+	Body          string        `json:"body"`
+	Score         int           `json:"score"`
+	AnswerCount   int           `json:"answer_count"`
+	ViewCount     int           `json:"view_count"`
+	Tags          []string      `json:"tags"`
+	CreationDate  float64       `json:"creation_date"`
+	Owner         *soOwner      `json:"owner"`
+	AcceptedAnswerID *int       `json:"accepted_answer_id"`
+	IsAnswered    bool          `json:"is_answered"`
+}
+
+type soOwner struct {
+	Reputation int    `json:"reputation"`
+	DisplayName string `json:"display_name"`
+}
+
+type soResponse struct {
+	Items          []soQuestion `json:"items"`
+	HasMore        bool         `json:"has_more"`
+	QuotaRemaining int          `json:"quota_remaining"`
+	QuotaMax       int          `json:"quota_max"`
+}
+
+func parseStackOverflow(body []byte, query string) (contracts.SearchResponse, error) {
+	var resp soResponse
+	if err := json.Unmarshal(body, &resp); err != nil {
+		return contracts.SearchResponse{}, fmt.Errorf("stackoverflow JSON parse error: %w", err)
+	}
+
+	results := make([]contracts.MainResult, 0, len(resp.Items))
+	for _, q := range resp.Items {
+		if q.Link == "" {
+			continue
+		}
+
+		// Strip HTML from the body excerpt.
+		snippet := truncate(stripHTML(q.Body), 300)
+
+		// Build a content string with useful metadata.
+		content := snippet
+		if q.Score > 0 {
+			content = fmt.Sprintf("Score: %d", q.Score)
+			if q.AnswerCount > 0 {
+				content += fmt.Sprintf(" · %d answers", q.AnswerCount)
+			}
+			if q.ViewCount > 0 {
+				content += fmt.Sprintf(" · %s views", formatCount(q.ViewCount))
+			}
+			if snippet != "" {
+				content += "\n" + snippet
+			}
+		}
+
+		// Append tags as category hint.
+		if len(q.Tags) > 0 {
+			displayTags := q.Tags
+			if len(displayTags) > 5 {
+				displayTags = displayTags[:5]
+			}
+			content += "\n[" + strings.Join(displayTags, "] [") + "]"
+		}
+
+		linkPtr := q.Link
+		results = append(results, contracts.MainResult{
+			Template:  "default",
+			Title:     q.Title,
+			Content:   content,
+			URL:       &linkPtr,
+			Engine:    "stackoverflow",
+			Score:     float64(q.Score),
+			Category:  "it",
+			Engines:   []string{"stackoverflow"},
+		})
+	}
+
+	return contracts.SearchResponse{
+		Query:               query,
+		NumberOfResults:    len(results),
+		Results:             results,
+		Answers:             []map[string]any{},
+		Corrections:         []string{},
+		Infoboxes:           []map[string]any{},
+		Suggestions:         []string{},
+		UnresponsiveEngines: [][2]string{},
+	}, nil
+}
+
+// formatCount formats large numbers compactly (1.2k, 3.4M).
+func formatCount(n int) string {
+	if n >= 1_000_000 {
+		return fmt.Sprintf("%.1fM", float64(n)/1_000_000)
+	}
+	if n >= 1_000 {
+		return fmt.Sprintf("%.1fk", float64(n)/1_000)
+	}
+	return fmt.Sprintf("%d", n)
+}
+
+// truncate cuts a string to at most maxLen characters, appending "…" if truncated.
+func truncate(s string, maxLen int) string {
+	if len(s) <= maxLen {
+		return s
+	}
+	return s[:maxLen] + "…"
+}
+
+// stackOverflowCreatedAt returns a time.Time from a Unix timestamp.
+// Kept as a helper for potential future pubdate use.
+func stackOverflowCreatedAt(unix float64) *string {
+	t := time.Unix(int64(unix), 0).UTC()
+	s := t.Format("2006-01-02")
+	return &s
+}
diff --git a/internal/engines/stackoverflow_test.go b/internal/engines/stackoverflow_test.go
new file mode 100644
index 0000000..ed8e522
--- /dev/null
+++ b/internal/engines/stackoverflow_test.go
@@ -0,0 +1,186 @@
+// samsa — a privacy-respecting metasearch engine
+// Copyright (C) 2026-present metamorphosis-dev
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package engines
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+func TestStackOverflow_Name(t *testing.T) {
+	e := &StackOverflowEngine{}
+	if e.Name() != "stackoverflow" {
+		t.Errorf("expected name 'stackoverflow', got %q", e.Name())
+	}
+}
+
+func TestStackOverflow_NilEngine(t *testing.T) {
+	var e *StackOverflowEngine
+	_, err := e.Search(context.Background(), contracts.SearchRequest{Query: "test"})
+	if err == nil {
+		t.Fatal("expected error for nil engine")
+	}
+}
+
+func TestStackOverflow_EmptyQuery(t *testing.T) {
+	e := &StackOverflowEngine{client: &http.Client{}}
+	resp, err := e.Search(context.Background(), contracts.SearchRequest{Query: ""})
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if len(resp.Results) != 0 {
+		t.Errorf("expected 0 results for empty query, got %d", len(resp.Results))
+	}
+}
+
+func TestStackOverflow_Search(t *testing.T) {
+	items := []soQuestion{
+		{
+			QuestionID:  12345,
+			Title:       "How to center a div in CSS?",
+			Link:        "https://stackoverflow.com/questions/12345",
+			Body:        "<p>I have a div that I want to center horizontally and vertically.</p>",
+			Score:       42,
+			AnswerCount: 7,
+			ViewCount:   15000,
+			Tags:        []string{"css", "html", "layout"},
+		},
+		{
+			QuestionID:  67890,
+			Title:       "Python list comprehension help",
+			Link:        "https://stackoverflow.com/questions/67890",
+			Body:        "<p>I'm trying to flatten a list of lists.</p>",
+			Score:       15,
+			AnswerCount: 3,
+			ViewCount:   2300,
+			Tags:        []string{"python", "list", "comprehension"},
+		},
+	}
+	respBody := soResponse{
+		Items:          items,
+		HasMore:        false,
+		QuotaRemaining: 299,
+		QuotaMax:       300,
+	}
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/2.3/search/advanced" {
+			t.Errorf("unexpected path: %s", r.URL.Path)
+		}
+		q := r.URL.Query()
+		if q.Get("site") != "stackoverflow" {
+			t.Errorf("expected site=stackoverflow, got %q", q.Get("site"))
+		}
+		if q.Get("sort") != "relevance" {
+			t.Errorf("expected sort=relevance, got %q", q.Get("sort"))
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		json.NewEncoder(w).Encode(respBody)
+	}))
+	defer srv.Close()
+
+	// We can't easily override the base URL, so test parsing directly.
+	body, _ := json.Marshal(respBody)
+	result, err := parseStackOverflow(body, "center div css")
+	if err != nil {
+		t.Fatalf("parseStackOverflow error: %v", err)
+	}
+
+	if result.NumberOfResults != 2 {
+		t.Errorf("expected 2 results, got %d", result.NumberOfResults)
+	}
+
+	if len(result.Results) < 2 {
+		t.Fatalf("expected at least 2 results, got %d", len(result.Results))
+	}
+
+	r0 := result.Results[0]
+	if r0.Title != "How to center a div in CSS?" {
+		t.Errorf("wrong title: %q", r0.Title)
+	}
+	if r0.Engine != "stackoverflow" {
+		t.Errorf("wrong engine: %q", r0.Engine)
+	}
+	if r0.Category != "it" {
+		t.Errorf("wrong category: %q", r0.Category)
+	}
+	if r0.URL == nil || *r0.URL != "https://stackoverflow.com/questions/12345" {
+		t.Errorf("wrong URL: %v", r0.URL)
+	}
+	if r0.Content == "" {
+		t.Error("expected non-empty content")
+	}
+
+	// Verify score is populated.
+	if r0.Score != 42 {
+		t.Errorf("expected score 42, got %f", r0.Score)
+	}
+}
+
+func TestStackOverflow_RateLimited(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusTooManyRequests)
+	}))
+	defer srv.Close()
+
+	// We can't override the URL, so test the parsing of rate limit response.
+	// The engine returns empty results with unresponsive engine info.
+	// This is verified via the factory integration; here we just verify the nil case.
+}
+
+func TestStackOverflow_NoAPIKey(t *testing.T) {
+	// Verify that the engine works without an API key set.
+	e := &StackOverflowEngine{client: &http.Client{}, apiKey: ""}
+	if e.apiKey != "" {
+		t.Error("expected empty API key")
+	}
+}
+
+func TestFormatCount(t *testing.T) {
+	tests := []struct {
+		n    int
+		want string
+	}{
+		{999, "999"},
+		{1000, "1.0k"},
+		{1500, "1.5k"},
+		{999999, "1000.0k"},
+		{1000000, "1.0M"},
+		{3500000, "3.5M"},
+	}
+	for _, tt := range tests {
+		got := formatCount(tt.n)
+		if got != tt.want {
+			t.Errorf("formatCount(%d) = %q, want %q", tt.n, got, tt.want)
+		}
+	}
+}
+
+func TestTruncate(t *testing.T) {
+	if got := truncate("hello", 10); got != "hello" {
+		t.Errorf("truncate short string: got %q", got)
+	}
+	if got := truncate("hello world this is long", 10); got != "hello worl…" {
+		t.Errorf("truncate long string: got %q", got)
+	}
+}
diff --git a/internal/engines/wikidata.go b/internal/engines/wikidata.go
new file mode 100644
index 0000000..2956341
--- /dev/null
+++ b/internal/engines/wikidata.go
@@ -0,0 +1,133 @@
+// samsa — a privacy-respecting metasearch engine
+// Copyright (C) 2026-present metamorphosis-dev
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+package engines
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+// wikidataAPIBase is the Wikidata MediaWiki API endpoint (overridable in tests).
+var wikidataAPIBase = "https://www.wikidata.org/w/api.php"
+
+// WikidataEngine searches entity labels and descriptions via the Wikidata API.
+// See: https://www.wikidata.org/w/api.php?action=help&modules=wbsearchentities
+type WikidataEngine struct {
+	client *http.Client
+}
+
+func (e *WikidataEngine) Name() string { return "wikidata" }
+
+func (e *WikidataEngine) Search(ctx context.Context, req contracts.SearchRequest) (contracts.SearchResponse, error) {
+	if e == nil || e.client == nil {
+		return contracts.SearchResponse{}, errors.New("wikidata engine not initialized")
+	}
+	q := strings.TrimSpace(req.Query)
+	if q == "" {
+		return contracts.SearchResponse{Query: req.Query}, nil
+	}
+
+	lang := strings.TrimSpace(req.Language)
+	if lang == "" || lang == "auto" {
+		lang = "en"
+	}
+	lang = strings.SplitN(lang, "-", 2)[0]
+	lang = strings.ReplaceAll(lang, "_", "-")
+	if _, ok := validWikipediaLangs[lang]; !ok {
+		lang = "en"
+	}
+
+	u, err := url.Parse(wikidataAPIBase)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	qv := u.Query()
+	qv.Set("action", "wbsearchentities")
+	qv.Set("search", q)
+	qv.Set("language", lang)
+	qv.Set("limit", "10")
+	qv.Set("format", "json")
+	u.RawQuery = qv.Encode()
+
+	httpReq, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	httpReq.Header.Set("User-Agent", "samsa/1.0 (Wikidata search; +https://github.com/metamorphosis-dev/samsa)")
+
+	resp, err := e.client.Do(httpReq)
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		io.Copy(io.Discard, io.LimitReader(resp.Body, 16*1024))
+		return contracts.SearchResponse{}, fmt.Errorf("wikidata upstream error: status %d", resp.StatusCode)
+	}
+
+	body, err := io.ReadAll(io.LimitReader(resp.Body, 2*1024*1024))
+	if err != nil {
+		return contracts.SearchResponse{}, err
+	}
+
+	var api struct {
+		Search []struct {
+			ID          string `json:"id"`
+			Label       string `json:"label"`
+			Description string `json:"description"`
+		} `json:"search"`
+	}
+	if err := json.Unmarshal(body, &api); err != nil {
+		return contracts.SearchResponse{}, fmt.Errorf("wikidata JSON parse error: %w", err)
+	}
+
+	results := make([]contracts.MainResult, 0, len(api.Search))
+	for _, hit := range api.Search {
+		id := strings.TrimSpace(hit.ID)
+		if id == "" || !strings.HasPrefix(id, "Q") {
+			continue
+		}
+		pageURL := "https://www.wikidata.org/wiki/" + url.PathEscape(id)
+		title := strings.TrimSpace(hit.Label)
+		if title == "" {
+			title = id
+		}
+		content := strings.TrimSpace(hit.Description)
+		urlPtr := pageURL
+		results = append(results, contracts.MainResult{
+			Template: "default.html",
+			Title:    title,
+			Content:  content,
+			URL:      &urlPtr,
+			Engine:   "wikidata",
+			Category: "general",
+			Engines:  []string{"wikidata"},
+		})
+	}
+
+	return contracts.SearchResponse{
+		Query:               req.Query,
+		NumberOfResults:     len(results),
+		Results:             results,
+		Answers:             []map[string]any{},
+		Corrections:         []string{},
+		Infoboxes:           []map[string]any{},
+		Suggestions:         []string{},
+		UnresponsiveEngines: [][2]string{},
+	}, nil
+}
diff --git a/internal/engines/wikidata_test.go b/internal/engines/wikidata_test.go
new file mode 100644
index 0000000..ff2ea45
--- /dev/null
+++ b/internal/engines/wikidata_test.go
@@ -0,0 +1,51 @@
+package engines
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+)
+
+func TestWikidataEngine_Search(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Query().Get("action") != "wbsearchentities" {
+			t.Errorf("action=%q", r.URL.Query().Get("action"))
+		}
+		if got := r.URL.Query().Get("search"); got != "test" {
+			t.Errorf("search=%q want test", got)
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"search":[{"id":"Q937","label":"Go","description":"Programming language"}]}`))
+	}))
+	defer ts.Close()
+
+	orig := wikidataAPIBase
+	t.Cleanup(func() { wikidataAPIBase = orig })
+	wikidataAPIBase = ts.URL + "/w/api.php"
+
+	e := &WikidataEngine{client: ts.Client()}
+	resp, err := e.Search(context.Background(), contracts.SearchRequest{
+		Query:    "test",
+		Language: "en",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(resp.Results) != 1 {
+		t.Fatalf("expected 1 result, got %d", len(resp.Results))
+	}
+	r0 := resp.Results[0]
+	if r0.Engine != "wikidata" {
+		t.Errorf("engine=%q", r0.Engine)
+	}
+	if r0.Title != "Go" {
+		t.Errorf("title=%q", r0.Title)
+	}
+	if r0.URL == nil || !strings.Contains(*r0.URL, "Q937") {
+		t.Errorf("url=%v", r0.URL)
+	}
+}
diff --git a/internal/engines/wikipedia.go b/internal/engines/wikipedia.go
index 518d994..44065f3 100644
--- a/internal/engines/wikipedia.go
+++ b/internal/engines/wikipedia.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 type WikipediaEngine struct {
@@ -108,7 +108,7 @@ func (e *WikipediaEngine) Search(ctx context.Context, req contracts.SearchReques
 	// Wikimedia APIs require a descriptive User-Agent.
 	httpReq.Header.Set(
 		"User-Agent",
-		"gosearch-go/0.1 (compatible; +https://github.com/metamorphosis-dev/kafka)",
+		"gosearch-go/0.1 (compatible; +https://github.com/metamorphosis-dev/samsa)",
 	)
 	// Best-effort: hint content language.
 	if req.Language != "" && req.Language != "auto" {
@@ -123,13 +123,13 @@ func (e *WikipediaEngine) Search(ctx context.Context, req contracts.SearchReques
 
 	if resp.StatusCode == http.StatusNotFound {
 		return contracts.SearchResponse{
-			Query:            req.Query,
-			NumberOfResults: 0,
-			Results:          []contracts.MainResult{},
-			Answers:          []map[string]any{},
-			Corrections:      []string{},
-			Infoboxes:        []map[string]any{},
-			Suggestions:      []string{},
+			Query:               req.Query,
+			NumberOfResults:     0,
+			Results:             []contracts.MainResult{},
+			Answers:             []map[string]any{},
+			Corrections:         []string{},
+			Infoboxes:           []map[string]any{},
+			Suggestions:         []string{},
 			UnresponsiveEngines: [][2]string{},
 		}, nil
 	}
@@ -141,9 +141,13 @@ func (e *WikipediaEngine) Search(ctx context.Context, req contracts.SearchReques
 	var api struct {
 		Title       string `json:"title"`
 		Description string `json:"description"`
+		Extract     string `json:"extract"`
 		Titles      struct {
 			Display string `json:"display"`
 		} `json:"titles"`
+		Thumbnail struct {
+			Source string `json:"source"`
+		} `json:"thumbnail"`
 		ContentURLs struct {
 			Desktop struct {
 				Page string `json:"page"`
@@ -160,7 +164,7 @@ func (e *WikipediaEngine) Search(ctx context.Context, req contracts.SearchReques
 		// API returned a non-standard payload; treat as no result.
 		return contracts.SearchResponse{
 			Query:               req.Query,
-			NumberOfResults:    0,
+			NumberOfResults:     0,
 			Results:             []contracts.MainResult{},
 			Answers:             []map[string]any{},
 			Corrections:         []string{},
@@ -175,36 +179,61 @@ func (e *WikipediaEngine) Search(ctx context.Context, req contracts.SearchReques
 		title = api.Title
 	}
 
-	content := api.Description
+	content := strings.TrimSpace(api.Extract)
+	if content == "" {
+		content = strings.TrimSpace(api.Description)
+	}
 
 	urlPtr := pageURL
 	pub := (*string)(nil)
 
+	// Knowledge infobox for HTML (Wikipedia REST summary: title, extract, thumbnail, link).
+	var infoboxes []map[string]any
+	ibTitle := api.Titles.Display
+	if ibTitle == "" {
+		ibTitle = api.Title
+	}
+	body := strings.TrimSpace(api.Extract)
+	if body == "" {
+		body = strings.TrimSpace(api.Description)
+	}
+	imgSrc := strings.TrimSpace(api.Thumbnail.Source)
+	if ibTitle != "" || body != "" || imgSrc != "" {
+		row := map[string]any{
+			"title":   ibTitle,
+			"infobox": body,
+			"url":     pageURL,
+		}
+		if imgSrc != "" {
+			row["img_src"] = imgSrc
+		}
+		infoboxes = append(infoboxes, row)
+	}
+
 	results := []contracts.MainResult{
 		{
-			Template: "default.html",
-			Title:    title,
-			Content:  content,
-			URL:      &urlPtr,
-			Pubdate:  pub,
-			Engine:   "wikipedia",
-			Score:    0,
-			Category: "general",
-			Priority: "",
+			Template:  "default.html",
+			Title:     title,
+			Content:   content,
+			URL:       &urlPtr,
+			Pubdate:   pub,
+			Engine:    "wikipedia",
+			Score:     0,
+			Category:  "general",
+			Priority:  "",
 			Positions: nil,
-			Engines:  []string{"wikipedia"},
+			Engines:   []string{"wikipedia"},
 		},
 	}
 
 	return contracts.SearchResponse{
 		Query:               req.Query,
-		NumberOfResults:    len(results),
+		NumberOfResults:     len(results),
 		Results:             results,
 		Answers:             []map[string]any{},
 		Corrections:         []string{},
-		Infoboxes:           []map[string]any{},
+		Infoboxes:           infoboxes,
 		Suggestions:         []string{},
 		UnresponsiveEngines: [][2]string{},
 	}, nil
 }
-
diff --git a/internal/engines/wikipedia_test.go b/internal/engines/wikipedia_test.go
index 592f427..b225424 100644
--- a/internal/engines/wikipedia_test.go
+++ b/internal/engines/wikipedia_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestWikipediaEngine_Search(t *testing.T) {
diff --git a/internal/engines/youtube.go b/internal/engines/youtube.go
index 0c5ff9e..a4fa9b2 100644
--- a/internal/engines/youtube.go
+++ b/internal/engines/youtube.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 type YouTubeEngine struct {
diff --git a/internal/httpapi/handlers.go b/internal/httpapi/handlers.go
index ce4165b..d4f7063 100644
--- a/internal/httpapi/handlers.go
+++ b/internal/httpapi/handlers.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -18,26 +18,34 @@ package httpapi
 
 import (
 	"context"
+	"crypto/sha256"
+	"encoding/hex"
 	"encoding/json"
+	"io"
 	"net/http"
 	"strings"
+	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
-	"github.com/metamorphosis-dev/kafka/internal/search"
-	"github.com/metamorphosis-dev/kafka/internal/views"
+	"github.com/metamorphosis-dev/samsa/internal/cache"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/httpclient"
+	"github.com/metamorphosis-dev/samsa/internal/search"
+	"github.com/metamorphosis-dev/samsa/internal/views"
 )
 
 type Handler struct {
-	searchSvc          *search.Service
-	autocompleteSvc    func(ctx context.Context, query string) ([]string, error)
-	sourceURL          string
+	searchSvc       *search.Service
+	autocompleteSvc func(ctx context.Context, query string) ([]string, error)
+	sourceURL       string
+	faviconCache    *cache.Cache
 }
 
-func NewHandler(searchSvc *search.Service, autocompleteSuggestions func(ctx context.Context, query string) ([]string, error), sourceURL string) *Handler {
+func NewHandler(searchSvc *search.Service, autocompleteSuggestions func(ctx context.Context, query string) ([]string, error), sourceURL string, faviconCache *cache.Cache) *Handler {
 	return &Handler{
 		searchSvc:       searchSvc,
 		autocompleteSvc: autocompleteSuggestions,
 		sourceURL:       sourceURL,
+		faviconCache:    faviconCache,
 	}
 }
 
@@ -47,13 +55,35 @@ func (h *Handler) Healthz(w http.ResponseWriter, r *http.Request) {
 	_, _ = w.Write([]byte("OK"))
 }
 
+// getTheme returns the user's theme preference from cookie, defaulting to "light".
+func (h *Handler) getTheme(r *http.Request) string {
+	if cookie, err := r.Cookie("theme"); err == nil {
+		if cookie.Value == "dark" || cookie.Value == "light" {
+			return cookie.Value
+		}
+	}
+	return "light"
+}
+
+// getFaviconService returns the favicon provider from cookie (default "none").
+func (h *Handler) getFaviconService(r *http.Request) string {
+	if cookie, err := r.Cookie("favicon"); err == nil {
+		switch cookie.Value {
+		case "none", "google", "duckduckgo", "self":
+			return cookie.Value
+		}
+	}
+	return "none"
+}
+
 // Index renders the homepage with the search box.
 func (h *Handler) Index(w http.ResponseWriter, r *http.Request) {
 	if r.URL.Path != "/" {
 		http.NotFound(w, r)
 		return
 	}
-	if err := views.RenderIndex(w, h.sourceURL); err != nil {
+	theme := h.getTheme(r)
+	if err := views.RenderIndex(w, h.sourceURL, theme); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}
 }
@@ -84,7 +114,7 @@ func (h *Handler) Search(w http.ResponseWriter, r *http.Request) {
 	req, err := search.ParseSearchRequest(r)
 	if err != nil {
 		if format == "html" || format == "" {
-			pd := views.PageData{SourceURL: h.sourceURL, Query: q}
+			pd := views.PageData{SourceURL: h.sourceURL, Query: q, Theme: h.getTheme(r), FaviconService: h.getFaviconService(r)}
 			if views.IsHTMXRequest(r) {
 				views.RenderSearchFragment(w, pd)
 			} else {
@@ -99,7 +129,7 @@ func (h *Handler) Search(w http.ResponseWriter, r *http.Request) {
 	resp, err := h.searchSvc.Search(r.Context(), req)
 	if err != nil {
 		if req.Format == contracts.FormatHTML {
-			pd := views.PageData{SourceURL: h.sourceURL, Query: req.Query}
+			pd := views.PageData{SourceURL: h.sourceURL, Query: req.Query, Theme: h.getTheme(r), FaviconService: h.getFaviconService(r)}
 			if views.IsHTMXRequest(r) {
 				views.RenderSearchFragment(w, pd)
 			} else {
@@ -113,7 +143,8 @@ func (h *Handler) Search(w http.ResponseWriter, r *http.Request) {
 
 	if req.Format == contracts.FormatHTML {
 		pd := views.FromResponse(resp, req.Query, req.Pageno,
-		r.FormValue("category"), r.FormValue("time"), r.FormValue("type"))
+			r.FormValue("category"), r.FormValue("time"), r.FormValue("type"), h.getFaviconService(r))
+		pd.Theme = h.getTheme(r)
 		if err := views.RenderSearchAuto(w, r, pd); err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 		}
@@ -150,12 +181,118 @@ func (h *Handler) Preferences(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if r.Method == "POST" {
-		// Preferences are stored in localStorage on the client via JavaScript.
-		// This handler exists only for form submission completeness.
+		// Handle theme preference via server-side cookie
+		theme := r.FormValue("theme")
+		if theme == "dark" || theme == "light" {
+			http.SetCookie(w, &http.Cookie{
+				Name:     "theme",
+				Value:    theme,
+				Path:     "/",
+				MaxAge:   86400 * 365,
+				HttpOnly: false, // Allow CSS to read via :has()
+				SameSite: http.SameSiteLaxMode,
+			})
+		}
+		// Persist favicon provider preference.
+		favicon := strings.TrimSpace(r.FormValue("favicon"))
+		switch favicon {
+		case "none", "google", "duckduckgo", "self":
+			http.SetCookie(w, &http.Cookie{
+				Name:     "favicon",
+				Value:    favicon,
+				Path:     "/",
+				MaxAge:   86400 * 365,
+				HttpOnly: false,
+				SameSite: http.SameSiteLaxMode,
+			})
+		}
 		http.Redirect(w, r, "/preferences", http.StatusFound)
 		return
 	}
-	if err := views.RenderPreferences(w, h.sourceURL); err != nil {
+	// Read theme cookie for template
+	theme := "light"
+	if cookie, err := r.Cookie("theme"); err == nil {
+		if cookie.Value == "dark" || cookie.Value == "light" {
+			theme = cookie.Value
+		}
+	}
+	if err := views.RenderPreferences(w, h.sourceURL, theme, h.getFaviconService(r)); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}
 }
+
+const faviconCacheTTL = 24 * time.Hour
+
+// Favicon serves a fetched favicon for the given domain, with ETag support
+// and a 24-hour Redis cache. This lets Kafka act as a privacy-preserving
+// favicon proxy: the user's browser talks to Kafka, not Google or DuckDuckGo.
+func (h *Handler) Favicon(w http.ResponseWriter, r *http.Request) {
+	domain := strings.TrimPrefix(r.URL.Path, "/favicon/")
+	domain = strings.TrimSuffix(domain, "/")
+	domain = strings.TrimSpace(domain)
+
+	if domain == "" || strings.Contains(domain, "/") {
+		http.Error(w, "invalid domain", http.StatusBadRequest)
+		return
+	}
+
+	cacheKey := "favicon:" + domain
+
+	// Check Redis cache.
+	if cached, ok := h.faviconCache.GetBytes(r.Context(), cacheKey); ok {
+		h.serveFavicon(w, r, cached)
+		return
+	}
+
+	// Fetch from the domain's favicon.ico.
+	fetchURL := "https://" + domain + "/favicon.ico"
+	req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, fetchURL, nil)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	req.Header.Set("User-Agent", "Kafka/0.1 (+https://git.ashisgreat.xyz/penal-colony/samsa)")
+	req.Header.Set("Accept", "image/x-icon,image/png,image/webp,*/*")
+
+	client := httpclient.NewClient(5 * time.Second)
+	resp, err := client.Do(req)
+	if err != nil {
+		http.Error(w, "favicon fetch failed", http.StatusBadGateway)
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		http.Error(w, "favicon not found", http.StatusNotFound)
+		return
+	}
+
+	body, err := io.ReadAll(http.MaxBytesReader(w, resp.Body, 64*1024))
+	if err != nil {
+		http.Error(w, "favicon too large", http.StatusBadGateway)
+		return
+	}
+
+	// Store in Redis with 24h TTL.
+	h.faviconCache.SetBytes(r.Context(), cacheKey, body, faviconCacheTTL)
+
+	h.serveFavicon(w, r, body)
+}
+
+// serveFavicon writes a cached or freshly-fetched body with appropriate
+// caching headers. ETag is derived from the body hash (no storage needed).
+func (h *Handler) serveFavicon(w http.ResponseWriter, r *http.Request, body []byte) {
+	h2 := sha256.Sum256(body)
+	etag := `"` + hex.EncodeToString(h2[:8]) + `"`
+
+	if etagMatch := r.Header.Get("If-None-Match"); etagMatch != "" && etagMatch == etag {
+		w.WriteHeader(http.StatusNotModified)
+		return
+	}
+
+	w.Header().Set("Content-Type", "image/x-icon")
+	w.Header().Set("ETag", etag)
+	w.Header().Set("Cache-Control", "private, max-age=86400")
+	w.WriteHeader(http.StatusOK)
+	w.Write(body)
+}
diff --git a/internal/httpapi/httpapi_test.go b/internal/httpapi/httpapi_test.go
index f33cb8c..7e27da0 100644
--- a/internal/httpapi/httpapi_test.go
+++ b/internal/httpapi/httpapi_test.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -24,25 +24,25 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
-	"github.com/metamorphosis-dev/kafka/internal/httpapi"
-	"github.com/metamorphosis-dev/kafka/internal/search"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/httpapi"
+	"github.com/metamorphosis-dev/samsa/internal/search"
 )
 
 // mockUpstreamHandler returns controlled JSON responses.
 func mockUpstreamJSON(query string) contracts.SearchResponse {
 	return contracts.SearchResponse{
-		Query:            query,
-		NumberOfResults:  2,
+		Query:           query,
+		NumberOfResults: 2,
 		Results: []contracts.MainResult{
 			{Title: "Upstream Result 1", URL: ptr("https://upstream.example/1"), Content: "From upstream", Engine: "upstream"},
 			{Title: "Upstream Result 2", URL: ptr("https://upstream.example/2"), Content: "From upstream", Engine: "upstream"},
 		},
-		Answers:              []map[string]any{},
-		Corrections:          []string{},
-		Infoboxes:            []map[string]any{},
-		Suggestions:          []string{"upstream suggestion"},
-		UnresponsiveEngines:  [][2]string{},
+		Answers:             []map[string]any{},
+		Corrections:         []string{},
+		Infoboxes:           []map[string]any{},
+		Suggestions:         []string{"upstream suggestion"},
+		UnresponsiveEngines: [][2]string{},
 	}
 }
 
@@ -67,13 +67,14 @@ func newTestServer(t *testing.T) (*httptest.Server, *httpapi.Handler) {
 		EnginesConfig: nil,
 	})
 
-	h := httpapi.NewHandler(svc, nil, "https://src.example.com")
+	h := httpapi.NewHandler(svc, nil, "https://src.example.com", nil)
 
 	mux := http.NewServeMux()
 	mux.HandleFunc("/healthz", h.Healthz)
 	mux.HandleFunc("/", h.Index)
 	mux.HandleFunc("/search", h.Search)
 	mux.HandleFunc("/autocompleter", h.Autocompleter)
+	mux.HandleFunc("/preferences", h.Preferences)
 
 	server := httptest.NewServer(mux)
 	t.Cleanup(server.Close)
@@ -228,3 +229,50 @@ func TestSearch_SourceURLInFooter(t *testing.T) {
 		t.Error("expected AGPLv3 link in footer")
 	}
 }
+
+func TestPreferences_PostSetsFaviconCookie(t *testing.T) {
+	server, _ := newTestServer(t)
+	client := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error {
+		return http.ErrUseLastResponse
+	}}
+	req, _ := http.NewRequest(http.MethodPost, server.URL+"/preferences", strings.NewReader("favicon=google&theme=dark"))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	resp, err := client.Do(req)
+	if err != nil {
+		t.Fatalf("request failed: %v", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusFound {
+		t.Fatalf("expected redirect 302, got %d", resp.StatusCode)
+	}
+	found := false
+	for _, c := range resp.Cookies() {
+		if c.Name == "favicon" {
+			found = true
+			if c.Value != "google" {
+				t.Fatalf("expected favicon cookie google, got %q", c.Value)
+			}
+		}
+	}
+	if !found {
+		t.Fatal("expected favicon cookie to be set")
+	}
+}
+
+func TestPreferences_GetReflectsFaviconCookie(t *testing.T) {
+	server, _ := newTestServer(t)
+	req, _ := http.NewRequest(http.MethodGet, server.URL+"/preferences", nil)
+	req.AddCookie(&http.Cookie{Name: "favicon", Value: "duckduckgo"})
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatalf("request failed: %v", err)
+	}
+	defer resp.Body.Close()
+
+	body, _ := io.ReadAll(resp.Body)
+	html := string(body)
+	if !strings.Contains(html, `option value="duckduckgo" selected`) {
+		t.Fatalf("expected duckduckgo option selected, body: %s", html)
+	}
+}
diff --git a/internal/httpclient/client.go b/internal/httpclient/client.go
new file mode 100644
index 0000000..450d121
--- /dev/null
+++ b/internal/httpclient/client.go
@@ -0,0 +1,61 @@
+// samsa — a privacy-respecting metasearch engine
+// Copyright (C) 2026-present metamorphosis-dev
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package httpclient
+
+import (
+	"net/http"
+	"sync"
+	"time"
+)
+
+var (
+	defaultTransport http.RoundTripper
+	once             sync.Once
+)
+
+// Default returns a shared, pre-configured http.RoundTripper suitable for
+// outgoing engine requests. It is safe for concurrent use across goroutines.
+// All fields are tuned for a meta-search engine that makes many concurrent
+// requests to a fixed set of upstream hosts:
+//
+//   - MaxIdleConnsPerHost = 20  (vs default of 2; keeps more warm connections
+//     to each host, avoiding repeated TCP+TLS handshakes)
+//   - MaxIdleConns = 100         (total idle connection ceiling)
+//   - IdleConnTimeout = 90s      (prunes connections before they go stale)
+//   - DialContext timeout = 5s   (fails fast on DNS/connect rather than
+//     holding a goroutine indefinitely)
+func Default() http.RoundTripper {
+	once.Do(func() {
+		defaultTransport = &http.Transport{
+			MaxIdleConnsPerHost: 20,
+			MaxIdleConns:        100,
+			IdleConnTimeout:     90 * time.Second,
+			DialContext: dialWithTimeout(5 * time.Second),
+		}
+	})
+	return defaultTransport
+}
+
+// NewClient returns an http.Client that uses DefaultTransport and the given
+// request timeout. The returned client reuses the shared connection pool,
+// so all clients created via this function share the same warm connections.
+func NewClient(timeout time.Duration) *http.Client {
+	return &http.Client{
+		Transport: Default(),
+		Timeout:   timeout,
+	}
+}
diff --git a/internal/httpclient/dial.go b/internal/httpclient/dial.go
new file mode 100644
index 0000000..c646e33
--- /dev/null
+++ b/internal/httpclient/dial.go
@@ -0,0 +1,30 @@
+// samsa — a privacy-respecting metasearch engine
+// Copyright (C) 2026-present metamorphosis-dev
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package httpclient
+
+import (
+	"context"
+	"net"
+	"time"
+)
+
+// dialWithTimeout returns a DialContext function for http.Transport that
+// respects the given connection timeout.
+func dialWithTimeout(timeout time.Duration) func(context.Context, string, string) (net.Conn, error) {
+	d := &net.Dialer{Timeout: timeout}
+	return d.DialContext
+}
diff --git a/internal/middleware/cors.go b/internal/middleware/cors.go
index d4ecf2a..52f3f53 100644
--- a/internal/middleware/cors.go
+++ b/internal/middleware/cors.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/internal/middleware/cors_test.go b/internal/middleware/cors_test.go
index 4f3f6c2..f24ed65 100644
--- a/internal/middleware/cors_test.go
+++ b/internal/middleware/cors_test.go
@@ -51,7 +51,7 @@ func TestCORS_SpecificOrigin(t *testing.T) {
 }
 
 func TestCORS_Preflight(t *testing.T) {
-	h := CORS(CORSConfig{})(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	h := CORS(CORSConfig{AllowedOrigins: []string{"https://example.com"}})(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		t.Error("handler should not be called for preflight")
 	}))
 
@@ -100,6 +100,7 @@ func TestCORS_CustomMethodsAndHeaders(t *testing.T) {
 	})(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
 
 	req := httptest.NewRequest("OPTIONS", "/search", nil)
+	req.Header.Set("Origin", "https://example.com")
 	rec := httptest.NewRecorder()
 	h.ServeHTTP(rec, req)
 
diff --git a/internal/middleware/ratelimit.go b/internal/middleware/ratelimit.go
index 6f662fd..5fc3101 100644
--- a/internal/middleware/ratelimit.go
+++ b/internal/middleware/ratelimit.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/internal/middleware/ratelimit_global.go b/internal/middleware/ratelimit_global.go
index 0bd34c5..89e73de 100644
--- a/internal/middleware/ratelimit_global.go
+++ b/internal/middleware/ratelimit_global.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/internal/middleware/security.go b/internal/middleware/security.go
index 09f3878..83f3b68 100644
--- a/internal/middleware/security.go
+++ b/internal/middleware/security.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -80,7 +80,7 @@ func SecurityHeaders(cfg SecurityHeadersConfig) func(http.Handler) http.Handler
 func defaultCSP() string {
 	return strings.Join([]string{
 		"default-src 'self'",
-		"script-src 'self'",
+		"script-src 'self' 'unsafe-inline' https://unpkg.com",
 		"style-src 'self' 'unsafe-inline'",
 		"img-src 'self' https: data:",
 		"connect-src 'self'",
diff --git a/internal/search/merge.go b/internal/search/merge.go
index 0e8a15a..349cf48 100644
--- a/internal/search/merge.go
+++ b/internal/search/merge.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 // MergeResponses merges multiple compatible JSON responses.
diff --git a/internal/search/merge_test.go b/internal/search/merge_test.go
index 7b54064..b898fba 100644
--- a/internal/search/merge_test.go
+++ b/internal/search/merge_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func TestMergeResponses_DedupResultsAndSets(t *testing.T) {
diff --git a/internal/search/request_params.go b/internal/search/request_params.go
index 2e477fb..59dc84a 100644
--- a/internal/search/request_params.go
+++ b/internal/search/request_params.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -31,10 +31,12 @@ const maxQueryLength = 1024
 
 // knownEngineNames is the allowlist of valid engine identifiers.
 var knownEngineNames = map[string]bool{
-	"wikipedia": true, "arxiv": true, "crossref": true,
+	"wikipedia": true, "wikidata": true, "arxiv": true, "crossref": true,
 	"braveapi": true, "brave": true, "qwant": true,
 	"duckduckgo": true, "github": true, "reddit": true,
 	"bing": true, "google": true, "youtube": true,
+	// Image engines
+	"bing_images": true, "ddg_images": true, "qwant_images": true,
 }
 
 // validateEngines filters engine names against the known registry.
@@ -159,6 +161,10 @@ func ParseSearchRequest(r *http.Request) (SearchRequest, error) {
 			delete(catSet, category)
 		}
 	}
+	// HTML UI uses a single ?category=images (etc.) query param; honor it here.
+	if single := strings.TrimSpace(r.FormValue("category")); single != "" {
+		catSet[single] = true
+	}
 	categories := make([]string, 0, len(catSet))
 	for c := range catSet {
 		categories = append(categories, c)
@@ -194,16 +200,16 @@ func ParseSearchRequest(r *http.Request) (SearchRequest, error) {
 
 	return SearchRequest{
 		Format:       OutputFormat(format),
-		Query:       q,
-		Pageno:      pageno,
-		Safesearch:  safesearch,
-		TimeRange:   timeRange,
+		Query:        q,
+		Pageno:       pageno,
+		Safesearch:   safesearch,
+		TimeRange:    timeRange,
 		TimeoutLimit: timeoutLimit,
-		Language:    language,
-		Engines:     engines,
-		Categories:  categories,
-		EngineData:  engineData,
-		AccessToken: accessToken,
+		Language:     language,
+		Engines:      engines,
+		Categories:   categories,
+		EngineData:   engineData,
+		AccessToken:  accessToken,
 	}, nil
 }
 
@@ -248,4 +254,3 @@ func parseAccessToken(r *http.Request) string {
 
 	return ""
 }
-
diff --git a/internal/search/request_params_test.go b/internal/search/request_params_test.go
index a14911f..0924b06 100644
--- a/internal/search/request_params_test.go
+++ b/internal/search/request_params_test.go
@@ -72,3 +72,21 @@ func TestParseSearchRequest_CategoriesAndEngineData(t *testing.T) {
 	}
 }
 
+func TestParseSearchRequest_SingularCategoryParam(t *testing.T) {
+	r := httptest.NewRequest(http.MethodGet, "/search?q=cats&category=images", nil)
+	req, err := ParseSearchRequest(r)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	found := false
+	for _, c := range req.Categories {
+		if c == "images" {
+			found = true
+			break
+		}
+	}
+	if !found {
+		t.Fatalf("expected category images from ?category=images, got %v", req.Categories)
+	}
+}
+
diff --git a/internal/search/response.go b/internal/search/response.go
index 1279a07..8f6a7d0 100644
--- a/internal/search/response.go
+++ b/internal/search/response.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -127,8 +127,8 @@ func writeCSV(w http.ResponseWriter, resp SearchResponse) error {
 
 func writeRSS(w http.ResponseWriter, resp SearchResponse) error {
 	q := resp.Query
-	escapedTitle := xmlEscape("kafka search: " + q)
-	escapedDesc := xmlEscape("Search results for \"" + q + "\" - kafka")
+	escapedTitle := xmlEscape("samsa search: " + q)
+	escapedDesc := xmlEscape("Search results for \"" + q + "\" - samsa")
 	escapedQueryTerms := xmlEscape(q)
 
 	link := "/search?q=" + url.QueryEscape(q)
diff --git a/internal/search/service.go b/internal/search/service.go
index 2ac9718..9e16ceb 100644
--- a/internal/search/service.go
+++ b/internal/search/service.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -18,29 +18,32 @@ package search
 
 import (
 	"context"
-	"net/http"
+	"encoding/json"
+	"fmt"
 	"sync"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/cache"
-	"github.com/metamorphosis-dev/kafka/internal/config"
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
-	"github.com/metamorphosis-dev/kafka/internal/engines"
-	"github.com/metamorphosis-dev/kafka/internal/upstream"
+	"github.com/metamorphosis-dev/samsa/internal/cache"
+	"github.com/metamorphosis-dev/samsa/internal/config"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/engines"
+	"github.com/metamorphosis-dev/samsa/internal/httpclient"
+	"github.com/metamorphosis-dev/samsa/internal/upstream"
 )
 
 type ServiceConfig struct {
-	UpstreamURL   string
-	HTTPTimeout   time.Duration
-	Cache         *cache.Cache
-	EnginesConfig *config.Config
+	UpstreamURL       string
+	HTTPTimeout       time.Duration
+	Cache             *cache.Cache
+	CacheTTLOverrides map[string]time.Duration
+	EnginesConfig     *config.Config
 }
 
 type Service struct {
 	upstreamClient *upstream.Client
 	planner        *engines.Planner
 	localEngines   map[string]engines.Engine
-	cache          *cache.Cache
+	engineCache    *cache.EngineCache
 }
 
 func NewService(cfg ServiceConfig) *Service {
@@ -49,7 +52,7 @@ func NewService(cfg ServiceConfig) *Service {
 		timeout = 10 * time.Second
 	}
 
-	httpClient := &http.Client{Timeout: timeout}
+	httpClient := httpclient.NewClient(timeout)
 
 	var up *upstream.Client
 	if cfg.UpstreamURL != "" {
@@ -59,118 +62,177 @@ func NewService(cfg ServiceConfig) *Service {
 		}
 	}
 
+	var engineCache *cache.EngineCache
+	if cfg.Cache != nil {
+		engineCache = cache.NewEngineCache(cfg.Cache, cfg.CacheTTLOverrides)
+	}
+
 	return &Service{
 		upstreamClient: up,
 		planner:        engines.NewPlannerFromEnv(),
-		localEngines:  engines.NewDefaultPortedEngines(httpClient, cfg.EnginesConfig),
-		cache:          cfg.Cache,
+		localEngines:   engines.NewDefaultPortedEngines(httpClient, cfg.EnginesConfig),
+		engineCache:    engineCache,
 	}
 }
 
+// derefString returns the string value of a *string, or "" if nil.
+func derefString(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}
+
 // Search executes the request against local engines (in parallel) and
 // optionally the upstream instance for unported engines.
-//
-// Individual engine failures are reported as unresponsive_engines rather
-// than aborting the entire search.
-//
-// If a Valkey cache is configured and contains a cached response for this
-// request, the cached result is returned without hitting any engines.
 func (s *Service) Search(ctx context.Context, req SearchRequest) (SearchResponse, error) {
-	// Check cache first.
-	if s.cache != nil {
-		cacheKey := cache.Key(req)
-		if cached, hit := s.cache.Get(ctx, cacheKey); hit {
-			return cached, nil
-		}
-	}
+	queryHash := cache.QueryHash(
+		req.Query,
+		int(req.Pageno),
+		int(req.Safesearch),
+		req.Language,
+		derefString(req.TimeRange),
+	)
 
-	merged, err := s.executeSearch(ctx, req)
-	if err != nil {
-		return SearchResponse{}, err
-	}
-
-	// Store in cache.
-	if s.cache != nil {
-		cacheKey := cache.Key(req)
-		s.cache.Set(ctx, cacheKey, merged)
-	}
-
-	return merged, nil
-}
-
-// executeSearch runs the actual engine queries and merges results.
-func (s *Service) executeSearch(ctx context.Context, req SearchRequest) (SearchResponse, error) {
 	localEngineNames, upstreamEngineNames, _ := s.planner.Plan(req)
 
-	// Run all local engines concurrently.
-	type engineResult struct {
-		name string
-		resp contracts.SearchResponse
-		err  error
+	// Phase 1: Parallel cache lookups — classify each engine as fresh/stale/miss
+	type cacheResult struct {
+		engine       string
+		cached       cache.CachedEngineResponse
+		hit          bool
+		fresh        *contracts.SearchResponse // nil if no fresh response
+		fetchErr     error
+		unmarshalErr bool // true if hit but unmarshal failed (treat as miss)
 	}
 
-	localResults := make([]engineResult, 0, len(localEngineNames))
+	cacheResults := make([]cacheResult, len(localEngineNames))
 
-	var wg sync.WaitGroup
-	var mu sync.Mutex
+	var lookupWg sync.WaitGroup
+	for i, name := range localEngineNames {
+		lookupWg.Add(1)
+		go func(i int, name string) {
+			defer lookupWg.Done()
 
-	for _, name := range localEngineNames {
-		eng, ok := s.localEngines[name]
-		if !ok {
-			mu.Lock()
-			localResults = append(localResults, engineResult{
-				name: name,
-				resp: unresponsiveResponse(req.Query, name, "engine_not_registered"),
-			})
-			mu.Unlock()
+			result := cacheResult{engine: name}
+
+			if s.engineCache != nil {
+				cached, ok := s.engineCache.Get(ctx, name, queryHash)
+				if ok {
+					result.hit = true
+					result.cached = cached
+					if !s.engineCache.IsStale(cached, name) {
+						// Fresh cache hit — deserialize and use directly
+						var resp contracts.SearchResponse
+						if err := json.Unmarshal(cached.Response, &resp); err == nil {
+							result.fresh = &resp
+						} else {
+							// Unmarshal failed — treat as cache miss (will fetch fresh synchronously)
+							result.unmarshalErr = true
+							result.hit = false // treat as miss
+						}
+					}
+					// If stale: result.fresh stays zero, result.cached has stale data
+				}
+			}
+
+			cacheResults[i] = result
+		}(i, name)
+	}
+	lookupWg.Wait()
+
+	// Phase 2: Fetch fresh for misses and stale entries
+	var fetchWg sync.WaitGroup
+	for i, name := range localEngineNames {
+		cr := cacheResults[i]
+
+		// Fresh hit — nothing to do in phase 2
+		if cr.hit && cr.fresh != nil {
 			continue
 		}
 
-		wg.Add(1)
-		go func(name string, eng engines.Engine) {
-			defer wg.Done()
+		// Stale hit — return stale immediately, refresh in background
+		if cr.hit && len(cr.cached.Response) > 0 && s.engineCache != nil && s.engineCache.IsStale(cr.cached, name) {
+			fetchWg.Add(1)
+			go func(name string) {
+				defer fetchWg.Done()
+				eng, ok := s.localEngines[name]
+				if !ok {
+					return
+				}
+				freshResp, err := eng.Search(ctx, req)
+				if err != nil {
+					s.engineCache.Logger().Debug("background refresh failed", "engine", name, "error", err)
+					return
+				}
+				s.engineCache.Set(ctx, name, queryHash, freshResp)
+			}(name)
+			continue
+		}
 
-			r, err := eng.Search(ctx, req)
+		// Cache miss — fetch fresh synchronously
+		if !cr.hit {
+			fetchWg.Add(1)
+			go func(i int, name string) {
+				defer fetchWg.Done()
 
-			mu.Lock()
-			defer mu.Unlock()
+				eng, ok := s.localEngines[name]
+				if !ok {
+					cacheResults[i] = cacheResult{
+						engine:   name,
+						fetchErr: fmt.Errorf("engine not registered: %s", name),
+					}
+					return
+				}
 
-			if err != nil {
-				localResults = append(localResults, engineResult{
-					name: name,
-					resp: unresponsiveResponse(req.Query, name, err.Error()),
-				})
-				return
+				freshResp, err := eng.Search(ctx, req)
+				if err != nil {
+					cacheResults[i] = cacheResult{
+						engine:   name,
+						fetchErr: err,
+					}
+					return
+				}
+
+				// Cache the fresh response
+				if s.engineCache != nil {
+					s.engineCache.Set(ctx, name, queryHash, freshResp)
+				}
+
+				cacheResults[i] = cacheResult{
+					engine: name,
+					fresh:  &freshResp,
+					hit:    false,
+				}
+			}(i, name)
+		}
+	}
+	fetchWg.Wait()
+
+	// Phase 3: Collect responses for merge
+	responses := make([]contracts.SearchResponse, 0, len(cacheResults))
+
+	for _, cr := range cacheResults {
+		if cr.fetchErr != nil {
+			responses = append(responses, unresponsiveResponse(req.Query, cr.engine, cr.fetchErr.Error()))
+			continue
+		}
+		// Use fresh data if available (fresh hit or freshly fetched), otherwise use stale cached
+		if cr.fresh != nil {
+			responses = append(responses, *cr.fresh)
+		} else if cr.hit && len(cr.cached.Response) > 0 {
+			var resp contracts.SearchResponse
+			if err := json.Unmarshal(cr.cached.Response, &resp); err == nil {
+				responses = append(responses, resp)
 			}
-			localResults = append(localResults, engineResult{name: name, resp: r})
-		}(name, eng)
-	}
-
-	wg.Wait()
-
-	// Collect successful responses and determine upstream fallbacks.
-	responses := make([]contracts.SearchResponse, 0, len(localResults)+1)
-	upstreamSet := map[string]bool{}
-	for _, e := range upstreamEngineNames {
-		upstreamSet[e] = true
-	}
-
-	for _, lr := range localResults {
-		responses = append(responses, lr.resp)
-
-		// If a local engine returned nothing (e.g. qwant anti-bot), fall back
-		// to upstream if available.
-		if shouldFallbackToUpstream(lr.name, lr.resp) && !upstreamSet[lr.name] {
-			upstreamEngineNames = append(upstreamEngineNames, lr.name)
-			upstreamSet[lr.name] = true
 		}
 	}
 
 	// Upstream proxy for unported (or fallback) engines.
+	// ... rest of the existing code is UNCHANGED ...
 	if s.upstreamClient != nil && len(upstreamEngineNames) > 0 {
 		r, err := s.upstreamClient.SearchJSON(ctx, req, upstreamEngineNames)
 		if err != nil {
-			// Upstream failure is treated as a single unresponsive engine entry.
 			responses = append(responses, contracts.SearchResponse{
 				Query:               req.Query,
 				UnresponsiveEngines: [][2]string{{"upstream", err.Error()}},
@@ -195,12 +257,12 @@ func (s *Service) executeSearch(ctx context.Context, req SearchRequest) (SearchR
 func unresponsiveResponse(query, engine, reason string) contracts.SearchResponse {
 	return contracts.SearchResponse{
 		Query:               query,
-		NumberOfResults:    0,
-		Results:            []contracts.MainResult{},
-		Answers:            []map[string]any{},
-		Corrections:        []string{},
-		Infoboxes:          []map[string]any{},
-		Suggestions:        []string{},
+		NumberOfResults:     0,
+		Results:             []contracts.MainResult{},
+		Answers:             []map[string]any{},
+		Corrections:         []string{},
+		Infoboxes:           []map[string]any{},
+		Suggestions:         []string{},
 		UnresponsiveEngines: [][2]string{{engine, reason}},
 	}
 }
@@ -209,12 +271,12 @@ func unresponsiveResponse(query, engine, reason string) contracts.SearchResponse
 func emptyResponse(query string) contracts.SearchResponse {
 	return contracts.SearchResponse{
 		Query:               query,
-		NumberOfResults:    0,
-		Results:            []contracts.MainResult{},
-		Answers:            []map[string]any{},
-		Corrections:        []string{},
-		Infoboxes:          []map[string]any{},
-		Suggestions:        []string{},
+		NumberOfResults:     0,
+		Results:             []contracts.MainResult{},
+		Answers:             []map[string]any{},
+		Corrections:         []string{},
+		Infoboxes:           []map[string]any{},
+		Suggestions:         []string{},
 		UnresponsiveEngines: [][2]string{},
 	}
 }
diff --git a/internal/search/service_test.go b/internal/search/service_test.go
index 6a9d1e6..aa7be07 100644
--- a/internal/search/service_test.go
+++ b/internal/search/service_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
-	"github.com/metamorphosis-dev/kafka/internal/engines"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/engines"
 )
 
 // mockEngine is a test engine that returns a predefined response or error.
diff --git a/internal/search/types.go b/internal/search/types.go
index 89b323d..14767fb 100644
--- a/internal/search/types.go
+++ b/internal/search/types.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
 
 package search
 
-import "github.com/metamorphosis-dev/kafka/internal/contracts"
+import "github.com/metamorphosis-dev/samsa/internal/contracts"
 
 // Re-export the JSON contract types so the rest of the code can stay in the
 // `internal/search` namespace without creating an import cycle.
diff --git a/internal/upstream/client.go b/internal/upstream/client.go
index 27d74b6..7c48311 100644
--- a/internal/upstream/client.go
+++ b/internal/upstream/client.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/httpclient"
 )
 
 type Client struct {
@@ -56,9 +57,7 @@ func NewClient(baseURL string, timeout time.Duration) (*Client, error) {
 
 	return &Client{
 		baseURL: base,
-		http: &http.Client{
-			Timeout: timeout,
-		},
+		http:    httpclient.NewClient(timeout),
 	}, nil
 }
 
diff --git a/internal/util/validate.go b/internal/util/validate.go
index eb7d55e..e585c94 100644
--- a/internal/util/validate.go
+++ b/internal/util/validate.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/internal/views/static/css/kafka.css b/internal/views/static/css/kafka.css
deleted file mode 100644
index 40f0f25..0000000
--- a/internal/views/static/css/kafka.css
+++ /dev/null
@@ -1,1435 +0,0 @@
-/* ============================================================
-   kafka — modern, clean search UI
-   ============================================================ */
-
-:root {
-  /* Light theme */
-  --bg: #ffffff;
-  --bg-secondary: #f8f9fa;
-  --bg-tertiary: #f1f3f5;
-  --border: #e9ecef;
-  --border-focus: #cad1d8;
-  --text-primary: #1a1a1a;
-  --text-secondary: #5c6370;
-  --text-muted: #8b929e;
-  --accent: #2563eb;
-  --accent-hover: #1d4ed8;
-  --accent-soft: #eff6ff;
-  --accent-glow: rgba(37, 99, 235, 0.15);
-  --shadow-sm: 0 1px 3px rgba(0,0,0,0.06), 0 1px 2px rgba(0,0,0,0.04);
-  --shadow-md: 0 4px 12px rgba(0,0,0,0.08), 0 2px 4px rgba(0,0,0,0.04);
-  --shadow-lg: 0 12px 32px rgba(0,0,0,0.12), 0 4px 8px rgba(0,0,0,0.06);
-  --radius-sm: 8px;
-  --radius-md: 12px;
-  --radius-lg: 16px;
-  --radius-full: 9999px;
-  --font: -apple-system, BlinkMacSystemFont, "SF Pro Display", "Segoe UI", Roboto, sans-serif;
-  --max-width: 880px;
-  --header-height: 56px;
-}
-
-[data-theme="dark"] {
-  --bg: #0f0f0f;
-  --bg-secondary: #1a1a1a;
-  --bg-tertiary: #242424;
-  --border: #2e2e2e;
-  --border-focus: #404040;
-  --text-primary: #e8eaed;
-  --text-secondary: #9aa0a6;
-  --text-muted: #6b7280;
-  --accent: #60a5fa;
-  --accent-hover: #93c5fd;
-  --accent-soft: #1e3a5f;
-  --accent-glow: rgba(96, 165, 250, 0.2);
-  --shadow-sm: 0 1px 3px rgba(0,0,0,0.3);
-  --shadow-md: 0 4px 12px rgba(0,0,0,0.4);
-  --shadow-lg: 0 12px 32px rgba(0,0,0,0.5);
-}
-
-*, *::before, *::after {
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-}
-
-html {
-  font-size: 16px;
-  scroll-behavior: smooth;
-}
-
-body {
-  font-family: var(--font);
-  background: var(--bg);
-  color: var(--text-primary);
-  line-height: 1.5;
-  min-height: 100vh;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* ============================================================
-   Header
-   ============================================================ */
-
-.site-header {
-  position: sticky;
-  top: 0;
-  z-index: 100;
-  height: var(--header-height);
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 1.5rem;
-  background: var(--bg);
-  border-bottom: 1px solid var(--border);
-  backdrop-filter: blur(12px);
-  background: color-mix(in srgb, var(--bg) 90%, transparent);
-}
-
-.site-logo {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  text-decoration: none;
-  color: var(--text-primary);
-}
-
-.site-logo-mark {
-  width: 28px;
-  height: 28px;
-  color: var(--accent);
-}
-
-.site-name {
-  font-size: 1.1rem;
-  font-weight: 600;
-  letter-spacing: -0.01em;
-}
-
-.settings-trigger {
-  background: none;
-  border: none;
-  width: 36px;
-  height: 36px;
-  border-radius: var(--radius-sm);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  color: var(--text-secondary);
-  transition: background 0.15s, color 0.15s;
-}
-.settings-trigger:hover {
-  background: var(--bg-tertiary);
-  color: var(--text-primary);
-}
-
-/* ============================================================
-   Main Layout
-   ============================================================ */
-
-main {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  padding: 0 1.5rem;
-}
-
-/* ============================================================
-   Homepage — Hero Search
-   ============================================================ */
-
-.page-home {
-  min-height: calc(100vh - var(--header-height));
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 4rem 1.5rem;
-  text-align: center;
-}
-
-.hero-logo {
-  margin-bottom: 2rem;
-}
-
-.hero-logo svg {
-  width: 64px;
-  height: 64px;
-  color: var(--accent);
-}
-
-.hero-tagline {
-  font-size: 1rem;
-  color: var(--text-muted);
-  margin-bottom: 2.5rem;
-  max-width: 400px;
-}
-
-.search-hero {
-  width: 100%;
-  max-width: 640px;
-}
-
-.search-box {
-  position: relative;
-  width: 100%;
-}
-
-.search-box input[type="text"],
-#q {
-  width: 100%;
-  padding: 1rem 3.5rem 1rem 1.25rem;
-  font-size: 1.1rem;
-  font-family: inherit;
-  border: 2px solid var(--border);
-  border-radius: var(--radius-full);
-  background: var(--bg);
-  color: var(--text-primary);
-  outline: none;
-  transition: border-color 0.2s, box-shadow 0.2s;
-}
-
-.search-box input[type="text"]:focus,
-#q:focus {
-  border-color: var(--accent);
-  box-shadow: var(--shadow-lg), 0 0 0 4px var(--accent-glow);
-}
-
-.search-box input[type="text"]::placeholder,
-#q::placeholder {
-  color: var(--text-muted);
-}
-
-.search-box-submit {
-  position: absolute;
-  right: 6px;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 40px;
-  height: 40px;
-  border: none;
-  border-radius: var(--radius-full);
-  background: var(--accent);
-  color: #fff;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transition: background 0.15s, transform 0.15s;
-}
-
-.search-box-submit:hover {
-  background: var(--accent-hover);
-  transform: translateY(-50%) scale(1.05);
-}
-
-.search-box-submit:active {
-  transform: translateY(-50%) scale(0.97);
-}
-
-/* ============================================================
-   Results Page
-   ============================================================ */
-
-.page-results {
-  padding-top: 1.5rem;
-}
-
-/* 3-column layout: empty left buffer | center results | right column
-   max-width 1400px, centered on page */
-.results-layout {
-  display: grid;
-  grid-template-columns: 1fr min(768px, 100%) 300px;
-  gap: 2rem;
-  align-items: start;
-  max-width: 1400px;
-  margin: 0 auto;
-}
-
-@media (max-width: 1000px) {
-  .results-layout {
-    grid-template-columns: 1fr 260px;
-    gap: 1.5rem;
-  }
-}
-
-@media (max-width: 700px) {
-  .results-layout {
-    grid-template-columns: 1fr;
-    gap: 1rem;
-  }
-}
-
-/* Compact search bar spans all columns */
-.search-compact {
-  grid-column: 1 / -1;
-}
-
-.search-compact .search-box {
-  max-width: 100%;
-}
-
-.search-compact input {
-  font-size: 1rem;
-  padding: 0.75rem 2.75rem 0.75rem 1rem;
-}
-
-.search-compact .search-box-submit {
-  width: 34px;
-  height: 34px;
-}
-
-/* ============================================================
-   Results Column
-   ============================================================ */
-
-.results-column {
-  min-width: 0;
-}
-
-/* Result count + meta */
-.results-meta {
-  display: flex;
-  align-items: center;
-  gap: 0.75rem;
-  margin-bottom: 1rem;
-  font-size: 0.85rem;
-  color: var(--text-muted);
-}
-
-/* Individual result card */
-.result {
-  background: var(--bg);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-md);
-  padding: 1rem 1.1rem;
-  margin-bottom: 0.75rem;
-  transition: border-color 0.15s, box-shadow 0.15s, transform 0.15s;
-}
-
-.result:hover {
-  border-color: var(--border-focus);
-  box-shadow: var(--shadow-sm);
-  transform: translateY(-1px);
-}
-
-.result_header {
-  margin-bottom: 0.25rem;
-}
-
-.result-favicon {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  border-radius: 3px;
-  vertical-align: middle;
-  margin-right: 0.4rem;
-  background: var(--bg-tertiary);
-  flex-shrink: 0;
-}
-
-.result_url {
-  display: flex;
-  align-items: center;
-  gap: 0.4rem;
-  font-size: 0.8rem;
-  color: var(--text-muted);
-  margin-bottom: 0.35rem;
-  overflow: hidden;
-}
-
-.result_url a {
-  color: var(--text-muted);
-  text-decoration: none;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.result_url a:hover {
-  color: var(--accent);
-}
-
-.result_url .engine-badge {
-  flex-shrink: 0;
-  display: inline-flex;
-  align-items: center;
-  gap: 0.25rem;
-  padding: 0.1rem 0.4rem;
-  background: var(--bg-tertiary);
-  border-radius: var(--radius-sm);
-  font-size: 0.7rem;
-  color: var(--text-muted);
-  margin-left: auto;
-}
-
-.result_header a {
-  font-size: 1rem;
-  font-weight: 500;
-  color: var(--text-primary);
-  text-decoration: none;
-  line-height: 1.4;
-  display: block;
-}
-
-.result_header a:hover {
-  color: var(--accent);
-}
-
-.result_header a:visited {
-  color: var(--text-secondary);
-}
-
-.result_content {
-  font-size: 0.9rem;
-  color: var(--text-secondary);
-  line-height: 1.55;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-}
-
-/* ============================================================
-   Right Column (formerly sidebar)
-   ============================================================ */
-
-.right-column {
-  position: sticky;
-  top: calc(var(--header-height) + 1.5rem);
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-}
-
-.sidebar-card {
-  background: var(--bg);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-md);
-  padding: 1rem;
-}
-
-.sidebar-card-title {
-  font-size: 0.7rem;
-  font-weight: 600;
-  text-transform: uppercase;
-  letter-spacing: 0.06em;
-  color: var(--text-muted);
-  margin-bottom: 0.75rem;
-}
-
-/* Knowledge Panel card */
-.knowledge-panel {
-  background: var(--bg-secondary);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-md);
-  padding: 1rem;
-}
-
-.knowledge-panel-title {
-  font-size: 1rem;
-  font-weight: 600;
-  color: var(--text-primary);
-  margin-bottom: 0.5rem;
-}
-
-.knowledge-panel-content {
-  font-size: 0.875rem;
-  color: var(--text-secondary);
-  line-height: 1.55;
-}
-
-.knowledge-panel-thumb {
-  width: 100%;
-  border-radius: var(--radius-sm);
-  margin-bottom: 0.75rem;
-}
-
-/* Related searches */
-.related-searches {
-  display: flex;
-  flex-direction: column;
-  gap: 0.35rem;
-}
-
-.related-search-link {
-  font-size: 0.85rem;
-  color: var(--accent);
-  text-decoration: none;
-  padding: 0.25rem 0;
-  border-radius: var(--radius-sm);
-  transition: color 0.15s;
-}
-
-.related-search-link:hover {
-  color: var(--accent-hover);
-  text-decoration: underline;
-}
-
-/* Suggestions in sidebar */
-.suggestion-list {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.4rem;
-}
-
-.suggestion a {
-  display: inline-block;
-  padding: 0.3rem 0.65rem;
-  font-size: 0.8rem;
-  border: 1px solid var(--border);
-  border-radius: var(--radius-full);
-  color: var(--accent);
-  text-decoration: none;
-  background: var(--accent-soft);
-  transition: background 0.15s, border-color 0.15s;
-}
-
-.suggestion a:hover {
-  background: color-mix(in srgb, var(--accent-soft) 70%, var(--bg-tertiary));
-  border-color: var(--accent);
-}
-
-/* Unresponsive engines warning */
-.unresponsive-engines {
-  font-size: 0.8rem;
-  color: var(--text-muted);
-}
-
-.unresponsive-engines li {
-  margin: 0.3rem 0;
-}
-
-/* Corrections */
-.correction {
-  font-size: 0.85rem;
-  color: var(--text-muted);
-  margin-bottom: 0.5rem;
-}
-
-/* ============================================================
-   No Results
-   ============================================================ */
-
-.no-results {
-  text-align: center;
-  padding: 4rem 2rem;
-}
-
-.no-results-icon {
-  font-size: 3rem;
-  margin-bottom: 1rem;
-  opacity: 0.3;
-}
-
-.no-results h2 {
-  font-size: 1.25rem;
-  font-weight: 500;
-  margin-bottom: 0.5rem;
-}
-
-.no-results p {
-  color: var(--text-muted);
-  font-size: 0.95rem;
-}
-
-/* ============================================================
-   Pagination
-   ============================================================ */
-
-.pagination {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 0.4rem;
-  padding: 2rem 0;
-  flex-wrap: wrap;
-}
-
-.pagination button,
-.pagination .page-link {
-  min-width: 40px;
-  height: 40px;
-  padding: 0 0.75rem;
-  border: 1px solid var(--border);
-  border-radius: var(--radius-sm);
-  background: var(--bg);
-  color: var(--text-primary);
-  font-size: 0.9rem;
-  font-family: inherit;
-  cursor: pointer;
-  text-decoration: none;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  transition: background 0.15s, border-color 0.15s, color 0.15s;
-}
-
-.pagination button:hover,
-.pagination .page-link:hover {
-  background: var(--bg-tertiary);
-  border-color: var(--border-focus);
-}
-
-.pagination .page-current {
-  background: var(--accent);
-  border-color: var(--accent);
-  color: #fff;
-}
-
-.pagination .page-current:hover {
-  background: var(--accent-hover);
-  border-color: var(--accent-hover);
-}
-
-.pagination .prev-next {
-  font-weight: 500;
-}
-
-/* ============================================================
-   Footer
-   ============================================================ */
-
-footer {
-  text-align: center;
-  padding: 3rem 1.5rem 2rem;
-  color: var(--text-muted);
-  font-size: 0.85rem;
-  margin-top: auto;
-}
-
-footer a {
-  color: var(--accent);
-  text-decoration: none;
-}
-
-footer a:hover {
-  text-decoration: underline;
-}
-
-/* ============================================================
-   Autocomplete Dropdown
-   ============================================================ */
-
-#autocomplete-dropdown {
-  position: absolute;
-  top: calc(100% + 6px);
-  left: 0;
-  right: 0;
-  background: var(--bg);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-md);
-  box-shadow: var(--shadow-lg);
-  z-index: 200;
-  max-height: 360px;
-  overflow-y: auto;
-  display: none;
-}
-
-#autocomplete-dropdown.open {
-  display: block;
-}
-
-.autocomplete-suggestion {
-  padding: 0.7rem 1rem;
-  cursor: pointer;
-  font-size: 0.95rem;
-  color: var(--text-primary);
-  border-bottom: 1px solid var(--border);
-  transition: background 0.1s;
-}
-
-.autocomplete-suggestion:last-child {
-  border-bottom: none;
-}
-
-.autocomplete-suggestion:hover,
-.autocomplete-suggestion.active {
-  background: var(--bg-tertiary);
-}
-
-.autocomplete-suggestion mark {
-  background: none;
-  color: var(--accent);
-  font-weight: 600;
-}
-
-.autocomplete-footer {
-  padding: 0.5rem 1rem;
-  font-size: 0.75rem;
-  color: var(--text-muted);
-  background: var(--bg-secondary);
-  border-radius: 0 0 var(--radius-md) var(--radius-md);
-  border-top: 1px solid var(--border);
-}
-
-/* ============================================================
-   Settings Panel
-   ============================================================ */
-
-.settings-popover {
-  position: fixed;
-  top: calc(var(--header-height) + 8px);
-  right: 1rem;
-  width: 300px;
-  max-height: calc(100vh - var(--header-height) - 2rem);
-  overflow-y: auto;
-  background: var(--bg);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-lg);
-  box-shadow: var(--shadow-lg);
-  z-index: 300;
-  display: none;
-}
-
-.settings-popover[data-open="true"] {
-  display: block;
-  animation: pop-in 0.2s ease;
-}
-
-@keyframes pop-in {
-  from { opacity: 0; transform: translateY(-8px) scale(0.97); }
-  to   { opacity: 1; transform: translateY(0) scale(1); }
-}
-
-.settings-popover-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 1rem 1.25rem;
-  border-bottom: 1px solid var(--border);
-  font-weight: 600;
-  font-size: 0.95rem;
-  position: sticky;
-  top: 0;
-  background: var(--bg);
-  z-index: 1;
-}
-
-.settings-popover-close {
-  background: none;
-  border: none;
-  width: 28px;
-  height: 28px;
-  border-radius: var(--radius-sm);
-  cursor: pointer;
-  color: var(--text-secondary);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 1.2rem;
-  transition: background 0.15s, color 0.15s;
-}
-
-.settings-popover-close:hover {
-  background: var(--bg-tertiary);
-  color: var(--text-primary);
-}
-
-.settings-popover-body {
-  padding: 1rem 1.25rem;
-  display: flex;
-  flex-direction: column;
-  gap: 1.25rem;
-}
-
-.settings-section-title {
-  font-size: 0.7rem;
-  font-weight: 600;
-  text-transform: uppercase;
-  letter-spacing: 0.06em;
-  color: var(--text-muted);
-  margin-bottom: 0.6rem;
-}
-
-/* Theme buttons */
-.theme-buttons {
-  display: flex;
-  gap: 0.4rem;
-}
-
-.theme-btn {
-  flex: 1;
-  padding: 0.45rem;
-  border: 1px solid var(--border);
-  border-radius: var(--radius-sm);
-  background: var(--bg);
-  color: var(--text-secondary);
-  cursor: pointer;
-  font-size: 0.8rem;
-  font-family: inherit;
-  transition: background 0.15s, border-color 0.15s, color 0.15s;
-}
-
-.theme-btn:hover {
-  background: var(--bg-tertiary);
-}
-
-.theme-btn.active {
-  background: var(--accent-soft);
-  border-color: var(--accent);
-  color: var(--accent);
-  font-weight: 500;
-}
-
-/* Engine toggles */
-.engine-grid {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 0.4rem;
-}
-
-.engine-toggle {
-  display: flex;
-  align-items: center;
-  gap: 0.4rem;
-  padding: 0.4rem 0.5rem;
-  border-radius: var(--radius-sm);
-  background: var(--bg-tertiary);
-  font-size: 0.8rem;
-  cursor: pointer;
-  transition: background 0.1s;
-}
-
-.engine-toggle:hover {
-  background: var(--border);
-}
-
-.engine-toggle input[type="checkbox"] {
-  width: 15px;
-  height: 15px;
-  margin: 0;
-  cursor: pointer;
-  accent-color: var(--accent);
-  flex-shrink: 0;
-}
-
-.engine-toggle span {
-  color: var(--text-secondary);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-/* Select dropdowns */
-.setting-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 0.75rem;
-}
-
-.setting-row label {
-  font-size: 0.85rem;
-  color: var(--text-secondary);
-}
-
-.setting-row select {
-  padding: 0.35rem 0.6rem;
-  font-size: 0.8rem;
-  font-family: inherit;
-  border: 1px solid var(--border);
-  border-radius: var(--radius-sm);
-  background: var(--bg);
-  color: var(--text-primary);
-  cursor: pointer;
-  min-width: 100px;
-}
-
-.setting-row select:focus {
-  outline: none;
-  border-color: var(--accent);
-}
-
-.settings-notice {
-  font-size: 0.75rem;
-  color: var(--text-muted);
-  font-style: italic;
-  margin-top: 0.25rem;
-}
-
-/* Mobile settings: bottom sheet */
-@media (max-width: 480px) {
-  .settings-popover {
-    position: fixed;
-    top: auto;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    width: 100%;
-    max-height: 70vh;
-    border-radius: var(--radius-lg) var(--radius-lg) 0 0;
-    border-bottom: none;
-  }
-
-  .settings-trigger-mobile {
-    display: flex;
-  }
-}
-
-@media (min-width: 481px) {
-  .settings-trigger-mobile {
-    display: none;
-  }
-}
-
-/* ============================================================
-   HTMX Loading State
-   ============================================================ */
-
-.htmx-indicator {
-  display: none;
-  text-align: center;
-  padding: 2rem;
-  color: var(--text-muted);
-}
-
-.htmx-request .htmx-indicator {
-  display: block;
-}
-
-.htmx-request .results-column {
-  opacity: 0.5;
-  transition: opacity 0.2s;
-}
-
-/* ============================================================
-   Back to Top
-   ============================================================ */
-
-.back-to-top {
-  text-align: center;
-  padding: 1rem;
-}
-
-.back-to-top a {
-  color: var(--accent);
-  text-decoration: none;
-  font-size: 0.85rem;
-}
-
-.back-to-top a:hover {
-  text-decoration: underline;
-}
-
-/* ============================================================
-   Video Results
-   ============================================================ */
-
-.video-result {
-  display: flex;
-  gap: 1rem;
-  align-items: flex-start;
-}
-
-.video-result .result_thumbnail {
-  flex-shrink: 0;
-  width: 180px;
-  border-radius: var(--radius-sm);
-  overflow: hidden;
-  background: var(--bg-tertiary);
-}
-
-.video-result .result_thumbnail img {
-  width: 100%;
-  height: auto;
-  display: block;
-  object-fit: cover;
-}
-
-.video-result .result_content_wrapper {
-  flex: 1;
-  min-width: 0;
-}
-
-@media (max-width: 480px) {
-  .video-result {
-    flex-direction: column;
-  }
-
-  .video-result .result_thumbnail {
-    width: 100%;
-  }
-}
-
-/* ============================================================
-   Infoboxes
-   ============================================================ */
-
-.infobox {
-  background: var(--bg-secondary);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-md);
-  padding: 1rem;
-  margin-bottom: 0.75rem;
-}
-
-.infobox .title {
-  font-weight: 600;
-  margin-bottom: 0.5rem;
-  font-size: 0.95rem;
-}
-
-.infobox img {
-  max-width: 100%;
-  border-radius: var(--radius-sm);
-  margin-top: 0.5rem;
-}
-
-/* ============================================================
-   Errors
-   ============================================================ */
-
-.dialog-error {
-  background: color-mix(in srgb, var(--accent) 8%, var(--bg));
-  border: 1px solid color-mix(in srgb, var(--accent) 30%, transparent);
-  color: var(--accent);
-  border-radius: var(--radius-md);
-  padding: 0.8rem 1rem;
-  margin-bottom: 1rem;
-  font-size: 0.9rem;
-}
-
-/* ============================================================
-   Focus visible — keyboard navigation
-   ============================================================ */
-
-:focus-visible {
-  outline: 2px solid var(--accent);
-  outline-offset: 2px;
-}
-
-button:focus-visible,
-a:focus-visible {
-  outline: 2px solid var(--accent);
-  outline-offset: 2px;
-}
-
-/* ============================================================
-   Selection color
-   ============================================================ */
-
-::selection {
-  background: var(--accent-soft);
-  color: var(--accent);
-}
-
-/* ============================================================
-   Scrollbar
-   ============================================================ */
-
-::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-}
-
-::-webkit-scrollbar-track {
-  background: var(--bg-secondary);
-}
-
-::-webkit-scrollbar-thumb {
-  background: var(--border);
-  border-radius: 4px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: var(--border-focus);
-}
-
-/* ============================================================
-   Three-Column Results Layout
-   ============================================================ */
-
-.results-layout {
-  display: grid;
-  grid-template-columns: 200px 1fr 240px;
-  gap: 2rem;
-  align-items: start;
-}
-
-.results-layout .left-sidebar,
-.results-layout .right-sidebar {
-  position: sticky;
-  top: calc(var(--header-height) + 1.5rem);
-  max-height: calc(100vh - var(--header-height) - 3rem);
-  overflow-y: auto;
-}
-
-.results-layout .results-column {
-  min-width: 0;
-}
-
-/* Tablet: hide left sidebar, two columns */
-@media (min-width: 769px) and (max-width: 1024px) {
-  .results-layout {
-    grid-template-columns: 1fr 220px;
-  }
-  .results-layout .left-sidebar {
-    display: none;
-  }
-}
-
-/* Mobile: single column, no sidebars */
-@media (max-width: 768px) {
-  .results-layout {
-    grid-template-columns: 1fr;
-  }
-  .results-layout .left-sidebar,
-  .results-layout .right-sidebar {
-    display: none;
-  }
-}
-
-/* ============================================================
-   Preferences Page Layout
-   ============================================================ */
-
-.preferences-layout {
-  display: grid;
-  grid-template-columns: 200px 1fr;
-  gap: 2rem;
-  align-items: start;
-  padding: 2rem 0;
-}
-
-.preferences-nav {
-  position: sticky;
-  top: calc(var(--header-height) + 1.5rem);
-}
-
-.preferences-nav-item {
-  display: flex;
-  align-items: center;
-  gap: 0.6rem;
-  padding: 0.6rem 0.75rem;
-  border-radius: var(--radius-sm);
-  color: var(--text-secondary);
-  text-decoration: none;
-  font-size: 0.9rem;
-  transition: background 0.15s, color 0.15s;
-  cursor: pointer;
-}
-
-.preferences-nav-item:hover {
-  background: var(--bg-tertiary);
-  color: var(--text-primary);
-}
-
-.preferences-nav-item.active {
-  background: var(--accent-soft);
-  color: var(--accent);
-  font-weight: 500;
-}
-
-.preferences-content {
-  background: var(--bg);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-lg);
-  padding: 1.5rem;
-}
-
-@media (max-width: 768px) {
-  .preferences-layout {
-    grid-template-columns: 1fr;
-  }
-  .preferences-nav {
-    position: static;
-    display: flex;
-    overflow-x: auto;
-    gap: 0.5rem;
-    padding-bottom: 0.5rem;
-  }
-  .preferences-nav-item {
-    white-space: nowrap;
-  }
-}
-
-/* ============================================================
-   Category Tiles
-   ============================================================ */
-
-.category-tiles {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
-  gap: 1rem;
-  margin-top: 2rem;
-}
-
-.category-tile {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 0.5rem;
-  padding: 1rem 0.5rem;
-  border-radius: var(--radius-md);
-  text-decoration: none;
-  color: var(--text-secondary);
-  font-size: 0.85rem;
-  transition: background 0.15s, color 0.15s, transform 0.15s, box-shadow 0.15s;
-}
-
-.category-tile:hover {
-  background: var(--bg-tertiary);
-  color: var(--text-primary);
-  transform: translateY(-2px);
-  box-shadow: var(--shadow-sm);
-}
-
-.category-tile-icon {
-  font-size: 1.5rem;
-  line-height: 1;
-}
-
-.category-tile.disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-  pointer-events: none;
-}
-
-@media (max-width: 768px) {
-  .category-tiles {
-    grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
-    gap: 0.75rem;
-  }
-  .category-tile {
-    padding: 0.75rem 0.25rem;
-    font-size: 0.75rem;
-  }
-  .category-tile-icon {
-    font-size: 1.25rem;
-  }
-}
-
-/* ============================================================
-   Left Sidebar (Results Page)
-   ============================================================ */
-
-.left-sidebar {
-  padding: 0;
-}
-
-.sidebar-nav {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-}
-
-.sidebar-nav-title {
-  font-size: 0.7rem;
-  font-weight: 600;
-  text-transform: uppercase;
-  letter-spacing: 0.06em;
-  color: var(--text-muted);
-  padding: 0.5rem 0.75rem;
-  margin-top: 0.5rem;
-}
-
-.sidebar-nav-item {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  padding: 0.5rem 0.75rem;
-  border-radius: var(--radius-sm);
-  color: var(--text-secondary);
-  text-decoration: none;
-  font-size: 0.875rem;
-  transition: background 0.15s, color 0.15s;
-}
-
-.sidebar-nav-item:hover {
-  background: var(--bg-tertiary);
-  color: var(--text-primary);
-}
-
-.sidebar-nav-item.active {
-  background: var(--accent-soft);
-  color: var(--accent);
-  font-weight: 500;
-}
-
-.sidebar-nav-item-icon {
-  font-size: 1rem;
-  width: 20px;
-  text-align: center;
-}
-
-.sidebar-filters {
-  margin-top: 1rem;
-  padding-top: 1rem;
-  border-top: 1px solid var(--border);
-}
-
-.sidebar-filter-group {
-  margin-bottom: 0.75rem;
-}
-
-.sidebar-filter-label {
-  font-size: 0.75rem;
-  font-weight: 500;
-  color: var(--text-muted);
-  padding: 0 0.75rem;
-  margin-bottom: 0.25rem;
-}
-
-.sidebar-filter-option {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  padding: 0.35rem 0.75rem;
-  font-size: 0.8rem;
-  color: var(--text-secondary);
-  cursor: pointer;
-  border-radius: var(--radius-sm);
-  transition: background 0.15s;
-}
-
-.sidebar-filter-option:hover {
-  background: var(--bg-tertiary);
-}
-
-.sidebar-filter-option input[type="radio"] {
-  accent-color: var(--accent);
-}
-
-/* Mobile filter chips */
-.mobile-filter-chips {
-  display: none;
-  overflow-x: auto;
-  gap: 0.5rem;
-  padding: 0.75rem 0;
-  -webkit-overflow-scrolling: touch;
-}
-
-.mobile-filter-chips::-webkit-scrollbar {
-  display: none;
-}
-
-.mobile-filter-chip {
-  display: inline-flex;
-  align-items: center;
-  padding: 0.4rem 0.75rem;
-  border: 1px solid var(--border);
-  border-radius: var(--radius-full);
-  font-size: 0.8rem;
-  color: var(--text-secondary);
-  white-space: nowrap;
-  text-decoration: none;
-  transition: background 0.15s, border-color 0.15s;
-}
-
-.mobile-filter-chip:hover,
-.mobile-filter-chip.active {
-  background: var(--accent-soft);
-  border-color: var(--accent);
-  color: var(--accent);
-}
-
-@media (max-width: 768px) {
-  .mobile-filter-chips {
-    display: flex;
-  }
-}
-
-/* ============================================================
-   Preferences Page Styles
-   ============================================================ */
-
-.pref-section {
-  margin-bottom: 2rem;
-}
-
-.pref-section:last-child {
-  margin-bottom: 0;
-}
-
-.pref-section-title {
-  font-size: 1rem;
-  font-weight: 600;
-  color: var(--text-primary);
-  margin-bottom: 1rem;
-  padding-bottom: 0.5rem;
-  border-bottom: 1px solid var(--border);
-}
-
-.pref-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 1rem;
-  padding: 0.75rem 0;
-  border-bottom: 1px solid var(--border);
-}
-
-.pref-row:last-child {
-  border-bottom: none;
-}
-
-.pref-row label {
-  font-size: 0.9rem;
-  color: var(--text-primary);
-}
-
-.pref-row-info {
-  flex: 1;
-}
-
-.pref-row-info label {
-  font-weight: 500;
-}
-
-.pref-desc {
-  font-size: 0.8rem;
-  color: var(--text-muted);
-  margin-top: 0.25rem;
-}
-
-.pref-row select {
-  padding: 0.5rem 0.75rem;
-  font-size: 0.85rem;
-  font-family: inherit;
-  border: 1px solid var(--border);
-  border-radius: var(--radius-sm);
-  background: var(--bg);
-  color: var(--text-primary);
-  cursor: pointer;
-  min-width: 150px;
-}
-
-.pref-row select:focus {
-  outline: none;
-  border-color: var(--accent);
-}
-
-.pref-row input[type="checkbox"] {
-  width: 18px;
-  height: 18px;
-  accent-color: var(--accent);
-  cursor: pointer;
-  flex-shrink: 0;
-}
-
-.pref-row input[type="checkbox"]:disabled {
-  opacity: 0.6;
-  cursor: not-allowed;
-}
-
-/* ============================================================
-   Print
-   ============================================================ */
-
-@media print {
-  .site-header, footer, .settings-popover, #backToTop, .htmx-indicator, .settings-trigger {
-    display: none !important;
-  }
-
-  body {
-    background: #fff;
-    color: #000;
-  }
-
-  .result {
-    break-inside: avoid;
-    border: 1px solid #ddd;
-    margin-bottom: 1rem;
-  }
-}
diff --git a/internal/views/static/css/samsa.css b/internal/views/static/css/samsa.css
new file mode 100644
index 0000000..2af59d9
--- /dev/null
+++ b/internal/views/static/css/samsa.css
@@ -0,0 +1,971 @@
+/* ============================================================
+   kafka — clean, minimal search UI
+   ============================================================ */
+
+:root {
+  --bg: #ffffff;
+  --bg-secondary: #f8f9fa;
+  --bg-tertiary: #f1f3f5;
+  --border: #e9ecef;
+  --border-focus: #cad1d8;
+  --text-primary: #1a1a1a;
+  --text-secondary: #5c6370;
+  --text-muted: #8b929e;
+  --accent: #0d9488;
+  --accent-hover: #0f766e;
+  --accent-soft: #f0fdfa;
+  --shadow-sm: 0 1px 3px rgba(0,0,0,0.06);
+  --shadow-md: 0 4px 12px rgba(0,0,0,0.08);
+  --radius-sm: 8px;
+  --radius-md: 12px;
+  --radius-lg: 16px;
+  --radius-full: 9999px;
+  --font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+  --font-mono: "IBM Plex Mono", ui-monospace, monospace;
+}
+
+:root[data-theme="dark"],
+html[data-theme="dark"],
+@media (prefers-color-scheme: dark) {
+  --bg: #0f0f0f !important;
+  --bg-secondary: #1a1a1a !important;
+  --bg-tertiary: #242424 !important;
+  --border: #2e2e2e !important;
+  --border-focus: #404040 !important;
+  --text-primary: #e8eaed !important;
+  --text-secondary: #9aa0a6 !important;
+  --text-muted: #6b7280 !important;
+  --accent: #14b8a6 !important;
+  --accent-hover: #2dd4bf !important;
+  --accent-soft: #134e4a !important;
+  --shadow-sm: 0 1px 3px rgba(0,0,0,0.3) !important;
+  --shadow-md: 0 4px 12px rgba(0,0,0,0.4) !important;
+}
+
+*, *::before, *::after {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+html {
+  font-size: 16px;
+  scroll-behavior: smooth;
+}
+
+body {
+  font-family: var(--font);
+  background: var(--bg);
+  color: var(--text-primary);
+  line-height: 1.5;
+  min-height: 100vh;
+  -webkit-font-smoothing: antialiased;
+}
+
+/* ============================================================
+   Header
+   ============================================================ */
+
+.site-header {
+  position: sticky;
+  top: 0;
+  z-index: 100;
+  height: 56px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 1.5rem;
+  background: var(--bg);
+  border-bottom: 1px solid var(--border);
+}
+
+.site-logo {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  text-decoration: none;
+  color: var(--text-primary);
+}
+
+.site-logo-mark {
+  width: 24px;
+  height: 24px;
+  color: var(--accent);
+}
+
+.site-name {
+  font-family: var(--font-mono);
+  font-size: 1.1rem;
+  font-weight: 700;
+  letter-spacing: -0.02em;
+}
+
+.settings-link {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 36px;
+  height: 36px;
+  border-radius: var(--radius-sm);
+  color: var(--text-secondary);
+  transition: background 0.15s, color 0.15s;
+}
+
+.settings-link:hover {
+  background: var(--bg-secondary);
+  color: var(--text-primary);
+}
+
+/* ============================================================
+   Main Layout
+   ============================================================ */
+
+main {
+  max-width: 800px;
+  margin: 0 auto;
+  padding: 0 1.5rem;
+}
+
+/* ============================================================
+   Homepage
+   ============================================================ */
+
+.page-home {
+  min-height: calc(100vh - 56px);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 4rem 1.5rem;
+}
+
+.home-container {
+  width: 100%;
+  max-width: 640px;
+  text-align: center;
+}
+
+.home-logo {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.75rem;
+  text-decoration: none;
+  color: var(--text-primary);
+  margin-bottom: 1rem;
+}
+
+.home-logo svg {
+  width: 48px;
+  height: 48px;
+  color: var(--accent);
+}
+
+.home-logo-text {
+  font-family: var(--font-mono);
+  font-size: 2rem;
+  font-weight: 700;
+  letter-spacing: -0.02em;
+}
+
+.home-tagline {
+  color: var(--text-muted);
+  margin-bottom: 2rem;
+  font-size: 0.95rem;
+}
+
+/* ============================================================
+   Search Form
+   ============================================================ */
+
+.search-form {
+  width: 100%;
+}
+
+.search-box {
+  position: relative;
+  width: 100%;
+}
+
+.search-box input[type="text"] {
+  width: 100%;
+  padding: 1rem 3.5rem 1rem 1.25rem;
+  font-size: 1.05rem;
+  font-family: inherit;
+  border: 2px solid var(--border);
+  border-radius: var(--radius-full);
+  background: var(--bg);
+  color: var(--text-primary);
+  outline: none;
+  transition: border-color 0.2s, box-shadow 0.2s;
+}
+
+.search-box input[type="text"]:focus {
+  border-color: var(--accent);
+  box-shadow: var(--shadow-md), 0 0 0 3px rgba(13, 148, 136, 0.1);
+}
+
+.search-box input[type="text"]::placeholder {
+  color: var(--text-muted);
+}
+
+.search-btn {
+  position: absolute;
+  right: 6px;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 42px;
+  height: 42px;
+  border: none;
+  border-radius: var(--radius-full);
+  background: var(--accent);
+  color: #fff;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: background 0.15s;
+}
+
+.search-btn:hover {
+  background: var(--accent-hover);
+}
+
+/* ============================================================
+   Results Page
+   ============================================================ */
+
+.page-results {
+  padding-top: 1.5rem;
+}
+
+.results-container {
+  max-width: 768px;
+  margin: 0 auto;
+}
+
+.results-header {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+  margin-bottom: 1rem;
+  position: sticky;
+  top: 56px;
+  background: var(--bg);
+  padding: 0.75rem 0;
+  z-index: 50;
+}
+
+.results-logo {
+  display: flex;
+  align-items: center;
+  gap: 0.4rem;
+  text-decoration: none;
+  color: var(--text-primary);
+  flex-shrink: 0;
+}
+
+.results-logo svg {
+  width: 20px;
+  height: 20px;
+  color: var(--accent);
+}
+
+.results-logo span {
+  font-family: var(--font-mono);
+  font-size: 1rem;
+  font-weight: 700;
+}
+
+.header-search {
+  flex: 1;
+}
+
+.header-search .search-box input {
+  padding: 0.65rem 2.5rem 0.65rem 1rem;
+  font-size: 0.95rem;
+}
+
+.header-search .search-btn {
+  width: 34px;
+  height: 34px;
+}
+
+/* ============================================================
+   Category Tabs
+   ============================================================ */
+
+.category-tabs {
+  display: flex;
+  gap: 0.25rem;
+  margin-bottom: 1.5rem;
+  border-bottom: 1px solid var(--border);
+  padding-bottom: 0.5rem;
+}
+
+.category-tab {
+  padding: 0.5rem 0.85rem;
+  font-size: 0.875rem;
+  font-weight: 500;
+  color: var(--text-secondary);
+  text-decoration: none;
+  border-radius: var(--radius-sm);
+  transition: background 0.15s, color 0.15s;
+}
+
+.category-tab:hover {
+  background: var(--bg-secondary);
+  color: var(--text-primary);
+}
+
+.category-tab.active {
+  background: var(--accent-soft);
+  color: var(--accent);
+}
+
+/* ============================================================
+   Results Meta
+   ============================================================ */
+
+.results-meta {
+  font-size: 0.85rem;
+  color: var(--text-muted);
+  margin-bottom: 1rem;
+}
+
+/* ============================================================
+   Result Cards
+   ============================================================ */
+
+.result {
+  padding: 0.85rem 0;
+  border-bottom: 1px solid var(--border);
+}
+
+.result[data-engine] {
+  border-left: 3px solid var(--accent, transparent);
+}
+
+.result:last-child {
+  border-bottom: none;
+}
+
+.result_header {
+  margin-bottom: 0.2rem;
+}
+
+.result_header a {
+  font-size: 1rem;
+  font-weight: 500;
+  color: #2563eb;
+  text-decoration: none;
+  line-height: 1.4;
+}
+
+.result_header a:hover {
+  text-decoration: underline;
+}
+
+.result_url {
+  display: flex;
+  align-items: center;
+  gap: 0.4rem;
+  font-size: 0.8rem;
+  color: var(--text-muted);
+  margin-bottom: 0.3rem;
+}
+
+.result-favicon {
+  width: 14px;
+  height: 14px;
+  border-radius: 2px;
+  background: var(--bg-tertiary);
+  flex-shrink: 0;
+}
+
+.result_url a {
+  color: var(--text-muted);
+  text-decoration: none;
+}
+
+.result_url a:hover {
+  color: var(--accent);
+}
+
+.engine-badge {
+  flex-shrink: 0;
+  padding: 0.1rem 0.35rem;
+  background: var(--bg-secondary);
+  border-radius: 4px;
+  font-size: 0.7rem;
+  color: var(--text-muted);
+  margin-left: auto;
+  border-left: 2.5px solid transparent;
+  transition: border-color 0.15s ease;
+}
+
+/* ============================================================
+   Engine Accent Colors
+   ============================================================ */
+
+.result[data-engine="google"],
+.engine-badge[data-engine="google"]        { --accent: #4285f4; }
+.result[data-engine="bing"],
+.engine-badge[data-engine="bing"]          { --accent: #00897b; }
+.result[data-engine="duckduckgo"],
+.engine-badge[data-engine="duckduckgo"]    { --accent: #de5833; }
+.result[data-engine="brave"],
+.engine-badge[data-engine="brave"]         { --accent: #fb542b; }
+.result[data-engine="braveapi"],
+.engine-badge[data-engine="braveapi"]      { --accent: #ff6600; }
+.result[data-engine="qwant"],
+.engine-badge[data-engine="qwant"]         { --accent: #5c97ff; }
+.result[data-engine="wikipedia"],
+.engine-badge[data-engine="wikipedia"]     { --accent: #333333; }
+.result[data-engine="github"],
+.engine-badge[data-engine="github"]        { --accent: #8b5cf6; }
+.result[data-engine="reddit"],
+.engine-badge[data-engine="reddit"]        { --accent: #ff4500; }
+.result[data-engine="youtube"],
+.engine-badge[data-engine="youtube"]       { --accent: #ff0000; }
+.result[data-engine="stackoverflow"],
+.engine-badge[data-engine="stackoverflow"] { --accent: #f48024; }
+.result[data-engine="arxiv"],
+.engine-badge[data-engine="arxiv"]         { --accent: #b31b1b; }
+.result[data-engine="crossref"],
+.engine-badge[data-engine="crossref"]      { --accent: #00354d; }
+.result[data-engine="bing_images"],
+.engine-badge[data-engine="bing_images"]   { --accent: #00897b; }
+.result[data-engine="ddg_images"],
+.engine-badge[data-engine="ddg_images"]    { --accent: #de5833; }
+.result[data-engine="qwant_images"],
+.engine-badge[data-engine="qwant_images"]  { --accent: #5c97ff; }
+
+.engine-badge[data-engine] {
+  border-left-color: var(--accent, transparent);
+  color: var(--accent, var(--text-muted));
+  font-weight: 500;
+}
+
+.result_content {
+  font-size: 0.875rem;
+  color: var(--text-secondary);
+  line-height: 1.55;
+}
+
+/* ============================================================
+   No Results
+   ============================================================ */
+
+.no-results {
+  text-align: center;
+  padding: 4rem 2rem;
+}
+
+.no-results-icon {
+  font-size: 3rem;
+  margin-bottom: 1rem;
+  opacity: 0.3;
+}
+
+.no-results h2 {
+  font-size: 1.25rem;
+  font-weight: 500;
+  margin-bottom: 0.5rem;
+}
+
+.no-results p {
+  color: var(--text-muted);
+  font-size: 0.95rem;
+}
+
+/* ============================================================
+   Pagination
+   ============================================================ */
+
+.pagination {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.5rem;
+  padding: 2rem 0;
+  flex-wrap: wrap;
+}
+
+.pagination button,
+.pagination form {
+  display: inline-flex;
+  margin: 0;
+  padding: 0;
+}
+
+.pagination button {
+  min-width: 40px;
+  height: 40px;
+  padding: 0 0.75rem;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-sm);
+  background: var(--bg);
+  color: var(--text-primary);
+  font-size: 0.9rem;
+  font-family: inherit;
+  cursor: pointer;
+  transition: background 0.15s, border-color 0.15s;
+  line-height: 1;
+  box-sizing: border-box;
+}
+
+.pagination button:hover {
+  background: var(--bg-secondary);
+  border-color: var(--border-focus);
+}
+
+.page-current {
+  min-width: 40px;
+  width: auto;
+  height: 40px;
+  padding: 0 0.75rem;
+  border: 1px solid var(--accent);
+  border-radius: var(--radius-sm);
+  background: var(--accent);
+  color: #fff;
+  font-size: 0.9rem;
+  font-weight: 500;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+}
+
+/* ============================================================
+   Footer
+   ============================================================ */
+
+footer {
+  text-align: center;
+  padding: 3rem 1.5rem 2rem;
+  color: var(--text-muted);
+  font-size: 0.85rem;
+}
+
+footer a {
+  color: var(--accent);
+  text-decoration: none;
+}
+
+footer a:hover {
+  text-decoration: underline;
+}
+
+/* ============================================================
+   Corrections
+   ============================================================ */
+
+.correction {
+  font-size: 0.9rem;
+  color: var(--text-secondary);
+  margin-bottom: 1rem;
+  padding: 0.5rem 0.75rem;
+  background: var(--bg-secondary);
+  border-radius: var(--radius-sm);
+}
+
+/* ============================================================
+   Image Grid
+   ============================================================ */
+
+.image-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+  gap: 1rem;
+}
+
+.image-result {
+  display: block;
+  border-radius: var(--radius-sm);
+  overflow: hidden;
+  background: var(--bg-secondary);
+  border: 1px solid var(--border);
+  text-decoration: none;
+  color: inherit;
+}
+
+.image-thumb {
+  aspect-ratio: 1;
+  overflow: hidden;
+  background: var(--bg-tertiary);
+}
+
+.image-thumb img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.image-meta {
+  padding: 0.5rem;
+}
+
+.image-title {
+  font-size: 0.8rem;
+  font-weight: 500;
+  color: var(--text-primary);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.image-source {
+  font-size: 0.7rem;
+  color: var(--text-muted);
+}
+
+/* ============================================================
+   Video Results
+   ============================================================ */
+
+.video-result {
+  display: flex;
+  gap: 1rem;
+  padding: 0.85rem 0;
+  border-bottom: 1px solid var(--border);
+}
+
+.video-result .result_thumbnail {
+  flex-shrink: 0;
+  width: 160px;
+  border-radius: var(--radius-sm);
+  overflow: hidden;
+  background: var(--bg-tertiary);
+}
+
+.video-result .result_content_wrapper {
+  flex: 1;
+  min-width: 0;
+}
+
+/* ============================================================
+   Back to Top
+   ============================================================ */
+
+.back-to-top {
+  text-align: center;
+  padding: 1rem;
+}
+
+.back-to-top a {
+  color: var(--accent);
+  text-decoration: none;
+  font-size: 0.85rem;
+}
+
+.back-to-top a:hover {
+  text-decoration: underline;
+}
+
+/* ============================================================
+   Responsive
+   ============================================================ */
+
+@media (max-width: 600px) {
+  .results-header {
+    flex-direction: column;
+    gap: 0.75rem;
+  }
+
+  .results-logo {
+    display: none;
+  }
+
+  .category-tabs {
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  .category-tabs::-webkit-scrollbar {
+    display: none;
+  }
+
+  .image-grid {
+    grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
+    gap: 0.5rem;
+  }
+}
+
+/* ============================================================
+   Preferences Page
+   ============================================================ */
+
+.preferences-container {
+  max-width: 640px;
+  margin: 2rem auto;
+  padding: 0 1.5rem;
+}
+
+.preferences-title {
+  font-size: 1.5rem;
+  font-weight: 600;
+  margin-bottom: 2rem;
+  color: var(--text-primary);
+}
+
+.preferences-form {
+  display: flex;
+  flex-direction: column;
+  gap: 2rem;
+}
+
+.pref-section {
+  background: var(--bg);
+  border: 1px solid var(--border);
+  border-radius: var(--radius-md);
+  padding: 1.25rem;
+}
+
+.pref-section-title {
+  font-size: 0.7rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.06em;
+  color: var(--text-muted);
+  margin-bottom: 1rem;
+  padding-bottom: 0.5rem;
+  border-bottom: 1px solid var(--border);
+}
+
+.pref-desc {
+  font-size: 0.8rem;
+  color: var(--text-muted);
+  margin-bottom: 1rem;
+}
+
+.pref-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 1rem;
+  padding: 0.75rem 0;
+  border-bottom: 1px solid var(--border);
+}
+
+.pref-row:last-child {
+  border-bottom: none;
+  padding-bottom: 0;
+}
+
+.pref-row label:first-child {
+  font-size: 0.9rem;
+  color: var(--text-primary);
+}
+
+.pref-row-info {
+  flex: 1;
+}
+
+.pref-row-info label {
+  font-weight: 500;
+}
+
+.pref-row select {
+  padding: 0.5rem 0.75rem;
+  font-size: 0.85rem;
+  font-family: inherit;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-sm);
+  background: var(--bg);
+  color: var(--text-primary);
+  cursor: pointer;
+  min-width: 120px;
+}
+
+.pref-row select:focus {
+  outline: none;
+  border-color: var(--accent);
+}
+
+.theme-buttons {
+  display: flex;
+  gap: 0.5rem;
+}
+
+.theme-btn {
+  padding: 0.5rem 1rem;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-sm);
+  background: var(--bg);
+  color: var(--text-secondary);
+  font-size: 0.85rem;
+  font-family: inherit;
+  cursor: pointer;
+  transition: all 0.15s;
+}
+
+.theme-btn:hover {
+  background: var(--bg-secondary);
+}
+
+.theme-btn.active {
+  background: var(--accent-soft);
+  border-color: var(--accent);
+  color: var(--accent);
+  font-weight: 500;
+}
+
+.engine-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
+  gap: 0.5rem;
+  margin-top: 0.75rem;
+}
+
+.engine-toggle {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  padding: 0.5rem 0.75rem;
+  background: var(--bg-secondary);
+  border-radius: var(--radius-sm);
+  font-size: 0.85rem;
+  cursor: pointer;
+  transition: background 0.15s;
+}
+
+.engine-toggle:hover {
+  background: var(--bg-tertiary);
+}
+
+.engine-toggle input[type="checkbox"] {
+  width: 16px;
+  height: 16px;
+  accent-color: var(--accent);
+  cursor: pointer;
+}
+
+.engine-toggle span {
+  color: var(--text-secondary);
+}
+
+.pref-actions {
+  display: flex;
+  gap: 1rem;
+  justify-content: flex-end;
+  padding-top: 1rem;
+}
+
+.btn-primary,
+.btn-secondary {
+  padding: 0.65rem 1.25rem;
+  border-radius: var(--radius-sm);
+  font-size: 0.9rem;
+  font-family: inherit;
+  cursor: pointer;
+  text-decoration: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.15s;
+}
+
+.btn-primary {
+  background: var(--accent);
+  color: #fff;
+  border: none;
+}
+
+.btn-primary:hover {
+  background: var(--accent-hover);
+}
+
+.btn-secondary {
+  background: var(--bg);
+  color: var(--text-secondary);
+  border: 1px solid var(--border);
+}
+
+.btn-secondary:hover {
+  background: var(--bg-secondary);
+  color: var(--text-primary);
+}
+
+@media (max-width: 600px) {
+  .engine-grid {
+    grid-template-columns: 1fr 1fr;
+  }
+
+  .pref-row {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 0.5rem;
+  }
+
+  .pref-row select {
+    width: 100%;
+  }
+
+  .pref-actions {
+    flex-direction: column;
+  }
+
+  .btn-primary,
+  .btn-secondary {
+    width: 100%;
+    text-align: center;
+  }
+}
+
+/* Dark mode class-based fallback */
+.dark,
+.dark body {
+  background: #0f0f0f !important;
+  color: #e8eaed !important;
+}
+.dark .site-header {
+  background: #1a1a1a !important;
+  border-color: #2e2e2e !important;
+}
+.dark .site-header a,
+.dark .site-header .site-name {
+  color: #e8eaed !important;
+}
+.dark input[type="text"],
+.dark input[type="search"],
+.dark textarea {
+  background: #1a1a1a !important;
+  border-color: #2e2e2e !important;
+  color: #e8eaed !important;
+}
+.dark .search-btn,
+.dark button {
+  background: #14b8a6 !important;
+  color: #0f0f0f !important;
+}
+.dark .pref-section,
+.dark .pref-row,
+.dark .engine-toggle,
+.dark select {
+  background: #1a1a1a !important;
+  border-color: #2e2e2e !important;
+  color: #e8eaed !important;
+}
+.dark a {
+  color: #14b8a6 !important;
+}
+.dark .result,
+.dark .result:hover,
+.dark .result-item,
+.dark .result-item:hover {
+  background: #1a1a1a !important;
+  border-color: #2e2e2e !important;
+}
+.dark footer {
+  background: #0f0f0f !important;
+  color: #9aa0a6 !important;
+}
+.dark .results-container,
+.dark .results-content,
+.dark .results-header {
+  background: #0f0f0f !important;
+}
+.dark .search-box {
+  background: #1a1a1a !important;
+  border-color: #2e2e2e !important;
+}
diff --git a/internal/views/static/js/settings.js b/internal/views/static/js/settings.js
index 9682e6a..4845028 100644
--- a/internal/views/static/js/settings.js
+++ b/internal/views/static/js/settings.js
@@ -7,7 +7,8 @@ var DEFAULT_PREFS = {
   theme: 'system',
   engines: ALL_ENGINES.slice(),
   safeSearch: 'moderate',
-  format: 'html'
+  format: 'html',
+  favicon: 'none' // 'none' | 'google' | 'duckduckgo'
 };
 
 var STORAGE_KEY = 'kafka_prefs';
@@ -22,7 +23,8 @@ function loadPrefs() {
         theme: parsed.theme || DEFAULT_PREFS.theme,
         engines: parsed.engines || DEFAULT_PREFS.engines.slice(),
         safeSearch: parsed.safeSearch || DEFAULT_PREFS.safeSearch,
-        format: parsed.format || DEFAULT_PREFS.format
+        format: parsed.format || DEFAULT_PREFS.format,
+        favicon: parsed.favicon || DEFAULT_PREFS.favicon
       };
     } catch (e) {
       prefs = DEFAULT_PREFS;
@@ -43,6 +45,25 @@ function applyTheme(theme) {
   }
 }
 
+function applyFavicon(service) {
+  var faviconMap = {
+    google: function(domain) { return 'https://www.google.com/s2/favicons?domain=' + encodeURIComponent(domain) + '&sz=32'; },
+    duckduckgo: function(domain) { return 'https://icons.duckduckgo.com/ip3/' + encodeURIComponent(domain) + '.ico'; },
+    self: function(domain) { return '/favicon/' + encodeURIComponent(domain); }
+  };
+  var imgs = document.querySelectorAll('.result-favicon');
+  imgs.forEach(function(img) {
+    var domain = img.getAttribute('data-domain');
+    if (!domain) return;
+    if (service === 'none') {
+      img.style.display = 'none';
+    } else if (faviconMap[service]) {
+      img.style.display = '';
+      img.src = faviconMap[service](domain);
+    }
+  });
+}
+
 function syncEngineInput(prefs) {
   var input = document.getElementById('engines-input');
   if (input) {
@@ -104,6 +125,13 @@ function renderPanel(prefs) {
   });
 
   
+  var faviconOptions = '';
+  ['none', 'google', 'duckduckgo', 'self'].forEach(function(src) {
+    var labels = { none: 'None', google: 'Google', duckduckgo: 'DuckDuckGo', self: 'Self (Kafka)' };
+    var selected = prefs.favicon === src ? ' selected' : '';
+    faviconOptions += '<option value="' + src + '"' + selected + '>' + labels[src] + '</option>';
+  });
+
   body.innerHTML =
     '<div class="settings-section">' +
       '<div class="settings-section-title">Appearance</div>' +
@@ -124,6 +152,10 @@ function renderPanel(prefs) {
         '<label for="pref-format">Default format</label>' +
         '<select id="pref-format">' + fmtOptionsHtml + '</select>' +
       '</div>' +
+      '<div class="setting-row">' +
+        '<label for="pref-favicon">Favicon service</label>' +
+        '<select id="pref-favicon">' + faviconOptions + '</select>' +
+      '</div>' +
     '</div>';
 
   // Theme buttons
@@ -162,6 +194,7 @@ function renderPanel(prefs) {
 function initSettings() {
   var prefs = loadPrefs();
   applyTheme(prefs.theme);
+  applyFavicon(prefs.favicon);
   syncEngineInput(prefs);
   renderPanel(prefs);
 
@@ -257,6 +290,9 @@ function initPreferences() {
   // Load saved preferences
   var prefs = loadPrefs();
 
+  // Apply favicon settings immediately on preferences page
+  applyFavicon(prefs.favicon);
+
   // Theme
   var themeEl = document.getElementById('pref-theme');
   if (themeEl) {
@@ -288,6 +324,17 @@ function initPreferences() {
     });
   }
 
+  // Favicon service (if exists on page)
+  var faviconEl = document.getElementById('pref-favicon');
+  if (faviconEl) {
+    faviconEl.value = prefs.favicon || 'none';
+    faviconEl.addEventListener('change', function() {
+      prefs.favicon = faviconEl.value;
+      savePrefs(prefs);
+      applyFavicon(prefs.favicon);
+    });
+  }
+
   // Show first section by default
   showSection('search');
 }
diff --git a/internal/views/templates/base.html b/internal/views/templates/base.html
index d2fec79..b4f7b01 100644
--- a/internal/views/templates/base.html
+++ b/internal/views/templates/base.html
@@ -1,17 +1,1152 @@
 {{define "base"}}
 <!DOCTYPE html>
-<html lang="en" data-theme="light">
+<html lang="en" id="top" data-theme="{{.Theme}}" class="{{.Theme}}">
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="referrer" content="no-referrer">
   <meta name="robots" content="noarchive">
-  <meta name="description" content="kafka — a privacy-respecting, open metasearch engine">
-  <title>{{template "title" .}}kafka</title>
-  <link rel="stylesheet" href="/static/css/kafka.css">
-  <script src="https://unpkg.com/htmx.org@2.0.4"></script>
+  <meta name="description" content="samsa — a privacy-respecting, open metasearch engine">
+  <title>{{if .Query}}{{.Query}} — {{end}}samsa</title>
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
   <link rel="icon" href="/static/img/favicon.svg" type="image/svg+xml">
-  <link title="kafka" type="application/opensearchdescription+xml" rel="search" href="/opensearch.xml">
+  <link title="samsa" type="application/opensearchdescription+xml" rel="search" href="/opensearch.xml">
+  <meta name="samsa" content="samsa">
+  <style>
+    /* samsa — modern dark metasearch UI (HTML + CSS only) */
+
+    :root {
+      --bg: #111111;
+      --bg-secondary: #1a1a1a;
+      --bg-tertiary: #242424;
+      --border: #2e2e2e;
+      --border-focus: #4a5568;
+      --text-primary: #e8eaed;
+      --text-secondary: #9aa0a6;
+      --text-muted: #8b9199;
+      --accent: #66b3ff;
+      --accent-hover: #8ec5ff;
+      --accent-soft: rgba(102, 179, 255, 0.12);
+      --title-link: #66b3ff;
+      --url-color: #7cb88a;
+      --desc-color: #cccccc;
+      --shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.35);
+      --shadow-md: 0 4px 14px rgba(0, 0, 0, 0.45);
+      --radius-sm: 8px;
+      --radius-md: 12px;
+      --radius-lg: 16px;
+      --radius-full: 9999px;
+      --font: "Inter", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+      --font-mono: ui-monospace, "Cascadia Code", "Source Code Pro", monospace;
+      --content-max: 860px;
+      --header-sticky-offset: 56px;
+      /* Side atmosphere (dark) */
+      --side-glow-a: rgba(102, 179, 255, 0.07);
+      --side-glow-b: rgba(102, 179, 255, 0.05);
+      --grid-line: rgba(255, 255, 255, 0.022);
+    }
+
+    :root[data-theme="light"],
+    html[data-theme="light"] {
+      --bg: #f4f5f7;
+      --bg-secondary: #ffffff;
+      --bg-tertiary: #ebeef2;
+      --border: #dfe3e8;
+      --border-focus: #b8c0cc;
+      --text-primary: #1a1d21;
+      --text-secondary: #4a5568;
+      --text-muted: #6b7280;
+      --accent: #0d9488;
+      --accent-hover: #0f766e;
+      --accent-soft: rgba(13, 148, 136, 0.12);
+      --title-link: #2563eb;
+      --url-color: #047857;
+      --desc-color: #4b5563;
+      --shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.08);
+      --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.1);
+      --side-glow-a: rgba(13, 148, 136, 0.08);
+      --side-glow-b: rgba(37, 99, 235, 0.06);
+      --grid-line: rgba(0, 0, 0, 0.04);
+    }
+
+    /* Slightly wider reading column on very large screens (reduces “empty” feel) */
+    @media (min-width: 1400px) {
+      :root {
+        --content-max: 920px;
+      }
+    }
+
+    @media (min-width: 1800px) {
+      :root {
+        --content-max: 960px;
+      }
+    }
+
+    *, *::before, *::after {
+      box-sizing: border-box;
+      margin: 0;
+      padding: 0;
+    }
+
+    html {
+      font-size: 16px;
+      scroll-behavior: smooth;
+    }
+
+    body {
+      font-family: var(--font);
+      color: var(--text-primary);
+      line-height: 1.5;
+      min-height: 100vh;
+      -webkit-font-smoothing: antialiased;
+      position: relative;
+      /* Base + soft side glows so wide viewports feel intentional, not “blank” */
+      background-color: var(--bg);
+      background-image:
+        radial-gradient(ellipse 75% 55% at 0% 18%, var(--side-glow-a), transparent 52%),
+        radial-gradient(ellipse 70% 50% at 100% 72%, var(--side-glow-b), transparent 50%),
+        radial-gradient(ellipse 90% 45% at 50% -5%, rgba(0, 0, 0, 0.2), transparent 45%);
+      background-attachment: fixed;
+    }
+
+    /* Subtle grid on the sides — fills visual weight without competing with results */
+    body::before {
+      content: "";
+      position: fixed;
+      inset: 0;
+      z-index: 0;
+      pointer-events: none;
+      opacity: 0.5;
+      background-image:
+        repeating-linear-gradient(0deg, transparent, transparent 63px, var(--grid-line) 63px, var(--grid-line) 64px),
+        repeating-linear-gradient(90deg, transparent, transparent 63px, var(--grid-line) 63px, var(--grid-line) 64px);
+      -webkit-mask-image: linear-gradient(90deg, transparent 0%, black 12%, black 88%, transparent 100%);
+      mask-image: linear-gradient(90deg, transparent 0%, black 12%, black 88%, transparent 100%);
+    }
+
+    .site-header,
+    main,
+    footer {
+      position: relative;
+      z-index: 1;
+    }
+
+    a {
+      color: var(--accent);
+    }
+
+    /* Site header */
+    .site-header {
+      position: sticky;
+      top: 0;
+      z-index: 200;
+      height: var(--header-sticky-offset);
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0 1.25rem;
+      background: var(--bg-secondary);
+      border-bottom: 1px solid var(--border);
+      box-shadow: var(--shadow-sm);
+    }
+
+    .site-logo {
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+      text-decoration: none;
+      color: var(--text-primary);
+    }
+
+    .site-logo-mark {
+      width: 24px;
+      height: 24px;
+      color: var(--accent);
+    }
+
+    .site-name {
+      font-family: var(--font);
+      font-size: 1.1rem;
+      font-weight: 600;
+      letter-spacing: -0.02em;
+    }
+
+    .settings-link {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 40px;
+      height: 40px;
+      border-radius: var(--radius-sm);
+      color: var(--text-secondary);
+      text-decoration: none;
+      transition: background 0.15s, color 0.15s;
+    }
+
+    .settings-link:hover {
+      background: var(--bg-tertiary);
+      color: var(--text-primary);
+    }
+
+    /* Main: centered column, comfortable reading width */
+    main {
+      max-width: var(--content-max);
+      margin: 0 auto;
+      padding: 0 1.25rem 2rem;
+    }
+
+    /* Homepage */
+    .page-home {
+      min-height: calc(100vh - var(--header-sticky-offset));
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      padding: 3rem 1.25rem;
+      text-align: center;
+    }
+
+    .home-container {
+      width: 100%;
+      max-width: 560px;
+    }
+
+    .home-logo {
+      display: inline-flex;
+      align-items: center;
+      gap: 0.75rem;
+      text-decoration: none;
+      color: var(--text-primary);
+      margin-bottom: 0.75rem;
+    }
+
+    .home-logo svg {
+      width: 48px;
+      height: 48px;
+      color: var(--accent);
+    }
+
+    .home-logo-text {
+      font-size: 2rem;
+      font-weight: 700;
+      letter-spacing: -0.03em;
+    }
+
+    .home-tagline {
+      color: var(--text-muted);
+      margin-bottom: 2rem;
+      font-size: 0.95rem;
+    }
+
+    /* Search bar (pill) */
+    .search-form {
+      width: 100%;
+    }
+
+    .search-box {
+      position: relative;
+      width: 100%;
+    }
+
+    .search-box input[type="text"] {
+      width: 100%;
+      padding: 0.9rem 3.25rem 0.9rem 1.15rem;
+      font-size: 1rem;
+      font-family: inherit;
+      border: 1px solid var(--border);
+      border-radius: var(--radius-full);
+      background: var(--bg-secondary);
+      color: var(--text-primary);
+      outline: none;
+      box-shadow: var(--shadow-sm);
+      transition: border-color 0.2s, box-shadow 0.2s;
+    }
+
+    .search-box input[type="text"]:focus {
+      border-color: var(--accent);
+      box-shadow: var(--shadow-md), 0 0 0 3px var(--accent-soft);
+    }
+
+    .search-box input[type="text"]:focus-visible {
+      outline: 2px solid var(--accent);
+      outline-offset: 2px;
+    }
+
+    .search-box input[type="text"]::placeholder {
+      color: var(--text-muted);
+    }
+
+    .search-btn {
+      position: absolute;
+      right: 5px;
+      top: 50%;
+      transform: translateY(-50%);
+      width: 40px;
+      height: 40px;
+      border: none;
+      border-radius: var(--radius-full);
+      background: var(--accent);
+      color: #111;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: background 0.15s, transform 0.1s;
+    }
+
+    .search-btn:hover {
+      background: var(--accent-hover);
+    }
+
+    .search-btn:focus-visible {
+      outline: 2px solid var(--text-primary);
+      outline-offset: 2px;
+    }
+
+    :root[data-theme="light"] .search-btn {
+      color: #fff;
+    }
+
+    /* Results page shell */
+    .page-results {
+      padding-top: 0;
+    }
+
+    .results-container {
+      max-width: var(--content-max);
+      margin: 0 auto;
+    }
+
+    .results-header {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 1rem;
+      position: sticky;
+      top: var(--header-sticky-offset);
+      z-index: 150;
+      padding: 1rem 0 0.75rem;
+      margin: 0 -1.25rem;
+      padding-left: 1.25rem;
+      padding-right: 1.25rem;
+      background: linear-gradient(to bottom, var(--bg) 0%, var(--bg) 88%, transparent 100%);
+      border-bottom: 1px solid var(--border);
+    }
+
+    .results-header-inner {
+      width: 100%;
+      max-width: var(--content-max);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 1rem;
+      flex-wrap: wrap;
+    }
+
+    .results-logo {
+      display: flex;
+      align-items: center;
+      gap: 0.4rem;
+      text-decoration: none;
+      color: var(--text-primary);
+      flex-shrink: 0;
+    }
+
+    .results-logo svg {
+      width: 22px;
+      height: 22px;
+      color: var(--accent);
+    }
+
+    .results-logo span {
+      font-size: 1.05rem;
+      font-weight: 600;
+      letter-spacing: -0.02em;
+    }
+
+    .header-search {
+      flex: 1;
+      min-width: 200px;
+      max-width: 640px;
+    }
+
+    .header-search .search-box input[type="text"] {
+      padding: 0.65rem 2.75rem 0.65rem 1rem;
+      font-size: 0.95rem;
+    }
+
+    .header-search .search-btn {
+      width: 34px;
+      height: 34px;
+    }
+
+    /* Category tabs */
+    .category-tabs {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.25rem;
+      justify-content: center;
+      width: 100%;
+      max-width: var(--content-max);
+      margin: 0 auto 1.25rem;
+      padding: 0 0 0.5rem;
+      border-bottom: 1px solid var(--border);
+    }
+
+    .category-tab {
+      padding: 0.5rem 0.9rem;
+      font-size: 0.875rem;
+      font-weight: 500;
+      color: var(--text-secondary);
+      text-decoration: none;
+      border-radius: var(--radius-sm);
+      border-bottom: 2px solid transparent;
+      margin-bottom: -1px;
+      transition: background 0.15s, color 0.15s, border-color 0.15s;
+    }
+
+    .category-tab:hover {
+      background: var(--bg-tertiary);
+      color: var(--text-primary);
+    }
+
+    .category-tab.active {
+      color: var(--accent);
+      border-bottom-color: var(--accent);
+      background: var(--accent-soft);
+    }
+
+    .results-content {
+      text-align: left;
+    }
+
+    .results-meta {
+      font-size: 0.85rem;
+      color: var(--text-muted);
+      margin-bottom: 1rem;
+    }
+
+    /* Result cards */
+    .result {
+      margin-bottom: 24px;
+      padding-bottom: 24px;
+      border-bottom: 1px solid var(--border);
+    }
+
+    .result:last-child {
+      border-bottom: none;
+      margin-bottom: 0;
+      padding-bottom: 0;
+    }
+
+    .result[data-engine] {
+      border-left: 3px solid var(--engine-accent, var(--accent));
+      padding-left: 0.75rem;
+      margin-left: -0.75rem;
+    }
+
+    .result_header {
+      margin-bottom: 0.35rem;
+    }
+
+    .result_header a {
+      font-size: 18px;
+      font-weight: 600;
+      color: var(--title-link);
+      text-decoration: none;
+      line-height: 1.35;
+    }
+
+    .result_header a:hover {
+      text-decoration: underline;
+    }
+
+    .result_url {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      gap: 0.5rem;
+      font-size: 13px;
+      color: var(--url-color);
+      margin-bottom: 0.5rem;
+    }
+
+    .result-favicon {
+      width: 14px;
+      height: 14px;
+      border-radius: 3px;
+      background: var(--bg-tertiary);
+      flex-shrink: 0;
+      vertical-align: middle;
+    }
+
+    .result_url a {
+      color: var(--url-color);
+      text-decoration: none;
+      word-break: break-all;
+      flex: 1;
+      min-width: 0;
+    }
+
+    .result_url a:hover {
+      text-decoration: underline;
+      color: var(--accent);
+    }
+
+    .engine-badge {
+      flex-shrink: 0;
+      margin-left: auto;
+      padding: 0.15rem 0.5rem;
+      background: var(--bg-tertiary);
+      border: 1px solid var(--border);
+      border-radius: var(--radius-full);
+      font-size: 0.7rem;
+      font-weight: 500;
+      text-transform: lowercase;
+      color: var(--text-secondary);
+      letter-spacing: 0.02em;
+    }
+
+    .engine-badge[data-engine] {
+      border-left: 3px solid var(--engine-accent, var(--border));
+      color: var(--text-secondary);
+    }
+
+    .result_content {
+      font-size: 0.9375rem;
+      color: var(--desc-color);
+      line-height: 1.5;
+    }
+
+    /* Engine accent colors */
+    .result[data-engine="google"], .engine-badge[data-engine="google"] { --engine-accent: #4285f4; }
+    .result[data-engine="bing"], .engine-badge[data-engine="bing"] { --engine-accent: #00897b; }
+    .result[data-engine="duckduckgo"], .engine-badge[data-engine="duckduckgo"] { --engine-accent: #de5833; }
+    .result[data-engine="brave"], .engine-badge[data-engine="brave"] { --engine-accent: #fb542b; }
+    .result[data-engine="braveapi"], .engine-badge[data-engine="braveapi"] { --engine-accent: #ff6600; }
+    .result[data-engine="qwant"], .engine-badge[data-engine="qwant"] { --engine-accent: #5c97ff; }
+    .result[data-engine="wikipedia"], .engine-badge[data-engine="wikipedia"] { --engine-accent: #a3a3a3; }
+    .result[data-engine="wikidata"], .engine-badge[data-engine="wikidata"] { --engine-accent: #339966; }
+    .result[data-engine="github"], .engine-badge[data-engine="github"] { --engine-accent: #8b5cf6; }
+    .result[data-engine="reddit"], .engine-badge[data-engine="reddit"] { --engine-accent: #ff4500; }
+    .result[data-engine="youtube"], .engine-badge[data-engine="youtube"] { --engine-accent: #ff0000; }
+    .result[data-engine="stackoverflow"], .engine-badge[data-engine="stackoverflow"] { --engine-accent: #f48024; }
+    .result[data-engine="arxiv"], .engine-badge[data-engine="arxiv"] { --engine-accent: #b31b1b; }
+    .result[data-engine="crossref"], .engine-badge[data-engine="crossref"] { --engine-accent: #00354d; }
+    .result[data-engine="bing_images"], .engine-badge[data-engine="bing_images"] { --engine-accent: #00897b; }
+    .result[data-engine="ddg_images"], .engine-badge[data-engine="ddg_images"] { --engine-accent: #de5833; }
+    .result[data-engine="qwant_images"], .engine-badge[data-engine="qwant_images"] { --engine-accent: #5c97ff; }
+
+    /* Wikipedia / knowledge infobox */
+    .infobox-list {
+      margin-bottom: 1.25rem;
+    }
+
+    .infobox-card {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      gap: 1rem;
+      align-items: flex-start;
+      padding: 1rem 1.15rem;
+      background: var(--bg-secondary);
+      border: 1px solid var(--border);
+      border-radius: var(--radius-md);
+      box-shadow: var(--shadow-sm);
+    }
+
+    .infobox-image-wrap {
+      flex-shrink: 0;
+      width: 120px;
+      height: 120px;
+      border-radius: var(--radius-sm);
+      overflow: hidden;
+      background: var(--bg-tertiary);
+      border: 1px solid var(--border);
+    }
+
+    .infobox-img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      display: block;
+    }
+
+    .infobox-main {
+      flex: 1;
+      min-width: min(100%, 220px);
+    }
+
+    .infobox-title {
+      font-size: 1.15rem;
+      font-weight: 600;
+      color: var(--text-primary);
+      margin-bottom: 0.5rem;
+      line-height: 1.3;
+    }
+
+    .infobox-content {
+      font-size: 0.9rem;
+      color: var(--desc-color);
+      line-height: 1.55;
+      margin-bottom: 0.65rem;
+    }
+
+    .infobox-link {
+      display: inline-block;
+      font-size: 0.875rem;
+      font-weight: 500;
+      color: var(--title-link);
+      text-decoration: none;
+    }
+
+    .infobox-link:hover {
+      text-decoration: underline;
+    }
+
+    .dialog-error {
+      padding: 0.65rem 0.85rem;
+      margin-bottom: 0.75rem;
+      background: rgba(239, 68, 68, 0.12);
+      border: 1px solid rgba(239, 68, 68, 0.35);
+      border-radius: var(--radius-sm);
+      color: #fca5a5;
+      font-size: 0.9rem;
+    }
+
+    /* Engine errors (unresponsive engines) */
+    .engine-errors-wrap {
+      margin-bottom: 1rem;
+    }
+
+    details.engine-errors {
+      width: 100%;
+      background: var(--bg-secondary);
+      border: 1px solid var(--border);
+      border-radius: var(--radius-md);
+      box-shadow: var(--shadow-sm);
+      overflow: hidden;
+    }
+
+    details.engine-errors > summary {
+      list-style: none;
+      cursor: pointer;
+      padding: 0.85rem 1rem;
+      color: var(--text-primary);
+      font-weight: 600;
+      user-select: none;
+      border-bottom: 1px solid var(--border);
+    }
+
+    details.engine-errors > summary::-webkit-details-marker {
+      display: none;
+    }
+
+    .engine-errors-list {
+      list-style: none;
+      padding: 0.65rem 1rem 0.9rem 1rem;
+      margin: 0;
+      display: flex;
+      flex-direction: column;
+      gap: 0.55rem;
+    }
+
+    .engine-error-item {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+      align-items: baseline;
+      font-size: 0.9rem;
+      color: var(--text-secondary);
+    }
+
+    .engine-error-engine {
+      font-family: var(--font-mono);
+      background: var(--bg-tertiary);
+      border: 1px solid var(--border);
+      border-radius: var(--radius-sm);
+      padding: 0.15rem 0.5rem;
+      color: var(--text-primary);
+    }
+
+    .engine-error-reason {
+      color: var(--text-muted);
+      word-break: break-word;
+    }
+
+    :root[data-theme="light"] .dialog-error {
+      color: #991b1b;
+      background: #fef2f2;
+      border-color: #fecaca;
+    }
+
+    .correction {
+      font-size: 0.9rem;
+      color: var(--text-secondary);
+      margin-bottom: 1rem;
+      padding: 0.6rem 0.85rem;
+      background: var(--bg-secondary);
+      border-radius: var(--radius-sm);
+      border: 1px solid var(--border);
+    }
+
+    .no-results {
+      text-align: center;
+      padding: 3rem 1.5rem;
+    }
+
+    .no-results-icon {
+      font-size: 2.5rem;
+      margin-bottom: 1rem;
+      opacity: 0.35;
+    }
+
+    .no-results h2 {
+      font-size: 1.2rem;
+      font-weight: 600;
+      margin-bottom: 0.5rem;
+    }
+
+    .no-results p {
+      color: var(--text-muted);
+      font-size: 0.95rem;
+    }
+
+    /* Pagination (links only) */
+    .pagination {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 0.45rem;
+      padding: 2rem 0 1rem;
+      flex-wrap: wrap;
+    }
+
+    .pagination a.pag-link {
+      min-width: 40px;
+      height: 40px;
+      padding: 0 0.65rem;
+      border: 1px solid var(--border);
+      border-radius: var(--radius-sm);
+      background: var(--bg-secondary);
+      color: var(--text-primary);
+      font-size: 0.9rem;
+      font-family: inherit;
+      text-decoration: none;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      transition: background 0.15s, border-color 0.15s;
+    }
+
+    .pagination a.pag-link:hover {
+      background: var(--bg-tertiary);
+      border-color: var(--border-focus);
+    }
+
+    .pagination a.pag-link:focus-visible {
+      outline: 2px solid var(--accent);
+      outline-offset: 2px;
+    }
+
+    .page-current {
+      min-width: 40px;
+      height: 40px;
+      padding: 0 0.65rem;
+      border: 1px solid var(--accent);
+      border-radius: var(--radius-sm);
+      background: var(--accent);
+      color: #111;
+      font-size: 0.9rem;
+      font-weight: 600;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    :root[data-theme="light"] .page-current {
+      color: #fff;
+    }
+
+    .back-to-top {
+      text-align: center;
+      padding: 1rem 0 2rem;
+    }
+
+    .back-to-top a {
+      color: var(--accent);
+      text-decoration: none;
+      font-size: 0.85rem;
+    }
+
+    .back-to-top a:hover {
+      text-decoration: underline;
+    }
+
+    /* Image grid */
+    .image-grid {
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+      gap: 1rem;
+    }
+
+    .image-result {
+      display: block;
+      border-radius: var(--radius-md);
+      overflow: hidden;
+      background: var(--bg-secondary);
+      border: 1px solid var(--border);
+      text-decoration: none;
+      color: inherit;
+      box-shadow: var(--shadow-sm);
+      transition: border-color 0.15s, box-shadow 0.15s;
+    }
+
+    .image-result:hover {
+      border-color: var(--border-focus);
+      box-shadow: var(--shadow-md);
+    }
+
+    .image-thumb {
+      aspect-ratio: 1;
+      overflow: hidden;
+      background: var(--bg-tertiary);
+    }
+
+    .image-thumb img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
+    .image-placeholder {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      height: 100%;
+      font-size: 2rem;
+      opacity: 0.4;
+    }
+
+    .image-meta {
+      padding: 0.55rem 0.65rem;
+    }
+
+    .image-title {
+      font-size: 0.8rem;
+      font-weight: 500;
+      color: var(--text-primary);
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      display: block;
+    }
+
+    .image-source {
+      font-size: 0.7rem;
+      color: var(--text-muted);
+    }
+
+    /* Video results */
+    .video-result {
+      display: flex;
+      gap: 1rem;
+      margin-bottom: 24px;
+      padding-bottom: 24px;
+      border-bottom: 1px solid var(--border);
+    }
+
+    .video-result:last-child {
+      border-bottom: none;
+      margin-bottom: 0;
+      padding-bottom: 0;
+    }
+
+    .video-result .result_thumbnail {
+      flex-shrink: 0;
+      width: 160px;
+      border-radius: var(--radius-sm);
+      overflow: hidden;
+      background: var(--bg-tertiary);
+    }
+
+    .video-result .result_thumbnail img {
+      width: 100%;
+      height: auto;
+      display: block;
+    }
+
+    .video-result .result_content_wrapper {
+      flex: 1;
+      min-width: 0;
+    }
+
+    .video-result .result_header a {
+      font-size: 18px;
+      font-weight: 600;
+      color: var(--title-link);
+      text-decoration: none;
+    }
+
+    .video-result .result_header a:hover {
+      text-decoration: underline;
+    }
+
+    /* Footer */
+    footer {
+      text-align: center;
+      padding: 2.5rem 1.25rem 2rem;
+      color: var(--text-muted);
+      font-size: 0.85rem;
+    }
+
+    footer a {
+      color: var(--accent);
+      text-decoration: none;
+    }
+
+    footer a:hover {
+      text-decoration: underline;
+    }
+
+    /* Preferences */
+    .preferences-container {
+      max-width: 640px;
+      margin: 2rem auto;
+      padding: 0;
+    }
+
+    .preferences-title {
+      font-size: 1.5rem;
+      font-weight: 600;
+      margin-bottom: 1.5rem;
+      color: var(--text-primary);
+    }
+
+    .preferences-form {
+      display: flex;
+      flex-direction: column;
+      gap: 1.5rem;
+    }
+
+    .pref-section {
+      background: var(--bg-secondary);
+      border: 1px solid var(--border);
+      border-radius: var(--radius-md);
+      padding: 1.25rem;
+    }
+
+    .pref-section-title {
+      font-size: 0.7rem;
+      font-weight: 600;
+      text-transform: uppercase;
+      letter-spacing: 0.06em;
+      color: var(--text-muted);
+      margin-bottom: 1rem;
+      padding-bottom: 0.5rem;
+      border-bottom: 1px solid var(--border);
+    }
+
+    .pref-desc {
+      font-size: 0.8rem;
+      color: var(--text-muted);
+      margin-bottom: 1rem;
+    }
+
+    .pref-row {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 1rem;
+      padding: 0.75rem 0;
+      border-bottom: 1px solid var(--border);
+    }
+
+    .pref-row:last-child {
+      border-bottom: none;
+      padding-bottom: 0;
+    }
+
+    .pref-row label:first-child {
+      font-size: 0.9rem;
+      color: var(--text-primary);
+    }
+
+    .pref-row-info {
+      flex: 1;
+    }
+
+    .pref-row-info label {
+      font-weight: 500;
+    }
+
+    .pref-row select {
+      padding: 0.5rem 0.75rem;
+      font-size: 0.85rem;
+      font-family: inherit;
+      border: 1px solid var(--border);
+      border-radius: var(--radius-sm);
+      background: var(--bg-tertiary);
+      color: var(--text-primary);
+      cursor: pointer;
+      min-width: 120px;
+    }
+
+    .pref-row select:focus {
+      outline: none;
+      border-color: var(--accent);
+      box-shadow: 0 0 0 2px var(--accent-soft);
+    }
+
+    .engine-grid {
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
+      gap: 0.5rem;
+      margin-top: 0.75rem;
+    }
+
+    .engine-toggle {
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+      padding: 0.5rem 0.75rem;
+      background: var(--bg-tertiary);
+      border-radius: var(--radius-sm);
+      border: 1px solid transparent;
+      font-size: 0.85rem;
+      cursor: pointer;
+      transition: background 0.15s, border-color 0.15s;
+    }
+
+    .engine-toggle:hover {
+      border-color: var(--border);
+    }
+
+    .engine-toggle input[type="checkbox"] {
+      width: 16px;
+      height: 16px;
+      accent-color: var(--accent);
+      cursor: pointer;
+    }
+
+    .engine-toggle span {
+      color: var(--text-secondary);
+    }
+
+    .pref-actions {
+      display: flex;
+      gap: 1rem;
+      justify-content: flex-end;
+      padding-top: 0.5rem;
+    }
+
+    .btn-primary,
+    .btn-secondary {
+      padding: 0.65rem 1.25rem;
+      border-radius: var(--radius-sm);
+      font-size: 0.9rem;
+      font-family: inherit;
+      cursor: pointer;
+      text-decoration: none;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      transition: background 0.15s, border-color 0.15s;
+      border: 1px solid transparent;
+    }
+
+    .btn-primary {
+      background: var(--accent);
+      color: #111;
+      border-color: var(--accent);
+    }
+
+    .btn-primary:hover {
+      background: var(--accent-hover);
+    }
+
+    :root[data-theme="light"] .btn-primary {
+      color: #fff;
+    }
+
+    .btn-secondary {
+      background: transparent;
+      color: var(--text-secondary);
+      border-color: var(--border);
+    }
+
+    .btn-secondary:hover {
+      background: var(--bg-tertiary);
+      color: var(--text-primary);
+    }
+
+    @media (max-width: 600px) {
+      .results-header-inner {
+        flex-direction: column;
+        align-items: stretch;
+      }
+
+      .results-logo {
+        justify-content: center;
+      }
+
+      .header-search {
+        max-width: none;
+      }
+
+      .category-tabs {
+        justify-content: flex-start;
+        overflow-x: auto;
+        -webkit-overflow-scrolling: touch;
+        flex-wrap: nowrap;
+        padding-bottom: 0.5rem;
+      }
+
+      .category-tabs::-webkit-scrollbar {
+        display: none;
+      }
+
+      .image-grid {
+        grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
+        gap: 0.5rem;
+      }
+
+      .video-result {
+        flex-direction: column;
+      }
+
+      .video-result .result_thumbnail {
+        width: 100%;
+        max-width: 280px;
+      }
+
+      .engine-grid {
+        grid-template-columns: 1fr 1fr;
+      }
+
+      .pref-row {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 0.5rem;
+      }
+
+      .pref-row select {
+        width: 100%;
+      }
+
+      .pref-actions {
+        flex-direction: column;
+      }
+
+      .btn-primary,
+      .btn-secondary {
+        width: 100%;
+      }
+    }
+  </style>
 </head>
 <body>
   <header class="site-header">
@@ -20,14 +1155,14 @@
         <circle cx="11" cy="11" r="8"/>
         <path d="m21 21-4.35-4.35"/>
       </svg>
-      <span class="site-name">kafka</span>
+      <span class="site-name">samsa</span>
     </a>
-    <button id="settings-trigger" class="settings-trigger" aria-label="Preferences" aria-expanded="false" aria-controls="settings-popover">
+    <a href="/preferences" class="settings-link" title="Preferences">
       <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
         <path d="M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0l-.15-.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.1a2 2 0 0 1 1 1.72v.51a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.39a2 2 0 0 0-.73-2.73l-.15-.08a2 2 0 0 1-1-1.74v-.5a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z"/>
         <circle cx="12" cy="12" r="3"/>
       </svg>
-    </button>
+    </a>
   </header>
 
   <main class="{{if .Query}}page-results{{else}}page-home{{end}}">
@@ -35,135 +1170,8 @@
   </main>
 
   <footer>
-    <p>Powered by <a href="https://git.ashisgreat.xyz/penal-colony/kafka">kafka</a> — a privacy-respecting, open metasearch engine{{if .SourceURL}} · <a href="{{.SourceURL}}">Source</a>{{end}} · <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPLv3</a></p>
+    <p>Powered by <a href="https://git.ashisgreat.xyz/penal-colony/samsa">samsa</a> — a privacy-respecting, open metasearch engine{{if .SourceURL}} · <a href="{{.SourceURL}}">Source</a>{{end}} · <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPLv3</a></p>
   </footer>
-
-  <script src="/static/js/settings.js"></script>
-
-  <div id="settings-popover" data-open="false" role="dialog" aria-label="Preferences" aria-modal="true">
-    <div class="settings-popover-header">
-      Preferences
-      <button class="settings-popover-close" aria-label="Close">×</button>
-    </div>
-    <div class="settings-popover-body"></div>
-  </div>
-
-  <div id="autocomplete-dropdown"></div>
-
-  <script>
-  (function () {
-    'use strict';
-
-    var input = document.getElementById('q');
-    var dropdown = document.getElementById('autocomplete-dropdown');
-    var form = document.getElementById('search-form');
-    var debounceTimer = null;
-    var suggestions = [];
-    var activeIndex = -1;
-    var fetchController = null;
-
-    function escapeRegex(str) {
-      return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    }
-
-    function highlight(text, query) {
-      if (!query) return text;
-      var re = new RegExp('^(' + escapeRegex(query) + ')', 'i');
-      return text.replace(re, '<mark>$1</mark>');
-    }
-
-    function renderDropdown() {
-      if (suggestions.length === 0) {
-        dropdown.classList.remove('open');
-        return;
-      }
-      var html = '';
-      for (var i = 0; i < suggestions.length; i++) {
-        var escaped = highlight(suggestions[i], input.value);
-        html += '<div class="autocomplete-suggestion" data-index="' + i + '">' + escaped + '</div>';
-      }
-      html += '<div class="autocomplete-footer">↑↓ navigate · Enter select · Esc close</div>';
-      dropdown.innerHTML = html;
-      dropdown.classList.add('open');
-      activeIndex = -1;
-    }
-
-    function closeDropdown() {
-      dropdown.classList.remove('open');
-      suggestions = [];
-      activeIndex = -1;
-    }
-
-    function selectSuggestion(index) {
-      if (index < 0 || index >= suggestions.length) return;
-      input.value = suggestions[index];
-      closeDropdown();
-      form.submit();
-    }
-
-    function updateActive(newIndex) {
-      var items = dropdown.querySelectorAll('.autocomplete-suggestion');
-      items.forEach(function (el) { el.classList.remove('active'); });
-      if (newIndex >= 0 && newIndex < items.length) {
-        items[newIndex].classList.add('active');
-        items[newIndex].scrollIntoView({ block: 'nearest' });
-      }
-      activeIndex = newIndex;
-    }
-
-    function fetchSuggestions(query) {
-      if (fetchController) fetchController.abort();
-      fetchController = new AbortController();
-      fetch('/autocompleter?q=' + encodeURIComponent(query), { signal: fetchController.signal })
-        .then(function (r) { return r.json(); })
-        .then(function (data) {
-          suggestions = data || [];
-          renderDropdown();
-        })
-        .catch(function (e) {
-          if (e.name !== 'AbortError') suggestions = [];
-          dropdown.classList.remove('open');
-        });
-    }
-
-    input.addEventListener('input', function () {
-      clearTimeout(debounceTimer);
-      var q = input.value.trim();
-      if (q.length < 2) { closeDropdown(); return; }
-      debounceTimer = setTimeout(function () { fetchSuggestions(q); }, 250);
-    });
-
-    input.addEventListener('keydown', function (e) {
-      if (!dropdown.classList.contains('open')) return;
-      var items = dropdown.querySelectorAll('.autocomplete-suggestion');
-      if (e.key === 'ArrowDown') {
-        e.preventDefault();
-        updateActive(Math.min(activeIndex + 1, items.length - 1));
-      } else if (e.key === 'ArrowUp') {
-        e.preventDefault();
-        updateActive(Math.max(activeIndex - 1, -1));
-      } else if (e.key === 'Enter' && activeIndex >= 0) {
-        e.preventDefault();
-        selectSuggestion(activeIndex);
-      } else if (e.key === 'Escape') {
-        closeDropdown();
-      }
-    });
-
-    input.addEventListener('blur', function () {
-      setTimeout(closeDropdown, 150);
-    });
-
-    dropdown.addEventListener('mousedown', function (e) {
-      var item = e.target.closest('.autocomplete-suggestion');
-      if (item) {
-        e.preventDefault();
-        var idx = parseInt(item.getAttribute('data-index'), 10);
-        selectSuggestion(idx);
-      }
-    });
-  }());
-  </script>
 </body>
 </html>
 {{end}}
diff --git a/internal/views/templates/image_item.html b/internal/views/templates/image_item.html
new file mode 100644
index 0000000..4b0909b
--- /dev/null
+++ b/internal/views/templates/image_item.html
@@ -0,0 +1,15 @@
+{{define "image_item"}}
+<a class="image-result" href="{{.URL}}" target="_blank" rel="noopener noreferrer">
+  <div class="image-thumb">
+    {{if .Thumbnail}}
+    <img src="{{.Thumbnail}}" alt="{{.Title}}" loading="lazy">
+    {{else}}
+    <div class="image-placeholder" aria-hidden="true">🖼️</div>
+    {{end}}
+  </div>
+  <div class="image-meta">
+    <span class="image-title">{{.Title}}</span>
+    {{if .Content}}<span class="image-source">{{.Content}}</span>{{end}}
+  </div>
+</a>
+{{end}}
diff --git a/internal/views/templates/index.html b/internal/views/templates/index.html
index 7a241f1..eb02d9b 100644
--- a/internal/views/templates/index.html
+++ b/internal/views/templates/index.html
@@ -1,60 +1,25 @@
 {{define "title"}}{{end}}
 {{define "content"}}
-<div class="search-hero">
-  <div class="hero-logo">
+<div class="home-container">
+  <a href="/" class="home-logo">
     <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
       <circle cx="11" cy="11" r="8"/>
       <path d="m21 21-4.35-4.35"/>
     </svg>
-  </div>
-  <p class="hero-tagline">Search the web privately, without tracking or censorship.</p>
-  <div class="search-box">
-    <form method="GET" action="/search" role="search" id="search-form">
-      <input type="text" name="q" id="q" placeholder="Search the web…" autocomplete="off" autofocus>
-      <button type="submit" class="search-box-submit" aria-label="Search">
+    <span class="home-logo-text">samsa</span>
+  </a>
+  <p class="home-tagline">Private meta-search, powered by open source.</p>
+
+  <form class="search-form" method="GET" action="/search" role="search">
+    <div class="search-box">
+      <input type="text" name="q" placeholder="Search the web…" autocomplete="off" autofocus>
+      <button type="submit" class="search-btn" aria-label="Search">
         <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
           <circle cx="11" cy="11" r="8"/>
           <path d="m21 21-4.35-4.35"/>
         </svg>
       </button>
-    </form>
-  </div>
-
-  <!-- Category Tiles -->
-  <div class="category-tiles">
-    <a href="/search" class="category-tile">
-      <span class="category-tile-icon">🌐</span>
-      <span>All</span>
-    </a>
-    <a href="/search?category=images" class="category-tile">
-      <span class="category-tile-icon">🖼️</span>
-      <span>Images</span>
-    </a>
-    <a href="/search?category=news" class="category-tile">
-      <span class="category-tile-icon">📰</span>
-      <span>News</span>
-    </a>
-    <a href="/search?category=videos" class="category-tile">
-      <span class="category-tile-icon">🎬</span>
-      <span>Videos</span>
-    </a>
-    <a href="/search?category=maps" class="category-tile">
-      <span class="category-tile-icon">🗺️</span>
-      <span>Maps</span>
-    </a>
-    <a href="/search?category=shopping" class="category-tile disabled" title="Coming soon">
-      <span class="category-tile-icon">🛒</span>
-      <span>Shopping</span>
-    </a>
-    <a href="/search?category=music" class="category-tile disabled" title="Coming soon">
-      <span class="category-tile-icon">🎵</span>
-      <span>Music</span>
-    </a>
-    <a href="/search?category=weather" class="category-tile disabled" title="Coming soon">
-      <span class="category-tile-icon">🌤️</span>
-      <span>Weather</span>
-    </a>
-  </div>
+    </div>
+  </form>
 </div>
-<div id="results"></div>
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/internal/views/templates/opensearch.xml b/internal/views/templates/opensearch.xml
index 3168631..151e175 100644
--- a/internal/views/templates/opensearch.xml
+++ b/internal/views/templates/opensearch.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <ShortName>kafka</ShortName>
+  <ShortName>samsa</ShortName>
   <Description>A privacy-respecting, open metasearch engine</Description>
   <InputEncoding>UTF-8</InputEncoding>
   <OutputEncoding>UTF-8</OutputEncoding>
-  <LongName>kafka — Privacy-respecting metasearch</LongName>
+  <LongName>samsa — Privacy-respecting metasearch</LongName>
   <Image width="16" height="16" type="image/svg+xml">/static/img/favicon.svg</Image>
-  <Contact>https://git.ashisgreat.xyz/penal-colony/kafka</Contact>
+  <Contact>https://git.ashisgreat.xyz/penal-colony/samsa</Contact>
   <Url type="text/html" method="GET" template="{baseUrl}/search?q={searchTerms}&amp;format=html">
     <Param name="pageno" value="{startPage?}" />
     <Param name="language" value="{language?}" />
diff --git a/internal/views/templates/preferences.html b/internal/views/templates/preferences.html
index 394c27f..1fbbd48 100644
--- a/internal/views/templates/preferences.html
+++ b/internal/views/templates/preferences.html
@@ -1,191 +1,112 @@
 {{define "title"}}Preferences{{end}}
 {{define "content"}}
-<div class="preferences-layout">
-  <!-- Preferences Navigation -->
-  <nav class="preferences-nav" id="preferences-nav">
-    <div class="preferences-nav-title">Settings</div>
-    <button class="preferences-nav-item active" data-section="search">🔍 Search</button>
-    <button class="preferences-nav-item" data-section="privacy">🔒 Privacy</button>
-    <button class="preferences-nav-item" data-section="tabs">📑 Tabs</button>
-    <button class="preferences-nav-item" data-section="appearance">🎨 Appearance</button>
-    <button class="preferences-nav-item" data-section="sidebar">📐 Sidebar</button>
-    <button class="preferences-nav-item" data-section="content">📄 Content</button>
-    <button class="preferences-nav-item" data-section="languages">🌍 Languages</button>
-    <button class="preferences-nav-item" data-section="regional">📍 Regional</button>
-  </nav>
+<div class="preferences-container">
+  <h1 class="preferences-title">Preferences</h1>
 
-  <!-- Preferences Content -->
-  <div class="preferences-content">
-    <!-- Search Section -->
-    <section class="pref-section" id="section-search">
-      <h2 class="pref-section-title">Search</h2>
+  <form class="preferences-form" method="POST" action="/preferences">
+
+    <section class="pref-section">
+      <h2 class="pref-section-title">Appearance</h2>
       <div class="pref-row">
-        <label for="pref-default-engine">Default engine</label>
-        <select id="pref-default-engine">
-          <option value="">All engines</option>
-          <option value="wikipedia">Wikipedia</option>
-          <option value="arxiv">arXiv</option>
-          <option value="braveapi">Brave API</option>
-          <option value="duckduckgo">DuckDuckGo</option>
-          <option value="github">GitHub</option>
-          <option value="reddit">Reddit</option>
-          <option value="bing">Bing</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-safesearch">Safe search</label>
-        <select id="pref-safesearch">
-          <option value="moderate">Moderate</option>
-          <option value="strict">Strict</option>
-          <option value="off">Off</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-search-lang">Search language</label>
-        <select id="pref-search-lang">
-          <option value="">All languages</option>
-          <option value="en">English</option>
-          <option value="de">Deutsch</option>
-          <option value="fr">Français</option>
-          <option value="es">Español</option>
-          <option value="zh">中文</option>
+        <label for="theme-select">Theme</label>
+        <select name="theme" id="theme-select">
+          <option value="light" {{if eq .Theme "light"}}selected{{end}}>Light</option>
+          <option value="dark" {{if eq .Theme "dark"}}selected{{end}}>Dark</option>
         </select>
       </div>
     </section>
 
-    <!-- Privacy Section -->
-    <section class="pref-section" id="section-privacy" style="display:none;">
+    <section class="pref-section">
+      <h2 class="pref-section-title">Search Engines</h2>
+      <p class="pref-desc">Select which engines to use for searches.</p>
+      <div class="engine-grid">
+        <label class="engine-toggle">
+          <input type="checkbox" name="engine" value="google" checked>
+          <span>Google</span>
+        </label>
+        <label class="engine-toggle">
+          <input type="checkbox" name="engine" value="duckduckgo" checked>
+          <span>DuckDuckGo</span>
+        </label>
+        <label class="engine-toggle">
+          <input type="checkbox" name="engine" value="bing" checked>
+          <span>Bing</span>
+        </label>
+        <label class="engine-toggle">
+          <input type="checkbox" name="engine" value="brave" checked>
+          <span>Brave</span>
+        </label>
+        <label class="engine-toggle">
+          <input type="checkbox" name="engine" value="wikipedia" checked>
+          <span>Wikipedia</span>
+        </label>
+        <label class="engine-toggle">
+          <input type="checkbox" name="engine" value="wikidata" checked>
+          <span>Wikidata</span>
+        </label>
+        <label class="engine-toggle">
+          <input type="checkbox" name="engine" value="github">
+          <span>GitHub</span>
+        </label>
+        <label class="engine-toggle">
+          <input type="checkbox" name="engine" value="reddit">
+          <span>Reddit</span>
+        </label>
+        <label class="engine-toggle">
+          <input type="checkbox" name="engine" value="youtube">
+          <span>YouTube</span>
+        </label>
+      </div>
+    </section>
+
+    <section class="pref-section">
       <h2 class="pref-section-title">Privacy</h2>
       <div class="pref-row">
         <div class="pref-row-info">
-          <label>Tracking protection</label>
-          <p class="pref-desc">Block trackers and scripts that follow you across the web.</p>
+          <label>Safe Search</label>
+          <p class="pref-desc">Filter explicit content from results</p>
         </div>
-        <input type="checkbox" id="pref-tracking" checked disabled>
+        <select name="safesearch">
+          <option value="0">Off</option>
+          <option value="1" selected>Moderate</option>
+          <option value="2">Strict</option>
+        </select>
       </div>
       <div class="pref-row">
         <div class="pref-row-info">
-          <label>Send Do Not Track header</label>
-          <p class="pref-desc">Ask websites not to track you.</p>
+          <label for="pref-favicon">Favicon Service</label>
+          <p class="pref-desc">Fetch favicons for result URLs. "None" is most private.</p>
         </div>
-        <input type="checkbox" id="pref-dnt">
-      </div>
-    </section>
-
-    <!-- Tabs Section -->
-    <section class="pref-section" id="section-tabs" style="display:none;">
-      <h2 class="pref-section-title">Tabs</h2>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>New tab behavior</label>
-          <p class="pref-desc">Choose what happens when you open a new tab.</p>
-        </div>
-        <select id="pref-newtab">
-          <option value="blank">Blank page</option>
-          <option value="home">Homepage</option>
+        <select name="favicon" id="pref-favicon">
+          <option value="none" {{if eq .FaviconService "none"}}selected{{end}}>None</option>
+          <option value="google" {{if eq .FaviconService "google"}}selected{{end}}>Google</option>
+          <option value="duckduckgo" {{if eq .FaviconService "duckduckgo"}}selected{{end}}>DuckDuckGo</option>
+          <option value="self" {{if eq .FaviconService "self"}}selected{{end}}>Self (Kafka)</option>
         </select>
       </div>
     </section>
 
-    <!-- Appearance Section -->
-    <section class="pref-section" id="section-appearance" style="display:none;">
-      <h2 class="pref-section-title">Appearance</h2>
+    <section class="pref-section">
+      <h2 class="pref-section-title">Language</h2>
       <div class="pref-row">
-        <label for="pref-theme">Theme</label>
-        <select id="pref-theme">
-          <option value="system">System</option>
-          <option value="light">Light</option>
-          <option value="dark">Dark</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-fontsize">Results font size</label>
-        <select id="pref-fontsize">
-          <option value="small">Small</option>
-          <option value="medium" selected>Medium</option>
-          <option value="large">Large</option>
-        </select>
-      </div>
-    </section>
-
-    <!-- Sidebar Section -->
-    <section class="pref-section" id="section-sidebar" style="display:none;">
-      <h2 class="pref-section-title">Sidebar</h2>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>Show sidebar on results page</label>
-          <p class="pref-desc">Display the left navigation sidebar on search results.</p>
-        </div>
-        <input type="checkbox" id="pref-show-sidebar" checked>
-      </div>
-    </section>
-
-    <!-- Content Section -->
-    <section class="pref-section" id="section-content" style="display:none;">
-      <h2 class="pref-section-title">Content</h2>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>Filter explicit results</label>
-          <p class="pref-desc">Hide explicit content from search results (SafeSearch).</p>
-        </div>
-        <input type="checkbox" id="pref-explicit-filter" checked>
-      </div>
-      <div class="pref-row">
-        <div class="pref-row-info">
-          <label>Auto-play media</label>
-          <p class="pref-desc">Automatically play video content when visible.</p>
-        </div>
-        <input type="checkbox" id="pref-autoplay">
-      </div>
-    </section>
-
-    <!-- Languages Section -->
-    <section class="pref-section" id="section-languages" style="display:none;">
-      <h2 class="pref-section-title">Languages</h2>
-      <div class="pref-row">
-        <label for="pref-ui-lang">Interface language</label>
-        <select id="pref-ui-lang">
-          <option value="en" selected>English</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-search-lang-full">Search language</label>
-        <select id="pref-search-lang-full">
-          <option value="">All languages</option>
+        <label for="search-lang">Interface &amp; Search Language</label>
+        <select name="language" id="search-lang">
+          <option value="all" selected>All languages</option>
           <option value="en">English</option>
           <option value="de">Deutsch</option>
           <option value="fr">Français</option>
           <option value="es">Español</option>
           <option value="zh">中文</option>
+          <option value="ja">日本語</option>
+          <option value="ru">Русский</option>
         </select>
       </div>
     </section>
 
-    <!-- Regional Section -->
-    <section class="pref-section" id="section-regional" style="display:none;">
-      <h2 class="pref-section-title">Regional</h2>
-      <div class="pref-row">
-        <label for="pref-region">Country/Region</label>
-        <select id="pref-region">
-          <option value="">All regions</option>
-          <option value="us">United States</option>
-          <option value="uk">United Kingdom</option>
-          <option value="de">Germany</option>
-          <option value="fr">France</option>
-          <option value="cn">China</option>
-        </select>
-      </div>
-      <div class="pref-row">
-        <label for="pref-timezone">Timezone</label>
-        <select id="pref-timezone">
-          <option value="">Auto-detect</option>
-          <option value="utc">UTC</option>
-          <option value="us-eastern">US/Eastern</option>
-          <option value="us-pacific">US/Pacific</option>
-          <option value="europe">Europe</option>
-        </select>
-      </div>
-    </section>
-  </div>
+    <div class="pref-actions">
+      <a href="/" class="btn-secondary">Cancel</a>
+      <button type="submit" class="btn-primary">Save Preferences</button>
+    </div>
+  </form>
 </div>
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/internal/views/templates/result_item.html b/internal/views/templates/result_item.html
index cf1c33b..5cc10d7 100644
--- a/internal/views/templates/result_item.html
+++ b/internal/views/templates/result_item.html
@@ -1,15 +1,17 @@
 {{define "result_item"}}
-<article class="result">
+<article class="result" data-engine="{{.Engine}}">
   <div class="result_header">
-    <a href="{{.URL}}" target="_blank" rel="noopener noreferrer">{{.Title}}</a>
+    <a href="{{.URL}}" target="_blank" rel="noopener noreferrer">{{.SafeTitle}}</a>
   </div>
   <div class="result_url">
-    <img class="result-favicon" src="https://www.google.com/s2/favicons?domain={{.URL | urlquery}}&sz=32" alt="" loading="lazy" onerror="this.style.display='none'">
+    {{if .FaviconIconURL}}
+    <img class="result-favicon" src="{{.FaviconIconURL}}" alt="" loading="lazy" width="14" height="14">
+    {{end}}
     <a href="{{.URL}}" target="_blank" rel="noopener noreferrer">{{.URL}}</a>
-    <span class="engine-badge">{{.Engine}}</span>
+    <span class="engine-badge" data-engine="{{.Engine}}">{{.Engine}}</span>
   </div>
   {{if .Content}}
-  <p class="result_content">{{.Content}}</p>
+  <p class="result_content">{{.SafeContent}}</p>
   {{end}}
 </article>
 {{end}}
diff --git a/internal/views/templates/results.html b/internal/views/templates/results.html
index 74d5f93..f601a03 100644
--- a/internal/views/templates/results.html
+++ b/internal/views/templates/results.html
@@ -1,58 +1,43 @@
 {{define "title"}}{{if .Query}}{{.Query}} — {{end}}{{end}}
 {{define "content"}}
-<div class="results-layout">
-  <!-- Compact search bar spans all columns -->
-  <div class="search-compact">
-    <div class="search-box">
-      <form method="GET" action="/search" role="search" id="search-form">
-        <input type="text" name="q" id="q" value="{{.Query}}" autocomplete="off" autofocus
-          hx-get="/search" hx-target="#results" hx-trigger="keyup changed delay:500ms" hx-include="this">
-        <button type="submit" class="search-box-submit" aria-label="Search">
-          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
-            <circle cx="11" cy="11" r="8"/>
-            <path d="m21 21-4.35-4.35"/>
-          </svg>
-        </button>
+<div class="results-container">
+  <div class="results-header">
+    <div class="results-header-inner">
+      <a href="/" class="results-logo">
+        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
+          <circle cx="11" cy="11" r="8"/>
+          <path d="m21 21-4.35-4.35"/>
+        </svg>
+        <span>samsa</span>
+      </a>
+
+      <form class="header-search" method="GET" action="/search" role="search">
+        {{if and .ActiveCategory (ne .ActiveCategory "all")}}
+        <input type="hidden" name="category" value="{{.ActiveCategory}}">
+        {{end}}
+        <div class="search-box">
+          <input type="text" name="q" value="{{.Query}}" placeholder="Search…" autocomplete="off">
+          <button type="submit" class="search-btn" aria-label="Search">
+            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
+              <circle cx="11" cy="11" r="8"/>
+              <path d="m21 21-4.35-4.35"/>
+            </svg>
+          </button>
+        </div>
       </form>
     </div>
   </div>
 
-  <!-- Center: Results -->
-  <div class="results-column" id="results">
-    {{template "results_inner" .}}
+  <div class="category-tabs" role="tablist">
+    <a href="/search?q={{.Query | urlquery}}&amp;category=" class="category-tab {{if or (eq .ActiveCategory "") (eq .ActiveCategory "all")}}active{{end}}">All</a>
+    <a href="/search?q={{.Query | urlquery}}&amp;category=general" class="category-tab {{if eq .ActiveCategory "general"}}active{{end}}">General</a>
+    <a href="/search?q={{.Query | urlquery}}&amp;category=it" class="category-tab {{if eq .ActiveCategory "it"}}active{{end}}">IT</a>
+    <a href="/search?q={{.Query | urlquery}}&amp;category=news" class="category-tab {{if eq .ActiveCategory "news"}}active{{end}}">News</a>
+    <a href="/search?q={{.Query | urlquery}}&amp;category=images" class="category-tab {{if eq .ActiveCategory "images"}}active{{end}}">Images</a>
   </div>
 
-  <!-- Right: Knowledge Panel + Related Searches -->
-  <aside class="right-column" id="right-column">
-    {{if and .Infoboxes (gt (len .Infoboxes) 0)}}
-    {{with index .Infoboxes 0}}
-    <div class="knowledge-panel">
-      {{if .img_src}}<img class="knowledge-panel-thumb" src="{{.img_src}}" alt="{{.title}}" loading="lazy">{{end}}
-      {{if .title}}<div class="knowledge-panel-title">{{.title}}</div>{{end}}
-      {{if .content}}<div class="knowledge-panel-content">{{.content}}</div>{{end}}
-    </div>
-    {{end}}
-    {{end}}
-
-    {{if .Suggestions}}
-    <div class="sidebar-card">
-      <div class="sidebar-card-title">Related Searches</div>
-      <div class="related-searches">
-        {{range .Suggestions}}
-        <a class="related-search-link" href="/search?q={{. | urlquery}}">{{.}}</a>
-        {{end}}
-      </div>
-    </div>
-    {{end}}
-
-    {{if .UnresponsiveEngines}}
-    <div class="sidebar-card">
-      <div class="sidebar-card-title">Engine Status</div>
-      <ul class="unresponsive-engines">
-        {{range .UnresponsiveEngines}}<li>{{index . 0}}: {{index . 1}}</li>{{end}}
-      </ul>
-    </div>
-    {{end}}
-  </aside>
+  <div class="results-content">
+    {{template "results_inner" .}}
+  </div>
 </div>
 {{end}}
diff --git a/internal/views/templates/results_inner.html b/internal/views/templates/results_inner.html
index cca51d1..0dac375 100644
--- a/internal/views/templates/results_inner.html
+++ b/internal/views/templates/results_inner.html
@@ -1,9 +1,44 @@
 {{define "results_inner"}}
 {{if .Corrections}}
-<div class="correction">{{range .Corrections}}{{.}} {{end}}</div>
+<div id="corrections" class="correction">{{range .Corrections}}{{.}} {{end}}</div>
 {{end}}
 
-{{if or .Answers .Infoboxes}}
+{{if .Infoboxes}}
+<div class="infobox-list" role="region" aria-label="Summary">
+  {{range .Infoboxes}}
+  <aside class="infobox-card">
+    {{if .ImgSrc}}
+    <div class="infobox-image-wrap">
+      <img src="{{.ImgSrc}}" alt="" class="infobox-img" loading="lazy" width="120" height="120">
+    </div>
+    {{end}}
+    <div class="infobox-main">
+      {{if .Title}}<h2 class="infobox-title">{{.Title}}</h2>{{end}}
+      {{if .Content}}<p class="infobox-content">{{.Content}}</p>{{end}}
+      {{if .URL}}<a href="{{.URL}}" class="infobox-link" target="_blank" rel="noopener noreferrer">Read article on Wikipedia</a>{{end}}
+    </div>
+  </aside>
+  {{end}}
+</div>
+{{end}}
+
+{{if .UnresponsiveEngines}}
+<div class="engine-errors-wrap" role="region" aria-label="Engine errors">
+  <details class="engine-errors">
+    <summary>Some search engines had errors</summary>
+    <ul class="engine-errors-list">
+      {{range .UnresponsiveEngines}}
+      <li class="engine-error-item">
+        <code class="engine-error-engine">{{index . 0}}</code>
+        <span class="engine-error-reason">{{index . 1}}</span>
+      </li>
+      {{end}}
+    </ul>
+  </details>
+</div>
+{{end}}
+
+{{if .Answers}}
 <div id="answers">
   {{range .Answers}}
   <div class="dialog-error">{{.}}</div>
@@ -11,7 +46,7 @@
 </div>
 {{end}}
 
-<div class="results-meta">
+<div class="results-meta" id="results-meta">
   {{if .NumberOfResults}}
   <span>{{.NumberOfResults}} results</span>
   {{end}}
@@ -19,16 +54,28 @@
 
 <div id="urls" role="main">
   {{if .Results}}
+  {{if .IsImageSearch}}
+  <div class="image-grid">
+    {{range .Results}}
+    {{if eq .Template "images"}}
+    {{template "image_item" .}}
+    {{end}}
+    {{end}}
+  </div>
+  {{else}}
   {{range .Results}}
   {{if eq .Template "videos"}}
   {{template "video_item" .}}
+  {{else if eq .Template "images"}}
+  {{template "image_item" .}}
   {{else}}
   {{template "result_item" .}}
   {{end}}
   {{end}}
-  {{else if not .Answers}}
+  {{end}}
+  {{else if and (not .Answers) (not .Infoboxes)}}
   <div class="no-results">
-    <div class="no-results-icon">🔍</div>
+    <div class="no-results-icon" aria-hidden="true">🔍</div>
     <h2>No results found</h2>
     <p>Try different keywords or check your spelling.</p>
   </div>
@@ -36,40 +83,26 @@
 </div>
 
 {{if .Pageno}}
-<nav class="pagination" role="navigation">
+<nav class="pagination" role="navigation" aria-label="Pagination">
   {{if gt .Pageno 1}}
-  <form method="GET" action="/search" class="prev-next">
-    <input type="hidden" name="q" value="{{.Query}}">
-    <input type="hidden" name="pageno" value="{{.PrevPage}}">
-    <button type="submit">← Prev</button>
-  </form>
+  <a class="pag-link" href="/search?q={{.Query | urlquery}}&amp;pageno={{.PrevPage}}{{if and .ActiveCategory (ne .ActiveCategory "all")}}&amp;category={{.ActiveCategory | urlquery}}{{end}}">← Prev</a>
   {{end}}
 
   {{range .PageNumbers}}
   {{if .IsCurrent}}
-  <span class="page-current">{{.Num}}</span>
+  <span class="page-current" aria-current="page">{{.Num}}</span>
   {{else}}
-  <form method="GET" action="/search" class="page-link">
-    <input type="hidden" name="q" value="{{$.Query}}">
-    <input type="hidden" name="pageno" value="{{.Num}}">
-    <button type="submit">{{.Num}}</button>
-  </form>
+  <a class="pag-link" href="/search?q={{$.Query | urlquery}}&amp;pageno={{.Num}}{{if and $.ActiveCategory (ne $.ActiveCategory "all")}}&amp;category={{$.ActiveCategory | urlquery}}{{end}}">{{.Num}}</a>
   {{end}}
   {{end}}
 
   {{if .HasNext}}
-  <form method="GET" action="/search" class="prev-next">
-    <input type="hidden" name="q" value="{{.Query}}">
-    <input type="hidden" name="pageno" value="{{.NextPage}}">
-    <button type="submit">Next →</button>
-  </form>
+  <a class="pag-link" href="/search?q={{.Query | urlquery}}&amp;pageno={{.NextPage}}{{if and .ActiveCategory (ne .ActiveCategory "all")}}&amp;category={{.ActiveCategory | urlquery}}{{end}}">Next →</a>
   {{end}}
 </nav>
 {{end}}
 
-<div class="back-to-top" id="backToTop">
-  <a href="#">↑ Back to top</a>
+<div class="back-to-top">
+  <a href="#top">↑ Back to top</a>
 </div>
-
-<div class="htmx-indicator">Searching…</div>
 {{end}}
diff --git a/internal/views/templates/video_item.html b/internal/views/templates/video_item.html
index b94c061..1d0601a 100644
--- a/internal/views/templates/video_item.html
+++ b/internal/views/templates/video_item.html
@@ -1,5 +1,5 @@
 {{define "video_item"}}
-<article class="result video-result">
+<article class="result video-result" data-engine="{{.Engine}}">
   {{if .Thumbnail}}
   <div class="result_thumbnail">
     <a href="{{.URL}}" target="_blank" rel="noopener noreferrer">
@@ -9,13 +9,19 @@
   {{end}}
   <div class="result_content_wrapper">
     <div class="result_header">
-      <a href="{{.URL}}" target="_blank" rel="noopener noreferrer">{{.Title}}</a>
+      <a href="{{.URL}}" target="_blank" rel="noopener noreferrer">{{.SafeTitle}}</a>
     </div>
     <div class="result_url">
-      <span class="engine-badge">youtube</span>
+      {{if .FaviconIconURL}}
+      <img class="result-favicon" src="{{.FaviconIconURL}}" alt="" loading="lazy" width="14" height="14">
+      {{end}}
+      {{if .URL}}
+      <a href="{{.URL}}" target="_blank" rel="noopener noreferrer">{{.URL}}</a>
+      {{end}}
+      <span class="engine-badge" data-engine="{{.Engine}}">{{.Engine}}</span>
     </div>
     {{if .Content}}
-    <p class="result_content">{{.Content}}</p>
+    <p class="result_content">{{.SafeContent}}</p>
     {{end}}
   </div>
 </article>
diff --git a/internal/views/views.go b/internal/views/views.go
index c176f81..ee84d70 100644
--- a/internal/views/views.go
+++ b/internal/views/views.go
@@ -1,4 +1,4 @@
-// kafka — a privacy-respecting metasearch engine
+// samsa — a privacy-respecting metasearch engine
 // Copyright (C) 2026-present metamorphosis-dev
 //
 // This program is free software: you can redistribute it and/or modify
@@ -19,14 +19,16 @@ package views
 import (
 	"embed"
 	"encoding/xml"
+	"html"
 	"html/template"
 	"io/fs"
 	"net/http"
+	"net/url"
 	"strconv"
 	"strings"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
-	"github.com/metamorphosis-dev/kafka/internal/util"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/util"
 )
 
 //go:embed all:templates
@@ -52,15 +54,19 @@ type PageData struct {
 	UnresponsiveEngines [][2]string
 	PageNumbers         []PageNumber
 	ShowHeader          bool
+	IsImageSearch       bool
+	// Theme is the user's selected theme (light/dark) from cookie
+	Theme          string
+	FaviconService string
 	// New fields for three-column layout
 	Categories         []string
-	CategoryIcons     map[string]string
+	CategoryIcons      map[string]string
 	DisabledCategories []string
-	ActiveCategory    string
-	TimeFilters       []FilterOption
-	TypeFilters       []FilterOption
-	ActiveTime        string
-	ActiveType        string
+	ActiveCategory     string
+	TimeFilters        []FilterOption
+	TypeFilters        []FilterOption
+	ActiveTime         string
+	ActiveType         string
 }
 
 // ResultView is a template-friendly wrapper around a MainResult.
@@ -69,12 +75,20 @@ type ResultView struct {
 	// TemplateName is the actual template to dispatch to, computed from Template.
 	// "videos" maps to "video_item", everything else maps to "result_item".
 	TemplateName string
+	// Domain is the hostname extracted from the result URL, used for favicon proxying.
+	Domain string
+	// FaviconIconURL is the resolved favicon image URL for the user's favicon preference (empty = hide).
+	FaviconIconURL string
+	// SafeTitle and SafeContent are HTML-unescaped versions for rendering.
+	// The API returns HTML entities which Go templates escape by default.
+	SafeTitle   template.HTML
+	SafeContent template.HTML
 }
 
 // PageNumber represents a numbered pagination button.
 type PageNumber struct {
-	Num        int
-	IsCurrent  bool
+	Num       int
+	IsCurrent bool
 }
 
 // InfoboxView is a template-friendly infobox.
@@ -82,6 +96,7 @@ type InfoboxView struct {
 	Title   string
 	Content string
 	ImgSrc  string
+	URL     string
 }
 
 // FilterOption represents a filter radio option for the sidebar.
@@ -91,9 +106,9 @@ type FilterOption struct {
 }
 
 var (
-	tmplFull    *template.Template
-	tmplIndex   *template.Template
-	tmplFragment *template.Template
+	tmplFull        *template.Template
+	tmplIndex       *template.Template
+	tmplFragment    *template.Template
 	tmplPreferences *template.Template
 )
 
@@ -106,13 +121,13 @@ func init() {
 	}
 
 	tmplFull = template.Must(template.New("").Funcs(funcMap).ParseFS(tmplFS,
-		"base.html", "results.html", "results_inner.html", "result_item.html", "video_item.html",
+		"base.html", "results.html", "results_inner.html", "result_item.html", "video_item.html", "image_item.html",
 	))
 	tmplIndex = template.Must(template.New("").Funcs(funcMap).ParseFS(tmplFS,
 		"base.html", "index.html",
 	))
 	tmplFragment = template.Must(template.New("").Funcs(funcMap).ParseFS(tmplFS,
-		"results.html", "results_inner.html", "result_item.html", "video_item.html",
+		"results.html", "results_inner.html", "result_item.html", "video_item.html", "image_item.html",
 	))
 	tmplPreferences = template.Must(template.New("").Funcs(funcMap).ParseFS(tmplFS,
 		"base.html", "preferences.html",
@@ -141,8 +156,26 @@ func OpenSearchXML(baseURL string) ([]byte, error) {
 	return []byte(result), nil
 }
 
+// faviconIconURL returns a safe img src for the given service and hostname, or "" for none/invalid.
+func faviconIconURL(service, domain string) string {
+	domain = strings.TrimSpace(domain)
+	if domain == "" {
+		return ""
+	}
+	switch service {
+	case "google":
+		return "https://www.google.com/s2/favicons?domain=" + url.QueryEscape(domain) + "&sz=32"
+	case "duckduckgo":
+		return "https://icons.duckduckgo.com/ip3/" + domain + ".ico"
+	case "self":
+		return "/favicon/" + domain
+	default:
+		return ""
+	}
+}
+
 // FromResponse builds PageData from a search response and request params.
-func FromResponse(resp contracts.SearchResponse, query string, pageno int, activeCategory, activeTime, activeType string) PageData {
+func FromResponse(resp contracts.SearchResponse, query string, pageno int, activeCategory, activeTime, activeType, faviconService string) PageData {
 	// Set defaults
 	if activeCategory == "" {
 		activeCategory = "all"
@@ -153,9 +186,10 @@ func FromResponse(resp contracts.SearchResponse, query string, pageno int, activ
 		Pageno:              pageno,
 		NumberOfResults:     resp.NumberOfResults,
 		UnresponsiveEngines: resp.UnresponsiveEngines,
+		FaviconService:      faviconService,
 
 		// New: categories with icons
-		Categories: []string{"all", "news", "images", "videos", "maps"},
+		Categories:         []string{"all", "news", "images", "videos", "maps"},
 		DisabledCategories: []string{"shopping", "music", "weather"},
 		CategoryIcons: map[string]string{
 			"all":      "🌐",
@@ -168,6 +202,7 @@ func FromResponse(resp contracts.SearchResponse, query string, pageno int, activ
 			"weather":  "🌤️",
 		},
 		ActiveCategory: activeCategory,
+		IsImageSearch:  activeCategory == "images",
 
 		// Time filters
 		TimeFilters: []FilterOption{
@@ -198,12 +233,23 @@ func FromResponse(resp contracts.SearchResponse, query string, pageno int, activ
 			tmplName = "video_item"
 		}
 		// Sanitize URLs to prevent javascript:/data: scheme injection.
+		var domain string
 		if r.URL != nil {
 			safe := util.SanitizeResultURL(*r.URL)
 			r.URL = &safe
+			if u, err := url.Parse(safe); err == nil {
+				domain = u.Hostname()
+			}
 		}
 		r.Thumbnail = util.SanitizeResultURL(r.Thumbnail)
-		pd.Results[i] = ResultView{MainResult: r, TemplateName: tmplName}
+		pd.Results[i] = ResultView{
+			MainResult:     r,
+			TemplateName:   tmplName,
+			Domain:         domain,
+			FaviconIconURL: faviconIconURL(faviconService, domain),
+			SafeTitle:      template.HTML(html.UnescapeString(r.Title)),
+			SafeContent:    template.HTML(html.UnescapeString(r.Content)),
+		}
 	}
 
 	// Convert answers (they're map[string]any — extract string values).
@@ -228,7 +274,10 @@ func FromResponse(resp contracts.SearchResponse, query string, pageno int, activ
 		if v, ok := ib["img_src"].(string); ok {
 			iv.ImgSrc = util.SanitizeResultURL(v)
 		}
-		if iv.Title != "" || iv.Content != "" {
+		if v, ok := ib["url"].(string); ok {
+			iv.URL = util.SanitizeResultURL(v)
+		}
+		if iv.Title != "" || iv.Content != "" || iv.ImgSrc != "" {
 			pd.Infoboxes = append(pd.Infoboxes, iv)
 		}
 	}
@@ -260,9 +309,9 @@ func FromResponse(resp contracts.SearchResponse, query string, pageno int, activ
 }
 
 // RenderIndex renders the homepage (search box only).
-func RenderIndex(w http.ResponseWriter, sourceURL string) error {
+func RenderIndex(w http.ResponseWriter, sourceURL, theme string) error {
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	return tmplIndex.ExecuteTemplate(w, "base", PageData{ShowHeader: true, SourceURL: sourceURL})
+	return tmplIndex.ExecuteTemplate(w, "base", PageData{ShowHeader: true, SourceURL: sourceURL, Theme: theme})
 }
 
 // RenderSearch renders the full search results page (with base layout).
@@ -306,8 +355,12 @@ func RenderSearchAuto(w http.ResponseWriter, r *http.Request, data PageData) err
 }
 
 // RenderPreferences renders the full preferences page.
-func RenderPreferences(w http.ResponseWriter, sourceURL string) error {
+func RenderPreferences(w http.ResponseWriter, sourceURL, theme, faviconService string) error {
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	return tmplPreferences.ExecuteTemplate(w, "base", PageData{ShowHeader: true, SourceURL: sourceURL})
+	return tmplPreferences.ExecuteTemplate(w, "base", PageData{
+		ShowHeader:     true,
+		SourceURL:      sourceURL,
+		Theme:          theme,
+		FaviconService: faviconService,
+	})
 }
-
diff --git a/internal/views/views_test.go b/internal/views/views_test.go
index 3f3c289..f83c017 100644
--- a/internal/views/views_test.go
+++ b/internal/views/views_test.go
@@ -1,9 +1,10 @@
 package views
 
 import (
+	"strings"
 	"testing"
 
-	"github.com/metamorphosis-dev/kafka/internal/contracts"
+	"github.com/metamorphosis-dev/samsa/internal/contracts"
 )
 
 func mockSearchResponse(query string, numResults int) contracts.SearchResponse {
@@ -36,11 +37,11 @@ func mockEmptyResponse() contracts.SearchResponse {
 }
 
 func TestFromResponse_Basic(t *testing.T) {
-	resp := mockSearchResponse("kafka trial", 42)
-	data := FromResponse(resp, "kafka trial", 1, "", "", "")
+	resp := mockSearchResponse("samsa trial", 42)
+	data := FromResponse(resp, "samsa trial", 1, "", "", "", "none")
 
-	if data.Query != "kafka trial" {
-		t.Errorf("expected query 'kafka trial', got %q", data.Query)
+	if data.Query != "samsa trial" {
+		t.Errorf("expected query 'samsa trial', got %q", data.Query)
 	}
 	if data.NumberOfResults != 42 {
 		t.Errorf("expected 42 results, got %d", data.NumberOfResults)
@@ -55,7 +56,7 @@ func TestFromResponse_Basic(t *testing.T) {
 
 func TestFromResponse_Pagination(t *testing.T) {
 	resp := mockSearchResponse("test", 100)
-	data := FromResponse(resp, "test", 3, "", "", "")
+	data := FromResponse(resp, "test", 3, "", "", "", "none")
 
 	if data.PrevPage != 2 {
 		t.Errorf("expected PrevPage 2, got %d", data.PrevPage)
@@ -80,7 +81,7 @@ func TestFromResponse_Pagination(t *testing.T) {
 }
 
 func TestFromResponse_Empty(t *testing.T) {
-	data := FromResponse(mockEmptyResponse(), "", 1, "", "", "")
+	data := FromResponse(mockEmptyResponse(), "", 1, "", "", "", "none")
 
 	if data.NumberOfResults != 0 {
 		t.Errorf("expected 0 results, got %d", data.NumberOfResults)
@@ -90,6 +91,31 @@ func TestFromResponse_Empty(t *testing.T) {
 	}
 }
 
+func TestFromResponse_FaviconIconURL(t *testing.T) {
+	u := "https://example.com/path"
+	resp := contracts.SearchResponse{
+		Query:               "q",
+		NumberOfResults:     1,
+		Results:             []contracts.MainResult{{Title: "t", URL: &u, Engine: "bing"}},
+		Answers:             []map[string]any{},
+		Corrections:         []string{},
+		Infoboxes:           []map[string]any{},
+		Suggestions:         []string{},
+		UnresponsiveEngines:   [][2]string{},
+	}
+	data := FromResponse(resp, "q", 1, "", "", "", "google")
+	if len(data.Results) != 1 {
+		t.Fatalf("expected 1 result, got %d", len(data.Results))
+	}
+	got := data.Results[0].FaviconIconURL
+	if got == "" || !strings.Contains(got, "google.com/s2/favicons") {
+		t.Fatalf("expected google favicon URL, got %q", got)
+	}
+	if !strings.Contains(got, "example.com") {
+		t.Fatalf("expected domain in favicon URL, got %q", got)
+	}
+}
+
 func TestIsHTMXRequest(t *testing.T) {
 	tests := []struct {
 		name    string