diff --git a/README.md b/README.md
index 1d9e376..3956449 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ svelte bsky client, wip
 
 - make everything faster, faster, faster
 - add post creator
-- allow setting default feed
+- add keyboard bindings (e.g. j/k to navigate, enter to open post, r to reply, etc)
 
 ## posts
 
@@ -39,4 +39,9 @@ svelte bsky client, wip
 
 ## settings
 
-- allow setting theme (auto/dark/light) and theme colors (base and accent color)
\ No newline at end of file
+- allow setting theme (auto/dark/light) and theme colors (base and accent color)
+- allow setting default feed
+
+## bugs
+
+- fix feed flashing sometimes
\ No newline at end of file
diff --git a/src/lib/atproto/server/feed.remote.ts b/src/lib/atproto/server/feed.remote.ts
index 0b9e8df..2e68784 100644
--- a/src/lib/atproto/server/feed.remote.ts
+++ b/src/lib/atproto/server/feed.remote.ts
@@ -57,6 +57,57 @@ export const unlikePost = command(
 	}
 );
 
+export const followUser = command(
+	v.object({
+		did: v.string()
+	}),
+	async (input) => {
+		const { locals } = getRequestEvent();
+		if (!locals.client || !locals.did) error(401, 'Not authenticated');
+
+		const rkey = TID.now();
+		const res = await locals.client.post('com.atproto.repo.createRecord', {
+			input: {
+				repo: locals.did,
+				collection: 'app.bsky.graph.follow',
+				rkey,
+				record: {
+					$type: 'app.bsky.graph.follow',
+					subject: input.did,
+					createdAt: new Date().toISOString()
+				}
+			}
+		});
+
+		if (!res.ok) error(res.status, 'Failed to follow');
+		return { uri: res.data.uri };
+	}
+);
+
+export const unfollowUser = command(
+	v.object({
+		followUri: v.string()
+	}),
+	async (input) => {
+		const { locals } = getRequestEvent();
+		if (!locals.client || !locals.did) error(401, 'Not authenticated');
+
+		const parts = input.followUri.split('/');
+		const rkey = parts[parts.length - 1];
+
+		const res = await locals.client.post('com.atproto.repo.deleteRecord', {
+			input: {
+				repo: locals.did,
+				collection: 'app.bsky.graph.follow',
+				rkey
+			}
+		});
+
+		if (!res.ok) error(res.status, 'Failed to unfollow');
+		return { ok: true };
+	}
+);
+
 export const getPostThread = command(
 	v.object({
 		uri: v.string(),
@@ -106,6 +157,30 @@ export const getAuthorFeed = command(
 	}
 );
 
+export const searchPosts = command(
+	v.object({
+		q: v.string(),
+		cursor: v.optional(v.string())
+	}),
+	async (input) => {
+		const { locals } = getRequestEvent();
+
+		const client = locals.client ?? new Client({
+			handler: simpleFetchHandler({ service: 'https://public.api.bsky.app' })
+		});
+
+		const res = await client.get('app.bsky.feed.searchPosts', {
+			params: {
+				q: input.q,
+				limit: 25,
+				...(input.cursor ? { cursor: input.cursor } : {})
+			}
+		});
+		if (!res.ok) error(res.status, 'Failed to search posts');
+		return { posts: res.data.posts, cursor: res.data.cursor ?? null };
+	}
+);
+
 export const loadFeed = command(
 	v.object({
 		feedUri: v.string(),
@@ -129,3 +204,67 @@ export const loadFeed = command(
 		return { posts: res.data.feed, cursor: res.data.cursor ?? null };
 	}
 );
+
+export const createBookmark = command(
+	v.object({
+		uri: v.string(),
+		cid: v.string()
+	}),
+	async (input) => {
+		const { locals } = getRequestEvent();
+		if (!locals.client || !locals.did) error(401, 'Not authenticated');
+
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		const opts: any = { as: null, input: { uri: input.uri, cid: input.cid } };
+		const res = await locals.client.post('app.bsky.bookmark.createBookmark' as any, opts); // eslint-disable-line @typescript-eslint/no-explicit-any
+		if (!res.ok) error(res.status, 'Failed to bookmark');
+		return { ok: true };
+	}
+);
+
+export const deleteBookmark = command(
+	v.object({
+		uri: v.string()
+	}),
+	async (input) => {
+		const { locals } = getRequestEvent();
+		if (!locals.client || !locals.did) error(401, 'Not authenticated');
+
+		try {
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const opts: any = { as: null, input: { uri: input.uri } };
+			await locals.client.post('app.bsky.bookmark.deleteBookmark' as any, opts); // eslint-disable-line @typescript-eslint/no-explicit-any
+		} catch (e: any) { // eslint-disable-line @typescript-eslint/no-explicit-any
+			console.error('[deleteBookmark] error:', e?.status, e?.body ?? e?.message ?? e);
+			error(e?.status ?? 500, 'Failed to remove bookmark');
+		}
+		return { ok: true };
+	}
+);
+
+export const getBookmarks = command(
+	v.object({
+		cursor: v.optional(v.string()),
+		limit: v.optional(v.number())
+	}),
+	async (input) => {
+		const { locals } = getRequestEvent();
+		if (!locals.client || !locals.did) error(401, 'Not authenticated');
+
+		const res = await locals.client.get('app.bsky.bookmark.getBookmarks' as any, { // eslint-disable-line @typescript-eslint/no-explicit-any
+			params: {
+				limit: input.limit ?? 30,
+				...(input.cursor ? { cursor: input.cursor } : {})
+			}
+		});
+
+		if (!res.ok) error(res.status, 'Failed to load bookmarks');
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		const data = res.data as any;
+		// API returns [{ createdAt, subject, item: PostView }]
+		const raw = data.items ?? data.bookmarks ?? [];
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		const posts = raw.map((entry: any) => entry.item ?? entry.post ?? entry);
+		return { posts, cursor: data.cursor ?? null };
+	}
+);
diff --git a/src/lib/bookmarks.svelte.ts b/src/lib/bookmarks.svelte.ts
new file mode 100644
index 0000000..b2796f7
--- /dev/null
+++ b/src/lib/bookmarks.svelte.ts
@@ -0,0 +1,27 @@
+import { createBookmark, deleteBookmark } from '$lib/atproto/server/feed.remote';
+
+// Track bookmark state: postUri -> bookmarked
+let _bookmarkState = $state<Record<string, boolean>>({});
+
+export const bookmarks = {
+	isBookmarked(postUri: string, viewerBookmark?: boolean): boolean {
+		if (postUri in _bookmarkState) return _bookmarkState[postUri];
+		return !!viewerBookmark;
+	},
+
+	async toggle(postUri: string, postCid: string, viewerBookmark?: boolean) {
+		const currentlyBookmarked = this.isBookmarked(postUri, viewerBookmark);
+		// Optimistic update
+		_bookmarkState[postUri] = !currentlyBookmarked;
+		try {
+			if (currentlyBookmarked) {
+				await deleteBookmark({ uri: postUri });
+			} else {
+				await createBookmark({ uri: postUri, cid: postCid });
+			}
+		} catch {
+			// Revert on failure
+			_bookmarkState[postUri] = currentlyBookmarked;
+		}
+	}
+};
diff --git a/src/lib/components/ScrollToTop.svelte b/src/lib/components/ScrollToTop.svelte
new file mode 100644
index 0000000..95cec04
--- /dev/null
+++ b/src/lib/components/ScrollToTop.svelte
@@ -0,0 +1,24 @@
+<script lang="ts">
+	import { ArrowUp } from '@lucide/svelte';
+
+	let visible = $state(false);
+
+	function onscroll() {
+		visible = window.scrollY > 800;
+	}
+
+	function scrollToTop() {
+		window.scrollTo({ top: 0, behavior: 'smooth' });
+	}
+</script>
+
+<svelte:window {onscroll} />
+
+{#if visible}
+	<button
+		onclick={scrollToTop}
+		class="fixed bottom-6 right-6 z-40 cursor-pointer rounded-full bg-base-900/80 p-3 text-white shadow-lg backdrop-blur-sm transition-opacity hover:bg-base-900 dark:bg-base-100/80 dark:text-base-900 dark:hover:bg-base-100"
+	>
+		<ArrowUp size={20} />
+	</button>
+{/if}
diff --git a/src/lib/components/action-buttons/BookmarkButton.svelte b/src/lib/components/action-buttons/BookmarkButton.svelte
index 455f445..7b1bc2f 100644
--- a/src/lib/components/action-buttons/BookmarkButton.svelte
+++ b/src/lib/components/action-buttons/BookmarkButton.svelte
@@ -11,7 +11,7 @@
 			xmlns="http://www.w3.org/2000/svg"
 			viewBox="0 0 24 24"
 			fill="currentColor"
-			class="group-hover/post-action:bg-accent-500/10 text-accent-700 dark:text-accent-400 -m-1.5 size-7 rounded-full p-1.5 transition-all duration-100"
+			class="group-hover/post-action:bg-accent-500/10 text-accent-700 dark:text-accent-400 -m-1 size-6 rounded-full p-1 transition-all duration-100"
 		>
 			<path
 				fill-rule="evenodd"
@@ -26,7 +26,7 @@
 			viewBox="0 0 24 24"
 			stroke-width="1.5"
 			stroke="currentColor"
-			class="group-hover/post-action:bg-accent-500/10 group-hover/post-action:text-accent-700 dark:group-hover/post-action:text-accent-400 -m-1.5 size-7 rounded-full p-1.5 transition-all duration-100"
+			class="group-hover/post-action:bg-accent-500/10 group-hover/post-action:text-accent-700 dark:group-hover/post-action:text-accent-400 -m-1 size-6 rounded-full p-1 transition-all duration-100"
 		>
 			<path
 				stroke-linecap="round"
@@ -39,13 +39,13 @@
 
 {#if onclick}
 	<button
-		class="group/post-action inline-flex cursor-pointer items-center gap-2 text-sm"
+		class="group/post-action inline-flex cursor-pointer items-center gap-1 text-xs"
 		{onclick}
 	>
 		{@render icon()}
 	</button>
 {:else}
-	<span class="inline-flex items-center gap-2 text-sm">
+	<span class="inline-flex items-center gap-1 text-xs">
 		{@render icon()}
 	</span>
 {/if}
diff --git a/src/lib/components/action-buttons/ReplyButton.svelte b/src/lib/components/action-buttons/ReplyButton.svelte
index c3021ed..1fc9452 100644
--- a/src/lib/components/action-buttons/ReplyButton.svelte
+++ b/src/lib/components/action-buttons/ReplyButton.svelte
@@ -36,7 +36,6 @@
 	<a
 		class="group/post-action inline-flex cursor-pointer items-center gap-1 text-xs"
 		{href}
-		target="_blank"
 	>
 		{@render icon()}
 	</a>
diff --git a/src/lib/components/bluesky-post/index.ts b/src/lib/components/bluesky-post/index.ts
index d8e6336..bb1e6b0 100644
--- a/src/lib/components/bluesky-post/index.ts
+++ b/src/lib/components/bluesky-post/index.ts
@@ -9,11 +9,11 @@ export type BlueskyHrefs = {
 	hashtag?: (tag: string) => string;
 };
 
-function defaultHrefs(baseUrl: string): Required<BlueskyHrefs> {
+function defaultHrefs(_baseUrl: string): Required<BlueskyHrefs> {
 	return {
-		profile: (handle, did) => `${baseUrl}/profile/${did ?? handle}`,
-		post: (handle, postId) => `${baseUrl}/profile/${handle}/post/${postId}`,
-		hashtag: (tag) => `${baseUrl}/hashtag/${tag}`
+		profile: (handle) => `/profile/${handle}`,
+		post: (handle, postId) => `/profile/${handle}/post/${postId}`,
+		hashtag: (tag) => `/hashtag/${tag}`
 	};
 }
 
diff --git a/src/lib/components/embed/ImageLightbox.svelte b/src/lib/components/embed/ImageLightbox.svelte
index 3241cd5..110ab98 100644
--- a/src/lib/components/embed/ImageLightbox.svelte
+++ b/src/lib/components/embed/ImageLightbox.svelte
@@ -15,6 +15,24 @@
 		lightboxState.open = false;
 	}
 
+	async function download() {
+		const img = lightboxState.images[lightboxState.index];
+		if (!img?.fullsize) return;
+		try {
+			const res = await fetch(img.fullsize);
+			const blob = await res.blob();
+			const url = URL.createObjectURL(blob);
+			const a = document.createElement('a');
+			a.href = url;
+			a.download = `image-${lightboxState.index + 1}.jpg`;
+			a.click();
+			URL.revokeObjectURL(url);
+		} catch {
+			// Fallback: open in new tab
+			window.open(img.fullsize, '_blank');
+		}
+	}
+
 	function onkeydown(event: KeyboardEvent) {
 		if (!lightboxState.open) return;
 		if (event.key === 'Escape') {
@@ -40,6 +58,29 @@
 		aria-modal="true"
 		aria-label={image.alt}
 	>
+		<!-- Top bar: close and download -->
+		<!-- svelte-ignore a11y_click_events_have_key_events, a11y_no_static_element_interactions -->
+		<div class="absolute top-4 right-4 z-10 flex gap-2" onclick={(e) => e.stopPropagation()}>
+			<button
+				class="rounded-full bg-white/20 p-2 text-white backdrop-blur-sm hover:bg-white/30 cursor-pointer transition-colors"
+				onclick={download}
+				aria-label="Download image"
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-5">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75V16.5M16.5 12 12 16.5m0 0L7.5 12m4.5 4.5V3" />
+				</svg>
+			</button>
+			<button
+				class="rounded-full bg-white/20 p-2 text-white backdrop-blur-sm hover:bg-white/30 cursor-pointer transition-colors"
+				onclick={close}
+				aria-label="Close"
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-5">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+				</svg>
+			</button>
+		</div>
+
 		{#if lightboxState.images.length > 1 && lightboxState.index > 0}
 			<!-- svelte-ignore a11y_click_events_have_key_events, a11y_no_static_element_interactions -->
 			<div class="absolute left-4 z-10" onclick={(e) => e.stopPropagation()}>
@@ -54,12 +95,10 @@
 			</div>
 		{/if}
 
-		<!-- svelte-ignore a11y_click_events_have_key_events, a11y_no_noninteractive_element_interactions -->
 		<img
 			src={image.fullsize}
 			alt={image.alt}
-			class="max-h-full max-w-full object-contain"
-			onclick={(e) => e.stopPropagation()}
+			class="h-full w-full object-contain"
 		/>
 
 		{#if lightboxState.images.length > 1 && lightboxState.index < lightboxState.images.length - 1}
diff --git a/src/lib/components/embed/index.ts b/src/lib/components/embed/index.ts
index 7027a26..5bc6352 100644
--- a/src/lib/components/embed/index.ts
+++ b/src/lib/components/embed/index.ts
@@ -39,7 +39,7 @@ export function wireEmbedClicks(
 				}
 			};
 			embed.record.onclickhandle = (handle) => navigateToProfile(handle);
-			embed.record.handleHref = (handle) => `/p/${handle}`;
+			embed.record.handleHref = (handle) => `/profile/${handle}`;
 		}
 	}
 	return embeds;
diff --git a/src/lib/components/nested-comments/Comment.svelte b/src/lib/components/nested-comments/Comment.svelte
index 6cd4ee5..44f7f6a 100644
--- a/src/lib/components/nested-comments/Comment.svelte
+++ b/src/lib/components/nested-comments/Comment.svelte
@@ -39,7 +39,7 @@
 
 <div class="relative isolate min-w-0">
 	<button
-		class="group absolute top-0 left-0 flex h-full w-7 cursor-pointer items-center"
+		class="group absolute top-0 left-2 flex h-full w-3 z-10 cursor-pointer items-center"
 		onclick={() => (expanded = !expanded)}
 	>
 		<div
@@ -78,7 +78,7 @@
 	</div>
 
 	{#if comment.replies?.length && depth <= maxDepth && expanded}
-	<div class="pl-5">
+	<div class="pl-3.5">
 		{#each comment.replies.toSorted(sort) as reply (reply.id ?? reply.href ?? reply.createdAt + reply.author.handle)}
 			<Comment
 				comment={reply}
diff --git a/src/lib/components/user-profile/UserProfile.svelte b/src/lib/components/user-profile/UserProfile.svelte
index 971f942..80f6193 100644
--- a/src/lib/components/user-profile/UserProfile.svelte
+++ b/src/lib/components/user-profile/UserProfile.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
+	import type { Snippet } from 'svelte';
 	import { Avatar, Button, cn, sanitize } from '@foxui/core';
 
-	let { profile, class: className }: { profile: {
+	let { profile, class: className, children }: { profile: {
 		banner?: string;
 		avatar?: string;
 		displayName?: string;
 		handle?: string;
 		description?: string;
-	}, class: string; } = $props();
+	}, class: string; children?: Snippet } = $props();
 </script>
 
 {#if profile}
@@ -53,6 +54,12 @@
 			<!-- <Button>Follow</Button> -->
 		</div>
 
+		{#if children}
+			<div class="px-4 sm:px-6 lg:px-8 pt-3">
+				{@render children()}
+			</div>
+		{/if}
+
 		<div class="px-4 sm:px-6 lg:px-8 py-4 text-xs sm:text-sm text-base-800 dark:text-base-200">
 			{@html sanitize(profile.description?.replaceAll('\n', '<br/>') ?? '')}
 		</div>
diff --git a/src/lib/db.svelte.ts b/src/lib/db.svelte.ts
index e76202a..7944b7d 100644
--- a/src/lib/db.svelte.ts
+++ b/src/lib/db.svelte.ts
@@ -21,6 +21,7 @@ interface CacheEntry {
 	key: string;
 	value: string; // JSON-serialized
 	expiresAt: number; // timestamp, 0 = no expiry
+	createdAt: number; // when the entry was written
 	accessedAt: number; // for LRU eviction
 }
 
@@ -43,7 +44,7 @@ class AppDatabase extends Dexie {
 
 	constructor() {
 		super('atmo-social');
-		this.version(1).stores({
+		this.version(2).stores({
 			identity: 'key, expiresAt, accessedAt',
 			profiles: 'key, expiresAt, accessedAt',
 			posts: 'key, expiresAt, accessedAt',
@@ -95,7 +96,7 @@ class CacheStore<T> {
 	}
 
 	/**
-	 * Returns the age of a cached entry in ms, or undefined if not cached.
+	 * Returns the age of a cached entry in ms (since it was written), or undefined if not cached/expired.
 	 */
 	async getAge(key: string): Promise<number | undefined> {
 		const now = Date.now();
@@ -105,7 +106,7 @@ class CacheStore<T> {
 				const entry = await table.get(key);
 				if (!entry) return undefined;
 				if (entry.expiresAt > 0 && entry.expiresAt < now) return undefined;
-				return now - entry.accessedAt;
+				return now - entry.createdAt;
 			}
 		} catch {
 			// fall through to memory
@@ -114,7 +115,7 @@ class CacheStore<T> {
 		const entry = mem.get(key);
 		if (!entry) return undefined;
 		if (entry.expiresAt > 0 && entry.expiresAt < now) return undefined;
-		return now - entry.accessedAt;
+		return now - entry.createdAt;
 	}
 
 	async get(key: string): Promise<T | undefined> {
@@ -154,6 +155,7 @@ class CacheStore<T> {
 			key,
 			value: JSON.stringify(value),
 			expiresAt: this.config.ttl ? now + this.config.ttl : 0,
+			createdAt: now,
 			accessedAt: now
 		};
 
@@ -179,6 +181,7 @@ class CacheStore<T> {
 			key,
 			value: JSON.stringify(value),
 			expiresAt: this.config.ttl ? now + this.config.ttl : 0,
+			createdAt: now,
 			accessedAt: now
 		}));
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index b1f55d8..40d19bd 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,12 +2,13 @@
 	import '../app.css';
 	import { onMount, onDestroy } from 'svelte';
 	import { Head, ThemeToggle, Avatar, Button } from '@foxui/core';
-	import { House, MessageCircle, Bell } from '@lucide/svelte';
+	import { House, MessageCircle, Bell, Search, Bookmark } from '@lucide/svelte';
 	import { goto } from '$app/navigation';
 	import { user } from '$lib/atproto/auth.svelte';
 	import { notificationsCache, startUnreadPoll, stopUnreadPoll, chatUnreadCount, startChatPoll, stopChatPoll, applyPendingFeed, startFeedPoll, stopFeedPoll, hydrateFromDb } from '$lib/cache.svelte';
 	import LoginModal, { loginModalState } from '$lib/LoginModal.svelte';
 	import ImageLightbox from '$lib/components/embed/ImageLightbox.svelte';
+	import ScrollToTop from '$lib/components/ScrollToTop.svelte';
 	import Sidebar from '$lib/Sidebar.svelte';
 	let { children } = $props();
 
@@ -31,6 +32,9 @@
 	<Button href="/" onmousedown={(e: MouseEvent) => { e.preventDefault(); applyPendingFeed(); window.scrollTo(0, 0); goto('/'); }} variant="ghost" size="icon">
 		<House size={20} />
 	</Button>
+	<Button href="/search" onmousedown={(e: MouseEvent) => { e.preventDefault(); goto('/search'); }} variant="ghost" size="icon">
+		<Search size={20} />
+	</Button>
 	<Button href="/chat" onmousedown={(e: MouseEvent) => { e.preventDefault(); goto('/chat'); }} variant="ghost" size="icon" class="relative">
 		<MessageCircle size={20} />
 		{#if chatUnreadCount.count > 0}
@@ -47,9 +51,14 @@
 			</span>
 		{/if}
 	</Button>
+	{#if user.did}
+		<Button href="/bookmarks" onmousedown={(e: MouseEvent) => { e.preventDefault(); goto('/bookmarks'); }} variant="ghost" size="icon">
+			<Bookmark size={20} />
+		</Button>
+	{/if}
 	<ThemeToggle class="mt-auto" />
 	{#if user.did}
-		{@const profileHref = `/p/${user.profile?.handle ?? user.did}`}
+		{@const profileHref = `/profile/${user.profile?.handle ?? user.did}`}
 		<Button href={profileHref} onmousedown={(e: MouseEvent) => { e.preventDefault(); goto(profileHref); }} variant="ghost" size="icon" class="mb-2">
 			<Avatar src={user.profile?.avatar} class="size-8" />
 		</Button>
@@ -66,6 +75,7 @@
 
 <LoginModal />
 <ImageLightbox />
+<ScrollToTop />
 
 <Head
 	title="atmo.social"
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 9d28f58..849dc7b 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -8,6 +8,7 @@
 	import { loadFeed, likePost, unlikePost } from '$lib/atproto/server/feed.remote';
 	import { cachePosts, prefetchThread, feedCache, prefetchNotifications, setFeedUri } from '$lib/cache.svelte';
 	import { wireEmbedClicks } from '$lib/components/embed';
+	import { bookmarks } from '$lib/bookmarks.svelte';
 
 	const LOGGED_IN_FEED = 'at://did:plc:3guzzweuqraryl3rdkimjamk/app.bsky.feed.generator/for-you';
 	const PUBLIC_FEED = 'at://did:plc:w4xbfzo7kqfes5zb7r6qv3rw/app.bsky.feed.generator/blacksky-trend';
@@ -157,10 +158,10 @@
 										const rootUri = record.reply.root.uri as string;
 										const [, , rootDid, , rootRkey] = rootUri.split('/');
 										const clickedRkey = feedPost.post.uri.split('/').pop();
-										return `/p/${rootDid}/post/${rootRkey}?highlight=${feedPost.post.author.handle}/${clickedRkey}`;
+										return `/profile/${rootDid}/post/${rootRkey}?highlight=${feedPost.post.author.handle}/${clickedRkey}`;
 									} else {
 										const rkey = feedPost.post.uri.split('/').pop();
-										return `/p/${feedPost.post.author.handle}/post/${rkey}`;
+										return `/profile/${feedPost.post.author.handle}/post/${rkey}`;
 									}
 								})()}
 								<div
@@ -169,14 +170,15 @@
 									<Post
 									compact={true}
 										data={postData}
-										embeds={wireEmbedClicks(embeds, (handle, rkey) => goto(`/p/${handle}/post/${rkey}`), (handle) => goto(`/p/${handle}`))}
+										embeds={wireEmbedClicks(embeds, (handle, rkey) => goto(`/profile/${handle}/post/${rkey}`), (handle) => goto(`/profile/${handle}`))}
 										href={postHref}
-										onclickhandle={(handle) => goto(`/p/${handle}`)}
-										handleHref={(handle) => `/p/${handle}`}
+										onclickhandle={(handle) => goto(`/profile/${handle}`)}
+										handleHref={(handle) => `/profile/${handle}`}
 										actions={user.did
 											? {
 													reply: {
-														count: postData.replyCount
+														count: postData.replyCount,
+														href: postHref + '#replies'
 													},
 													repost: {
 														count: postData.repostCount
@@ -185,11 +187,16 @@
 														count: getLikeCount(feedPost.post.uri, postData.likeCount ?? 0),
 														active: isLiked(feedPost.post.uri, feedPost.post.viewer?.like),
 														onclick: () => handleLike(feedPost.post.uri, feedPost.post.cid, feedPost.post.viewer?.like)
+													},
+													bookmark: {
+														active: bookmarks.isBookmarked(feedPost.post.uri, feedPost.post.viewer?.bookmarked),
+														onclick: () => bookmarks.toggle(feedPost.post.uri, feedPost.post.cid, feedPost.post.viewer?.bookmarked)
 													}
 												}
 											: {
 													reply: {
-														count: postData.replyCount
+														count: postData.replyCount,
+														href: postHref + '#replies'
 													},
 													repost: {
 														count: postData.repostCount
diff --git a/src/routes/bookmarks/+page.svelte b/src/routes/bookmarks/+page.svelte
new file mode 100644
index 0000000..d507e50
--- /dev/null
+++ b/src/routes/bookmarks/+page.svelte
@@ -0,0 +1,194 @@
+<script lang="ts">
+	import { onMount, onDestroy } from 'svelte';
+	import { goto } from '$app/navigation';
+	import { user } from '$lib/atproto/auth.svelte';
+	import { blueskyPostToPostData } from '$lib/components';
+	import { Post } from '$lib/components';
+	import { ArrowLeft, Loader2 } from '@lucide/svelte';
+	import { likePost, unlikePost, getBookmarks } from '$lib/atproto/server/feed.remote';
+	import { cachePosts, prefetchThread } from '$lib/cache.svelte';
+	import { wireEmbedClicks } from '$lib/components/embed';
+	import { bookmarks } from '$lib/bookmarks.svelte';
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	let posts = $state<any[]>([]);
+	let cursor = $state<string | null>(null);
+	let loading = $state(true);
+	let loadingMore = $state(false);
+
+	let likeState = $state<Record<string, string | null>>({});
+	let likeCountDelta = $state<Record<string, number>>({});
+
+	function isLiked(postUri: string, viewerLike?: string): boolean {
+		if (postUri in likeState) return likeState[postUri] !== null;
+		return !!viewerLike;
+	}
+
+	function getLikeCount(postUri: string, originalCount: number): number {
+		return originalCount + (likeCountDelta[postUri] ?? 0);
+	}
+
+	async function handleLike(postUri: string, postCid: string, viewerLike?: string) {
+		const currentlyLiked = isLiked(postUri, viewerLike);
+		if (currentlyLiked) {
+			const likeUri = likeState[postUri] ?? viewerLike;
+			if (!likeUri) return;
+			likeState[postUri] = null;
+			likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) - 1;
+			try {
+				await unlikePost({ likeUri });
+			} catch {
+				likeState[postUri] = likeUri;
+				likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) + 1;
+			}
+		} else {
+			likeState[postUri] = 'pending';
+			likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) + 1;
+			try {
+				const result = await likePost({ uri: postUri, cid: postCid });
+				likeState[postUri] = result.uri;
+			} catch {
+				likeState[postUri] = null;
+				likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) - 1;
+			}
+		}
+	}
+
+	onMount(async () => {
+		if (!user.did) {
+			goto('/');
+			return;
+		}
+		try {
+			const result = await getBookmarks({});
+			posts = JSON.parse(JSON.stringify(result.posts));
+			cachePosts(posts);
+			for (const p of posts) {
+				const post = p.post ?? p;
+				if (post?.uri) prefetchThread(post.uri);
+			}
+			cursor = result.cursor;
+		} catch (e) {
+			console.error('Failed to load bookmarks:', e);
+		} finally {
+			loading = false;
+		}
+	});
+
+	async function loadMore() {
+		if (loadingMore || !cursor) return;
+		loadingMore = true;
+		try {
+			const result = await getBookmarks({ cursor });
+			const newPosts = JSON.parse(JSON.stringify(result.posts));
+			cachePosts(newPosts);
+			for (const p of newPosts) {
+				const post = p.post ?? p;
+				if (post?.uri) prefetchThread(post.uri);
+			}
+			posts = [...posts, ...newPosts];
+			cursor = result.cursor;
+		} catch (e) {
+			console.error('Failed to load more bookmarks:', e);
+		} finally {
+			loadingMore = false;
+		}
+	}
+
+	function handleScroll() {
+		if (loadingMore || !cursor) return;
+		const { scrollTop, scrollHeight, clientHeight } = document.documentElement;
+		if (scrollHeight - scrollTop - clientHeight < 2000) {
+			loadMore();
+		}
+	}
+
+	onMount(() => window.addEventListener('scroll', handleScroll));
+	onDestroy(() => {
+		if (typeof window !== 'undefined') window.removeEventListener('scroll', handleScroll);
+	});
+
+	// Posts are already normalized to PostView by the server command
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	function getPostView(item: any) {
+		return item;
+	}
+</script>
+
+<div class="flex h-dvh flex-col">
+	<div class="mx-auto w-full max-w-lg py-4">
+		<div class="mb-2 ml-4 flex items-center gap-2 sm:ml-0">
+			<button
+				onclick={() => history.back()}
+				class="text-base-500 hover:text-base-700 dark:text-base-400 dark:hover:text-base-200 rounded-lg p-1.5 transition-colors"
+			>
+				<ArrowLeft size={20} />
+			</button>
+			<h1 class="text-base-900 dark:text-base-100 text-lg font-semibold">Bookmarks</h1>
+		</div>
+
+		{#if loading}
+			<div class="flex items-center justify-center py-12">
+				<Loader2 class="text-base-400 animate-spin" size={28} />
+			</div>
+		{:else if posts.length === 0}
+			<div class="flex items-center justify-center py-12">
+				<p class="text-base-400 text-sm">No bookmarks yet</p>
+			</div>
+		{:else}
+			<div>
+				{#each posts as item, i (getPostView(item)?.uri ? `${getPostView(item).uri}-${i}` : i)}
+					{@const postView = getPostView(item)}
+					{#if postView?.uri && postView?.author}
+						{@const { postData, embeds } = blueskyPostToPostData(postView, 'https://bsky.app')}
+						{@const postHref = `/profile/${postView.author.handle}/post/${postView.uri.split('/').pop()}`}
+						<div class="-mx-2 px-6 pt-3 pb-2 sm:px-2 rounded-xl hover:bg-base-100/50 dark:hover:bg-base-800/30 transition-colors">
+							<Post
+								compact={true}
+								data={postData}
+								embeds={wireEmbedClicks(embeds, (handle, rkey) => goto(`/profile/${handle}/post/${rkey}`), (handle) => goto(`/profile/${handle}`))}
+								href={postHref}
+								onclickhandle={(handle) => goto(`/profile/${handle}`)}
+								handleHref={(handle) => `/profile/${handle}`}
+								actions={user.did
+									? {
+											reply: { count: postData.replyCount },
+											repost: { count: postData.repostCount },
+											like: {
+												count: getLikeCount(postView.uri, postData.likeCount ?? 0),
+												active: isLiked(postView.uri, postView.viewer?.like),
+												onclick: () => handleLike(postView.uri, postView.cid, postView.viewer?.like)
+											},
+											bookmark: {
+												active: bookmarks.isBookmarked(postView.uri, postView.viewer?.bookmarked),
+												onclick: () => bookmarks.toggle(postView.uri, postView.cid, postView.viewer?.bookmarked)
+											}
+										}
+									: {
+											reply: { count: postData.replyCount },
+											repost: { count: postData.repostCount },
+											like: { count: postData.likeCount }
+										}}
+							/>
+						</div>
+						{#if i < posts.length - 1}
+							<hr class="border-base-200 dark:border-base-800 mx-4 sm:mx-0" />
+						{/if}
+					{/if}
+				{/each}
+			</div>
+
+			{#if loadingMore}
+				<div class="flex justify-center py-6">
+					<Loader2 class="text-base-400 animate-spin" size={24} />
+				</div>
+			{/if}
+
+			{#if !cursor && posts.length > 0}
+				<p class="text-base-400 py-6 text-center text-sm">You've reached the end</p>
+			{/if}
+		{/if}
+
+		<div class="pb-[max(0.75rem,env(safe-area-inset-bottom))]"></div>
+	</div>
+</div>
diff --git a/src/routes/chat/[convoId]/+page.svelte b/src/routes/chat/[convoId]/+page.svelte
index df9c38e..3ddc822 100644
--- a/src/routes/chat/[convoId]/+page.svelte
+++ b/src/routes/chat/[convoId]/+page.svelte
@@ -182,11 +182,11 @@
 			<ArrowLeft size={20} />
 		</a>
 
-		<button onclick={() => goto(`/p/${member.handle}`)} class="cursor-pointer">
+		<button onclick={() => goto(`/profile/${member.handle}`)} class="cursor-pointer">
 			<Avatar src={member.avatar} class="size-8" />
 		</button>
 
-		<button onclick={() => goto(`/p/${member.handle}`)} class="cursor-pointer text-left">
+		<button onclick={() => goto(`/profile/${member.handle}`)} class="cursor-pointer text-left">
 			<p class="text-base-900 dark:text-base-100 text-sm font-medium">
 				{member.displayName ?? member.handle}
 			</p>
@@ -216,7 +216,7 @@
 				{#if isMessageView(msg)}
 					<div class="flex items-start gap-3 px-1 {showHeader ? 'mt-2 py-0.5' : 'py-0'}">
 						{#if showHeader}
-							<button class="shrink-0 cursor-pointer" onmousedown={() => goto(`/p/${isOwn ? (user.profile?.handle ?? user.did) : member.handle}`)}>
+							<button class="shrink-0 cursor-pointer" onmousedown={() => goto(`/profile/${isOwn ? (user.profile?.handle ?? user.did) : member.handle}`)}>
 								<Avatar src={isOwn ? user.profile?.avatar : member.avatar} class="mt-0.5 size-8" />
 							</button>
 						{:else}
@@ -225,7 +225,7 @@
 						<div class="min-w-0 flex-1">
 							{#if showHeader}
 								<div class="flex items-baseline gap-2">
-									<button class="cursor-pointer text-sm font-medium hover:underline {isOwn ? 'text-accent-500' : 'text-base-900 dark:text-base-100'}" onmousedown={() => goto(`/p/${isOwn ? (user.profile?.handle ?? user.did) : member.handle}`)}>
+									<button class="cursor-pointer text-sm font-medium hover:underline {isOwn ? 'text-accent-500' : 'text-base-900 dark:text-base-100'}" onmousedown={() => goto(`/profile/${isOwn ? (user.profile?.handle ?? user.did) : member.handle}`)}>
 										{isOwn ? (user.profile?.displayName ?? 'You') : (member.displayName ?? member.handle)}
 									</button>
 									<span class="text-base-400 text-[10px]">
diff --git a/src/routes/hashtag/[tag]/+page.svelte b/src/routes/hashtag/[tag]/+page.svelte
new file mode 100644
index 0000000..74dde55
--- /dev/null
+++ b/src/routes/hashtag/[tag]/+page.svelte
@@ -0,0 +1,181 @@
+<script lang="ts">
+	/* eslint-disable svelte/no-navigation-without-resolve */
+	import { onMount, onDestroy, untrack } from 'svelte';
+	import { goto } from '$app/navigation';
+	import { page } from '$app/state';
+	import { user } from '$lib/atproto/auth.svelte';
+	import { blueskyPostToPostData } from '$lib/components';
+	import { Post } from '$lib/components';
+	import { Hash, Loader2 } from '@lucide/svelte';
+	import { searchPosts, likePost, unlikePost } from '$lib/atproto/server/feed.remote';
+	import { cachePosts, prefetchThread } from '$lib/cache.svelte';
+	import { wireEmbedClicks } from '$lib/components/embed';
+
+	let tag = $derived(page.params.tag);
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	let posts = $state<any[]>([]);
+	let cursor = $state<string | null>(null);
+	let loading = $state(true);
+	let loadingMore = $state(false);
+
+	let likeState = $state<Record<string, string | null>>({});
+	let likeCountDelta = $state<Record<string, number>>({});
+
+	function isLiked(postUri: string, viewerLike?: string): boolean {
+		if (postUri in likeState) return likeState[postUri] !== null;
+		return !!viewerLike;
+	}
+
+	function getLikeCount(postUri: string, originalCount: number): number {
+		return originalCount + (likeCountDelta[postUri] ?? 0);
+	}
+
+	async function handleLike(postUri: string, postCid: string, viewerLike?: string) {
+		const currentlyLiked = isLiked(postUri, viewerLike);
+		if (currentlyLiked) {
+			const likeUri = likeState[postUri] ?? viewerLike;
+			if (!likeUri) return;
+			likeState[postUri] = null;
+			likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) - 1;
+			try {
+				await unlikePost({ likeUri });
+			} catch {
+				likeState[postUri] = likeUri;
+				likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) + 1;
+			}
+		} else {
+			likeState[postUri] = 'pending';
+			likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) + 1;
+			try {
+				const result = await likePost({ uri: postUri, cid: postCid });
+				likeState[postUri] = result.uri;
+			} catch {
+				likeState[postUri] = null;
+				likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) - 1;
+			}
+		}
+	}
+
+	async function loadTag(t: string) {
+		loading = true;
+		posts = [];
+		cursor = null;
+		likeState = {};
+		likeCountDelta = {};
+		try {
+			const result = await searchPosts({ q: `#${t}` });
+			posts = result.posts;
+			cachePosts(posts.map((p: any) => ({ post: p }))); // eslint-disable-line @typescript-eslint/no-explicit-any
+			for (const p of posts) prefetchThread(p.uri);
+			cursor = result.cursor;
+		} catch (e) {
+			console.error('Failed to load hashtag:', e);
+		} finally {
+			loading = false;
+		}
+	}
+
+	async function loadMore() {
+		if (loadingMore || !cursor) return;
+		loadingMore = true;
+		try {
+			const result = await searchPosts({ q: `#${tag}`, cursor });
+			cachePosts(result.posts.map((p: any) => ({ post: p }))); // eslint-disable-line @typescript-eslint/no-explicit-any
+			for (const p of result.posts) prefetchThread(p.uri);
+			posts = [...posts, ...result.posts];
+			cursor = result.cursor;
+		} catch (e) {
+			console.error('Failed to load more:', e);
+		} finally {
+			loadingMore = false;
+		}
+	}
+
+	function handleScroll() {
+		if (loadingMore || !cursor) return;
+		const { scrollTop, scrollHeight, clientHeight } = document.documentElement;
+		if (scrollHeight - scrollTop - clientHeight < 2000) {
+			loadMore();
+		}
+	}
+
+	$effect(() => {
+		const t = tag;
+		if (t) untrack(() => loadTag(t));
+	});
+
+	onMount(() => window.addEventListener('scroll', handleScroll));
+	onDestroy(() => {
+		if (typeof window !== 'undefined') window.removeEventListener('scroll', handleScroll);
+	});
+</script>
+
+<div class="flex h-dvh flex-col">
+	<div class="mx-auto w-full max-w-lg">
+		<!-- Header -->
+		<div class="flex items-center gap-2 px-4 pt-4 pb-3">
+			<Hash class="text-base-400" size={20} />
+			<h1 class="text-base-900 dark:text-base-100 text-lg font-semibold">{tag}</h1>
+		</div>
+
+		{#if loading}
+			<div class="flex items-center justify-center py-12">
+				<Loader2 class="text-base-400 animate-spin" size={28} />
+			</div>
+		{:else if posts.length === 0}
+			<div class="flex flex-col items-center justify-center py-20">
+				<Hash class="text-base-300 dark:text-base-600 mb-3" size={40} />
+				<p class="text-base-400 text-sm">No posts with #{tag}</p>
+			</div>
+		{:else}
+			<div>
+				{#each posts as post, i (post.uri ? `${post.uri}-${i}` : i)}
+					{@const { postData, embeds } = blueskyPostToPostData(post)}
+					{@const rkey = post.uri.split('/').pop()}
+					{@const postHref = `/profile/${post.author.handle}/post/${rkey}`}
+					<div class="-mx-2 rounded-xl px-6 pt-3 pb-2 transition-colors hover:bg-base-100/50 sm:px-2 dark:hover:bg-base-800/30">
+						<Post
+							compact={true}
+							data={postData}
+							embeds={wireEmbedClicks(embeds, (handle, rk) => goto(`/profile/${handle}/post/${rk}`), (handle) => goto(`/profile/${handle}`))}
+							href={postHref}
+							onclickhandle={(handle) => goto(`/profile/${handle}`)}
+							handleHref={(handle) => `/profile/${handle}`}
+							actions={user.did
+								? {
+										reply: { count: postData.replyCount, href: postHref + '#replies' },
+										repost: { count: postData.repostCount },
+										like: {
+											count: getLikeCount(post.uri, postData.likeCount ?? 0),
+											active: isLiked(post.uri, post.viewer?.like),
+											onclick: () => handleLike(post.uri, post.cid, post.viewer?.like)
+										}
+									}
+								: {
+										reply: { count: postData.replyCount, href: postHref + '#replies' },
+										repost: { count: postData.repostCount },
+										like: { count: postData.likeCount }
+									}}
+						/>
+					</div>
+					{#if i < posts.length - 1}
+						<hr class="border-base-200 dark:border-base-800 mx-4 sm:mx-0" />
+					{/if}
+				{/each}
+			</div>
+
+			{#if loadingMore}
+				<div class="flex justify-center py-6">
+					<Loader2 class="text-base-400 animate-spin" size={24} />
+				</div>
+			{/if}
+
+			{#if !cursor && posts.length > 0}
+				<p class="text-base-400 py-6 text-center text-sm">No more results</p>
+			{/if}
+
+			<div class="pb-[max(0.75rem,env(safe-area-inset-bottom))]"></div>
+		{/if}
+	</div>
+</div>
diff --git a/src/routes/notifications/+page.svelte b/src/routes/notifications/+page.svelte
index 1bbb482..8701271 100644
--- a/src/routes/notifications/+page.svelte
+++ b/src/routes/notifications/+page.svelte
@@ -166,7 +166,7 @@
 
 	function navigateToNotification(notif: Notification) {
 		if (notif.reason === 'follow') {
-			goto(`/p/${notif.author.handle}`);
+			goto(`/profile/${notif.author.handle}`);
 			return;
 		}
 
@@ -174,7 +174,7 @@
 		if (['reply', 'quote', 'mention'].includes(notif.reason)) {
 			const parts = notif.uri.split('/');
 			const rkey = parts[parts.length - 1];
-			goto(`/p/${notif.author.handle}/post/${rkey}`);
+			goto(`/profile/${notif.author.handle}/post/${rkey}`);
 			return;
 		}
 
@@ -184,7 +184,7 @@
 			const rkey = parts[parts.length - 1];
 			const did = parts[2];
 			// Use the profile handle from user since it's our own post
-			goto(`/p/${user.profile?.handle ?? did}/post/${rkey}`);
+			goto(`/profile/${user.profile?.handle ?? did}/post/${rkey}`);
 			return;
 		}
 	}
@@ -253,7 +253,7 @@
 										onmousedown={(e) => {
 											e.stopPropagation();
 											e.preventDefault();
-											goto(`/p/${notif.author.handle}`);
+											goto(`/profile/${notif.author.handle}`);
 										}}
 									>
 										<Avatar src={notif.author.avatar} class="size-8" />
@@ -267,7 +267,7 @@
 											onmousedown={(e) => {
 												e.stopPropagation();
 												e.preventDefault();
-												goto(`/p/${notif.author.handle}`);
+												goto(`/profile/${notif.author.handle}`);
 											}}
 										>
 											@{notif.author.handle}
diff --git a/src/routes/p/[actor]/+page.svelte b/src/routes/profile/[handle]/+page.svelte
similarity index 72%
rename from src/routes/p/[actor]/+page.svelte
rename to src/routes/profile/[handle]/+page.svelte
index bc101a8..a91adac 100644
--- a/src/routes/p/[actor]/+page.svelte
+++ b/src/routes/profile/[handle]/+page.svelte
@@ -9,11 +9,17 @@
 	import { user, logout } from '$lib/atproto/auth.svelte';
 	import { actorToDid, getDetailedProfile } from '$lib/atproto/methods';
 	import { getCachedProfile, cacheProfile, cachePosts, prefetchThread } from '$lib/cache.svelte';
-	import { getAuthorFeed, likePost, unlikePost } from '$lib/atproto/server/feed.remote';
+	import { getAuthorFeed, likePost, unlikePost, followUser, unfollowUser } from '$lib/atproto/server/feed.remote';
 	import { wireEmbedClicks } from '$lib/components/embed';
+	import { bookmarks } from '$lib/bookmarks.svelte';
 	import { Client, simpleFetchHandler } from '@atcute/client';
 
+	import { UserPlus, UserCheck } from '@lucide/svelte';
+
 	let isOwnProfile = $derived(user.did && profile?.did === user.did);
+	let followUri = $state<string | null>(null);
+	let isFollowing = $derived(followUri !== null);
+	let followLoading = $state(false);
 
 	let loading = $state(true);
 	let error = $state<string | null>(null);
@@ -66,6 +72,30 @@
 		}
 	}
 
+	async function toggleFollow() {
+		if (!profile?.did || followLoading) return;
+		followLoading = true;
+		try {
+			if (isFollowing) {
+				await unfollowUser({ followUri: followUri! });
+				followUri = null;
+			} else {
+				const result = await followUser({ did: profile.did });
+				followUri = result.uri;
+			}
+		} catch (e) {
+			console.error('Failed to toggle follow:', e);
+		} finally {
+			followLoading = false;
+		}
+	}
+
+	function numberToHuman(n: number): string {
+		if (n < 1000) return String(n);
+		if (n < 1_000_000) return `${(n / 1000).toFixed(1)}k`;
+		return `${(n / 1_000_000).toFixed(1)}m`;
+	}
+
 	async function loadProfile(actor: string) {
 		loading = true;
 		error = null;
@@ -75,6 +105,7 @@
 		postsLoading = true;
 		likeState = {};
 		likeCountDelta = {};
+		followUri = null;
 
 		// Show cached profile instantly
 		const cached = await getCachedProfile(actor);
@@ -93,6 +124,7 @@
 			if (fresh) {
 				profile = fresh;
 				cacheProfile(fresh);
+				followUri = fresh.viewer?.following ?? null;
 			} else if (!cached) {
 				error = 'Profile not found';
 			}
@@ -120,7 +152,7 @@
 	}
 
 	$effect(() => {
-		const actor = page.params.actor;
+		const actor = page.params.handle;
 		if (actor) untrack(() => loadProfile(actor));
 	});
 
@@ -129,7 +161,7 @@
 		loadingMore = true;
 		try {
 			const result = await getAuthorFeed({
-				actor: page.params.actor,
+				actor: page.params.handle,
 				cursor: postsCursor
 			});
 			const newPosts = JSON.parse(JSON.stringify(result.posts));
@@ -180,15 +212,42 @@
 					description: profile.description
 				}}
 				class=""
-			/>
-			{#if isOwnProfile}
-				<div class="px-4 py-4">
-					<Button variant="ghost" onclick={logout} class="gap-2">
-						<LogOut size={16} />
-						Log out
-					</Button>
+			>
+				<div class="flex items-center justify-between">
+					<div class="flex gap-4 text-sm">
+						<button onclick={() => {}} class="hover:underline">
+							<span class="text-base-900 dark:text-base-100 font-semibold">{numberToHuman(profile.followsCount ?? 0)}</span>
+							<span class="text-base-500 dark:text-base-400"> following</span>
+						</button>
+						<button onclick={() => {}} class="hover:underline">
+							<span class="text-base-900 dark:text-base-100 font-semibold">{numberToHuman(profile.followersCount ?? 0)}</span>
+							<span class="text-base-500 dark:text-base-400"> followers</span>
+						</button>
+					</div>
+					{#if isOwnProfile}
+						<Button variant="ghost" onclick={logout} class="gap-2" size="sm">
+							<LogOut size={14} />
+							Log out
+						</Button>
+					{:else if user.did}
+						<Button
+							variant={isFollowing ? 'outline' : 'default'}
+							size="sm"
+							onclick={toggleFollow}
+							disabled={followLoading}
+							class="gap-1.5"
+						>
+							{#if isFollowing}
+								<UserCheck size={14} />
+								Following
+							{:else}
+								<UserPlus size={14} />
+								Follow
+							{/if}
+						</Button>
+					{/if}
 				</div>
-			{/if}
+			</UserProfile>
 
 			<!-- Author posts -->
 			{#if postsLoading}
@@ -202,7 +261,7 @@
 							{@const { postData, embeds } = blueskyPostToPostData(feedPost.post, 'https://bsky.app', feedPost.reason)}
 							{@const postHref = (() => {
 								const rkey = feedPost.post.uri.split('/').pop();
-								return `/p/${feedPost.post.author.handle}/post/${rkey}`;
+								return `/profile/${feedPost.post.author.handle}/post/${rkey}`;
 							})()}
 							<div
 								class="-mx-2 px-6 pt-3 pb-2 sm:px-2 rounded-xl hover:bg-base-100/50 dark:hover:bg-base-800/30 transition-colors"
@@ -210,10 +269,10 @@
 								<Post
 									compact={true}
 									data={postData}
-									embeds={wireEmbedClicks(embeds, (handle, rkey) => goto(`/p/${handle}/post/${rkey}`), (handle) => goto(`/p/${handle}`))}
+									embeds={wireEmbedClicks(embeds, (handle, rkey) => goto(`/profile/${handle}/post/${rkey}`), (handle) => goto(`/profile/${handle}`))}
 									href={postHref}
-									onclickhandle={(handle) => goto(`/p/${handle}`)}
-									handleHref={(handle) => `/p/${handle}`}
+									onclickhandle={(handle) => goto(`/profile/${handle}`)}
+									handleHref={(handle) => `/profile/${handle}`}
 									actions={user.did
 										? {
 												reply: { count: postData.replyCount },
@@ -222,6 +281,10 @@
 													count: getLikeCount(feedPost.post.uri, postData.likeCount ?? 0),
 													active: isLiked(feedPost.post.uri, feedPost.post.viewer?.like),
 													onclick: () => handleLike(feedPost.post.uri, feedPost.post.cid, feedPost.post.viewer?.like)
+												},
+												bookmark: {
+													active: bookmarks.isBookmarked(feedPost.post.uri, feedPost.post.viewer?.bookmarked),
+													onclick: () => bookmarks.toggle(feedPost.post.uri, feedPost.post.cid, feedPost.post.viewer?.bookmarked)
 												}
 											}
 										: {
diff --git a/src/routes/p/[actor]/post/[rkey]/+page.svelte b/src/routes/profile/[handle]/post/[rkey]/+page.svelte
similarity index 87%
rename from src/routes/p/[actor]/post/[rkey]/+page.svelte
rename to src/routes/profile/[handle]/post/[rkey]/+page.svelte
index 5120ad7..4ae34f4 100644
--- a/src/routes/p/[actor]/post/[rkey]/+page.svelte
+++ b/src/routes/profile/[handle]/post/[rkey]/+page.svelte
@@ -12,6 +12,7 @@
 	import { getCachedPost, getCachedThread, getThreadAge } from '$lib/cache.svelte';
 	import { threadStore } from '$lib/db.svelte';
 	import { wireEmbedClicks } from '$lib/components/embed';
+	import { bookmarks } from '$lib/bookmarks.svelte';
 
 	let loading = $state(true);
 	let loadingComments = $state(true);
@@ -99,7 +100,7 @@
 	onMount(async () => {
 
 		try {
-			const did = await actorToDid(page.params.actor);
+			const did = await actorToDid(page.params.handle);
 			const uri = `at://${did}/app.bsky.feed.post/${page.params.rkey}`;
 
 			// Show cached data instantly
@@ -152,7 +153,7 @@
 	});
 
 	function handleClickHandle(handle: string) {
-		goto(`/p/${handle}`);
+		goto(`/profile/${handle}`);
 	}
 </script>
 
@@ -177,9 +178,9 @@
 			<div class="px-4 sm:px-0">
 				<Post
 					data={postData}
-					embeds={wireEmbedClicks(embeds, (handle, rkey) => goto(`/p/${handle}/post/${rkey}`), (handle) => goto(`/p/${handle}`))}
+					embeds={wireEmbedClicks(embeds, (handle, rkey) => goto(`/profile/${handle}/post/${rkey}`), (handle) => goto(`/profile/${handle}`))}
 					onclickhandle={handleClickHandle}
-					handleHref={(handle) => `/p/${handle}`}
+					handleHref={(handle) => `/profile/${handle}`}
 					actions={user.did
 						? {
 								reply: { count: postData.replyCount },
@@ -188,6 +189,10 @@
 									count: getLikeCount(postView.uri, postData.likeCount ?? 0),
 									active: isLiked(postView.uri, postView.viewer?.like),
 									onclick: () => handleLike(postView.uri, postView.cid, postView.viewer?.like)
+								},
+								bookmark: {
+									active: bookmarks.isBookmarked(postView.uri, postView.viewer?.bookmarked),
+									onclick: () => bookmarks.toggle(postView.uri, postView.cid, postView.viewer?.bookmarked)
 								}
 							}
 						: {
@@ -198,15 +203,17 @@
 				/>
 			</div>
 
-			{#if loadingComments}
-				<div class="flex justify-center py-6">
-					<Loader2 class="text-base-400 animate-spin" size={24} />
-				</div>
-			{:else if comments.length > 0}
-				<div class="px-4 sm:px-0">
-					<NestedComments {comments} onclickhandle={handleClickHandle} actions={commentActions} />
-				</div>
-			{/if}
+			<div id="replies">
+				{#if loadingComments}
+					<div class="flex justify-center py-6">
+						<Loader2 class="text-base-400 animate-spin" size={24} />
+					</div>
+				{:else if comments.length > 0}
+					<div class="px-4 sm:px-0">
+						<NestedComments {comments} onclickhandle={handleClickHandle} actions={commentActions} />
+					</div>
+				{/if}
+			</div>
 		{/if}
 	</div>
 </div>
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte
new file mode 100644
index 0000000..90394ac
--- /dev/null
+++ b/src/routes/search/+page.svelte
@@ -0,0 +1,207 @@
+<script lang="ts">
+	/* eslint-disable svelte/no-navigation-without-resolve */
+	import { onMount, onDestroy } from 'svelte';
+	import { goto } from '$app/navigation';
+	import { page } from '$app/state';
+	import { user } from '$lib/atproto/auth.svelte';
+	import { blueskyPostToPostData } from '$lib/components';
+	import { Post } from '$lib/components';
+	import { Search, Loader2 } from '@lucide/svelte';
+	import { searchPosts, likePost, unlikePost } from '$lib/atproto/server/feed.remote';
+	import { cachePosts, prefetchThread } from '$lib/cache.svelte';
+	import { wireEmbedClicks } from '$lib/components/embed';
+
+	let query = $state(page.url.searchParams.get('q') ?? '');
+	let inputValue = $state(query);
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	let posts = $state<any[]>([]);
+	let cursor = $state<string | null>(null);
+	let loading = $state(false);
+	let loadingMore = $state(false);
+	let searched = $state(false);
+
+	let likeState = $state<Record<string, string | null>>({});
+	let likeCountDelta = $state<Record<string, number>>({});
+
+	function isLiked(postUri: string, viewerLike?: string): boolean {
+		if (postUri in likeState) return likeState[postUri] !== null;
+		return !!viewerLike;
+	}
+
+	function getLikeCount(postUri: string, originalCount: number): number {
+		return originalCount + (likeCountDelta[postUri] ?? 0);
+	}
+
+	async function handleLike(postUri: string, postCid: string, viewerLike?: string) {
+		const currentlyLiked = isLiked(postUri, viewerLike);
+		if (currentlyLiked) {
+			const likeUri = likeState[postUri] ?? viewerLike;
+			if (!likeUri) return;
+			likeState[postUri] = null;
+			likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) - 1;
+			try {
+				await unlikePost({ likeUri });
+			} catch {
+				likeState[postUri] = likeUri;
+				likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) + 1;
+			}
+		} else {
+			likeState[postUri] = 'pending';
+			likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) + 1;
+			try {
+				const result = await likePost({ uri: postUri, cid: postCid });
+				likeState[postUri] = result.uri;
+			} catch {
+				likeState[postUri] = null;
+				likeCountDelta[postUri] = (likeCountDelta[postUri] ?? 0) - 1;
+			}
+		}
+	}
+
+	async function doSearch(q: string) {
+		if (!q.trim()) return;
+		query = q.trim();
+		loading = true;
+		searched = true;
+		posts = [];
+		cursor = null;
+		likeState = {};
+		likeCountDelta = {};
+
+		// Update URL
+		const url = new URL(window.location.href);
+		url.searchParams.set('q', query);
+		history.replaceState({}, '', url);
+
+		try {
+			const result = await searchPosts({ q: query });
+			posts = result.posts;
+			cachePosts(posts.map((p: any) => ({ post: p }))); // eslint-disable-line @typescript-eslint/no-explicit-any
+			for (const p of posts) prefetchThread(p.uri);
+			cursor = result.cursor;
+		} catch (e) {
+			console.error('Search failed:', e);
+		} finally {
+			loading = false;
+		}
+	}
+
+	async function loadMore() {
+		if (loadingMore || !cursor || !query) return;
+		loadingMore = true;
+		try {
+			const result = await searchPosts({ q: query, cursor });
+			cachePosts(result.posts.map((p: any) => ({ post: p }))); // eslint-disable-line @typescript-eslint/no-explicit-any
+			for (const p of result.posts) prefetchThread(p.uri);
+			posts = [...posts, ...result.posts];
+			cursor = result.cursor;
+		} catch (e) {
+			console.error('Failed to load more:', e);
+		} finally {
+			loadingMore = false;
+		}
+	}
+
+	function handleScroll() {
+		if (loadingMore || !cursor) return;
+		const { scrollTop, scrollHeight, clientHeight } = document.documentElement;
+		if (scrollHeight - scrollTop - clientHeight < 2000) {
+			loadMore();
+		}
+	}
+
+	function handleSubmit(e: Event) {
+		e.preventDefault();
+		doSearch(inputValue);
+	}
+
+	onMount(() => {
+		window.addEventListener('scroll', handleScroll);
+		if (query) doSearch(query);
+	});
+
+	onDestroy(() => {
+		if (typeof window !== 'undefined') window.removeEventListener('scroll', handleScroll);
+	});
+</script>
+
+<div class="flex h-dvh flex-col">
+	<div class="mx-auto w-full max-w-lg">
+		<!-- Search bar -->
+		<form onsubmit={handleSubmit} class="px-4 pt-4 pb-3">
+			<div class="relative">
+				<Search class="text-base-400 absolute top-1/2 left-3 -translate-y-1/2" size={16} />
+				<input
+					type="text"
+					bind:value={inputValue}
+					placeholder="Search posts..."
+					class="border-base-200 bg-base-50 text-base-900 placeholder:text-base-400 focus:border-accent-400 focus:ring-accent-400 dark:border-base-700 dark:bg-base-900 dark:text-base-100 dark:placeholder:text-base-500 w-full rounded-full border py-2 pr-4 pl-9 text-sm focus:ring-1 focus:outline-none"
+				/>
+			</div>
+		</form>
+
+		{#if loading}
+			<div class="flex items-center justify-center py-12">
+				<Loader2 class="text-base-400 animate-spin" size={28} />
+			</div>
+		{:else if searched && posts.length === 0}
+			<div class="flex flex-col items-center justify-center py-20">
+				<Search class="text-base-300 dark:text-base-600 mb-3" size={40} />
+				<p class="text-base-400 text-sm">No results for "{query}"</p>
+			</div>
+		{:else if posts.length > 0}
+			<div>
+				{#each posts as post, i (post.uri ? `${post.uri}-${i}` : i)}
+					{@const { postData, embeds } = blueskyPostToPostData(post)}
+					{@const rkey = post.uri.split('/').pop()}
+					{@const postHref = `/profile/${post.author.handle}/post/${rkey}`}
+					<div class="-mx-2 rounded-xl px-6 pt-3 pb-2 transition-colors hover:bg-base-100/50 sm:px-2 dark:hover:bg-base-800/30">
+						<Post
+							compact={true}
+							data={postData}
+							embeds={wireEmbedClicks(embeds, (handle, rk) => goto(`/profile/${handle}/post/${rk}`), (handle) => goto(`/profile/${handle}`))}
+							href={postHref}
+							onclickhandle={(handle) => goto(`/profile/${handle}`)}
+							handleHref={(handle) => `/profile/${handle}`}
+							actions={user.did
+								? {
+										reply: { count: postData.replyCount, href: postHref + '#replies' },
+										repost: { count: postData.repostCount },
+										like: {
+											count: getLikeCount(post.uri, postData.likeCount ?? 0),
+											active: isLiked(post.uri, post.viewer?.like),
+											onclick: () => handleLike(post.uri, post.cid, post.viewer?.like)
+										}
+									}
+								: {
+										reply: { count: postData.replyCount, href: postHref + '#replies' },
+										repost: { count: postData.repostCount },
+										like: { count: postData.likeCount }
+									}}
+						/>
+					</div>
+					{#if i < posts.length - 1}
+						<hr class="border-base-200 dark:border-base-800 mx-4 sm:mx-0" />
+					{/if}
+				{/each}
+			</div>
+
+			{#if loadingMore}
+				<div class="flex justify-center py-6">
+					<Loader2 class="text-base-400 animate-spin" size={24} />
+				</div>
+			{/if}
+
+			{#if !cursor && posts.length > 0}
+				<p class="text-base-400 py-6 text-center text-sm">No more results</p>
+			{/if}
+
+			<div class="pb-[max(0.75rem,env(safe-area-inset-bottom))]"></div>
+		{:else if !searched}
+			<div class="flex flex-col items-center justify-center py-20">
+				<Search class="text-base-300 dark:text-base-600 mb-3" size={40} />
+				<p class="text-base-400 text-sm">Search for posts on Bluesky</p>
+			</div>
+		{/if}
+	</div>
+</div>