feat: add event module pages (placeholders + full Team module) - 6 placeholder 'coming soon' pages: tasks, files, schedule, budget, guests, sponsors - Full Team module: add/remove members, change roles, role badges - Uses existing event_members DB table and API layer - i18n keys added for EN and ET (module placeholders + team) - svelte-check: 0 errors, vitest: 112/112 passed

ui: overhaul org settings components (General, Members, Roles, Integrations) - SettingsGeneral: border-based cards, compact danger zone with error border - SettingsMembers: Avatar component, icon buttons, border-based list - SettingsRoles: icon buttons for edit/delete, smaller permission badges - SettingsIntegrations: compact integration cards, Material Symbols for coming-soon - Removed unused Card imports from all settings components - svelte-check: 0 errors, vitest: 112/112 passed
ui: overhaul home page, style guide, account settings - Home page: bg-background, border-based org cards, material icons, compact typography - Style guide: new header with back button, rounded-xl swatches, consistent section headings - Account settings: replace bg-background rounded-[32px] with border-based rounded-xl cards - svelte-check: 0 errors, vitest: 112/112 passed
2026-02-07 11:39:51 +02:00 · 2026-02-07 11:23:49 +02:00 · 2026-02-07 11:18:23 +02:00 · 2026-02-07 11:03:58 +02:00 · 2026-02-07 10:44:53 +02:00
50 changed files with 2743 additions and 1740 deletions
--- a/messages/en.json
+++ b/messages/en.json
@@ -254,6 +254,9 @@
 	"entity_invite": "invite",
 	"entity_event": "event",
 	"nav_events": "Events",
+	"nav_chat": "Chat",
+	"chat_title": "Chat",
+	"chat_subtitle": "Team messaging and communication",
 	"events_title": "Events",
 	"events_subtitle": "Organize and manage your events",
 	"events_new": "New Event",
@@ -320,5 +323,28 @@
 	"events_mod_team": "Team",
 	"events_mod_team_desc": "Team members and shift scheduling",
 	"events_mod_sponsors": "Sponsors",
-	"events_mod_sponsors_desc": "Sponsors, partners, and deliverables"
+	"events_mod_sponsors_desc": "Sponsors, partners, and deliverables",
+	"module_coming_soon": "Coming Soon",
+	"module_coming_soon_desc": "This module is under development and will be available soon.",
+	"team_title": "Event Team",
+	"team_subtitle": "Manage team members and their roles for this event.",
+	"team_add_member": "Add Member",
+	"team_role_lead": "Lead",
+	"team_role_manager": "Manager",
+	"team_role_member": "Member",
+	"team_empty": "No team members assigned yet. Add members from your organization.",
+	"team_remove_confirm": "Remove {name} from this event's team?",
+	"team_remove_btn": "Remove",
+	"team_added": "{name} added to team",
+	"team_removed": "{name} removed from team",
+	"team_updated": "Role updated",
+	"team_select_member": "Select a member",
+	"team_select_role": "Select role",
+	"team_already_assigned": "Already on team",
+	"overview_subtitle": "Welcome back. Here's what's happening.",
+	"overview_stat_events": "Events",
+	"overview_upcoming_events": "Upcoming Events",
+	"overview_upcoming_empty": "No upcoming events. Create one to get started.",
+	"overview_view_all_events": "View all events",
+	"overview_more_members": "+{count} more"
 }
--- a/messages/et.json
+++ b/messages/et.json
@@ -254,6 +254,9 @@
 	"entity_invite": "kutse",
 	"entity_event": "ürituse",
 	"nav_events": "Üritused",
+	"nav_chat": "Vestlus",
+	"chat_title": "Vestlus",
+	"chat_subtitle": "Meeskonna sõnumid ja suhtlus",
 	"events_title": "Üritused",
 	"events_subtitle": "Korralda ja halda oma üritusi",
 	"events_new": "Uus üritus",
@@ -320,5 +323,28 @@
 	"events_mod_team": "Meeskond",
 	"events_mod_team_desc": "Meeskonnaliikmed ja vahetuste planeerimine",
 	"events_mod_sponsors": "Sponsorid",
-	"events_mod_sponsors_desc": "Sponsorid, partnerid ja kohustused"
+	"events_mod_sponsors_desc": "Sponsorid, partnerid ja kohustused",
+	"module_coming_soon": "Tulekul",
+	"module_coming_soon_desc": "See moodul on arendamisel ja saab peagi kättesaadavaks.",
+	"team_title": "Ürituse meeskond",
+	"team_subtitle": "Halda meeskonnaliikmeid ja nende rolle selle ürituse jaoks.",
+	"team_add_member": "Lisa liige",
+	"team_role_lead": "Juht",
+	"team_role_manager": "Haldur",
+	"team_role_member": "Liige",
+	"team_empty": "Meeskonnaliikmeid pole veel määratud. Lisa liikmeid oma organisatsioonist.",
+	"team_remove_confirm": "Eemalda {name} selle ürituse meeskonnast?",
+	"team_remove_btn": "Eemalda",
+	"team_added": "{name} lisatud meeskonda",
+	"team_removed": "{name} eemaldatud meeskonnast",
+	"team_updated": "Roll uuendatud",
+	"team_select_member": "Vali liige",
+	"team_select_role": "Vali roll",
+	"team_already_assigned": "Juba meeskonnas",
+	"overview_subtitle": "Tere tagasi. Siin on ülevaade toimuvast.",
+	"overview_stat_events": "Üritused",
+	"overview_upcoming_events": "Tulevased üritused",
+	"overview_upcoming_empty": "Tulevasi üritusi pole. Loo üks alustamiseks.",
+	"overview_view_all_events": "Vaata kõiki üritusi",
+	"overview_more_members": "+{count} veel"
 }
--- a/src/lib/components/calendar/Calendar.svelte
+++ b/src/lib/components/calendar/Calendar.svelte
@@ -123,63 +123,63 @@
 	});
 </script>

-<div class="flex flex-col h-full gap-2">
+<div class="flex flex-col h-full">
 	<!-- Navigation bar -->
-	<div class="flex items-center justify-between px-2">
-		<div class="flex items-center gap-2">
+	<div class="flex items-center justify-between px-4 py-2 shrink-0">
+		<div class="flex items-center gap-1">
 			<button
-				class="p-1 text-light/60 hover:text-light hover:bg-dark rounded-full transition-colors"
+				class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
 				onclick={prev}
 				aria-label="Previous"
 			>
 				<span
 					class="material-symbols-rounded"
-					style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
+					style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
 					>chevron_left</span
 				>
 			</button>
 			<span
-				class="font-heading text-h4 text-white min-w-[200px] text-center"
+				class="font-heading text-body-sm text-white min-w-[180px] text-center"
 				>{headerTitle}</span
 			>
 			<button
-				class="p-1 text-light/60 hover:text-light hover:bg-dark rounded-full transition-colors"
+				class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
 				onclick={next}
 				aria-label="Next"
 			>
 				<span
 					class="material-symbols-rounded"
-					style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
+					style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
 					>chevron_right</span
 				>
 			</button>
 			<button
-				class="px-3 py-1 text-body-md font-body text-light/60 hover:text-white hover:bg-dark rounded-[32px] transition-colors ml-2"
+				class="px-2.5 py-1 text-body-sm font-body text-light/50 hover:text-white hover:bg-dark/50 rounded-lg transition-colors ml-1"
 				onclick={goToToday}
 			>
 				Today
 			</button>
 		</div>
-		<div class="flex bg-dark rounded-[32px] p-0.5">
+		<div class="flex gap-0.5 bg-dark/30 rounded-lg p-0.5">
 			<button
-				class="px-3 py-1 text-body-md font-body rounded-[32px] transition-colors {currentView ===
+				class="px-2.5 py-1 text-[12px] font-body rounded-md transition-colors {currentView ===
 				'day'
-					? 'bg-primary text-night'
-					: 'text-light/60 hover:text-light'}"
+					? 'bg-primary text-background'
+					: 'text-light/50 hover:text-white'}"
 				onclick={() => (currentView = "day")}>Day</button
 			>
 			<button
-				class="px-3 py-1 text-body-md font-body rounded-[32px] transition-colors {currentView ===
+				class="px-2.5 py-1 text-[12px] font-body rounded-md transition-colors {currentView ===
 				'week'
-					? 'bg-primary text-night'
-					: 'text-light/60 hover:text-light'}"
+					? 'bg-primary text-background'
+					: 'text-light/50 hover:text-white'}"
 				onclick={() => (currentView = "week")}>Week</button
 			>
 			<button
-				class="px-3 py-1 text-body-md font-body rounded-[32px] transition-colors {currentView ===
+				class="px-2.5 py-1 text-[12px] font-body rounded-md transition-colors {currentView ===
 				'month'
-					? 'bg-primary text-night'
-					: 'text-light/60 hover:text-light'}"
+					? 'bg-primary text-background'
+					: 'text-light/50 hover:text-white'}"
 				onclick={() => (currentView = "month")}>Month</button
 			>
 		</div>
@@ -187,48 +187,40 @@

 	<!-- Month View -->
 	{#if currentView === "month"}
-		<div
-			class="flex flex-col flex-1 gap-2 min-h-0 bg-background rounded-xl p-2"
-		>
+		<div class="flex flex-col flex-1 min-h-0">
 			<!-- Day Headers -->
-			<div class="grid grid-cols-7 gap-2">
+			<div class="grid grid-cols-7 border-b border-light/5">
 				{#each weekDayHeaders as day}
-					<div class="flex items-center justify-center py-2 px-2">
-						<span
-							class="font-heading text-h4 text-white text-center"
-							>{day}</span
-						>
+					<div class="flex items-center justify-center py-2">
+						<span class="font-body text-[11px] text-light/40 uppercase tracking-wider">{day}</span>
 					</div>
 				{/each}
 			</div>

 			<!-- Calendar Grid -->
-			<div
-				class="flex-1 flex flex-col gap-2 min-h-0 rounded-lg overflow-hidden"
-			>
+			<div class="flex-1 flex flex-col min-h-0 overflow-hidden">
 				{#each weeks as week}
-					<div class="grid grid-cols-7 gap-2 flex-1">
+					<div class="grid grid-cols-7 flex-1 border-b border-light/5 last:border-b-0">
 						{#each week as day}
 							{@const dayEvents = getEventsForDay(day)}
 							{@const isToday = isSameDay(day, today)}
 							{@const inMonth = isCurrentMonth(day)}
-							<div
-								class="bg-night rounded-none flex flex-col items-start px-2 py-2.5 overflow-hidden transition-colors hover:bg-dark/50 min-h-0 cursor-pointer
-									{!inMonth ? 'opacity-50' : ''}"
+							<button
+								type="button"
+								class="flex flex-col items-start px-1.5 py-1 overflow-hidden transition-colors hover:bg-dark/30 min-h-0 cursor-pointer border-r border-light/5 last:border-r-0
+									{!inMonth ? 'opacity-40' : ''}"
 								onclick={() => onDateClick?.(day)}
 							>
 								<span
-									class="font-body text-body text-white {isToday
-										? 'text-primary font-bold'
-										: ''}"
+									class="text-[12px] font-body w-6 h-6 flex items-center justify-center rounded-full shrink-0
+									{isToday ? 'bg-primary text-background font-bold' : 'text-light/60'}"
 								>
 									{day.getDate()}
 								</span>
 								{#each dayEvents.slice(0, 2) as event}
 									<button
-										class="w-full mt-1 px-2 py-0.5 rounded-[4px] text-body-sm font-bold font-body text-night truncate text-left"
-										style="background-color: {event.color ??
-											'#00A3E0'}"
+										class="w-full mt-0.5 px-1.5 py-0.5 rounded text-[11px] font-body text-night truncate text-left font-medium"
+										style="background-color: {event.color ?? '#00A3E0'}"
 										onclick={(e) => {
 											e.stopPropagation();
 											onEventClick?.(event);
@@ -238,12 +230,9 @@
 									</button>
 								{/each}
 								{#if dayEvents.length > 2}
-									<span
-										class="text-body-sm text-light/40 mt-0.5"
-										>+{dayEvents.length - 2} more</span
-									>
+									<span class="text-[10px] text-light/30 mt-0.5 px-1">+{dayEvents.length - 2}</span>
 								{/if}
-							</div>
+							</button>
 						{/each}
 					</div>
 				{/each}
@@ -253,40 +242,25 @@

 	<!-- Week View -->
 	{#if currentView === "week"}
-		<div
-			class="flex flex-col flex-1 gap-2 min-h-0 bg-background rounded-xl p-2"
-		>
-			<div
-				class="grid grid-cols-7 gap-2 flex-1 rounded-lg overflow-hidden"
-			>
+		<div class="flex flex-col flex-1 min-h-0">
+			<div class="grid grid-cols-7 flex-1 overflow-hidden">
 				{#each weekDates as day}
 					{@const dayEvents = getEventsForDay(day)}
 					{@const isToday = isSameDay(day, today)}
-					<div class="flex flex-col overflow-hidden">
-						<div class="px-2 py-2 text-center">
-							<div
-								class="font-heading text-h4 {isToday
-									? 'text-primary'
-									: 'text-white'}"
-							>
+					<div class="flex flex-col overflow-hidden border-r border-light/5 last:border-r-0">
+						<div class="px-2 py-2 text-center border-b border-light/5">
+							<div class="text-[11px] font-body uppercase tracking-wider {isToday ? 'text-primary' : 'text-light/40'}">
 								{weekDayHeaders[(day.getDay() + 6) % 7]}
 							</div>
-							<div
-								class="font-body text-body-md {isToday
-									? 'text-primary'
-									: 'text-light/60'}"
-							>
+							<div class="text-body-sm font-heading mt-0.5 {isToday ? 'text-primary' : 'text-white'}">
 								{day.getDate()}
 							</div>
 						</div>
-						<div
-							class="bg-night flex-1 px-2 pb-2 space-y-1 overflow-y-auto"
-						>
+						<div class="flex-1 px-1.5 py-1.5 space-y-1 overflow-y-auto">
 							{#each dayEvents as event}
 								<button
-									class="w-full px-2 py-1.5 rounded-[4px] text-body-sm font-bold font-body text-night truncate text-left"
-									style="background-color: {event.color ??
-										'#00A3E0'}"
+									class="w-full px-2 py-1.5 rounded text-[11px] font-body text-night truncate text-left font-medium"
+									style="background-color: {event.color ?? '#00A3E0'}"
 									onclick={() => onEventClick?.(event)}
 								>
 									{event.title}
@@ -302,27 +276,24 @@
 	<!-- Day View -->
 	{#if currentView === "day"}
 		{@const dayEvents = getEventsForDay(currentDate)}
-		<div class="flex-1 bg-night px-4 py-5 min-h-0 overflow-auto">
+		<div class="flex-1 px-4 py-4 min-h-0 overflow-auto">
 			{#if dayEvents.length === 0}
-				<div class="text-center text-light/40 py-12">
-					<p class="font-body text-body">No events for this day</p>
+				<div class="flex flex-col items-center justify-center h-full text-light/40">
+					<span class="material-symbols-rounded mb-3" style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;">event_busy</span>
+					<p class="text-body-sm">No events for this day</p>
 				</div>
 			{:else}
 				<div class="space-y-2">
 					{#each dayEvents as event}
 						<button
-							class="w-full text-left p-3 rounded-[8px] transition-colors hover:opacity-80"
-							style="background-color: {event.color ??
-								'#00A3E0'}20; border-left: 3px solid {event.color ??
-								'#00A3E0'}"
+							class="w-full text-left p-3 rounded-xl border border-light/5 hover:border-light/10 transition-all"
+							style="border-left: 3px solid {event.color ?? '#00A3E0'}"
 							onclick={() => onEventClick?.(event)}
 						>
-							<div class="font-heading text-h5 text-white">
+							<div class="font-heading text-body-sm text-white">
 								{event.title}
 							</div>
-							<div
-								class="font-body text-body-md text-light/60 mt-1"
-							>
+							<div class="text-[12px] text-light/40 mt-1">
 								{new Date(event.start_time).toLocaleTimeString(
 									"en-US",
 									{ hour: "numeric", minute: "2-digit" },
@@ -333,9 +304,7 @@
 								)}
 							</div>
 							{#if event.description}
-								<div
-									class="font-body text-body-md text-light/50 mt-2"
-								>
+								<div class="text-[12px] text-light/30 mt-1.5 line-clamp-2">
 									{event.description}
 								</div>
 							{/if}
--- a/src/lib/components/documents/DocumentViewer.svelte
+++ b/src/lib/components/documents/DocumentViewer.svelte
@@ -42,17 +42,15 @@
 	}
 </script>

-<div
-	class="bg-night rounded-[32px] overflow-hidden flex flex-col min-w-0 h-full"
->
+<div class="flex flex-col min-w-0 h-full overflow-hidden">
 	<!-- Lock Banner -->
 	{#if locked}
 		<div
-			class="flex items-center gap-2 px-4 py-2.5 bg-warning/10 border-b border-warning/20"
+			class="flex items-center gap-2 px-4 py-2 bg-warning/10 border-b border-warning/20 shrink-0"
 		>
 			<span
 				class="material-symbols-rounded text-warning"
-				style="font-size: 20px; font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
+				style="font-size: 18px; font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 18;"
 			>
 				lock
 			</span>
@@ -64,42 +62,35 @@
 	{/if}

 	<!-- Header -->
-	<header class="flex items-center gap-2 px-4 py-5">
-		<h2 class="flex-1 font-heading text-h1 text-white truncate">
+	<div class="flex items-center gap-2 px-5 py-3 border-b border-light/5 shrink-0">
+		<h2 class="flex-1 font-heading text-body-sm text-white truncate">
 			{document.name}
 		</h2>
 		{#if locked}
-			<Button size="md" disabled>
-				<span
-					class="material-symbols-rounded mr-1"
-					style="font-size: 16px; font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 16;"
-					>lock</span
-				>
-				Locked
-			</Button>
+			<Button size="sm" disabled>Locked</Button>
 		{:else if mode === "edit"}
-			<Button size="md" onclick={handleEditClick}>
+			<Button size="sm" onclick={handleEditClick}>
 				{isEditing ? "Preview" : "Edit"}
 			</Button>
 		{:else}
-			<Button size="md" onclick={handleEditClick}>Edit</Button>
+			<Button size="sm" onclick={handleEditClick}>Edit</Button>
 		{/if}
 		<button
 			type="button"
-			class="p-1 hover:bg-dark rounded-full transition-colors"
+			class="p-1 hover:bg-dark/50 rounded-lg transition-colors"
 			aria-label="More options"
 		>
 			<span
-				class="material-symbols-rounded text-light"
-				style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
+				class="material-symbols-rounded text-light/40 hover:text-white"
+				style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;"
 			>
 				more_horiz
 			</span>
 		</button>
-	</header>
+	</div>

 	<!-- Editor Area -->
-	<div class="flex-1 bg-background rounded-[32px] mx-4 mb-4 overflow-auto">
+	<div class="flex-1 overflow-auto">
 		<Editor {document} {onSave} editable={isEditing} />
 	</div>
 </div>
--- a/src/lib/components/documents/FileBrowser.svelte
+++ b/src/lib/components/documents/FileBrowser.svelte
@@ -5,9 +5,6 @@
 		Button,
 		Modal,
 		Input,
-		Avatar,
-		IconButton,
-		Icon,
 	} from "$lib/components/ui";
 	import { DocumentViewer } from "$lib/components/documents";
 	import { createLogger } from "$lib/utils/logger";
@@ -490,97 +487,101 @@
 	}
 </script>

-<div class="flex h-full gap-4">
+<div class="flex h-full gap-0">
 	<!-- Files Panel -->
-	<div
-		class="bg-night rounded-[32px] flex flex-col gap-4 px-4 py-5 overflow-hidden flex-1 min-w-0 h-full"
-	>
-		<!-- Header -->
-		<header class="flex items-center gap-2 p-1">
-			<Avatar name={title} size="md" />
-			<h1 class="flex-1 font-heading text-h1 text-white">{title}</h1>
-			<Button size="md" onclick={handleAdd}>{m.btn_new()}</Button>
-			<IconButton title={m.files_toggle_view()} onclick={toggleViewMode}>
-				<Icon
-					name={viewMode === "list" ? "grid_view" : "view_list"}
-					size={24}
-				/>
-			</IconButton>
-		</header>
-
-		<!-- Breadcrumb Path -->
-		<nav class="flex items-center gap-2 text-h3 font-heading">
-			{#each breadcrumbPath as crumb, i}
-				{#if i > 0}
-					<span
-						class="material-symbols-rounded text-light/30"
-						style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
-					>
-						chevron_right
-					</span>
-				{/if}
-				<a
-					href={getFolderUrl(crumb.id)}
-					class="px-3 py-1 rounded-xl transition-colors
-					{crumb.id === currentFolderId
-						? 'text-white'
-						: 'text-light/60 hover:text-primary'}
-					{dragOverBreadcrumb === (crumb.id ?? '__root__')
-						? 'ring-2 ring-primary bg-primary/10'
-						: ''}"
-					ondragover={(e) => {
-						e.preventDefault();
-						e.stopPropagation();
-						if (e.dataTransfer) e.dataTransfer.dropEffect = "move";
-						dragOverBreadcrumb = crumb.id ?? "__root__";
-					}}
-					ondragleave={() => {
-						dragOverBreadcrumb = undefined;
-					}}
-					ondrop={async (e) => {
-						e.preventDefault();
-						e.stopPropagation();
-						dragOverBreadcrumb = undefined;
-						if (!draggedItem) return;
-						if (draggedItem.parent_id === crumb.id) {
+	<div class="flex flex-col flex-1 min-w-0 h-full overflow-hidden">
+		<!-- Toolbar: Breadcrumbs + Actions -->
+		<div class="flex items-center gap-2 px-6 py-3 border-b border-light/5 shrink-0">
+			<!-- Breadcrumb Path -->
+			<nav class="flex items-center gap-1 flex-1 min-w-0 overflow-x-auto">
+				{#each breadcrumbPath as crumb, i}
+					{#if i > 0}
+						<span
+							class="material-symbols-rounded text-light/20 shrink-0"
+							style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;"
+						>
+							chevron_right
+						</span>
+					{/if}
+					<a
+						href={getFolderUrl(crumb.id)}
+						class="px-2 py-1 rounded-lg text-body-sm font-body whitespace-nowrap transition-colors
+						{crumb.id === currentFolderId
+							? 'text-white bg-dark/30'
+							: 'text-light/50 hover:text-white hover:bg-dark/30'}
+						{dragOverBreadcrumb === (crumb.id ?? '__root__')
+							? 'ring-2 ring-primary bg-primary/10'
+							: ''}"
+						ondragover={(e) => {
+							e.preventDefault();
+							e.stopPropagation();
+							if (e.dataTransfer) e.dataTransfer.dropEffect = "move";
+							dragOverBreadcrumb = crumb.id ?? "__root__";
+						}}
+						ondragleave={() => {
+							dragOverBreadcrumb = undefined;
+						}}
+						ondrop={async (e) => {
+							e.preventDefault();
+							e.stopPropagation();
+							dragOverBreadcrumb = undefined;
+							if (!draggedItem) return;
+							if (draggedItem.parent_id === crumb.id) {
+								resetDragState();
+								return;
+							}
+							const draggedName = draggedItem.name;
+							await handleMove(draggedItem.id, crumb.id);
+							toasts.success(
+								`Moved "${draggedName}" to "${crumb.name}"`,
+							);
 							resetDragState();
-							return;
-						}
-						const draggedName = draggedItem.name;
-						await handleMove(draggedItem.id, crumb.id);
-						toasts.success(
-							`Moved "${draggedName}" to "${crumb.name}"`,
-						);
-						resetDragState();
-					}}
+						}}
+					>
+						{#if i === 0}
+							<span class="material-symbols-rounded" style="font-size: 16px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 16;">home</span>
+						{:else}
+							{crumb.name}
+						{/if}
+					</a>
+				{/each}
+			</nav>
+
+			<Button size="sm" icon="add" onclick={handleAdd}>{m.btn_new()}</Button>
+			<button
+				type="button"
+				class="p-1.5 rounded-lg text-light/40 hover:text-white hover:bg-dark/50 transition-colors"
+				title={m.files_toggle_view()}
+				onclick={toggleViewMode}
+			>
+				<span
+					class="material-symbols-rounded"
+					style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
+					>{viewMode === "list" ? "grid_view" : "view_list"}</span
 				>
-					{crumb.name}
-				</a>
-			{/each}
-		</nav>
+			</button>
+		</div>

 		<!-- File List/Grid -->
-		<div class="flex-1 overflow-auto min-h-0">
+		<div class="flex-1 overflow-auto min-h-0 p-4">
 			{#if viewMode === "list"}
 				<div
-					class="flex flex-col gap-1"
+					class="flex flex-col gap-0.5"
 					ondragover={handleContainerDragOver}
 					ondrop={handleDropOnEmpty}
 					role="list"
 				>
 					{#if currentFolderItems.length === 0}
-						<div class="text-center text-light/40 py-8 text-sm">
-							<p>
-								No files yet. Drag files here or create a new
-								one.
-							</p>
+						<div class="flex flex-col items-center justify-center text-light/40 py-16">
+							<span class="material-symbols-rounded mb-3" style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;">folder_open</span>
+							<p class="text-body-sm">{m.files_empty()}</p>
 						</div>
 					{:else}
 						{#each currentFolderItems as item}
 							<button
 								type="button"
-								class="flex items-center gap-2 h-10 pl-1 pr-2 py-1 rounded-[32px] w-full text-left transition-colors hover:bg-dark
-								{selectedDoc?.id === item.id ? 'bg-dark' : ''}
+								class="flex items-center gap-3 px-3 py-2 rounded-xl w-full text-left transition-colors hover:bg-dark/50
+								{selectedDoc?.id === item.id ? 'bg-dark/50 ring-1 ring-primary/20' : ''}
 								{draggedItem?.id === item.id ? 'opacity-50' : ''}
 								{dragOverFolder === item.id ? 'ring-2 ring-primary bg-primary/10' : ''}"
 								draggable="true"
@@ -595,24 +596,20 @@
 								oncontextmenu={(e) =>
 									handleContextMenu(e, item)}
 							>
-								<div
-									class="w-8 h-8 flex items-center justify-center p-1"
-								>
-									<span
-										class="material-symbols-rounded text-light"
-										style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
-									>
-										{getDocIcon(item)}
-									</span>
-								</div>
 								<span
-									class="font-body text-body text-white truncate flex-1"
+									class="material-symbols-rounded shrink-0 {item.type === 'folder' ? 'text-amber-400' : item.type === 'kanban' ? 'text-purple-400' : 'text-light/50'}"
+									style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
+								>
+									{getDocIcon(item)}
+								</span>
+								<span
+									class="font-body text-body-sm text-white truncate flex-1"
 									>{item.name}</span
 								>
 								{#if item.type === "folder"}
 									<span
-										class="material-symbols-rounded text-light/50"
-										style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
+										class="material-symbols-rounded text-light/20"
+										style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;"
 									>
 										chevron_right
 									</span>
@@ -624,26 +621,22 @@
 			{:else}
 				<!-- Grid View -->
 				<div
-					class="grid grid-cols-3 lg:grid-cols-4 xl:grid-cols-6 gap-4"
+					class="grid grid-cols-3 lg:grid-cols-4 xl:grid-cols-6 gap-2"
 					ondragover={handleContainerDragOver}
 					ondrop={handleDropOnEmpty}
 					role="list"
 				>
 					{#if currentFolderItems.length === 0}
-						<div
-							class="col-span-full text-center text-light/40 py-8 text-sm"
-						>
-							<p>
-								No files yet. Drag files here or create a new
-								one.
-							</p>
+						<div class="col-span-full flex flex-col items-center justify-center text-light/40 py-16">
+							<span class="material-symbols-rounded mb-3" style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;">folder_open</span>
+							<p class="text-body-sm">{m.files_empty()}</p>
 						</div>
 					{:else}
 						{#each currentFolderItems as item}
 							<button
 								type="button"
-								class="flex flex-col items-center gap-2 p-4 rounded-xl transition-colors hover:bg-dark
-								{selectedDoc?.id === item.id ? 'bg-dark' : ''}
+								class="flex flex-col items-center gap-2 p-3 rounded-xl border border-transparent transition-all hover:bg-dark/50 hover:border-light/5
+								{selectedDoc?.id === item.id ? 'bg-dark/50 border-primary/20' : ''}
 								{draggedItem?.id === item.id ? 'opacity-50' : ''}
 								{dragOverFolder === item.id ? 'ring-2 ring-primary bg-primary/10' : ''}"
 								draggable="true"
@@ -659,13 +652,13 @@
 									handleContextMenu(e, item)}
 							>
 								<span
-									class="material-symbols-rounded text-light"
-									style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 48;"
+									class="material-symbols-rounded {item.type === 'folder' ? 'text-amber-400' : item.type === 'kanban' ? 'text-purple-400' : 'text-light/40'}"
+									style="font-size: 40px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 40;"
 								>
 									{getDocIcon(item)}
 								</span>
 								<span
-									class="font-body text-body-md text-white text-center truncate w-full"
+									class="font-body text-[12px] text-white text-center truncate w-full"
 									>{item.name}</span
 								>
 							</button>
@@ -678,7 +671,7 @@

 	<!-- Compact Editor Panel (shown when a doc is selected) -->
 	{#if selectedDoc}
-		<div class="flex-1 min-w-0 h-full">
+		<div class="flex-1 min-w-0 h-full border-l border-light/5">
 			<DocumentViewer
 				document={selectedDoc}
 				onSave={handleSave}
--- a/src/lib/components/kanban/KanbanCard.svelte
+++ b/src/lib/components/kanban/KanbanCard.svelte
@@ -57,7 +57,7 @@

 <button
 	type="button"
-	class="bg-night rounded-[16px] p-2 cursor-pointer hover:ring-1 hover:ring-primary/30 transition-all group w-full text-left overflow-clip flex flex-col gap-2 relative"
+	class="bg-night/80 border border-light/5 hover:border-light/10 rounded-xl px-3 py-2.5 cursor-pointer transition-all group w-full text-left flex flex-col gap-1.5 relative"
 	class:opacity-50={isDragging}
 	{draggable}
 	{ondragstart}
@@ -67,25 +67,25 @@
 	{#if ondelete}
 		<button
 			type="button"
-			class="absolute top-1 right-1 p-1 rounded-full opacity-0 group-hover:opacity-100 hover:bg-error/20 transition-all z-10"
+			class="absolute top-1.5 right-1.5 p-0.5 rounded-lg opacity-0 group-hover:opacity-100 hover:bg-error/10 transition-all z-10"
 			onclick={handleDelete}
 			aria-label="Delete card"
 		>
 			<span
-				class="material-symbols-rounded text-light/40 hover:text-error"
-				style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;"
+				class="material-symbols-rounded text-light/30 hover:text-error"
+				style="font-size: 16px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 16;"
 			>
-				delete
+				close
 			</span>
 		</button>
 	{/if}

 	<!-- Tags / Chips -->
 	{#if card.tags && card.tags.length > 0}
-		<div class="flex gap-[10px] items-start flex-wrap">
+		<div class="flex gap-1 items-start flex-wrap">
 			{#each card.tags as tag}
 				<span
-					class="rounded-[4px] px-1 py-[4px] font-body font-bold text-[14px] text-night leading-none overflow-clip"
+					class="rounded-[4px] px-1.5 py-0.5 font-body font-bold text-[11px] text-night leading-none"
 					style="background-color: {tag.color || '#00A3E0'}"
 				>
 					{tag.name}
@@ -95,55 +95,40 @@
 	{/if}

 	<!-- Title -->
-	<p class="font-body text-body text-white w-full leading-none p-1">
+	<p class="font-body text-body-sm text-white w-full leading-snug">
 		{card.title}
 	</p>

 	<!-- Bottom row: details + avatar -->
 	{#if hasFooter}
-		<div class="flex items-center justify-between w-full">
-			<div class="flex gap-1 items-center">
-				<!-- Due date -->
+		<div class="flex items-center justify-between w-full mt-0.5">
+			<div class="flex gap-2 items-center text-[11px] text-light/40">
 				{#if card.due_date}
-					<div class="flex items-center">
+					<span class="flex items-center gap-0.5">
 						<span
-							class="material-symbols-rounded text-light p-1"
-							style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
-						>
-							calendar_today
-						</span>
-						<span
-							class="font-body text-[12px] text-light leading-none"
-						>
-							{formatDueDate(card.due_date)}
-						</span>
-					</div>
+							class="material-symbols-rounded"
+							style="font-size: 14px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 14;"
+						>calendar_today</span>
+						{formatDueDate(card.due_date)}
+					</span>
 				{/if}

-				<!-- Checklist -->
 				{#if (card.checklist_total ?? 0) > 0}
-					<div class="flex items-center">
+					<span class="flex items-center gap-0.5">
 						<span
-							class="material-symbols-rounded text-light p-1"
-							style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
-						>
-							check_box
-						</span>
-						<span
-							class="font-body text-[12px] text-light leading-none"
-						>
-							{card.checklist_done ?? 0}/{card.checklist_total}
-						</span>
-					</div>
+							class="material-symbols-rounded"
+							style="font-size: 14px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 14;"
+						>check_box</span>
+						{card.checklist_done ?? 0}/{card.checklist_total}
+					</span>
 				{/if}
 			</div>

-			<!-- Assignee avatar -->
 			{#if card.assignee_id}
 				<Avatar
 					name={card.assignee_name || "?"}
 					src={card.assignee_avatar}
-					size="sm"
+					size="xs"
 				/>
 			{/if}
 		</div>
--- a/src/lib/components/settings/SettingsGeneral.svelte
+++ b/src/lib/components/settings/SettingsGeneral.svelte
@@ -124,93 +124,88 @@
 	}
 </script>

-<div class="flex flex-col gap-8">
+<div class="flex flex-col gap-6 max-w-2xl">
 	<!-- Organization Details -->
-	<h2 class="font-heading text-h2 text-white">Organization details</h2>
+	<div class="bg-dark/30 border border-light/5 rounded-xl p-5 flex flex-col gap-5">
+		<h2 class="font-heading text-body text-white">Organization details</h2>

-	<div class="flex flex-col gap-8">
-		<div class="flex flex-col gap-4">
-			<!-- Avatar Upload -->
-			<div class="flex flex-col gap-2">
-				<span class="font-body text-body-sm text-light">Avatar</span>
-				<div class="flex items-center gap-4">
-					<Avatar name={orgName || "?"} src={avatarUrl} size="lg" />
-					<div class="flex gap-2">
-						<input
-							type="file"
-							accept="image/*"
-							class="hidden"
-							bind:this={avatarInput}
-							onchange={handleAvatarUpload}
-						/>
+		<!-- Avatar Upload -->
+		<div class="flex flex-col gap-2">
+			<span class="font-body text-body-sm text-light/60">Avatar</span>
+			<div class="flex items-center gap-4">
+				<Avatar name={orgName || "?"} src={avatarUrl} size="lg" />
+				<div class="flex gap-2">
+					<input
+						type="file"
+						accept="image/*"
+						class="hidden"
+						bind:this={avatarInput}
+						onchange={handleAvatarUpload}
+					/>
+					<Button
+						variant="secondary"
+						size="sm"
+						onclick={() => avatarInput?.click()}
+						loading={isUploading}
+					>
+						Upload
+					</Button>
+					{#if avatarUrl}
 						<Button
-							variant="secondary"
+							variant="tertiary"
 							size="sm"
-							onclick={() => avatarInput?.click()}
-							loading={isUploading}
+							onclick={removeAvatar}
 						>
-							Upload
+							Remove
 						</Button>
-						{#if avatarUrl}
-							<Button
-								variant="tertiary"
-								size="sm"
-								onclick={removeAvatar}
-							>
-								Remove
-							</Button>
-						{/if}
-					</div>
+					{/if}
 				</div>
 			</div>
-			<Input
-				label="Name"
-				bind:value={orgName}
-				placeholder="Organization name"
-			/>
-			<Input
-				label="URL slug (yoursite.com/...)"
-				bind:value={orgSlug}
-				placeholder="my-org"
-			/>
+		</div>
+		<Input
+			label="Name"
+			bind:value={orgName}
+			placeholder="Organization name"
+		/>
+		<Input
+			label="URL slug (yoursite.com/...)"
+			bind:value={orgSlug}
+			placeholder="my-org"
+		/>
+		<div>
+			<Button size="sm" onclick={saveGeneralSettings} loading={isSaving}
+				>Save Changes</Button
+			>
+		</div>
+	</div>
+
+	<!-- Danger Zone -->
+	{#if isOwner}
+		<div class="bg-dark/30 border border-error/10 rounded-xl p-5 flex flex-col gap-3">
+			<h4 class="font-heading text-body-sm text-error">Danger Zone</h4>
+			<p class="font-body text-[11px] text-light/40">
+				Permanently delete this organization and all its data.
+			</p>
 			<div>
-				<Button onclick={saveGeneralSettings} loading={isSaving}
-					>Save Changes</Button
+				<Button variant="danger" size="sm" onclick={onDelete}
+					>Delete Organization</Button
 				>
 			</div>
 		</div>
+	{/if}

-		<!-- Danger Zone -->
-		{#if isOwner}
-			<div class="flex flex-col gap-4">
-				<h4 class="font-heading text-h4 text-white">Danger Zone</h4>
-				<p class="font-body text-body text-white">
-					Permanently delete this organization and all its data.
-				</p>
-				<div>
-					<Button variant="danger" onclick={onDelete}
-						>Delete Organization</Button
-					>
-				</div>
+	<!-- Leave Organization (non-owners) -->
+	{#if !isOwner}
+		<div class="bg-dark/30 border border-light/5 rounded-xl p-5 flex flex-col gap-3">
+			<h4 class="font-heading text-body-sm text-white">Leave Organization</h4>
+			<p class="font-body text-[11px] text-light/40">
+				Leave this organization. You will need to be re-invited to rejoin.
+			</p>
+			<div>
+				<Button variant="secondary" size="sm" onclick={onLeave}
+					>Leave {org.name}</Button
+				>
 			</div>
-		{/if}
-
-		<!-- Leave Organization (non-owners) -->
-		{#if !isOwner}
-			<div class="flex flex-col gap-4">
-				<h4 class="font-heading text-h4 text-white">
-					Leave Organization
-				</h4>
-				<p class="font-body text-body text-white">
-					Leave this organization. You will need to be re-invited to
-					rejoin.
-				</p>
-				<div>
-					<Button variant="secondary" onclick={onLeave}
-						>Leave {org.name}</Button
-					>
-				</div>
-			</div>
-		{/if}
-	</div>
+		</div>
+	{/if}
 </div>
--- a/src/lib/components/settings/SettingsIntegrations.svelte
+++ b/src/lib/components/settings/SettingsIntegrations.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Button, Modal, Card, Input } from "$lib/components/ui";
+	import { Button, Modal, Input } from "$lib/components/ui";
 	import { toasts } from "$lib/stores/toast.svelte";
 	import {
 		extractCalendarId,
@@ -108,184 +108,88 @@
 	}
 </script>

-<div class="space-y-6 max-w-2xl">
-	<Card>
-		<div class="p-6">
-			<div class="flex items-start gap-4">
-				<div
-					class="w-12 h-12 bg-white rounded-lg flex items-center justify-center"
-				>
-					<svg class="w-8 h-8" viewBox="0 0 24 24">
-						<path
-							fill="#4285F4"
-							d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
-						/>
-						<path
-							fill="#34A853"
-							d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
-						/>
-						<path
-							fill="#FBBC05"
-							d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
-						/>
-						<path
-							fill="#EA4335"
-							d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
-						/>
-					</svg>
-				</div>
-				<div class="flex-1">
-					<h3 class="text-lg font-semibold text-light">
-						Google Calendar
-					</h3>
-					<p class="text-sm text-light/50 mt-1">
-						Sync events between your organization and Google
-						Calendar.
-					</p>
+<div class="space-y-3 max-w-2xl">
+	<!-- Google Calendar -->
+	<div class="bg-dark/30 border border-light/5 rounded-xl p-5">
+		<div class="flex items-start gap-4">
+			<div class="w-10 h-10 bg-white rounded-xl flex items-center justify-center shrink-0">
+				<svg class="w-6 h-6" viewBox="0 0 24 24">
+					<path fill="#4285F4" d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"/>
+					<path fill="#34A853" d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"/>
+					<path fill="#FBBC05" d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"/>
+					<path fill="#EA4335" d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"/>
+				</svg>
+			</div>
+			<div class="flex-1 min-w-0">
+				<h3 class="font-heading text-body-sm text-white">Google Calendar</h3>
+				<p class="text-[11px] text-light/40 mt-0.5">
+					Sync events between your organization and Google Calendar.
+				</p>

-					{#if orgCalendar}
-						<div
-							class="mt-4 p-3 bg-green-500/10 border border-green-500/20 rounded-lg"
-						>
-							<div
-								class="flex flex-col sm:flex-row sm:items-center justify-between gap-3 p-3 bg-green-500/10 rounded-lg"
-							>
-								<div class="min-w-0 flex-1">
-									<p
-										class="text-sm font-medium text-green-400"
-									>
-										Connected
-									</p>
-									<p class="text-light font-medium">
-										{orgCalendar.calendar_name ||
-											"Google Calendar"}
-									</p>
-									<p
-										class="text-xs text-light/50 truncate"
-										title={orgCalendar.calendar_id}
-									>
-										{orgCalendar.calendar_id}
-									</p>
-									<p class="text-xs text-light/40 mt-1">
-										Events sync both ways — create here or
-										in Google Calendar.
-									</p>
-									<a
-										href="https://calendar.google.com/calendar/u/0/r?cid={encodeURIComponent(
-											orgCalendar.calendar_id,
-										)}"
-										target="_blank"
-										rel="noopener noreferrer"
-										class="inline-flex items-center gap-1.5 text-xs text-blue-400 hover:text-blue-300 mt-2"
-									>
-										<svg
-											class="w-3.5 h-3.5"
-											viewBox="0 0 24 24"
-											fill="none"
-											stroke="currentColor"
-											stroke-width="2"
-										>
-											<path
-												d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"
-											/>
-											<polyline points="15 3 21 3 21 9" />
-											<line
-												x1="10"
-												y1="14"
-												x2="21"
-												y2="3"
-											/>
-										</svg>
-										Open in Google Calendar
-									</a>
-								</div>
-								<Button
-									variant="danger"
-									size="sm"
-									onclick={disconnectOrgCalendar}
-									>Disconnect</Button
+				{#if orgCalendar}
+					<div class="mt-3 p-3 bg-green-500/10 border border-green-500/20 rounded-lg">
+						<div class="flex flex-col sm:flex-row sm:items-center justify-between gap-3">
+							<div class="min-w-0 flex-1">
+								<p class="text-[11px] font-medium text-green-400">Connected</p>
+								<p class="text-body-sm text-white">{orgCalendar.calendar_name || "Google Calendar"}</p>
+								<p class="text-[10px] text-light/40 truncate" title={orgCalendar.calendar_id}>{orgCalendar.calendar_id}</p>
+								<p class="text-[10px] text-light/30 mt-1">Events sync both ways.</p>
+								<a
+									href="https://calendar.google.com/calendar/u/0/r?cid={encodeURIComponent(orgCalendar.calendar_id)}"
+									target="_blank"
+									rel="noopener noreferrer"
+									class="inline-flex items-center gap-1 text-[11px] text-blue-400 hover:text-blue-300 mt-1.5"
 								>
+									<span class="material-symbols-rounded" style="font-size: 14px;">open_in_new</span>
+									Open in Google Calendar
+								</a>
 							</div>
+							<Button variant="danger" size="sm" onclick={disconnectOrgCalendar}>Disconnect</Button>
 						</div>
-					{:else if !serviceAccountEmail}
-						<div
-							class="mt-4 p-3 bg-yellow-500/10 border border-yellow-500/20 rounded-lg"
-						>
-							<p class="text-sm text-yellow-400 font-medium">
-								Setup required
-							</p>
-							<p class="text-xs text-light/50 mt-1">
-								A server administrator needs to configure the <code
-									class="bg-light/10 px-1 rounded"
-									>GOOGLE_SERVICE_ACCOUNT_KEY</code
-								> environment variable before calendars can be connected.
-							</p>
-						</div>
-					{:else}
-						<div class="mt-4">
-							<Button onclick={() => (showConnectModal = true)}
-								>Connect Google Calendar</Button
-							>
-						</div>
-					{/if}
-				</div>
+					</div>
+				{:else if !serviceAccountEmail}
+					<div class="mt-3 p-3 bg-yellow-500/10 border border-yellow-500/20 rounded-lg">
+						<p class="text-[11px] text-yellow-400 font-medium">Setup required</p>
+						<p class="text-[10px] text-light/40 mt-1">
+							A server administrator needs to configure the <code class="bg-light/10 px-1 rounded">GOOGLE_SERVICE_ACCOUNT_KEY</code> environment variable.
+						</p>
+					</div>
+				{:else}
+					<div class="mt-3">
+						<Button size="sm" onclick={() => (showConnectModal = true)}>Connect Google Calendar</Button>
+					</div>
+				{/if}
 			</div>
 		</div>
-	</Card>
+	</div>

-	<Card>
-		<div class="p-6 opacity-50">
-			<div class="flex items-start gap-4">
-				<div
-					class="w-12 h-12 bg-[#7289da] rounded-lg flex items-center justify-center"
-				>
-					<svg
-						class="w-7 h-7 text-white"
-						viewBox="0 0 24 24"
-						fill="currentColor"
-					>
-						<path
-							d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515a.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0a12.64 12.64 0 0 0-.617-1.25a.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057a19.9 19.9 0 0 0 5.993 3.03a.078.078 0 0 0 .084-.028a14.09 14.09 0 0 0 1.226-1.994a.076.076 0 0 0-.041-.106a13.107 13.107 0 0 1-1.872-.892a.077.077 0 0 1-.008-.128a10.2 10.2 0 0 0 .372-.292a.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127a12.299 12.299 0 0 1-1.873.892a.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028a19.839 19.839 0 0 0 6.002-3.03a.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419c0-1.333.956-2.419 2.157-2.419c1.21 0 2.176 1.096 2.157 2.42c0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419c0-1.333.955-2.419 2.157-2.419c1.21 0 2.176 1.096 2.157 2.42c0 1.333-.946 2.418-2.157 2.418z"
-						/>
-					</svg>
-				</div>
-				<div class="flex-1">
-					<h3 class="text-lg font-semibold text-light">Discord</h3>
-					<p class="text-sm text-light/50 mt-1">
-						Get notifications in your Discord server.
-					</p>
-					<p class="text-xs text-light/40 mt-2">Coming soon</p>
-				</div>
+	<!-- Discord (coming soon) -->
+	<div class="bg-dark/30 border border-light/5 rounded-xl p-5 opacity-40">
+		<div class="flex items-start gap-4">
+			<div class="w-10 h-10 bg-[#5865F2] rounded-xl flex items-center justify-center shrink-0">
+				<span class="material-symbols-rounded text-white" style="font-size: 22px;">forum</span>
+			</div>
+			<div class="flex-1">
+				<h3 class="font-heading text-body-sm text-white">Discord</h3>
+				<p class="text-[11px] text-light/40 mt-0.5">Get notifications in your Discord server.</p>
+				<p class="text-[10px] text-light/30 mt-1">Coming soon</p>
 			</div>
 		</div>
-	</Card>
+	</div>

-	<Card>
-		<div class="p-6 opacity-50">
-			<div class="flex items-start gap-4">
-				<div
-					class="w-12 h-12 bg-[#4A154B] rounded-lg flex items-center justify-center"
-				>
-					<svg
-						class="w-7 h-7 text-white"
-						viewBox="0 0 24 24"
-						fill="currentColor"
-					>
-						<path
-							d="M5.042 15.165a2.528 2.528 0 0 1-2.52 2.523A2.528 2.528 0 0 1 0 15.165a2.527 2.527 0 0 1 2.522-2.52h2.52v2.52zM6.313 15.165a2.527 2.527 0 0 1 2.521-2.52a2.527 2.527 0 0 1 2.521 2.52v6.313A2.528 2.528 0 0 1 8.834 24a2.528 2.528 0 0 1-2.521-2.522v-6.313zM8.834 5.042a2.528 2.528 0 0 1-2.521-2.52A2.528 2.528 0 0 1 8.834 0a2.528 2.528 0 0 1 2.521 2.522v2.52H8.834zM8.834 6.313a2.528 2.528 0 0 1 2.521 2.521a2.528 2.528 0 0 1-2.521 2.521H2.522A2.528 2.528 0 0 1 0 8.834a2.528 2.528 0 0 1 2.522-2.521h6.312zM18.956 8.834a2.528 2.528 0 0 1 2.522-2.521A2.528 2.528 0 0 1 24 8.834a2.528 2.528 0 0 1-2.522 2.521h-2.522V8.834zM17.688 8.834a2.528 2.528 0 0 1-2.523 2.521a2.527 2.527 0 0 1-2.52-2.521V2.522A2.527 2.527 0 0 1 15.165 0a2.528 2.528 0 0 1 2.523 2.522v6.312zM15.165 18.956a2.528 2.528 0 0 1 2.523 2.522A2.528 2.528 0 0 1 15.165 24a2.527 2.527 0 0 1-2.52-2.522v-2.522h2.52zM15.165 17.688a2.527 2.527 0 0 1-2.52-2.523a2.526 2.526 0 0 1 2.52-2.52h6.313A2.527 2.527 0 0 1 24 15.165a2.528 2.528 0 0 1-2.522 2.523h-6.313z"
-						/>
-					</svg>
-				</div>
-				<div class="flex-1">
-					<h3 class="text-lg font-semibold text-light">Slack</h3>
-					<p class="text-sm text-light/50 mt-1">
-						Get notifications in your Slack workspace.
-					</p>
-					<p class="text-xs text-light/40 mt-2">Coming soon</p>
-				</div>
+	<!-- Slack (coming soon) -->
+	<div class="bg-dark/30 border border-light/5 rounded-xl p-5 opacity-40">
+		<div class="flex items-start gap-4">
+			<div class="w-10 h-10 bg-[#4A154B] rounded-xl flex items-center justify-center shrink-0">
+				<span class="material-symbols-rounded text-white" style="font-size: 22px;">tag</span>
+			</div>
+			<div class="flex-1">
+				<h3 class="font-heading text-body-sm text-white">Slack</h3>
+				<p class="text-[11px] text-light/40 mt-0.5">Get notifications in your Slack workspace.</p>
+				<p class="text-[10px] text-light/30 mt-1">Coming soon</p>
 			</div>
 		</div>
-	</Card>
+	</div>
 </div>

 <!-- Connect Calendar Modal -->
--- a/src/lib/components/settings/SettingsMembers.svelte
+++ b/src/lib/components/settings/SettingsMembers.svelte
@@ -2,7 +2,6 @@
 	import {
 		Button,
 		Modal,
-		Card,
 		Input,
 		Select,
 		Avatar,
@@ -169,113 +168,97 @@
 	}
 </script>

-<div class="space-y-6">
+<div class="space-y-4 max-w-2xl">
 	<div class="flex items-center justify-between">
-		<h2 class="text-lg font-semibold text-light">
-			{m.settings_members_title({
-				count: String(members.length),
-			})}
-		</h2>
-		<Button onclick={() => (showInviteModal = true)}>
-			<svg
-				class="w-4 h-4 mr-2"
-				viewBox="0 0 24 24"
-				fill="none"
-				stroke="currentColor"
-				stroke-width="2"
-			>
-				<path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2" /><circle
-					cx="9"
-					cy="7"
-					r="4"
-				/><line x1="19" y1="8" x2="19" y2="14" /><line
-					x1="22"
-					y1="11"
-					x2="16"
-					y2="11"
-				/>
-			</svg>
+		<div>
+			<h2 class="font-heading text-body text-white">
+				{m.settings_members_title({
+					count: String(members.length),
+				})}
+			</h2>
+		</div>
+		<Button size="sm" icon="person_add" onclick={() => (showInviteModal = true)}>
 			{m.settings_members_invite()}
 		</Button>
 	</div>

 	<!-- Pending Invites -->
 	{#if invites.length > 0}
-		<Card>
-			<div class="p-4">
-				<h3 class="text-sm font-medium text-light/70 mb-3">
-					{m.settings_members_pending()}
-				</h3>
-				<div class="space-y-2">
-					{#each invites as invite}
-						<div
-							class="flex items-center justify-between py-2 px-3 bg-light/5 rounded-lg"
-						>
-							<div>
-								<p class="text-light">{invite.email}</p>
-								<p class="text-xs text-light/40">
-									Invited as {invite.role} • Expires {new Date(
-										invite.expires_at,
-									).toLocaleDateString()}
-								</p>
-							</div>
-							<div class="flex items-center gap-2">
-								<Button
-									variant="tertiary"
-									size="sm"
-									onclick={() =>
-										navigator.clipboard.writeText(
-											`${window.location.origin}/invite/${invite.token}`,
-										)}
-									>{m.settings_members_copy_link()}</Button
-								>
-								<Button
-									variant="danger"
-									size="sm"
-									onclick={() => cancelInvite(invite.id)}
-									>Cancel</Button
-								>
-							</div>
+		<div class="bg-dark/30 border border-light/5 rounded-xl p-4">
+			<h3 class="text-body-sm font-heading text-light/60 mb-3">
+				{m.settings_members_pending()}
+			</h3>
+			<div class="space-y-2">
+				{#each invites as invite}
+					<div
+						class="flex items-center justify-between py-2 px-3 bg-light/5 rounded-lg"
+					>
+						<div>
+							<p class="text-body-sm text-white">{invite.email}</p>
+							<p class="text-[11px] text-light/40">
+								Invited as {invite.role} • Expires {new Date(
+									invite.expires_at,
+								).toLocaleDateString()}
+							</p>
 						</div>
-					{/each}
-				</div>
+						<div class="flex items-center gap-1.5">
+							<button
+								type="button"
+								class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
+								onclick={() =>
+									navigator.clipboard.writeText(
+										`${window.location.origin}/invite/${invite.token}`,
+									)}
+								title={m.settings_members_copy_link()}
+							>
+								<span class="material-symbols-rounded" style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;">content_copy</span>
+							</button>
+							<button
+								type="button"
+								class="p-1.5 text-light/40 hover:text-error hover:bg-error/10 rounded-lg transition-colors"
+								onclick={() => cancelInvite(invite.id)}
+								title="Cancel invite"
+							>
+								<span class="material-symbols-rounded" style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;">close</span>
+							</button>
+						</div>
+					</div>
+				{/each}
 			</div>
-		</Card>
+		</div>
 	{/if}

 	<!-- Members List -->
-	<Card>
-		<div class="divide-y divide-light/10">
+	<div class="bg-dark/30 border border-light/5 rounded-xl overflow-hidden">
+		<div class="divide-y divide-light/5">
 			{#each members as member}
 				{@const rawProfile = member.profiles}
 				{@const profile = Array.isArray(rawProfile)
 					? rawProfile[0]
 					: rawProfile}
 				<div
-					class="flex items-center justify-between p-4 hover:bg-light/5 transition-colors"
+					class="flex items-center justify-between px-4 py-3 hover:bg-light/5 transition-colors"
 				>
 					<div class="flex items-center gap-3">
-						<div
-							class="w-10 h-10 rounded-full bg-primary/20 flex items-center justify-center text-primary font-medium"
-						>
-							{(profile?.full_name ||
-								profile?.email ||
-								"?")[0].toUpperCase()}
-						</div>
+						<Avatar
+							name={profile?.full_name || profile?.email || "?"}
+							src={profile?.avatar_url}
+							size="sm"
+						/>
 						<div>
-							<p class="text-light font-medium">
+							<p class="text-body-sm text-white">
 								{profile?.full_name ||
 									profile?.email ||
 									"Unknown User"}
 							</p>
-							<p class="text-sm text-light/50">
+							<p class="text-[11px] text-light/40">
 								{profile?.email || "No email"}
 							</p>
 						</div>
 					</div>
-					<div class="flex items-center gap-3">
+					<div class="flex items-center gap-2">
 						<span
-							class="px-2 py-1 text-xs rounded-full capitalize"
+							class="px-2 py-0.5 text-[10px] rounded-md capitalize font-body"
 							style="background-color: {roles.find(
 								(r) => r.name.toLowerCase() === member.role,
 							)?.color ?? '#6366f1'}20; color: {roles.find(
@@ -283,18 +266,20 @@
 							)?.color ?? '#6366f1'}">{member.role}</span
 						>
 						{#if member.user_id !== userId && member.role !== "owner"}
-							<Button
-								variant="tertiary"
-								size="sm"
+							<button
+								type="button"
+								class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
 								onclick={() => openMemberModal(member)}
-								>Edit</Button
+								title="Edit"
 							>
+								<span class="material-symbols-rounded" style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;">edit</span>
+							</button>
 						{/if}
 					</div>
 				</div>
 			{/each}
 		</div>
-	</Card>
+	</div>
 </div>

 <!-- Invite Member Modal -->
--- a/src/lib/components/settings/SettingsRoles.svelte
+++ b/src/lib/components/settings/SettingsRoles.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Button, Modal, Card, Input } from "$lib/components/ui";
+	import { Button, Modal, Input } from "$lib/components/ui";
 	import { toasts } from "$lib/stores/toast.svelte";
 	import type { SupabaseClient } from "@supabase/supabase-js";
 	import type { Database } from "$lib/supabase/types";
@@ -188,86 +188,72 @@
 	}
 </script>

-<div class="space-y-6">
+<div class="space-y-4 max-w-2xl">
 	<div class="flex items-center justify-between">
 		<div>
-			<h2 class="text-lg font-semibold text-light">Roles</h2>
-			<p class="text-sm text-light/50">
+			<h2 class="font-heading text-body text-white">Roles</h2>
+			<p class="text-body-sm text-light/40 mt-0.5">
 				Create custom roles with specific permissions.
 			</p>
 		</div>
-		<Button onclick={() => openRoleModal()} icon="add">
+		<Button size="sm" onclick={() => openRoleModal()} icon="add">
 			Create Role
 		</Button>
 	</div>

-	<div class="grid gap-4">
+	<div class="flex flex-col gap-2">
 		{#each roles as role}
-			<Card>
-				<div class="p-4">
-					<div class="flex items-center justify-between mb-3">
-						<div class="flex items-center gap-3">
-							<div
-								class="w-3 h-3 rounded-full"
-								style="background-color: {role.color}"
-							></div>
-							<span class="font-medium text-light"
-								>{role.name}</span
-							>
-							{#if role.is_system}
-								<span
-									class="text-xs text-light/40 bg-light/10 px-2 py-0.5 rounded"
-									>System</span
-								>
-							{/if}
-							{#if role.is_default}
-								<span
-									class="text-xs text-primary bg-primary/10 px-2 py-0.5 rounded"
-									>Default</span
-								>
-							{/if}
-						</div>
-						<div class="flex items-center gap-2">
-							{#if !role.is_system || role.name !== "Owner"}
-								<Button
-									variant="tertiary"
-									size="sm"
-									onclick={() => openRoleModal(role)}
-									>Edit</Button
-								>
-							{/if}
-							{#if !role.is_system}
-								<Button
-									variant="danger"
-									size="sm"
-									onclick={() => deleteRole(role)}
-									>Delete</Button
-								>
-							{/if}
-						</div>
+			<div class="bg-dark/30 border border-light/5 rounded-xl px-4 py-3 hover:border-light/10 transition-colors">
+				<div class="flex items-center justify-between mb-2">
+					<div class="flex items-center gap-2">
+						<div
+							class="w-2.5 h-2.5 rounded-full shrink-0"
+							style="background-color: {role.color}"
+						></div>
+						<span class="text-body-sm font-medium text-white">{role.name}</span>
+						{#if role.is_system}
+							<span class="text-[10px] text-light/30 bg-light/5 px-1.5 py-0.5 rounded-md">System</span>
+						{/if}
+						{#if role.is_default}
+							<span class="text-[10px] text-primary bg-primary/10 px-1.5 py-0.5 rounded-md">Default</span>
+						{/if}
 					</div>
-					<div class="flex flex-wrap gap-1">
-						{#if role.permissions.includes("*")}
-							<span
-								class="text-xs bg-light/10 text-light/70 px-2 py-1 rounded"
-								>All Permissions</span
+					<div class="flex items-center gap-1.5">
+						{#if !role.is_system || role.name !== "Owner"}
+							<button
+								type="button"
+								class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
+								onclick={() => openRoleModal(role)}
+								title="Edit"
 							>
-						{:else}
-							{#each role.permissions.slice(0, 6) as perm}
-								<span
-									class="text-xs bg-light/10 text-light/50 px-2 py-1 rounded"
-									>{perm}</span
-								>
-							{/each}
-							{#if role.permissions.length > 6}
-								<span class="text-xs text-light/40"
-									>+{role.permissions.length - 6} more</span
-								>
-							{/if}
+								<span class="material-symbols-rounded" style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;">edit</span>
+							</button>
+						{/if}
+						{#if !role.is_system}
+							<button
+								type="button"
+								class="p-1.5 text-light/40 hover:text-error hover:bg-error/10 rounded-lg transition-colors"
+								onclick={() => deleteRole(role)}
+								title="Delete"
+							>
+								<span class="material-symbols-rounded" style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;">delete</span>
+							</button>
 						{/if}
 					</div>
 				</div>
-			</Card>
+				<div class="flex flex-wrap gap-1">
+					{#if role.permissions.includes("*")}
+						<span class="text-[10px] bg-light/5 text-light/50 px-1.5 py-0.5 rounded-md">All Permissions</span>
+					{:else}
+						{#each role.permissions.slice(0, 6) as perm}
+							<span class="text-[10px] bg-light/5 text-light/40 px-1.5 py-0.5 rounded-md">{perm}</span>
+						{/each}
+						{#if role.permissions.length > 6}
+							<span class="text-[10px] text-light/30">+{role.permissions.length - 6} more</span>
+						{/if}
+					{/if}
+				</div>
+			</div>
 		{/each}
 	</div>
 </div>
--- a/src/lib/components/ui/ActivityFeed.svelte
+++ b/src/lib/components/ui/ActivityFeed.svelte
@@ -0,0 +1,132 @@
+<script lang="ts">
+	import * as m from "$lib/paraglide/messages";
+
+	interface ActivityEntry {
+		id: string;
+		action: string;
+		entity_type: string;
+		entity_id: string | null;
+		entity_name: string | null;
+		created_at: string | null;
+		profiles: {
+			full_name: string | null;
+			email: string | null;
+		} | null;
+	}
+
+	interface Props {
+		entries: ActivityEntry[];
+		emptyLabel?: string;
+	}
+
+	let { entries, emptyLabel }: Props = $props();
+
+	function getEntityTypeLabel(entityType: string): string {
+		const map: Record<string, () => string> = {
+			document: m.entity_document,
+			folder: m.entity_folder,
+			kanban_board: m.entity_kanban_board,
+			kanban_card: m.entity_kanban_card,
+			kanban_column: m.entity_kanban_column,
+			member: m.entity_member,
+			role: m.entity_role,
+			invite: m.entity_invite,
+			event: m.entity_event,
+		};
+		return (map[entityType] ?? (() => entityType))();
+	}
+
+	function getActivityIcon(action: string): string {
+		const map: Record<string, string> = {
+			create: "add_circle",
+			update: "edit",
+			delete: "delete",
+			move: "drive_file_move",
+			rename: "edit_note",
+		};
+		return map[action] ?? "info";
+	}
+
+	function getActivityColor(action: string): string {
+		const map: Record<string, string> = {
+			create: "text-emerald-400",
+			update: "text-blue-400",
+			delete: "text-red-400",
+			move: "text-amber-400",
+			rename: "text-purple-400",
+		};
+		return map[action] ?? "text-light/50";
+	}
+
+	function formatTimeAgo(dateStr: string | null): string {
+		if (!dateStr) return "";
+		const now = Date.now();
+		const then = new Date(dateStr).getTime();
+		const diffMs = now - then;
+		const diffMin = Math.floor(diffMs / 60000);
+		if (diffMin < 1) return m.activity_just_now();
+		if (diffMin < 60)
+			return m.activity_minutes_ago({ count: String(diffMin) });
+		const diffHr = Math.floor(diffMin / 60);
+		if (diffHr < 24) return m.activity_hours_ago({ count: String(diffHr) });
+		const diffDay = Math.floor(diffHr / 24);
+		return m.activity_days_ago({ count: String(diffDay) });
+	}
+
+	function getDescription(entry: ActivityEntry): string {
+		const userName =
+			entry.profiles?.full_name || entry.profiles?.email || "Someone";
+		const entityType = getEntityTypeLabel(entry.entity_type);
+		const name = entry.entity_name ?? "—";
+
+		const map: Record<string, () => string> = {
+			create: () =>
+				m.activity_created({ user: userName, entityType, name }),
+			update: () =>
+				m.activity_updated({ user: userName, entityType, name }),
+			delete: () =>
+				m.activity_deleted({ user: userName, entityType, name }),
+			move: () => m.activity_moved({ user: userName, entityType, name }),
+			rename: () =>
+				m.activity_renamed({ user: userName, entityType, name }),
+		};
+		return (map[entry.action] ?? map["update"]!)();
+	}
+</script>
+
+{#if entries.length === 0}
+	<div
+		class="flex flex-col items-center justify-center text-light/40 py-8"
+	>
+		<span
+			class="material-symbols-rounded mb-2"
+			style="font-size: 40px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 40;"
+			>history</span
+		>
+		<p class="text-body-sm">{emptyLabel ?? m.activity_empty()}</p>
+	</div>
+{:else}
+	<div class="flex flex-col gap-0.5">
+		{#each entries as entry}
+			<div
+				class="flex items-start gap-3 px-3 py-2 rounded-xl hover:bg-dark/50 transition-colors"
+			>
+				<span
+					class="material-symbols-rounded {getActivityColor(
+						entry.action,
+					)} mt-0.5 shrink-0"
+					style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;"
+					>{getActivityIcon(entry.action)}</span
+				>
+				<div class="flex-1 min-w-0">
+					<p class="text-body-sm text-light/70 leading-relaxed">
+						{getDescription(entry)}
+					</p>
+				</div>
+				<span class="text-[11px] text-light/30 shrink-0 mt-0.5"
+					>{formatTimeAgo(entry.created_at)}</span
+				>
+			</div>
+		{/each}
+	</div>
+{/if}
--- a/src/lib/components/ui/ContentSkeleton.svelte
+++ b/src/lib/components/ui/ContentSkeleton.svelte
@@ -0,0 +1,109 @@
+<script lang="ts">
+	import Skeleton from "./Skeleton.svelte";
+
+	interface Props {
+		variant?: "default" | "kanban" | "files" | "calendar" | "settings" | "list" | "detail";
+	}
+
+	let { variant = "default" }: Props = $props();
+</script>
+
+<div class="flex-1 p-6 animate-in">
+	{#if variant === "kanban"}
+		<div class="flex gap-3 h-full overflow-hidden">
+			{#each Array(3) as _}
+				<div class="flex-shrink-0 w-[256px] bg-dark/20 rounded-xl p-4 flex flex-col gap-3">
+					<div class="flex items-center gap-2">
+						<Skeleton variant="text" width="120px" height="1.25rem" />
+						<Skeleton variant="rectangular" width="24px" height="20px" class="rounded-lg" />
+					</div>
+					{#each Array(3) as __}
+						<Skeleton variant="card" height="72px" class="rounded-xl" />
+					{/each}
+				</div>
+			{/each}
+		</div>
+	{:else if variant === "files"}
+		<div class="flex items-center gap-2 mb-4">
+			<Skeleton variant="text" width="300px" height="2.5rem" class="rounded-xl" />
+			<div class="flex-1"></div>
+			<Skeleton variant="circular" width="36px" height="36px" />
+			<Skeleton variant="circular" width="36px" height="36px" />
+		</div>
+		<div class="grid grid-cols-2 md:grid-cols-4 lg:grid-cols-6 gap-3">
+			{#each Array(12) as _}
+				<Skeleton variant="card" height="100px" class="rounded-xl" />
+			{/each}
+		</div>
+	{:else if variant === "calendar"}
+		<div class="flex items-center gap-2 mb-4">
+			<Skeleton variant="circular" width="32px" height="32px" />
+			<Skeleton variant="text" width="200px" height="1.5rem" />
+			<Skeleton variant="circular" width="32px" height="32px" />
+			<div class="flex-1"></div>
+			<Skeleton variant="rectangular" width="200px" height="32px" class="rounded-xl" />
+		</div>
+		<div class="grid grid-cols-7 gap-1">
+			{#each Array(7) as _}
+				<Skeleton variant="text" width="100%" height="2rem" />
+			{/each}
+			{#each Array(35) as _}
+				<Skeleton variant="rectangular" width="100%" height="72px" class="rounded-none" />
+			{/each}
+		</div>
+	{:else if variant === "settings"}
+		<div class="flex flex-col gap-4">
+			<Skeleton variant="text" width="160px" height="1.5rem" />
+			<Skeleton variant="text" lines={3} />
+			<Skeleton variant="rectangular" width="100%" height="48px" class="rounded-xl" />
+			<Skeleton variant="rectangular" width="100%" height="48px" class="rounded-xl" />
+		</div>
+	{:else if variant === "list"}
+		<div class="grid grid-cols-2 lg:grid-cols-4 gap-3 mb-6">
+			{#each Array(4) as _}
+				<Skeleton variant="card" height="72px" class="rounded-xl" />
+			{/each}
+		</div>
+		<div class="flex flex-col gap-2">
+			{#each Array(5) as _}
+				<Skeleton variant="rectangular" height="64px" class="rounded-xl" />
+			{/each}
+		</div>
+	{:else if variant === "detail"}
+		<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
+			<div class="lg:col-span-2 flex flex-col gap-4">
+				<Skeleton variant="card" height="200px" class="rounded-xl" />
+				<Skeleton variant="card" height="300px" class="rounded-xl" />
+			</div>
+			<div class="flex flex-col gap-4">
+				<Skeleton variant="card" height="180px" class="rounded-xl" />
+				<Skeleton variant="card" height="120px" class="rounded-xl" />
+			</div>
+		</div>
+	{:else}
+		<div class="grid grid-cols-2 lg:grid-cols-4 gap-3 mb-6">
+			{#each Array(4) as _}
+				<Skeleton variant="card" height="72px" class="rounded-xl" />
+			{/each}
+		</div>
+		<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
+			<div class="lg:col-span-2">
+				<Skeleton variant="card" height="300px" class="rounded-xl" />
+			</div>
+			<div class="flex flex-col gap-4">
+				<Skeleton variant="card" height="140px" class="rounded-xl" />
+				<Skeleton variant="card" height="200px" class="rounded-xl" />
+			</div>
+		</div>
+	{/if}
+</div>
+
+<style>
+	.animate-in {
+		animation: fadeIn 0.2s ease-out;
+	}
+	@keyframes fadeIn {
+		from { opacity: 0; }
+		to { opacity: 1; }
+	}
+</style>
--- a/src/lib/components/ui/EventCard.svelte
+++ b/src/lib/components/ui/EventCard.svelte
@@ -0,0 +1,116 @@
+<script lang="ts">
+	import StatusBadge from "./StatusBadge.svelte";
+
+	interface Props {
+		name: string;
+		slug: string;
+		status: string;
+		startDate: string | null;
+		endDate: string | null;
+		color: string | null;
+		venueName: string | null;
+		href: string;
+		compact?: boolean;
+	}
+
+	let {
+		name,
+		slug,
+		status,
+		startDate,
+		endDate,
+		color,
+		venueName,
+		href,
+		compact = false,
+	}: Props = $props();
+
+	function formatDate(dateStr: string | null): string {
+		if (!dateStr) return "";
+		return new Date(dateStr).toLocaleDateString(undefined, {
+			month: "short",
+			day: "numeric",
+		});
+	}
+</script>
+
+{#if compact}
+	<!-- Compact variant: single row for lists/sidebars -->
+	<a
+		{href}
+		class="flex items-center gap-3 px-3 py-2.5 rounded-xl hover:bg-dark/50 transition-colors group"
+	>
+		<div
+			class="w-2.5 h-2.5 rounded-full shrink-0"
+			style="background-color: {color || '#00A3E0'}"
+		></div>
+		<div class="flex-1 min-w-0">
+			<p
+				class="text-body-sm text-white group-hover:text-primary transition-colors truncate"
+			>
+				{name}
+			</p>
+			<div class="flex items-center gap-2 mt-0.5">
+				{#if startDate}
+					<span class="text-[11px] text-light/40"
+						>{formatDate(startDate)}{endDate
+							? ` — ${formatDate(endDate)}`
+							: ""}</span
+					>
+				{/if}
+				{#if venueName}
+					<span class="text-[11px] text-light/30"
+						>· {venueName}</span
+					>
+				{/if}
+			</div>
+		</div>
+		<StatusBadge {status} />
+	</a>
+{:else}
+	<!-- Full card variant: for grid layouts -->
+	<a
+		{href}
+		class="group bg-dark/30 hover:bg-dark/60 border border-light/5 hover:border-light/10 rounded-2xl p-5 flex flex-col gap-3 transition-all"
+	>
+		<div class="flex items-center justify-between">
+			<div class="flex items-center gap-2">
+				<div
+					class="w-3 h-3 rounded-full"
+					style="background-color: {color || '#00A3E0'}"
+				></div>
+				<h3
+					class="text-body font-heading text-white group-hover:text-primary transition-colors truncate"
+				>
+					{name}
+				</h3>
+			</div>
+			<StatusBadge {status} />
+		</div>
+
+		<div class="flex items-center gap-3 text-[12px] text-light/40">
+			{#if startDate}
+				<span class="flex items-center gap-1">
+					<span
+						class="material-symbols-rounded"
+						style="font-size: 14px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 14;"
+						>calendar_today</span
+					>
+					{formatDate(startDate)}{endDate
+						? ` — ${formatDate(endDate)}`
+						: ""}
+				</span>
+			{/if}
+			{#if venueName}
+				<span class="flex items-center gap-1">
+					<span
+						class="material-symbols-rounded"
+						style="font-size: 14px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 14;"
+						>location_on</span
+					>
+					{venueName}
+				</span>
+			{/if}
+		</div>
+	</a>
+{/if}
--- a/src/lib/components/ui/KanbanColumn.svelte
+++ b/src/lib/components/ui/KanbanColumn.svelte
@@ -14,28 +14,25 @@
 </script>

 <div
-	class="bg-background flex flex-col gap-4 items-start overflow-hidden px-4 py-5 rounded-[32px] w-64 h-[512px]"
+	class="bg-dark/20 border border-light/5 flex flex-col overflow-hidden rounded-xl w-[272px] shrink-0 h-full"
 >
 	<!-- Header -->
-	<div class="flex items-center gap-2 p-1 rounded-[32px] w-full">
+	<div class="flex items-center gap-2 px-3 py-2.5 border-b border-light/5">
 		<div class="flex-1 flex items-center gap-2 min-w-0">
-			<span class="font-heading text-h4 text-white truncate">{title}</span
-			>
-			<div
-				class="bg-dark flex items-center justify-center p-1 rounded-lg shrink-0"
-			>
-				<span class="font-heading text-h6 text-white">{count}</span>
-			</div>
+			<span class="font-heading text-body-sm text-white truncate">{title}</span>
+			<span
+				class="text-[11px] text-light/40 bg-light/5 px-1.5 py-0.5 rounded-md shrink-0"
+			>{count}</span>
 		</div>
 		{#if onMore}
 			<button
 				type="button"
-				class="p-1 flex items-center justify-center hover:bg-dark/50 rounded-full transition-colors"
+				class="p-0.5 flex items-center justify-center hover:bg-dark/50 rounded-lg transition-colors"
 				onclick={onMore}
 			>
 				<span
-					class="material-symbols-rounded text-light"
-					style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
+					class="material-symbols-rounded text-light/40 hover:text-white"
+					style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;"
 				>
 					more_horiz
 				</span>
@@ -45,7 +42,7 @@

 	<!-- Cards container -->
 	<div
-		class="flex-1 flex flex-col gap-2 items-start overflow-y-auto w-full min-h-0"
+		class="flex-1 flex flex-col gap-1.5 p-2 overflow-y-auto min-h-0"
 	>
 		{#if children}
 			{@render children()}
@@ -54,8 +51,10 @@

 	<!-- Add button -->
 	{#if onAddCard}
-		<Button variant="secondary" fullWidth icon="add" onclick={onAddCard}>
-			Add card
-		</Button>
+		<div class="px-2 pb-2">
+			<Button variant="tertiary" fullWidth size="sm" icon="add" onclick={onAddCard}>
+				Add card
+			</Button>
+		</div>
 	{/if}
 </div>
--- a/src/lib/components/ui/MemberList.svelte
+++ b/src/lib/components/ui/MemberList.svelte
@@ -0,0 +1,71 @@
+<script lang="ts">
+	import Avatar from "./Avatar.svelte";
+
+	interface MemberItem {
+		id: string;
+		user_id: string;
+		role: string;
+		profiles: {
+			id: string;
+			email: string;
+			full_name: string | null;
+			avatar_url: string | null;
+		} | null;
+	}
+
+	interface Props {
+		members: MemberItem[];
+		max?: number;
+		moreHref?: string;
+		moreLabel?: string;
+		emptyLabel?: string;
+	}
+
+	let {
+		members,
+		max = 6,
+		moreHref,
+		moreLabel,
+		emptyLabel,
+	}: Props = $props();
+
+	const visible = $derived(members.slice(0, max));
+	const remaining = $derived(members.length - max);
+</script>
+
+<div class="flex flex-col gap-1.5">
+	{#each visible as member}
+		<div class="flex items-center gap-2.5 px-1 py-1">
+			<Avatar
+				name={member.profiles?.full_name ||
+					member.profiles?.email ||
+					"?"}
+				src={member.profiles?.avatar_url}
+				size="sm"
+			/>
+			<div class="flex-1 min-w-0">
+				<p class="text-body-sm text-white truncate">
+					{member.profiles?.full_name ||
+						member.profiles?.email ||
+						"Unknown"}
+				</p>
+				<p class="text-[11px] text-light/40 capitalize">
+					{member.role}
+				</p>
+			</div>
+		</div>
+	{/each}
+	{#if remaining > 0 && moreHref && moreLabel}
+		<a
+			href={moreHref}
+			class="text-body-sm text-primary hover:underline text-center pt-1"
+		>
+			{moreLabel}
+		</a>
+	{/if}
+	{#if members.length === 0 && emptyLabel}
+		<p class="text-body-sm text-light/30 text-center py-4">
+			{emptyLabel}
+		</p>
+	{/if}
+</div>
--- a/src/lib/components/ui/ModuleCard.svelte
+++ b/src/lib/components/ui/ModuleCard.svelte
@@ -0,0 +1,40 @@
+<script lang="ts">
+	interface Props {
+		label: string;
+		description: string;
+		icon: string;
+		href: string;
+		color?: string;
+		bg?: string;
+	}
+
+	let {
+		label,
+		description,
+		icon,
+		href,
+		color = "text-primary",
+		bg = "bg-primary/10",
+	}: Props = $props();
+</script>
+
+<a
+	{href}
+	class="group bg-dark/30 hover:bg-dark/60 border border-light/5 hover:border-light/10 rounded-xl p-4 flex flex-col gap-2 transition-all"
+>
+	<div
+		class="w-10 h-10 rounded-xl {bg} flex items-center justify-center"
+	>
+		<span
+			class="material-symbols-rounded {color}"
+			style="font-size: 22px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 22;"
+			>{icon}</span
+		>
+	</div>
+	<h3
+		class="text-body font-heading text-white group-hover:text-primary transition-colors"
+	>
+		{label}
+	</h3>
+	<p class="text-[12px] text-light/40">{description}</p>
+</a>
--- a/src/lib/components/ui/PageHeader.svelte
+++ b/src/lib/components/ui/PageHeader.svelte
@@ -0,0 +1,46 @@
+<script lang="ts">
+	import type { Snippet } from "svelte";
+
+	interface Props {
+		title: string;
+		subtitle?: string;
+		icon?: string;
+		iconColor?: string;
+		actions?: Snippet;
+		class?: string;
+	}
+
+	let {
+		title,
+		subtitle,
+		icon,
+		iconColor = "text-white",
+		actions,
+		class: className = "",
+	}: Props = $props();
+</script>
+
+<header
+	class="flex items-center justify-between px-6 py-5 border-b border-light/5 shrink-0 {className}"
+>
+	<div class="flex items-center gap-3 min-w-0">
+		{#if icon}
+			<span
+				class="material-symbols-rounded {iconColor} shrink-0"
+				style="font-size: 28px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 28;"
+				>{icon}</span
+			>
+		{/if}
+		<div class="min-w-0">
+			<h1 class="text-h1 font-heading text-white truncate">{title}</h1>
+			{#if subtitle}
+				<p class="text-body-sm text-light/50 mt-0.5">{subtitle}</p>
+			{/if}
+		</div>
+	</div>
+	{#if actions}
+		<div class="flex items-center gap-2 shrink-0 ml-4">
+			{@render actions()}
+		</div>
+	{/if}
+</header>
--- a/src/lib/components/ui/QuickLinkGrid.svelte
+++ b/src/lib/components/ui/QuickLinkGrid.svelte
@@ -0,0 +1,30 @@
+<script lang="ts">
+	interface QuickLink {
+		label: string;
+		icon: string;
+		href: string;
+		color?: string;
+	}
+
+	interface Props {
+		links: QuickLink[];
+	}
+
+	let { links }: Props = $props();
+</script>
+
+<div class="grid grid-cols-2 gap-2">
+	{#each links as link}
+		<a
+			href={link.href}
+			class="flex flex-col items-center gap-1.5 p-3 rounded-xl bg-dark/30 hover:bg-dark/60 border border-light/5 hover:border-light/10 transition-all text-center"
+		>
+			<span
+				class="material-symbols-rounded {link.color ?? 'text-light/50'}"
+				style="font-size: 22px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 22;"
+				>{link.icon}</span
+			>
+			<span class="text-[12px] text-light/60">{link.label}</span>
+		</a>
+	{/each}
+</div>
--- a/src/lib/components/ui/SectionCard.svelte
+++ b/src/lib/components/ui/SectionCard.svelte
@@ -0,0 +1,41 @@
+<script lang="ts">
+	import type { Snippet } from "svelte";
+
+	interface Props {
+		title?: string;
+		titleRight?: Snippet;
+		padding?: "sm" | "md" | "lg";
+		class?: string;
+		children: Snippet;
+	}
+
+	let {
+		title,
+		titleRight,
+		padding = "md",
+		class: className = "",
+		children,
+	}: Props = $props();
+
+	const paddingClasses = {
+		sm: "p-3",
+		md: "p-5",
+		lg: "p-6",
+	};
+</script>
+
+<div
+	class="bg-dark/30 border border-light/5 rounded-xl {paddingClasses[padding]} {className}"
+>
+	{#if title || titleRight}
+		<div class="flex items-center justify-between mb-4">
+			{#if title}
+				<h2 class="text-body font-heading text-white">{title}</h2>
+			{/if}
+			{#if titleRight}
+				{@render titleRight()}
+			{/if}
+		</div>
+	{/if}
+	{@render children()}
+</div>
--- a/src/lib/components/ui/StatCard.svelte
+++ b/src/lib/components/ui/StatCard.svelte
@@ -0,0 +1,58 @@
+<script lang="ts">
+	interface Props {
+		label: string;
+		value: number | string;
+		icon: string;
+		color?: string;
+		bg?: string;
+		href?: string | null;
+	}
+
+	let {
+		label,
+		value,
+		icon,
+		color = "text-primary",
+		bg = "bg-primary/10",
+		href = null,
+	}: Props = $props();
+</script>
+
+{#if href}
+	<a
+		{href}
+		class="bg-dark/30 border border-light/5 hover:border-light/10 rounded-xl p-4 flex items-center gap-3 transition-all group"
+	>
+		<div
+			class="w-10 h-10 rounded-xl {bg} flex items-center justify-center shrink-0"
+		>
+			<span
+				class="material-symbols-rounded {color}"
+				style="font-size: 22px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 22;"
+				>{icon}</span
+			>
+		</div>
+		<div>
+			<p class="text-xl font-bold text-white leading-none">{value}</p>
+			<p class="text-[12px] text-light/40 mt-0.5">{label}</p>
+		</div>
+	</a>
+{:else}
+	<div
+		class="bg-dark/30 border border-light/5 rounded-xl p-4 flex items-center gap-3"
+	>
+		<div
+			class="w-10 h-10 rounded-xl {bg} flex items-center justify-center shrink-0"
+		>
+			<span
+				class="material-symbols-rounded {color}"
+				style="font-size: 22px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 22;"
+				>{icon}</span
+			>
+		</div>
+		<div>
+			<p class="text-xl font-bold text-white leading-none">{value}</p>
+			<p class="text-[12px] text-light/40 mt-0.5">{label}</p>
+		</div>
+	</div>
+{/if}
--- a/src/lib/components/ui/StatusBadge.svelte
+++ b/src/lib/components/ui/StatusBadge.svelte
@@ -0,0 +1,30 @@
+<script lang="ts">
+	interface Props {
+		status: string;
+		size?: "sm" | "md";
+	}
+
+	let { status, size = "sm" }: Props = $props();
+
+	const colorMap: Record<string, string> = {
+		planning: "text-amber-400 bg-amber-400/10",
+		active: "text-emerald-400 bg-emerald-400/10",
+		completed: "text-blue-400 bg-blue-400/10",
+		archived: "text-light/40 bg-light/5",
+		draft: "text-light/40 bg-light/5",
+		sent: "text-amber-400 bg-amber-400/10",
+		signed: "text-emerald-400 bg-emerald-400/10",
+		fulfilled: "text-blue-400 bg-blue-400/10",
+	};
+
+	const sizeClasses = {
+		sm: "text-[10px] px-2 py-0.5",
+		md: "text-[12px] px-2.5 py-1",
+	};
+
+	const colors = $derived(colorMap[status] ?? "text-light/40 bg-light/5");
+</script>
+
+<span class="rounded-full capitalize {sizeClasses[size]} {colors}"
+	>{status}</span
+>
--- a/src/lib/components/ui/TabBar.svelte
+++ b/src/lib/components/ui/TabBar.svelte
@@ -0,0 +1,37 @@
+<script lang="ts">
+	interface Tab {
+		value: string;
+		label: string;
+		icon?: string;
+	}
+
+	interface Props {
+		tabs: Tab[];
+		active: string;
+		onchange: (value: string) => void;
+	}
+
+	let { tabs, active, onchange }: Props = $props();
+</script>
+
+<div class="flex items-center gap-1 px-6 py-3 border-b border-light/5 shrink-0">
+	{#each tabs as tab}
+		<button
+			type="button"
+			class="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-body-sm font-body transition-colors {active ===
+			tab.value
+				? 'bg-primary text-background'
+				: 'text-light/50 hover:text-white hover:bg-dark/50'}"
+			onclick={() => onchange(tab.value)}
+		>
+			{#if tab.icon}
+				<span
+					class="material-symbols-rounded"
+					style="font-size: 16px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 16;"
+					>{tab.icon}</span
+				>
+			{/if}
+			{tab.label}
+		</button>
+	{/each}
+</div>
--- a/src/lib/components/ui/index.ts
+++ b/src/lib/components/ui/index.ts
@@ -26,6 +26,17 @@ export { default as Icon } from './Icon.svelte';
 export { default as AssigneePicker } from './AssigneePicker.svelte';
 export { default as ContextMenu } from './ContextMenu.svelte';
 export { default as PageSkeleton } from './PageSkeleton.svelte';
+export { default as PageHeader } from './PageHeader.svelte';
+export { default as SectionCard } from './SectionCard.svelte';
+export { default as StatCard } from './StatCard.svelte';
+export { default as StatusBadge } from './StatusBadge.svelte';
+export { default as TabBar } from './TabBar.svelte';
+export { default as MemberList } from './MemberList.svelte';
+export { default as ActivityFeed } from './ActivityFeed.svelte';
+export { default as EventCard } from './EventCard.svelte';
+export { default as ContentSkeleton } from './ContentSkeleton.svelte';
+export { default as QuickLinkGrid } from './QuickLinkGrid.svelte';
+export { default as ModuleCard } from './ModuleCard.svelte';
 export { default as ImagePreviewModal } from './ImagePreviewModal.svelte';
 export { default as Twemoji } from './Twemoji.svelte';
 export { default as EmojiPicker } from './EmojiPicker.svelte';
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
    import { getContext } from "svelte";
-    import { Button, Card, Modal, Input } from "$lib/components/ui";
+    import { Button, Modal, Input } from "$lib/components/ui";
    import { createOrganization, generateSlug } from "$lib/api/organizations";
    import { toasts } from "$lib/stores/toast.svelte";
    import type { SupabaseClient } from "@supabase/supabase-js";
@@ -58,108 +58,53 @@
    <title>Organizations | Root</title>
 </svelte:head>

-<div class="min-h-screen bg-dark">
-    <header class="border-b border-light/10 bg-surface">
-        <div
-            class="max-w-6xl mx-auto px-6 py-4 flex items-center justify-between"
-        >
-            <h1 class="text-xl font-bold text-light">Root Org</h1>
-            <div class="flex items-center gap-4">
-                <a href="/style" class="text-sm text-light/60 hover:text-light"
-                    >Style Guide</a
-                >
+<div class="min-h-screen bg-background">
+    <!-- Header -->
+    <header class="border-b border-light/5">
+        <div class="max-w-5xl mx-auto px-6 py-4 flex items-center justify-between">
+            <div class="flex items-center gap-3">
+                <span class="material-symbols-rounded text-primary" style="font-size: 28px; font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 28;">hub</span>
+                <span class="font-heading text-h4 text-white">Root</span>
+            </div>
+            <div class="flex items-center gap-2">
+                <a href="/style" class="px-3 py-1.5 text-[12px] text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors">Style Guide</a>
                <form method="POST" action="/auth/logout">
-                    <Button variant="tertiary" size="sm" type="submit"
-                        >Sign Out</Button
-                    >
+                    <Button variant="tertiary" size="sm" type="submit">Sign Out</Button>
                </form>
            </div>
        </div>
    </header>

-    <main class="max-w-6xl mx-auto px-6 py-8">
-        <div class="flex items-center justify-between mb-8">
+    <main class="max-w-5xl mx-auto px-6 py-8">
+        <div class="flex items-center justify-between mb-6">
            <div>
-                <h2 class="text-2xl font-bold text-light">
-                    Your Organizations
-                </h2>
-                <p class="text-light/50 mt-1">
-                    Select an organization to get started
-                </p>
+                <h2 class="font-heading text-h3 text-white">Your Organizations</h2>
+                <p class="text-body-sm text-light/40 mt-1">Select an organization to get started</p>
            </div>
-            <Button onclick={() => (showCreateModal = true)}>
-                <svg
-                    class="w-4 h-4 mr-2"
-                    viewBox="0 0 24 24"
-                    fill="none"
-                    stroke="currentColor"
-                    stroke-width="2"
-                >
-                    <line x1="12" y1="5" x2="12" y2="19" />
-                    <line x1="5" y1="12" x2="19" y2="12" />
-                </svg>
-                New Organization
-            </Button>
+            <Button size="sm" icon="add" onclick={() => (showCreateModal = true)}>New Organization</Button>
        </div>

        {#if organizations.length === 0}
-            <Card>
-                <div class="p-12 text-center">
-                    <svg
-                        class="w-16 h-16 mx-auto mb-4 text-light/30"
-                        viewBox="0 0 24 24"
-                        fill="none"
-                        stroke="currentColor"
-                        stroke-width="1.5"
-                    >
-                        <path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2" />
-                        <circle cx="9" cy="7" r="4" />
-                        <path d="M23 21v-2a4 4 0 0 0-3-3.87" />
-                        <path d="M16 3.13a4 4 0 0 1 0 7.75" />
-                    </svg>
-                    <h3 class="text-lg font-medium text-light mb-2">
-                        No organizations yet
-                    </h3>
-                    <p class="text-light/50 mb-6">
-                        Create your first organization to start collaborating
-                    </p>
-                    <Button onclick={() => (showCreateModal = true)}
-                        >Create Organization</Button
-                    >
-                </div>
-            </Card>
+            <div class="bg-dark/30 border border-light/5 rounded-xl p-12 text-center">
+                <span class="material-symbols-rounded text-light/20 mb-3 block" style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;">groups</span>
+                <h3 class="font-heading text-body text-white mb-1">No organizations yet</h3>
+                <p class="text-body-sm text-light/40 mb-6">Create your first organization to start collaborating</p>
+                <Button size="sm" icon="add" onclick={() => (showCreateModal = true)}>Create Organization</Button>
+            </div>
        {:else}
-            <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+            <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-3">
                {#each organizations as org}
                    <a href="/{org.slug}" class="block group">
-                        <Card
-                            class="h-full hover:ring-1 hover:ring-primary/50 transition-all"
-                        >
-                            <div class="p-6">
-                                <div
-                                    class="flex items-start justify-between mb-4"
-                                >
-                                    <div
-                                        class="w-12 h-12 bg-primary/20 rounded-xl flex items-center justify-center text-primary font-bold text-lg"
-                                    >
-                                        {org.name.charAt(0).toUpperCase()}
-                                    </div>
-                                    <span
-                                        class="text-xs px-2 py-1 bg-light/10 rounded text-light/60 capitalize"
-                                    >
-                                        {org.role}
-                                    </span>
+                        <div class="bg-dark/30 border border-light/5 hover:border-light/10 rounded-xl p-5 transition-all h-full">
+                            <div class="flex items-start justify-between mb-3">
+                                <div class="w-10 h-10 bg-primary/10 rounded-xl flex items-center justify-center text-primary font-heading text-body">
+                                    {org.name.charAt(0).toUpperCase()}
                                </div>
-                                <h3
-                                    class="text-lg font-semibold text-light group-hover:text-primary transition-colors"
-                                >
-                                    {org.name}
-                                </h3>
-                                <p class="text-sm text-light/40 mt-1">
-                                    /{org.slug}
-                                </p>
+                                <span class="text-[10px] px-2 py-0.5 bg-light/5 rounded-md text-light/40 capitalize font-body">{org.role}</span>
                            </div>
-                        </Card>
+                            <h3 class="font-heading text-body-sm text-white group-hover:text-primary transition-colors">{org.name}</h3>
+                            <p class="text-[11px] text-light/30 mt-0.5 font-body">/{org.slug}</p>
+                        </div>
                    </a>
                {/each}
            </div>
--- a/src/routes/[orgSlug]/+layout.server.ts
+++ b/src/routes/[orgSlug]/+layout.server.ts
@@ -20,7 +20,7 @@ export const load: LayoutServerLoad = async ({ params, locals }) => {
 	}

 	// Now fetch membership, members, activity, and user profile in parallel (all depend on org.id)
-	const [membershipResult, membersResult, activityResult, profileResult, docCountResult, folderCountResult, kanbanCountResult] = await Promise.all([
+	const [membershipResult, membersResult, activityResult, profileResult, docCountResult, folderCountResult, kanbanCountResult, eventCountResult] = await Promise.all([
 		locals.supabase
 			.from('org_members')
 			.select('role, role_id')
@@ -68,7 +68,11 @@ export const load: LayoutServerLoad = async ({ params, locals }) => {
 			.from('documents')
 			.select('id', { count: 'exact', head: true })
 			.eq('org_id', org.id)
-			.eq('type', 'kanban')
+			.eq('type', 'kanban'),
+		locals.supabase
+			.from('events')
+			.select('id', { count: 'exact', head: true })
+			.eq('org_id', org.id)
 	]);

 	const { data: membership } = membershipResult;
@@ -81,6 +85,7 @@ export const load: LayoutServerLoad = async ({ params, locals }) => {
 		documentCount: docCountResult.count ?? 0,
 		folderCount: folderCountResult.count ?? 0,
 		kanbanCount: kanbanCountResult.count ?? 0,
+		eventCount: eventCountResult.count ?? 0,
 	};

 	if (!membership) {
@@ -121,6 +126,15 @@ export const load: LayoutServerLoad = async ({ params, locals }) => {
 		profiles: (m.user_id ? memberProfilesMap[m.user_id] : null) ?? null
 	}));

+	// Fetch upcoming events for the overview
+	const { data: upcomingEvents } = await locals.supabase
+		.from('events')
+		.select('id, name, slug, status, start_date, end_date, color, venue_name')
+		.eq('org_id', org.id)
+		.in('status', ['planning', 'active'])
+		.order('start_date', { ascending: true, nullsFirst: false })
+		.limit(5);
+
 	return {
 		org,
 		userRole: membership.role,
@@ -128,6 +142,7 @@ export const load: LayoutServerLoad = async ({ params, locals }) => {
 		members,
 		recentActivity: recentActivity ?? [],
 		stats,
+		upcomingEvents: upcomingEvents ?? [],
 		user,
 		profile: profile ?? { id: user.id, email: user.email ?? '', full_name: null, avatar_url: null }
 	};
--- a/src/routes/[orgSlug]/+layout.svelte
+++ b/src/routes/[orgSlug]/+layout.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-	import { page, navigating } from "$app/stores";
+	import { page } from "$app/stores";
 	import { goto } from "$app/navigation";
 	import type { Snippet } from "svelte";
 	import { getContext } from "svelte";
 	import { on } from "svelte/events";
-	import { Avatar, Logo, PageSkeleton } from "$lib/components/ui";
+	import { Avatar, Logo } from "$lib/components/ui";
 	import type { SupabaseClient } from "@supabase/supabase-js";
 	import type { Database } from "$lib/supabase/types";
 	import { hasPermission, type Permission } from "$lib/utils/permissions";
@@ -345,23 +345,7 @@
 	</aside>

 	<!-- Main Content Area -->
-	<main class="flex-1 bg-night rounded-[32px] overflow-auto relative">
-		{#if $navigating}
-			{@const target = $navigating.to?.url.pathname ?? ""}
-			{@const skeletonVariant = target.includes("/kanban")
-				? "kanban"
-				: target.includes("/documents")
-					? "files"
-					: target.includes("/calendar")
-						? "calendar"
-						: target.includes("/events")
-							? "default"
-							: target.includes("/settings")
-								? "settings"
-								: "default"}
-			<PageSkeleton variant={skeletonVariant} />
-		{:else}
-			{@render children()}
-		{/if}
+	<main class="flex-1 bg-night rounded-[32px] overflow-hidden relative">
+		{@render children()}
 	</main>
 </div>
--- a/src/routes/[orgSlug]/+page.svelte
+++ b/src/routes/[orgSlug]/+page.svelte
@@ -1,5 +1,13 @@
 <script lang="ts">
-	import { Avatar, Card } from "$lib/components/ui";
+	import {
+		PageHeader,
+		StatCard,
+		SectionCard,
+		EventCard,
+		ActivityFeed,
+		MemberList,
+		QuickLinkGrid,
+	} from "$lib/components/ui";
 	import * as m from "$lib/paraglide/messages";

 	interface ActivityEntry {
@@ -15,6 +23,17 @@
 		} | null;
 	}

+	interface UpcomingEvent {
+		id: string;
+		name: string;
+		slug: string;
+		status: string;
+		start_date: string | null;
+		end_date: string | null;
+		color: string | null;
+		venue_name: string | null;
+	}
+
 	interface Props {
 		data: {
 			org: { id: string; name: string; slug: string };
@@ -24,8 +43,10 @@
 				documentCount: number;
 				folderCount: number;
 				kanbanCount: number;
+				eventCount: number;
 			};
 			recentActivity: ActivityEntry[];
+			upcomingEvents: UpcomingEvent[];
 			members: {
 				id: string;
 				user_id: string;
@@ -48,321 +69,174 @@
 			documentCount: 0,
 			folderCount: 0,
 			kanbanCount: 0,
+			eventCount: 0,
 		},
 	);

 	const recentActivity = $derived(data.recentActivity ?? []);
+	const upcomingEvents = $derived(data.upcomingEvents ?? []);
 	const members = $derived(data.members ?? []);

 	const isAdmin = $derived(
 		data.userRole === "owner" || data.userRole === "admin",
 	);
-
-	const statCards = $derived([
-		{
-			label: m.overview_stat_members(),
-			value: stats.memberCount,
-			icon: "group",
-			href: isAdmin ? `/${data.org.slug}/settings` : null,
-			color: "text-blue-400",
-			bg: "bg-blue-400/10",
-		},
-		{
-			label: m.overview_stat_documents(),
-			value: stats.documentCount,
-			icon: "description",
-			href: `/${data.org.slug}/documents`,
-			color: "text-emerald-400",
-			bg: "bg-emerald-400/10",
-		},
-		{
-			label: m.overview_stat_folders(),
-			value: stats.folderCount,
-			icon: "folder",
-			href: `/${data.org.slug}/documents`,
-			color: "text-amber-400",
-			bg: "bg-amber-400/10",
-		},
-		{
-			label: m.overview_stat_boards(),
-			value: stats.kanbanCount,
-			icon: "view_kanban",
-			href: `/${data.org.slug}/documents`,
-			color: "text-purple-400",
-			bg: "bg-purple-400/10",
-		},
-	]);
+	const isEditor = $derived(
+		["owner", "admin", "editor"].includes(data.userRole),
+	);

 	const quickLinks = $derived([
-		{
-			label: m.nav_files(),
-			icon: "cloud",
-			href: `/${data.org.slug}/documents`,
-		},
-		{
-			label: m.nav_calendar(),
-			icon: "calendar_today",
-			href: `/${data.org.slug}/calendar`,
-		},
-		...(isAdmin
-			? [
-					{
-						label: m.nav_settings(),
-						icon: "settings",
-						href: `/${data.org.slug}/settings`,
-					},
-				]
-			: []),
+		{ label: m.nav_events(), icon: "celebration", href: `/${data.org.slug}/events`, color: "text-primary" },
+		{ label: m.nav_files(), icon: "cloud", href: `/${data.org.slug}/documents`, color: "text-emerald-400" },
+		{ label: m.nav_calendar(), icon: "calendar_today", href: `/${data.org.slug}/calendar`, color: "text-blue-400" },
+		{ label: "Chat", icon: "chat", href: `/${data.org.slug}/chat`, color: "text-purple-400" },
 	]);
-
-	function getEntityTypeLabel(entityType: string): string {
-		const map: Record<string, () => string> = {
-			document: m.entity_document,
-			folder: m.entity_folder,
-			kanban_board: m.entity_kanban_board,
-			kanban_card: m.entity_kanban_card,
-			kanban_column: m.entity_kanban_column,
-			member: m.entity_member,
-			role: m.entity_role,
-			invite: m.entity_invite,
-		};
-		return (map[entityType] ?? (() => entityType))();
-	}
-
-	function getActivityIcon(action: string): string {
-		const map: Record<string, string> = {
-			create: "add_circle",
-			update: "edit",
-			delete: "delete",
-			move: "drive_file_move",
-			rename: "edit_note",
-		};
-		return map[action] ?? "info";
-	}
-
-	function getActivityColor(action: string): string {
-		const map: Record<string, string> = {
-			create: "text-emerald-400",
-			update: "text-blue-400",
-			delete: "text-red-400",
-			move: "text-amber-400",
-			rename: "text-purple-400",
-		};
-		return map[action] ?? "text-light/50";
-	}
-
-	function formatTimeAgo(dateStr: string | null): string {
-		if (!dateStr) return "";
-		const now = Date.now();
-		const then = new Date(dateStr).getTime();
-		const diffMs = now - then;
-		const diffMin = Math.floor(diffMs / 60000);
-		if (diffMin < 1) return m.activity_just_now();
-		if (diffMin < 60)
-			return m.activity_minutes_ago({ count: String(diffMin) });
-		const diffHr = Math.floor(diffMin / 60);
-		if (diffHr < 24) return m.activity_hours_ago({ count: String(diffHr) });
-		const diffDay = Math.floor(diffHr / 24);
-		return m.activity_days_ago({ count: String(diffDay) });
-	}
-
-	function getActivityDescription(entry: ActivityEntry): string {
-		const userName =
-			entry.profiles?.full_name || entry.profiles?.email || "Someone";
-		const entityType = getEntityTypeLabel(entry.entity_type);
-		const name = entry.entity_name ?? "—";
-
-		const map: Record<string, () => string> = {
-			create: () =>
-				m.activity_created({ user: userName, entityType, name }),
-			update: () =>
-				m.activity_updated({ user: userName, entityType, name }),
-			delete: () =>
-				m.activity_deleted({ user: userName, entityType, name }),
-			move: () => m.activity_moved({ user: userName, entityType, name }),
-			rename: () =>
-				m.activity_renamed({ user: userName, entityType, name }),
-		};
-		return (map[entry.action] ?? map["update"]!)();
-	}
 </script>

 <svelte:head>
 	<title>{data.org.name} | Root</title>
 </svelte:head>

-<div class="flex flex-col h-full p-4 lg:p-5 gap-6 overflow-auto">
-	<!-- Header -->
-	<header>
-		<h1 class="text-h1 font-heading text-white">{data.org.name}</h1>
-		<p class="text-body text-light/60 font-body">{m.overview_title()}</p>
-	</header>
-
-	<!-- Stats Grid -->
-	<div class="grid grid-cols-2 lg:grid-cols-4 gap-4">
-		{#each statCards as stat}
-			{#if stat.href}
+<div class="flex flex-col h-full overflow-auto">
+	<PageHeader title={data.org.name} subtitle={m.overview_subtitle()}>
+		{#snippet actions()}
+			{#if isEditor}
 				<a
-					href={stat.href}
-					class="bg-night rounded-2xl p-5 flex flex-col gap-3 hover:bg-night/80 transition-colors group"
-				>
-					<div
-						class="w-10 h-10 rounded-xl {stat.bg} flex items-center justify-center"
-					>
-						<span
-							class="material-symbols-rounded {stat.color}"
-							style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
-						>
-							{stat.icon}
-						</span>
-					</div>
-					<div>
-						<p class="text-2xl font-bold text-white">
-							{stat.value}
-						</p>
-						<p class="text-body-sm text-light/50">{stat.label}</p>
-					</div>
-				</a>
-			{:else}
-				<div class="bg-night rounded-2xl p-5 flex flex-col gap-3">
-					<div
-						class="w-10 h-10 rounded-xl {stat.bg} flex items-center justify-center"
-					>
-						<span
-							class="material-symbols-rounded {stat.color}"
-							style="font-size: 24px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;"
-						>
-							{stat.icon}
-						</span>
-					</div>
-					<div>
-						<p class="text-2xl font-bold text-white">
-							{stat.value}
-						</p>
-						<p class="text-body-sm text-light/50">{stat.label}</p>
-					</div>
-				</div>
-			{/if}
-		{/each}
-	</div>
-
-	<div class="grid grid-cols-1 lg:grid-cols-3 gap-6 flex-1 min-h-0">
-		<!-- Recent Activity -->
-		<div
-			class="lg:col-span-2 bg-night rounded-2xl p-5 flex flex-col gap-4 min-h-0"
-		>
-			<h2 class="text-h3 font-heading text-white">
-				{m.activity_title()}
-			</h2>
-
-			{#if recentActivity.length === 0}
-				<div
-					class="flex-1 flex flex-col items-center justify-center text-light/40 py-12"
+					href="/{data.org.slug}/events"
+					class="flex items-center gap-2 px-4 py-2 bg-primary text-background rounded-xl font-body text-body-sm hover:bg-primary-hover transition-colors"
 				>
 					<span
-						class="material-symbols-rounded mb-3"
-						style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 48;"
+						class="material-symbols-rounded"
+						style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
+						>celebration</span
 					>
-						history
-					</span>
-					<p class="text-body">{m.activity_empty()}</p>
-				</div>
-			{:else}
-				<div class="flex flex-col gap-1 overflow-auto flex-1">
-					{#each recentActivity as entry}
-						<div
-							class="flex items-start gap-3 px-3 py-2.5 rounded-xl hover:bg-dark/50 transition-colors"
-						>
-							<span
-								class="material-symbols-rounded {getActivityColor(
-									entry.action,
-								)} mt-0.5 shrink-0"
-								style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
-							>
-								{getActivityIcon(entry.action)}
-							</span>
-							<div class="flex-1 min-w-0">
-								<p
-									class="text-body-sm text-light leading-relaxed"
-								>
-									{getActivityDescription(entry)}
-								</p>
-								<p class="text-[11px] text-light/40 mt-0.5">
-									{formatTimeAgo(entry.created_at)}
-								</p>
-							</div>
-						</div>
-					{/each}
-				</div>
+					{m.nav_events()}
+				</a>
 			{/if}
+		{/snippet}
+	</PageHeader>
+
+	<div class="flex-1 p-6 overflow-auto">
+		<!-- Stats Grid -->
+		<div class="grid grid-cols-2 lg:grid-cols-4 gap-3 mb-6">
+			<StatCard
+				label={m.overview_stat_events()}
+				value={stats.eventCount}
+				icon="celebration"
+				href="/{data.org.slug}/events"
+				color="text-primary"
+				bg="bg-primary/10"
+			/>
+			<StatCard
+				label={m.overview_stat_members()}
+				value={stats.memberCount}
+				icon="group"
+				href={isAdmin ? `/${data.org.slug}/settings` : null}
+				color="text-blue-400"
+				bg="bg-blue-400/10"
+			/>
+			<StatCard
+				label={m.overview_stat_documents()}
+				value={stats.documentCount}
+				icon="description"
+				href="/{data.org.slug}/documents"
+				color="text-emerald-400"
+				bg="bg-emerald-400/10"
+			/>
+			<StatCard
+				label={m.overview_stat_boards()}
+				value={stats.kanbanCount}
+				icon="view_kanban"
+				href="/{data.org.slug}/documents"
+				color="text-purple-400"
+				bg="bg-purple-400/10"
+			/>
 		</div>

-		<!-- Sidebar: Quick Links + Members -->
-		<div class="flex flex-col gap-6">
-			<!-- Quick Links -->
-			<div class="bg-night rounded-2xl p-5 flex flex-col gap-3">
-				<h2 class="text-h3 font-heading text-white">
-					{m.overview_quick_links()}
-				</h2>
-				<div class="flex flex-col gap-1">
-					{#each quickLinks as link}
+		<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
+			<!-- Left Column: Upcoming Events + Activity -->
+			<div class="lg:col-span-2 flex flex-col gap-6">
+				<!-- Upcoming Events -->
+				<SectionCard title={m.overview_upcoming_events()}>
+					{#snippet titleRight()}
 						<a
-							href={link.href}
-							class="flex items-center gap-3 px-3 py-2.5 rounded-xl text-light hover:bg-dark/50 hover:text-white transition-colors"
+							href="/{data.org.slug}/events"
+							class="text-[12px] text-primary hover:underline"
+							>{m.overview_view_all_events()}</a
 						>
+					{/snippet}
+
+					{#if upcomingEvents.length === 0}
+						<div class="flex flex-col items-center justify-center text-light/40 py-8">
 							<span
-								class="material-symbols-rounded text-light/50"
-								style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
+								class="material-symbols-rounded mb-2"
+								style="font-size: 40px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 40;"
+								>celebration</span
 							>
-								{link.icon}
-							</span>
-							<span class="text-body">{link.label}</span>
-						</a>
-					{/each}
-				</div>
+							<p class="text-body-sm">{m.overview_upcoming_empty()}</p>
+						</div>
+					{:else}
+						<div class="flex flex-col gap-1">
+							{#each upcomingEvents as event}
+								<EventCard
+									name={event.name}
+									slug={event.slug}
+									status={event.status}
+									startDate={event.start_date}
+									endDate={event.end_date}
+									color={event.color}
+									venueName={event.venue_name}
+									href="/{data.org.slug}/events/{event.slug}"
+									compact
+								/>
+							{/each}
+						</div>
+					{/if}
+				</SectionCard>
+
+				<!-- Recent Activity -->
+				<SectionCard title={m.activity_title()}>
+					<ActivityFeed entries={recentActivity} />
+				</SectionCard>
 			</div>

-			<!-- Team Members Preview -->
-			<div class="bg-night rounded-2xl p-5 flex flex-col gap-3">
-				<div class="flex items-center justify-between">
-					<h2 class="text-h3 font-heading text-white">
-						{m.overview_stat_members()}
-					</h2>
-					<span class="text-body-sm text-light/40"
-						>{stats.memberCount}</span
+			<!-- Right Column: Quick Links + Team -->
+			<div class="flex flex-col gap-6">
+				<SectionCard title={m.overview_quick_links()}>
+					<QuickLinkGrid links={quickLinks} />
+				</SectionCard>
+
+				<SectionCard title={m.overview_stat_members()}>
+					{#snippet titleRight()}
+						<span class="text-[12px] text-light/30">{stats.memberCount}</span>
+					{/snippet}
+					<MemberList
+						{members}
+						max={6}
+						moreHref="/{data.org.slug}/settings"
+						moreLabel={m.overview_more_members({ count: String(Math.max(0, stats.memberCount - 6)) })}
+					/>
+				</SectionCard>
+
+				{#if isAdmin}
+					<a
+						href="/{data.org.slug}/settings"
+						class="flex items-center gap-3 bg-dark/30 border border-light/5 hover:border-light/10 rounded-xl p-4 transition-all group"
 					>
-				</div>
-				<div class="flex flex-col gap-2">
-					{#each members.slice(0, 5) as member}
-						<div class="flex items-center gap-3 px-1 py-1">
-							<Avatar
-								name={member.profiles?.full_name ||
-									member.profiles?.email ||
-									"?"}
-								src={member.profiles?.avatar_url}
-								size="sm"
-							/>
-							<div class="flex-1 min-w-0">
-								<p class="text-body-sm text-white truncate">
-									{member.profiles?.full_name ||
-										member.profiles?.email ||
-										"Unknown"}
-								</p>
-								<p class="text-[11px] text-light/40 capitalize">
-									{member.role}
-								</p>
-							</div>
+						<div class="w-10 h-10 rounded-xl bg-light/5 flex items-center justify-center">
+							<span
+								class="material-symbols-rounded text-light/40 group-hover:text-white transition-colors"
+								style="font-size: 22px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 22;"
+								>settings</span
+							>
 						</div>
-					{/each}
-					{#if stats.memberCount > 5}
-						<a
-							href="/{data.org.slug}/settings"
-							class="text-body-sm text-primary hover:underline text-center pt-1"
-						>
-							+{stats.memberCount - 5} more
-						</a>
-					{/if}
-				</div>
+						<div>
+							<p class="text-body-sm text-white group-hover:text-primary transition-colors">
+								{m.nav_settings()}
+							</p>
+							<p class="text-[11px] text-light/30">{m.settings_general_title()}</p>
+						</div>
+					</a>
+				{/if}
 			</div>
 		</div>
 	</div>
--- a/src/routes/[orgSlug]/account/+layout.svelte
+++ b/src/routes/[orgSlug]/account/+layout.svelte
@@ -0,0 +1,36 @@
+<script lang="ts">
+	import type { Snippet } from "svelte";
+	import { navigating } from "$app/stores";
+	import { PageHeader, ContentSkeleton } from "$lib/components/ui";
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+		};
+		children: Snippet;
+	}
+
+	let { data, children }: Props = $props();
+
+	const isNavigatingHere = $derived(
+		$navigating?.to?.url.pathname.includes("/account") ?? false,
+	);
+</script>
+
+<div class="flex flex-col h-full overflow-hidden">
+	<PageHeader
+		title={m.account_title()}
+		subtitle={m.account_subtitle()}
+		icon="person"
+		iconColor="text-light/50"
+	/>
+
+	{#if isNavigatingHere}
+		<ContentSkeleton variant="settings" />
+	{:else}
+		<div class="flex-1 overflow-auto">
+			{@render children()}
+		</div>
+	{/if}
+</div>
--- a/src/routes/[orgSlug]/account/+page.svelte
+++ b/src/routes/[orgSlug]/account/+page.svelte
@@ -227,25 +227,17 @@
 	<title>Account Settings | Root</title>
 </svelte:head>

-<div class="flex flex-col h-full p-4 lg:p-5 gap-4">
-	<!-- Header -->
-	<div>
-		<h1 class="font-heading text-h1 text-white">{m.account_title()}</h1>
-		<p class="font-body text-body text-light/60 mt-1">
-			{m.account_subtitle()}
-		</p>
-	</div>
-
-	<div class="grid grid-cols-1 lg:grid-cols-3 gap-4 flex-1 min-h-0">
+<div class="flex-1 p-6 overflow-auto">
+	<div class="grid grid-cols-1 lg:grid-cols-3 gap-4">
 		<!-- Profile Section -->
-		<div class="bg-background rounded-[32px] p-6 flex flex-col gap-6">
-			<h2 class="font-heading text-h3 text-white">
+		<div class="bg-dark/30 border border-light/5 rounded-xl p-5 flex flex-col gap-5">
+			<h2 class="font-heading text-body text-white">
 				{m.account_profile()}
 			</h2>

 			<!-- Avatar -->
 			<div class="flex flex-col gap-3">
-				<span class="font-body text-body-sm text-light"
+				<span class="font-body text-body-sm text-light/60"
 					>{m.account_photo()}</span
 				>
 				<div class="flex items-center gap-4">
@@ -314,8 +306,8 @@
 		</div>

 		<!-- Appearance Section -->
-		<div class="bg-background rounded-[32px] p-6 flex flex-col gap-6">
-			<h2 class="font-heading text-h3 text-white">
+		<div class="bg-dark/30 border border-light/5 rounded-xl p-5 flex flex-col gap-5">
+			<h2 class="font-heading text-body text-white">
 				{m.account_appearance()}
 			</h2>

@@ -333,7 +325,7 @@

 			<!-- Accent Color -->
 			<div class="flex flex-col gap-2">
-				<span class="font-body text-body-sm text-light"
+				<span class="font-body text-body-sm text-light/60"
 					>{m.account_accent_color()}</span
 				>
 				<div class="flex flex-wrap gap-2 items-center">
@@ -371,10 +363,10 @@
 			<!-- Use Org Theme -->
 			<div class="flex items-center justify-between">
 				<div>
-					<p class="font-body text-body text-white">
+					<p class="font-body text-body-sm text-white">
 						{m.account_use_org_theme()}
 					</p>
-					<p class="font-body text-[12px] text-light/50">
+					<p class="font-body text-[11px] text-light/40">
 						{m.account_use_org_theme_desc()}
 					</p>
 				</div>
@@ -396,20 +388,20 @@

 			<!-- Language -->
 			<div class="flex flex-col gap-2">
-				<span class="font-body text-body-sm text-light"
+				<span class="font-body text-body-sm text-light/60"
 					>{m.account_language()}</span
 				>
-				<p class="font-body text-[12px] text-light/50">
+				<p class="font-body text-[11px] text-light/40">
 					{m.account_language_desc()}
 				</p>
 				<div class="flex gap-2 mt-1">
 					{#each locales as locale}
 						<button
 							type="button"
-							class="px-4 py-2 rounded-full text-sm font-medium transition-colors {currentLocale ===
+							class="px-3 py-1.5 rounded-lg text-[12px] font-medium transition-colors {currentLocale ===
 							locale
-								? 'bg-primary text-night'
-								: 'bg-light/10 text-light/70 hover:bg-light/20'}"
+								? 'bg-primary text-background'
+								: 'bg-light/5 text-light/50 hover:bg-light/10'}"
 							onclick={() => handleLanguageChange(locale)}
 						>
 							{localeLabels[locale] ?? locale}
@@ -426,16 +418,16 @@
 		</div>

 		<!-- Security & Sessions Section -->
-		<div class="bg-background rounded-[32px] p-6 flex flex-col gap-6">
-			<h2 class="font-heading text-h3 text-white">
+		<div class="bg-dark/30 border border-light/5 rounded-xl p-5 flex flex-col gap-5">
+			<h2 class="font-heading text-body text-white">
 				{m.account_security()}
 			</h2>

 			<div class="flex flex-col gap-2">
-				<p class="font-body text-body text-white">
+				<p class="font-body text-body-sm text-white">
 					{m.account_password()}
 				</p>
-				<p class="font-body text-body-sm text-light/50">
+				<p class="font-body text-[11px] text-light/40">
 					{m.account_password_desc()}
 				</p>
 				<div class="mt-2">
@@ -460,11 +452,11 @@
 				</div>
 			</div>

-			<div class="border-t border-light/10 pt-4 flex flex-col gap-2">
-				<p class="font-body text-body text-white">
+			<div class="border-t border-light/5 pt-4 flex flex-col gap-2">
+				<p class="font-body text-body-sm text-white">
 					{m.account_active_sessions()}
 				</p>
-				<p class="font-body text-body-sm text-light/50">
+				<p class="font-body text-[11px] text-light/40">
 					{m.account_sessions_desc()}
 				</p>
 				<div class="mt-2">
--- a/src/routes/[orgSlug]/calendar/+layout.svelte
+++ b/src/routes/[orgSlug]/calendar/+layout.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+	import type { Snippet } from "svelte";
+	import { navigating } from "$app/stores";
+	import { PageHeader, ContentSkeleton } from "$lib/components/ui";
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+		};
+		children: Snippet;
+	}
+
+	let { data, children }: Props = $props();
+
+	const isNavigatingHere = $derived(
+		$navigating?.to?.url.pathname.includes("/calendar") ?? false,
+	);
+</script>
+
+<div class="flex flex-col h-full overflow-hidden">
+	<PageHeader title={m.nav_calendar()} icon="calendar_today" iconColor="text-blue-400" />
+
+	{#if isNavigatingHere}
+		<ContentSkeleton variant="calendar" />
+	{:else}
+		<div class="flex-1 overflow-auto">
+			{@render children()}
+		</div>
+	{/if}
+</div>
--- a/src/routes/[orgSlug]/calendar/+page.svelte
+++ b/src/routes/[orgSlug]/calendar/+page.svelte
@@ -456,13 +456,11 @@
 	<title>Calendar - {data.org.name} | Root</title>
 </svelte:head>

-<div class="flex flex-col h-full p-4 lg:p-5 gap-4">
-	<!-- Header -->
-	<header class="flex items-center gap-2 p-1">
-		<h1 class="flex-1 font-heading text-h1 text-white">
-			{m.calendar_title()}
-		</h1>
-		<Button size="md" onclick={() => handleDateClick(new Date())}
+<div class="flex flex-col h-full">
+	<!-- Toolbar -->
+	<div class="flex items-center gap-2 px-6 py-3 border-b border-light/5 shrink-0">
+		<div class="flex-1"></div>
+		<Button size="sm" onclick={() => handleDateClick(new Date())}
 			>{m.btn_new()}</Button
 		>
 		<ContextMenu
@@ -502,10 +500,10 @@
 					: []),
 			]}
 		/>
-	</header>
+	</div>

 	<!-- Calendar Grid -->
-	<div class="flex-1 overflow-auto">
+	<div class="flex-1 overflow-auto p-4">
 		<Calendar
 			events={allEvents}
 			onDateClick={handleDateClick}
--- a/src/routes/[orgSlug]/chat/+layout.svelte
+++ b/src/routes/[orgSlug]/chat/+layout.svelte
@@ -0,0 +1,36 @@
+<script lang="ts">
+	import type { Snippet } from "svelte";
+	import { navigating } from "$app/stores";
+	import { PageHeader, ContentSkeleton } from "$lib/components/ui";
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+		};
+		children: Snippet;
+	}
+
+	let { data, children }: Props = $props();
+
+	const isNavigatingHere = $derived(
+		$navigating?.to?.url.pathname?.includes(`/${data.org.slug}/chat`),
+	);
+</script>
+
+<div class="flex flex-col h-full overflow-hidden">
+	<PageHeader
+		title={m.chat_title()}
+		subtitle={m.chat_subtitle()}
+		icon="chat"
+		iconColor="text-primary"
+	/>
+
+	{#if isNavigatingHere && !$navigating?.from?.url.pathname?.includes(`/${data.org.slug}/chat`)}
+		<ContentSkeleton variant="default" />
+	{:else}
+		<div class="flex-1 overflow-hidden">
+			{@render children()}
+		</div>
+	{/if}
+</div>
--- a/src/routes/[orgSlug]/chat/+page.svelte
+++ b/src/routes/[orgSlug]/chat/+page.svelte
@@ -392,9 +392,9 @@
 <!-- Matrix Login Modal -->
 {#if showMatrixLogin}
 	<div class="h-full flex items-center justify-center">
-		<div class="bg-night rounded-[32px] p-8 w-full max-w-md">
-			<h2 class="font-heading text-h3 text-white mb-2">Connect to Chat</h2>
-			<p class="text-light/50 text-body mb-6">
+		<div class="bg-dark/30 border border-light/5 rounded-xl p-8 w-full max-w-md">
+			<h2 class="font-heading text-body text-white mb-1">Connect to Chat</h2>
+			<p class="text-body-sm text-light/50 mb-6">
 				Enter your Matrix credentials to enable messaging.
 			</p>

@@ -410,12 +410,12 @@
 					placeholder="@user:matrix.org"
 				/>
 				<div>
-					<label class="block text-body-sm font-body text-light mb-1">Password</label>
+					<label class="block text-body-sm font-body text-light/60 mb-1">Password</label>
 					<input
 						type="password"
 						bind:value={matrixPassword}
 						placeholder="Password"
-						class="w-full bg-dark border border-light/10 rounded-2xl px-4 py-3 text-white font-body text-body placeholder:text-light/30 focus:outline-none focus:border-primary"
+						class="w-full bg-dark border border-light/10 rounded-xl px-3 py-2 text-white font-body text-body-sm placeholder:text-light/30 focus:outline-none focus:border-primary"
 						onkeydown={(e) => {
 							if (e.key === "Enter") handleMatrixLogin();
 						}}
@@ -438,9 +438,9 @@
 	<div class="h-full flex items-center justify-center">
 		<div class="text-center">
 			<div
-				class="animate-spin w-12 h-12 border-4 border-primary border-t-transparent rounded-full mx-auto mb-4"
+				class="animate-spin w-10 h-10 border-3 border-primary border-t-transparent rounded-full mx-auto mb-4"
 			></div>
-			<p class="text-light/50">
+			<p class="text-body-sm text-light/40">
 				{#if isInitializing}
 					Connecting to Matrix...
 				{:else if $syncState === "CATCHUP"}
@@ -460,56 +460,50 @@
 {:else if matrixClient}
 	<MatrixProvider client={matrixClient}>
 		{#snippet children()}
-			<div class="h-full flex gap-2 min-h-0">
+			<div class="h-full flex min-h-0">
 				<!-- Chat Sidebar -->
-				<aside class="w-56 bg-night rounded-[32px] flex flex-col overflow-hidden shrink-0">
-					<header class="px-3 py-5">
-						<div class="flex items-center gap-2">
-							<span class="material-symbols-rounded text-light" style="font-size: 20px;">chat</span>
-							<span class="flex-1 font-heading text-light text-base">Messages</span>
-							<button
-								class="text-light hover:text-primary transition-colors"
-								onclick={() => (showStartDMModal = true)}
-								title="New message"
-							>
-								<span class="material-symbols-rounded" style="font-size: 20px;">add</span>
-							</button>
-						</div>
-					</header>
+				<aside class="w-56 border-r border-light/5 flex flex-col overflow-hidden shrink-0">
+					<div class="flex items-center gap-2 px-3 py-2.5 border-b border-light/5">
+						<span class="flex-1 font-heading text-body-sm text-white">Messages</span>
+						<button
+							class="p-1 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
+							onclick={() => (showStartDMModal = true)}
+							title="New message"
+						>
+							<span class="material-symbols-rounded" style="font-size: 18px;">add</span>
+						</button>
+					</div>

 					<!-- Room search -->
-					<div class="px-3 pb-2">
+					<div class="px-2 py-2">
 						<div class="relative">
 							<span
-								class="material-symbols-rounded absolute left-3 top-1/2 -translate-y-1/2 text-light/40"
+								class="material-symbols-rounded absolute left-2.5 top-1/2 -translate-y-1/2 text-light/30"
 								style="font-size: 16px;"
 							>search</span>
 							<input
 								type="text"
 								bind:value={roomSearchQuery}
-								placeholder="Search rooms..."
-								class="w-full pl-9 pr-3 py-2 bg-dark text-light text-sm rounded-lg border border-light/10 placeholder:text-light/30 focus:outline-none focus:border-primary"
+								placeholder="Search..."
+								class="w-full pl-8 pr-3 py-1.5 bg-dark/50 text-white text-[12px] rounded-lg border border-light/5 placeholder:text-light/30 focus:outline-none focus:border-primary"
 							/>
 						</div>
 					</div>

 					<!-- Room list (sectioned) -->
-					<nav class="flex-1 overflow-y-auto px-2 pb-2">
+					<nav class="flex-1 overflow-y-auto px-1.5 pb-2">
 						{#if allRooms.length === 0}
-							<p class="text-light/40 text-sm text-center py-8">
+							<p class="text-light/30 text-[12px] text-center py-8">
 								{roomSearchQuery ? "No matching rooms" : "No rooms yet"}
 							</p>
 						{:else}
 							<!-- Org / Space Rooms -->
 							{#if filteredOrgRooms.length > 0}
-								<div class="mb-2">
+								<div class="mb-1.5">
 									<div class="flex items-center justify-between px-2 py-1">
-										<span class="text-xs font-semibold text-light/40 uppercase tracking-wider">
-											<span class="material-symbols-rounded align-middle" style="font-size: 14px;">workspaces</span>
-											Organization
-										</span>
+										<span class="text-[10px] font-body text-light/30 uppercase tracking-wider">Organization</span>
 										<button
-											class="w-5 h-5 flex items-center justify-center text-light/40 hover:text-light hover:bg-light/10 rounded transition-colors"
+											class="p-0.5 text-light/30 hover:text-white hover:bg-dark/50 rounded transition-colors"
 											onclick={() => (showCreateRoomModal = true)}
 											title="Create room"
 										>
@@ -520,16 +514,16 @@
 										{#each filteredOrgRooms as room (room.roomId)}
 											<li>
 												<button
-													class="w-full flex items-center gap-2 pl-1 pr-2 py-1 rounded-[50px] transition-colors text-left
-														{$selectedRoomId === room.roomId ? 'bg-primary/20' : 'hover:bg-light/5'}"
+													class="w-full flex items-center gap-2 px-2 py-1.5 rounded-lg transition-colors text-left
+														{$selectedRoomId === room.roomId ? 'bg-primary/10 text-white' : 'text-light/60 hover:bg-dark/50 hover:text-white'}"
 													onclick={() => handleRoomSelect(room.roomId)}
 												>
 													<Avatar src={room.avatarUrl} name={room.name} size="xs" />
 													<div class="flex-1 min-w-0">
-														<span class="font-bold text-sm text-light truncate block">{room.name}</span>
+														<span class="text-[12px] font-body truncate block">{room.name}</span>
 													</div>
 													{#if room.unreadCount > 0}
-														<span class="bg-primary text-white text-xs px-1.5 py-0.5 rounded-full min-w-[18px] text-center">
+														<span class="bg-primary text-background text-[10px] px-1.5 py-0.5 rounded-full min-w-[16px] text-center font-bold">
 															{room.unreadCount > 99 ? "99+" : room.unreadCount}
 														</span>
 													{/if}
@@ -542,14 +536,11 @@

 							<!-- Direct Messages -->
 							{#if filteredDmRooms.length > 0}
-								<div class="mb-2">
+								<div class="mb-1.5">
 									<div class="flex items-center justify-between px-2 py-1">
-										<span class="text-xs font-semibold text-light/40 uppercase tracking-wider">
-											<span class="material-symbols-rounded align-middle" style="font-size: 14px;">chat_bubble</span>
-											Direct Messages
-										</span>
+										<span class="text-[10px] font-body text-light/30 uppercase tracking-wider">Direct Messages</span>
 										<button
-											class="w-5 h-5 flex items-center justify-center text-light/40 hover:text-light hover:bg-light/10 rounded transition-colors"
+											class="p-0.5 text-light/30 hover:text-white hover:bg-dark/50 rounded transition-colors"
 											onclick={() => (showStartDMModal = true)}
 											title="New DM"
 										>
@@ -560,16 +551,16 @@
 										{#each filteredDmRooms as room (room.roomId)}
 											<li>
 												<button
-													class="w-full flex items-center gap-2 pl-1 pr-2 py-1 rounded-[50px] transition-colors text-left
-														{$selectedRoomId === room.roomId ? 'bg-primary/20' : 'hover:bg-light/5'}"
+													class="w-full flex items-center gap-2 px-2 py-1.5 rounded-lg transition-colors text-left
+														{$selectedRoomId === room.roomId ? 'bg-primary/10 text-white' : 'text-light/60 hover:bg-dark/50 hover:text-white'}"
 													onclick={() => handleRoomSelect(room.roomId)}
 												>
 													<Avatar src={room.avatarUrl} name={room.name} size="xs" />
 													<div class="flex-1 min-w-0">
-														<span class="font-bold text-sm text-light truncate block">{room.name}</span>
+														<span class="text-[12px] font-body truncate block">{room.name}</span>
 													</div>
 													{#if room.unreadCount > 0}
-														<span class="bg-primary text-white text-xs px-1.5 py-0.5 rounded-full min-w-[18px] text-center">
+														<span class="bg-primary text-background text-[10px] px-1.5 py-0.5 rounded-full min-w-[16px] text-center font-bold">
 															{room.unreadCount > 99 ? "99+" : room.unreadCount}
 														</span>
 													{/if}
@@ -582,14 +573,11 @@

 							<!-- Other Rooms (not in a space, not DMs) -->
 							{#if filteredOtherRooms.length > 0}
-								<div class="mb-2">
+								<div class="mb-1.5">
 									<div class="flex items-center justify-between px-2 py-1">
-										<span class="text-xs font-semibold text-light/40 uppercase tracking-wider">
-											<span class="material-symbols-rounded align-middle" style="font-size: 14px;">tag</span>
-											Rooms
-										</span>
+										<span class="text-[10px] font-body text-light/30 uppercase tracking-wider">Rooms</span>
 										<button
-											class="w-5 h-5 flex items-center justify-center text-light/40 hover:text-light hover:bg-light/10 rounded transition-colors"
+											class="p-0.5 text-light/30 hover:text-white hover:bg-dark/50 rounded transition-colors"
 											onclick={() => (showCreateRoomModal = true)}
 											title="Create room"
 										>
@@ -600,16 +588,16 @@
 										{#each filteredOtherRooms as room (room.roomId)}
 											<li>
 												<button
-													class="w-full flex items-center gap-2 pl-1 pr-2 py-1 rounded-[50px] transition-colors text-left
-														{$selectedRoomId === room.roomId ? 'bg-primary/20' : 'hover:bg-light/5'}"
+													class="w-full flex items-center gap-2 px-2 py-1.5 rounded-lg transition-colors text-left
+														{$selectedRoomId === room.roomId ? 'bg-primary/10 text-white' : 'text-light/60 hover:bg-dark/50 hover:text-white'}"
 													onclick={() => handleRoomSelect(room.roomId)}
 												>
 													<Avatar src={room.avatarUrl} name={room.name} size="xs" />
 													<div class="flex-1 min-w-0">
-														<span class="font-bold text-sm text-light truncate block">{room.name}</span>
+														<span class="text-[12px] font-body truncate block">{room.name}</span>
 													</div>
 													{#if room.unreadCount > 0}
-														<span class="bg-primary text-white text-xs px-1.5 py-0.5 rounded-full min-w-[18px] text-center">
+														<span class="bg-primary text-background text-[10px] px-1.5 py-0.5 rounded-full min-w-[16px] text-center font-bold">
 															{room.unreadCount > 99 ? "99+" : room.unreadCount}
 														</span>
 													{/if}
@@ -623,76 +611,76 @@
 					</nav>

 					<!-- User footer -->
-					<footer class="p-3 border-t border-light/10">
+					<div class="px-2 py-2 border-t border-light/5">
 						<div class="flex items-center gap-2">
 							<Avatar name={$auth.userId || "User"} size="xs" status="online" />
 							<div class="flex-1 min-w-0">
-								<p class="text-xs font-medium text-light truncate">{$auth.userId}</p>
+								<p class="text-[11px] text-light/50 truncate">{$auth.userId}</p>
 							</div>
 							<button
-								class="text-light/50 hover:text-light p-1 rounded-lg hover:bg-light/10 transition-colors"
+								class="p-1 text-light/30 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
 								onclick={handleLogout}
 								title="Disconnect chat"
 							>
-								<span class="material-symbols-rounded" style="font-size: 18px;">logout</span>
+								<span class="material-symbols-rounded" style="font-size: 16px;">logout</span>
 							</button>
 						</div>
-					</footer>
+					</div>
 				</aside>

 				<!-- Main Chat Area -->
-				<main class="flex-1 flex flex-col min-h-0 overflow-hidden bg-night rounded-[32px]">
+				<main class="flex-1 flex flex-col min-h-0 overflow-hidden">
 					{#if $selectedRoomId}
 						<div class="flex-1 flex flex-col min-h-0 overflow-hidden">
 							<!-- Room Header -->
-							<header class="h-14 px-5 flex items-center border-b border-light/10">
+							<div class="px-4 py-2.5 flex items-center border-b border-light/5 shrink-0">
 								{#each $roomSummaries.filter((r) => r.roomId === $selectedRoomId) as room}
-									<div class="flex items-center gap-3 w-full">
+									<div class="flex items-center gap-2.5 w-full">
 										<Avatar src={room.avatarUrl} name={room.name} size="sm" />
 										<div class="flex-1 min-w-0">
-											<h2 class="font-heading text-h5 text-light truncate">{room.name}</h2>
-											<p class="text-xs text-light/50">
+											<h2 class="font-heading text-body-sm text-white truncate">{room.name}</h2>
+											<p class="text-[11px] text-light/40">
 												{room.memberCount} members{room.isEncrypted ? " · Encrypted" : ""}
 											</p>
 										</div>
 										<button
-											class="p-2 text-light/50 hover:text-light hover:bg-light/10 rounded-lg transition-colors"
+											class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
 											onclick={() => (showMessageSearch = !showMessageSearch)}
 											title="Search messages"
 										>
-											<span class="material-symbols-rounded" style="font-size: 20px;">search</span>
+											<span class="material-symbols-rounded" style="font-size: 18px;">search</span>
 										</button>
 										<button
-											class="p-2 text-light/50 hover:text-light hover:bg-light/10 rounded-lg transition-colors"
+											class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
 											onclick={() => (showRoomInfo = !showRoomInfo)}
 											title="Room info"
 										>
-											<span class="material-symbols-rounded" style="font-size: 20px;">info</span>
+											<span class="material-symbols-rounded" style="font-size: 18px;">info</span>
 										</button>
 										<button
-											class="p-2 text-light/50 hover:text-light hover:bg-light/10 rounded-lg transition-colors"
+											class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
 											onclick={() => (showMemberList = !showMemberList)}
 											title="Members"
 										>
-											<span class="material-symbols-rounded" style="font-size: 20px;">group</span>
+											<span class="material-symbols-rounded" style="font-size: 18px;">group</span>
 										</button>
 									</div>
 								{/each}
-							</header>
+							</div>

 							<!-- Message search panel -->
 							{#if showMessageSearch}
-								<div class="border-b border-light/10 p-3 bg-dark/50">
+								<div class="border-b border-light/5 px-4 py-2.5">
 									<div class="relative">
-										<span class="material-symbols-rounded absolute left-3 top-1/2 -translate-y-1/2 text-light/40" style="font-size: 16px;">search</span>
+										<span class="material-symbols-rounded absolute left-2.5 top-1/2 -translate-y-1/2 text-light/30" style="font-size: 16px;">search</span>
 										<input
 											type="text"
 											bind:value={messageSearchQuery}
-											placeholder="Search messages in this room..."
-											class="w-full pl-9 pr-8 py-2 bg-night text-light text-sm rounded-lg border border-light/10 placeholder:text-light/30 focus:outline-none focus:border-primary"
+											placeholder="Search messages..."
+											class="w-full pl-8 pr-8 py-1.5 bg-dark/50 text-white text-[12px] rounded-lg border border-light/5 placeholder:text-light/30 focus:outline-none focus:border-primary"
 										/>
 										<button
-											class="absolute right-2 top-1/2 -translate-y-1/2 text-light/40 hover:text-light"
+											class="absolute right-2 top-1/2 -translate-y-1/2 text-light/30 hover:text-white"
 											onclick={() => { showMessageSearch = false; messageSearchQuery = ""; }}
 										>
 											<span class="material-symbols-rounded" style="font-size: 16px;">close</span>
@@ -700,22 +688,22 @@
 									</div>
 									{#if messageSearchQuery && messageSearchResults.length > 0}
 										<div class="mt-2 max-h-48 overflow-y-auto">
-											<p class="text-xs text-light/40 mb-2">
+											<p class="text-[11px] text-light/30 mb-1.5">
 												{messageSearchResults.length} result{messageSearchResults.length !== 1 ? "s" : ""}
 											</p>
 											{#each messageSearchResults.slice(0, 20) as result}
 												<button
-													class="w-full text-left px-3 py-2 hover:bg-light/5 rounded transition-colors"
+													class="w-full text-left px-3 py-1.5 hover:bg-dark/50 rounded-lg transition-colors"
 													onclick={() => { showMessageSearch = false; messageSearchQuery = ""; }}
 												>
-													<p class="text-xs text-primary">{result.senderName}</p>
-													<p class="text-sm text-light truncate">{result.content}</p>
-													<p class="text-xs text-light/30">{new Date(result.timestamp).toLocaleString()}</p>
+													<p class="text-[11px] text-primary">{result.senderName}</p>
+													<p class="text-body-sm text-white truncate">{result.content}</p>
+													<p class="text-[10px] text-light/30">{new Date(result.timestamp).toLocaleString()}</p>
 												</button>
 											{/each}
 										</div>
 									{:else if messageSearchQuery}
-										<p class="text-sm text-light/40 mt-2">No results found</p>
+										<p class="text-body-sm text-light/30 mt-2">No results found</p>
 									{/if}
 								</div>
 							{/if}
@@ -729,11 +717,11 @@
 								role="region"
 							>
 								{#if isDraggingFile}
-									<div class="absolute inset-0 z-50 bg-primary/20 border-2 border-dashed border-primary rounded-lg flex items-center justify-center backdrop-blur-sm">
+									<div class="absolute inset-0 z-50 bg-primary/10 border-2 border-dashed border-primary rounded-xl flex items-center justify-center backdrop-blur-sm">
 										<div class="text-center">
-											<span class="material-symbols-rounded text-primary mb-4 block" style="font-size: 64px;">upload_file</span>
-											<p class="text-xl font-semibold text-primary">Drop to upload</p>
-											<p class="text-sm text-light/60 mt-1">Release to send file</p>
+											<span class="material-symbols-rounded text-primary mb-3 block" style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;">upload_file</span>
+											<p class="text-body-sm font-heading text-primary">Drop to upload</p>
+											<p class="text-[12px] text-light/40 mt-0.5">Release to send file</p>
 										</div>
 									</div>
 								{/if}
@@ -764,7 +752,7 @@
 								<!-- Side panels -->
 								{#if showRoomInfo}
 									{#each $roomSummaries.filter((r) => r.roomId === $selectedRoomId) as currentRoom}
-										<aside class="w-72 border-l border-light/10 bg-dark/30">
+										<aside class="w-72 border-l border-light/5">
 											<RoomInfoPanel
 												room={currentRoom}
 												members={currentMembers}
@@ -773,7 +761,7 @@
 										</aside>
 									{/each}
 								{:else if showMemberList}
-									<aside class="w-64 border-l border-light/10 bg-dark/30">
+									<aside class="w-64 border-l border-light/5">
 										<MemberList members={currentMembers} />
 									</aside>
 								{/if}
@@ -782,10 +770,10 @@
 					{:else}
 						<!-- No room selected -->
 						<div class="flex-1 flex items-center justify-center">
-							<div class="text-center text-light/40">
-								<span class="material-symbols-rounded mb-4 block" style="font-size: 64px; font-variation-settings: 'FILL' 0, 'wght' 300;">chat</span>
-								<h2 class="font-heading text-h4 text-light/50 mb-2">Select a room</h2>
-								<p class="text-body text-light/30">Choose a conversation to start chatting</p>
+							<div class="text-center text-light/30">
+								<span class="material-symbols-rounded mb-3 block" style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;">chat</span>
+								<p class="text-body-sm text-light/40 mb-1">Select a room</p>
+								<p class="text-[12px] text-light/20">Choose a conversation to start chatting</p>
 							</div>
 						</div>
 					{/if}
--- a/src/routes/[orgSlug]/documents/+layout.svelte
+++ b/src/routes/[orgSlug]/documents/+layout.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+	import type { Snippet } from "svelte";
+	import { navigating } from "$app/stores";
+	import { PageHeader, ContentSkeleton } from "$lib/components/ui";
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+		};
+		children: Snippet;
+	}
+
+	let { data, children }: Props = $props();
+
+	const isNavigatingHere = $derived(
+		$navigating?.to?.url.pathname.includes("/documents") && !$navigating?.to?.url.pathname.includes("/events"),
+	);
+</script>
+
+<div class="flex flex-col h-full overflow-hidden">
+	<PageHeader title={m.nav_files()} icon="cloud" iconColor="text-emerald-400" />
+
+	{#if isNavigatingHere}
+		<ContentSkeleton variant="files" />
+	{:else}
+		<div class="flex-1 overflow-auto">
+			{@render children()}
+		</div>
+	{/if}
+</div>
--- a/src/routes/[orgSlug]/documents/+page.svelte
+++ b/src/routes/[orgSlug]/documents/+page.svelte
@@ -22,7 +22,7 @@
 	<title>Files - {data.org.name} | Root</title>
 </svelte:head>

-<div class="h-full p-4 lg:p-5">
+<div class="h-full p-6">
 	<FileBrowser
 		org={data.org}
 		bind:documents
--- a/src/routes/[orgSlug]/events/+layout.svelte
+++ b/src/routes/[orgSlug]/events/+layout.svelte
@@ -0,0 +1,49 @@
+<script lang="ts">
+	import type { Snippet } from "svelte";
+	import { navigating, page } from "$app/stores";
+	import { PageHeader, ContentSkeleton } from "$lib/components/ui";
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+			userRole: string;
+		};
+		children: Snippet;
+	}
+
+	let { data, children }: Props = $props();
+
+	// Only show the events list header when on the events list page itself,
+	// not on event detail pages (which have their own layout)
+	const isEventsList = $derived(
+		$page.url.pathname === `/${data.org.slug}/events`,
+	);
+
+	const isNavigatingToList = $derived(
+		$navigating?.to?.url.pathname === `/${data.org.slug}/events`,
+	);
+
+	const showListLayout = $derived(isEventsList || isNavigatingToList);
+</script>
+
+{#if showListLayout}
+	<div class="flex flex-col h-full overflow-hidden">
+		<PageHeader
+			title={m.events_title()}
+			subtitle={m.events_subtitle()}
+			icon="celebration"
+			iconColor="text-primary"
+		/>
+
+		{#if isNavigatingToList && !isEventsList}
+			<ContentSkeleton variant="list" />
+		{:else}
+			<div class="flex-1 overflow-hidden">
+				{@render children()}
+			</div>
+		{/if}
+	</div>
+{:else}
+	{@render children()}
+{/if}
--- a/src/routes/[orgSlug]/events/+page.svelte
+++ b/src/routes/[orgSlug]/events/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { goto } from "$app/navigation";
 	import { page } from "$app/stores";
-	import { Avatar } from "$lib/components/ui";
+	import { EventCard, TabBar, Button } from "$lib/components/ui";
 	import { getContext } from "svelte";
 	import type { SupabaseClient } from "@supabase/supabase-js";
 	import type { Database } from "$lib/supabase/types";
@@ -68,45 +68,6 @@
 		"#14B8A6",
 	];

-	function getStatusColor(status: string): string {
-		const map: Record<string, string> = {
-			planning: "text-amber-400 bg-amber-400/10",
-			active: "text-emerald-400 bg-emerald-400/10",
-			completed: "text-blue-400 bg-blue-400/10",
-			archived: "text-light/40 bg-light/5",
-		};
-		return map[status] ?? "text-light/40 bg-light/5";
-	}
-
-	function getStatusIcon(status: string): string {
-		const map: Record<string, string> = {
-			planning: "edit_note",
-			active: "play_circle",
-			completed: "check_circle",
-			archived: "archive",
-		};
-		return map[status] ?? "help";
-	}
-
-	function formatDate(dateStr: string | null): string {
-		if (!dateStr) return "";
-		return new Date(dateStr).toLocaleDateString(undefined, {
-			month: "short",
-			day: "numeric",
-			year: "numeric",
-		});
-	}
-
-	function formatDateRange(
-		start: string | null,
-		end: string | null,
-	): string {
-		if (!start && !end) return m.events_no_dates();
-		if (start && !end) return formatDate(start);
-		if (!start && end) return `Until ${formatDate(end)}`;
-		return `${formatDate(start)} — ${formatDate(end)}`;
-	}
-
 	async function handleCreate() {
 		if (!newEventName.trim()) return;
 		creating = true;
@@ -171,166 +132,66 @@
 </svelte:head>

 <div class="flex flex-col h-full">
-	<!-- Header -->
-	<header
-		class="flex items-center justify-between px-6 py-5 border-b border-light/5"
-	>
-		<div>
-			<h1 class="text-h1 font-heading text-white">{m.events_title()}</h1>
-			<p class="text-body-sm text-light/50 mt-1">
-				{m.events_subtitle()}
-			</p>
+	<!-- Toolbar: Status Tabs + Create Button -->
+	<div class="flex items-center justify-between px-6 py-3 border-b border-light/5 shrink-0">
+		<div class="flex items-center gap-1">
+			{#each statusTabs as tab}
+				<button
+					type="button"
+					class="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-body-sm font-body transition-colors {data.statusFilter ===
+					tab.value
+						? 'bg-primary text-background'
+						: 'text-light/50 hover:text-white hover:bg-dark/50'}"
+					onclick={() => switchStatus(tab.value)}
+				>
+					<span
+						class="material-symbols-rounded"
+						style="font-size: 16px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 16;"
+						>{tab.icon}</span
+					>
+					{tab.label}
+				</button>
+			{/each}
 		</div>
 		{#if isEditor}
-			<button
-				type="button"
-				class="flex items-center gap-2 px-4 py-2 bg-primary text-background rounded-xl font-body text-body-sm hover:bg-primary-hover transition-colors"
-				onclick={() => (showCreateModal = true)}
-			>
-				<span
-					class="material-symbols-rounded"
-					style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
-					>add</span
-				>
+			<Button size="sm" icon="add" onclick={() => (showCreateModal = true)}>
 				{m.events_new()}
-			</button>
+			</Button>
 		{/if}
-	</header>
-
-	<!-- Status Tabs -->
-	<div class="flex items-center gap-1 px-6 py-3 border-b border-light/5">
-		{#each statusTabs as tab}
-			<button
-				type="button"
-				class="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-body-sm font-body transition-colors {data.statusFilter ===
-				tab.value
-					? 'bg-primary text-background'
-					: 'text-light/60 hover:text-white hover:bg-dark/50'}"
-				onclick={() => switchStatus(tab.value)}
-			>
-				<span
-					class="material-symbols-rounded"
-					style="font-size: 16px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 16;"
-					>{tab.icon}</span
-				>
-				{tab.label}
-			</button>
-		{/each}
 	</div>

 	<!-- Events Grid -->
 	<div class="flex-1 overflow-auto p-6">
 		{#if data.events.length === 0}
-			<div
-				class="flex flex-col items-center justify-center h-full text-light/40"
-			>
+			<div class="flex flex-col items-center justify-center h-full text-light/40">
 				<span
 					class="material-symbols-rounded mb-4"
 					style="font-size: 64px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;"
 					>celebration</span
 				>
 				<p class="text-h3 font-heading mb-2">{m.events_empty_title()}</p>
-				<p class="text-body text-light/30">
-					{m.events_empty_desc()}
-				</p>
+				<p class="text-body text-light/30">{m.events_empty_desc()}</p>
 				{#if isEditor}
-					<button
-						type="button"
-						class="mt-4 flex items-center gap-2 px-4 py-2 bg-primary text-background rounded-xl font-body text-body-sm hover:bg-primary-hover transition-colors"
-						onclick={() => (showCreateModal = true)}
-					>
-						<span
-							class="material-symbols-rounded"
-							style="font-size: 20px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 20;"
-							>add</span
-						>
-						{m.events_create()}
-					</button>
+					<div class="mt-4">
+						<Button icon="add" onclick={() => (showCreateModal = true)}>
+							{m.events_create()}
+						</Button>
+					</div>
 				{/if}
 			</div>
 		{:else}
 			<div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
 				{#each data.events as event}
-					<a
+					<EventCard
+						name={event.name}
+						slug={event.slug}
+						status={event.status}
+						startDate={event.start_date}
+						endDate={event.end_date}
+						color={event.color}
+						venueName={event.venue_name}
 						href="/{data.org.slug}/events/{event.slug}"
-						class="group bg-dark/30 hover:bg-dark/60 border border-light/5 hover:border-light/10 rounded-2xl p-5 flex flex-col gap-3 transition-all"
-					>
-						<!-- Color bar + Status -->
-						<div class="flex items-center justify-between">
-							<div class="flex items-center gap-2">
-								<div
-									class="w-3 h-3 rounded-full"
-									style="background-color: {event.color ||
-										'#00A3E0'}"
-								></div>
-								<h3
-									class="text-body font-heading text-white group-hover:text-primary transition-colors truncate"
-								>
-									{event.name}
-								</h3>
-							</div>
-							<span
-								class="text-[11px] font-body px-2 py-0.5 rounded-full capitalize {getStatusColor(
-									event.status,
-								)}"
-							>
-								{event.status}
-							</span>
-						</div>
-
-						<!-- Description -->
-						{#if event.description}
-							<p
-								class="text-body-sm text-light/50 line-clamp-2"
-							>
-								{event.description}
-							</p>
-						{/if}
-
-						<!-- Meta row -->
-						<div
-							class="flex items-center gap-4 text-[12px] text-light/40 mt-auto pt-2"
-						>
-							<!-- Date -->
-							<div class="flex items-center gap-1">
-								<span
-									class="material-symbols-rounded"
-									style="font-size: 14px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 14;"
-									>calendar_today</span
-								>
-								<span
-									>{formatDateRange(
-										event.start_date,
-										event.end_date,
-									)}</span
-								>
-							</div>
-
-							<!-- Venue -->
-							{#if event.venue_name}
-								<div class="flex items-center gap-1">
-									<span
-										class="material-symbols-rounded"
-										style="font-size: 14px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 14;"
-										>location_on</span
-									>
-									<span class="truncate max-w-[120px]"
-										>{event.venue_name}</span
-									>
-								</div>
-							{/if}
-
-							<!-- Members -->
-							<div class="flex items-center gap-1 ml-auto">
-								<span
-									class="material-symbols-rounded"
-									style="font-size: 14px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 14;"
-									>group</span
-								>
-								<span>{event.member_count}</span>
-							</div>
-						</div>
-					</a>
+					/>
 				{/each}
 			</div>
 		{/if}
--- a/src/routes/[orgSlug]/events/[eventSlug]/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { goto } from "$app/navigation";
-	import { Avatar } from "$lib/components/ui";
+	import { ModuleCard, SectionCard, StatusBadge } from "$lib/components/ui";
 	import { getContext } from "svelte";
 	import type { SupabaseClient } from "@supabase/supabase-js";
 	import type { Database } from "$lib/supabase/types";
@@ -394,36 +394,21 @@
 			class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-3"
 		>
 			{#each moduleCards as mod}
-				<a
+				<ModuleCard
+					label={mod.label}
+					description={mod.description}
+					icon={mod.icon}
 					href={mod.href}
-					class="group bg-dark/30 hover:bg-dark/60 border border-light/5 hover:border-light/10 rounded-xl p-4 flex flex-col gap-2 transition-all"
-				>
-					<div
-						class="w-10 h-10 rounded-xl {mod.bg} flex items-center justify-center"
-					>
-						<span
-							class="material-symbols-rounded {mod.color}"
-							style="font-size: 22px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 22;"
-							>{mod.icon}</span
-						>
-					</div>
-					<h3
-						class="text-body font-heading text-white group-hover:text-primary transition-colors"
-					>
-						{mod.label}
-					</h3>
-					<p class="text-[12px] text-light/40">{mod.description}</p>
-				</a>
+					color={mod.color}
+					bg={mod.bg}
+				/>
 			{/each}
 		</div>

 		<!-- Event Details Section -->
 		<div class="mt-8 grid grid-cols-1 lg:grid-cols-2 gap-6">
 			<!-- Info Card -->
-			<div class="bg-dark/30 border border-light/5 rounded-xl p-5">
-				<h3 class="text-body font-heading text-white mb-3">
-					{m.events_details()}
-				</h3>
+			<SectionCard title={m.events_details()}>
 				<div class="flex flex-col gap-2.5">
 					<div class="flex items-center gap-3">
 						<span
@@ -474,41 +459,30 @@
 						</div>
 					{/if}
 				</div>
-			</div>
+			</SectionCard>

 			<!-- Team Card -->
-			<div class="bg-dark/30 border border-light/5 rounded-xl p-5">
-				<div class="flex items-center justify-between mb-3">
-					<h3 class="text-body font-heading text-white">
-						{m.events_team_count({ count: String(data.eventMembers.length) })}
-					</h3>
+			<SectionCard title={m.events_team_count({ count: String(data.eventMembers.length) })}>
+				{#snippet titleRight()}
 					<a
 						href="{basePath}/team"
 						class="text-[12px] text-primary hover:underline"
 						>{m.events_team_manage()}</a
 					>
-				</div>
+				{/snippet}
 				<div class="flex flex-col gap-2">
 					{#each data.eventMembers.slice(0, 6) as member}
 						<div class="flex items-center gap-2.5">
-							<Avatar
-								name={member.profile?.full_name ||
-									member.profile?.email ||
-									"?"}
-								src={member.profile?.avatar_url}
-								size="sm"
-							/>
+							<div class="w-7 h-7 rounded-full bg-primary/20 flex items-center justify-center text-[11px] font-bold text-primary shrink-0">
+								{(member.profile?.full_name || member.profile?.email || "?").charAt(0).toUpperCase()}
+							</div>
 							<div class="flex-1 min-w-0">
-								<p
-									class="text-body-sm text-white truncate"
-								>
+								<p class="text-body-sm text-white truncate">
 									{member.profile?.full_name ||
 										member.profile?.email ||
 										"Unknown"}
 								</p>
-								<p
-									class="text-[11px] text-light/40 capitalize"
-								>
+								<p class="text-[11px] text-light/40 capitalize">
 									{member.role}
 								</p>
 							</div>
@@ -528,7 +502,7 @@
 						</p>
 					{/if}
 				</div>
-			</div>
+			</SectionCard>
 		</div>
 	</div>
 </div>
--- a/src/routes/[orgSlug]/events/[eventSlug]/budget/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/budget/+page.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+			event: { name: string; slug: string };
+		};
+	}
+
+	let { data }: Props = $props();
+</script>
+
+<svelte:head>
+	<title>{m.events_mod_budget()} | {data.event.name} | {data.org.name}</title>
+</svelte:head>
+
+<div class="flex flex-col items-center justify-center h-full text-light/40 p-6">
+	<span
+		class="material-symbols-rounded mb-4"
+		style="font-size: 64px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;"
+		>account_balance_wallet</span
+	>
+	<h2 class="text-h3 font-heading text-white mb-2">{m.events_mod_budget()}</h2>
+	<p class="text-body-sm text-light/30 text-center max-w-sm">
+		{m.events_mod_budget_desc()}
+	</p>
+	<span
+		class="mt-4 text-[11px] text-light/20 bg-light/5 px-3 py-1 rounded-full"
+		>{m.module_coming_soon()}</span
+	>
+</div>
--- a/src/routes/[orgSlug]/events/[eventSlug]/files/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/files/+page.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+			event: { name: string; slug: string };
+		};
+	}
+
+	let { data }: Props = $props();
+</script>
+
+<svelte:head>
+	<title>{m.events_mod_files()} | {data.event.name} | {data.org.name}</title>
+</svelte:head>
+
+<div class="flex flex-col items-center justify-center h-full text-light/40 p-6">
+	<span
+		class="material-symbols-rounded mb-4"
+		style="font-size: 64px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;"
+		>folder</span
+	>
+	<h2 class="text-h3 font-heading text-white mb-2">{m.events_mod_files()}</h2>
+	<p class="text-body-sm text-light/30 text-center max-w-sm">
+		{m.events_mod_files_desc()}
+	</p>
+	<span
+		class="mt-4 text-[11px] text-light/20 bg-light/5 px-3 py-1 rounded-full"
+		>{m.module_coming_soon()}</span
+	>
+</div>
--- a/src/routes/[orgSlug]/events/[eventSlug]/guests/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/guests/+page.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+			event: { name: string; slug: string };
+		};
+	}
+
+	let { data }: Props = $props();
+</script>
+
+<svelte:head>
+	<title>{m.events_mod_guests()} | {data.event.name} | {data.org.name}</title>
+</svelte:head>
+
+<div class="flex flex-col items-center justify-center h-full text-light/40 p-6">
+	<span
+		class="material-symbols-rounded mb-4"
+		style="font-size: 64px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;"
+		>groups</span
+	>
+	<h2 class="text-h3 font-heading text-white mb-2">{m.events_mod_guests()}</h2>
+	<p class="text-body-sm text-light/30 text-center max-w-sm">
+		{m.events_mod_guests_desc()}
+	</p>
+	<span
+		class="mt-4 text-[11px] text-light/20 bg-light/5 px-3 py-1 rounded-full"
+		>{m.module_coming_soon()}</span
+	>
+</div>
--- a/src/routes/[orgSlug]/events/[eventSlug]/schedule/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/schedule/+page.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+			event: { name: string; slug: string };
+		};
+	}
+
+	let { data }: Props = $props();
+</script>
+
+<svelte:head>
+	<title>{m.events_mod_schedule()} | {data.event.name} | {data.org.name}</title>
+</svelte:head>
+
+<div class="flex flex-col items-center justify-center h-full text-light/40 p-6">
+	<span
+		class="material-symbols-rounded mb-4"
+		style="font-size: 64px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;"
+		>calendar_today</span
+	>
+	<h2 class="text-h3 font-heading text-white mb-2">{m.events_mod_schedule()}</h2>
+	<p class="text-body-sm text-light/30 text-center max-w-sm">
+		{m.events_mod_schedule_desc()}
+	</p>
+	<span
+		class="mt-4 text-[11px] text-light/20 bg-light/5 px-3 py-1 rounded-full"
+		>{m.module_coming_soon()}</span
+	>
+</div>
--- a/src/routes/[orgSlug]/events/[eventSlug]/sponsors/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/sponsors/+page.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+			event: { name: string; slug: string };
+		};
+	}
+
+	let { data }: Props = $props();
+</script>
+
+<svelte:head>
+	<title>{m.events_mod_sponsors()} | {data.event.name} | {data.org.name}</title>
+</svelte:head>
+
+<div class="flex flex-col items-center justify-center h-full text-light/40 p-6">
+	<span
+		class="material-symbols-rounded mb-4"
+		style="font-size: 64px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;"
+		>handshake</span
+	>
+	<h2 class="text-h3 font-heading text-white mb-2">{m.events_mod_sponsors()}</h2>
+	<p class="text-body-sm text-light/30 text-center max-w-sm">
+		{m.events_mod_sponsors_desc()}
+	</p>
+	<span
+		class="mt-4 text-[11px] text-light/20 bg-light/5 px-3 py-1 rounded-full"
+		>{m.module_coming_soon()}</span
+	>
+</div>
--- a/src/routes/[orgSlug]/events/[eventSlug]/tasks/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/tasks/+page.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+			event: { name: string; slug: string };
+		};
+	}
+
+	let { data }: Props = $props();
+</script>
+
+<svelte:head>
+	<title>{m.events_mod_tasks()} | {data.event.name} | {data.org.name}</title>
+</svelte:head>
+
+<div class="flex flex-col items-center justify-center h-full text-light/40 p-6">
+	<span
+		class="material-symbols-rounded mb-4"
+		style="font-size: 64px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;"
+		>task_alt</span
+	>
+	<h2 class="text-h3 font-heading text-white mb-2">{m.events_mod_tasks()}</h2>
+	<p class="text-body-sm text-light/30 text-center max-w-sm">
+		{m.events_mod_tasks_desc()}
+	</p>
+	<span
+		class="mt-4 text-[11px] text-light/20 bg-light/5 px-3 py-1 rounded-full"
+		>{m.module_coming_soon()}</span
+	>
+</div>
--- a/src/routes/[orgSlug]/events/[eventSlug]/team/+page.svelte
+++ b/src/routes/[orgSlug]/events/[eventSlug]/team/+page.svelte
@@ -0,0 +1,490 @@
+<script lang="ts">
+	import { Avatar, Button, Modal, Select } from "$lib/components/ui";
+	import { getContext } from "svelte";
+	import type { SupabaseClient } from "@supabase/supabase-js";
+	import type { Database } from "$lib/supabase/types";
+	import { toasts } from "$lib/stores/ui";
+	import type { Event, EventMember } from "$lib/api/events";
+	import * as m from "$lib/paraglide/messages";
+
+	interface OrgMember {
+		id: string;
+		user_id: string;
+		role: string;
+		profiles: {
+			id: string;
+			email: string;
+			full_name: string | null;
+			avatar_url: string | null;
+		} | null;
+	}
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+			userRole: string;
+			members: OrgMember[];
+			event: Event;
+			eventMembers: (EventMember & {
+				profile?: {
+					id: string;
+					email: string;
+					full_name: string | null;
+					avatar_url: string | null;
+				};
+			})[];
+		};
+	}
+
+	let { data }: Props = $props();
+
+	const supabase = getContext<SupabaseClient<Database>>("supabase");
+
+	const isEditor = $derived(
+		["owner", "admin", "editor"].includes(data.userRole),
+	);
+
+	// Local mutable copy of event members
+	let teamMembers = $state(data.eventMembers);
+
+	// Sync when data changes (e.g. after invalidation)
+	$effect(() => {
+		teamMembers = data.eventMembers;
+	});
+
+	// Add member modal
+	let showAddModal = $state(false);
+	let selectedUserId = $state("");
+	let selectedRole = $state<"lead" | "manager" | "member">("member");
+	let adding = $state(false);
+
+	// Remove confirmation
+	let memberToRemove = $state<(typeof teamMembers)[0] | null>(null);
+	let removing = $state(false);
+
+	// Edit role
+	let editingMember = $state<(typeof teamMembers)[0] | null>(null);
+	let editRole = $state<"lead" | "manager" | "member">("member");
+	let updatingRole = $state(false);
+
+	// Org members not yet on the team
+	const availableMembers = $derived(
+		data.members.filter(
+			(om) => !teamMembers.some((tm) => tm.user_id === om.user_id),
+		),
+	);
+
+	const roleOptions = $derived([
+		{ value: "lead", label: m.team_role_lead() },
+		{ value: "manager", label: m.team_role_manager() },
+		{ value: "member", label: m.team_role_member() },
+	]);
+
+	function getRoleColor(role: string): string {
+		const map: Record<string, string> = {
+			lead: "text-amber-400 bg-amber-400/10",
+			manager: "text-purple-400 bg-purple-400/10",
+			member: "text-light/50 bg-light/5",
+		};
+		return map[role] ?? "text-light/50 bg-light/5";
+	}
+
+	function getMemberName(member: (typeof teamMembers)[0]): string {
+		return member.profile?.full_name || member.profile?.email || "Unknown";
+	}
+
+	async function handleAdd() {
+		if (!selectedUserId) return;
+		adding = true;
+		try {
+			const { data: inserted, error } = await (supabase as any)
+				.from("event_members")
+				.upsert(
+					{
+						event_id: data.event.id,
+						user_id: selectedUserId,
+						role: selectedRole,
+					},
+					{ onConflict: "event_id,user_id" },
+				)
+				.select()
+				.single();
+
+			if (error) throw error;
+
+			// Find profile from org members
+			const orgMember = data.members.find(
+				(m) => m.user_id === selectedUserId,
+			);
+			const profile = orgMember?.profiles ?? undefined;
+
+			teamMembers = [
+				...teamMembers,
+				{ ...inserted, profile },
+			];
+
+			const name = profile?.full_name || profile?.email || "Member";
+			toasts.success(m.team_added({ name }));
+			showAddModal = false;
+			selectedUserId = "";
+			selectedRole = "member";
+		} catch (e: any) {
+			toasts.error(e.message || "Failed to add member");
+		} finally {
+			adding = false;
+		}
+	}
+
+	async function handleRemove() {
+		if (!memberToRemove) return;
+		removing = true;
+		try {
+			const { error } = await (supabase as any)
+				.from("event_members")
+				.delete()
+				.eq("event_id", data.event.id)
+				.eq("user_id", memberToRemove.user_id);
+
+			if (error) throw error;
+
+			const name = getMemberName(memberToRemove);
+			teamMembers = teamMembers.filter(
+				(m) => m.user_id !== memberToRemove!.user_id,
+			);
+			toasts.success(m.team_removed({ name }));
+			memberToRemove = null;
+		} catch (e: any) {
+			toasts.error(e.message || "Failed to remove member");
+		} finally {
+			removing = false;
+		}
+	}
+
+	async function handleRoleUpdate() {
+		if (!editingMember) return;
+		updatingRole = true;
+		try {
+			const { error } = await (supabase as any)
+				.from("event_members")
+				.update({ role: editRole })
+				.eq("event_id", data.event.id)
+				.eq("user_id", editingMember.user_id);
+
+			if (error) throw error;
+
+			teamMembers = teamMembers.map((m) =>
+				m.user_id === editingMember!.user_id
+					? { ...m, role: editRole }
+					: m,
+			);
+			toasts.success(m.team_updated());
+			editingMember = null;
+		} catch (e: any) {
+			toasts.error(e.message || "Failed to update role");
+		} finally {
+			updatingRole = false;
+		}
+	}
+
+	function openEditRole(member: (typeof teamMembers)[0]) {
+		editingMember = member;
+		editRole = member.role;
+	}
+</script>
+
+<svelte:head>
+	<title>{m.events_mod_team()} | {data.event.name} | {data.org.name}</title>
+</svelte:head>
+
+<div class="flex flex-col h-full overflow-auto p-6">
+	<div class="max-w-2xl w-full mx-auto flex flex-col gap-4">
+		<!-- Header -->
+		<div class="flex items-center justify-between">
+			<div>
+				<h2 class="font-heading text-body text-white">{m.team_title()}</h2>
+				<p class="text-body-sm text-light/40 mt-0.5">{m.team_subtitle()}</p>
+			</div>
+			{#if isEditor}
+				<Button
+					size="sm"
+					icon="person_add"
+					onclick={() => (showAddModal = true)}
+					disabled={availableMembers.length === 0}
+				>
+					{m.team_add_member()}
+				</Button>
+			{/if}
+		</div>
+
+		<!-- Team List -->
+		{#if teamMembers.length === 0}
+			<div
+				class="flex flex-col items-center justify-center py-16 text-light/40"
+			>
+				<span
+					class="material-symbols-rounded mb-4"
+					style="font-size: 56px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;"
+					>badge</span
+				>
+				<p class="text-body-sm text-light/30 text-center max-w-sm">
+					{m.team_empty()}
+				</p>
+				{#if isEditor && availableMembers.length > 0}
+					<div class="mt-4">
+						<Button
+							size="sm"
+							icon="person_add"
+							onclick={() => (showAddModal = true)}
+						>
+							{m.team_add_member()}
+						</Button>
+					</div>
+				{/if}
+			</div>
+		{:else}
+			<div
+				class="bg-dark/30 border border-light/5 rounded-xl overflow-hidden"
+			>
+				<div class="divide-y divide-light/5">
+					{#each teamMembers as member}
+						<div
+							class="flex items-center justify-between px-4 py-3 hover:bg-light/5 transition-colors"
+						>
+							<div class="flex items-center gap-3">
+								<Avatar
+									name={member.profile?.full_name ||
+										member.profile?.email ||
+										"?"}
+									src={member.profile?.avatar_url}
+									size="sm"
+								/>
+								<div>
+									<p class="text-body-sm text-white">
+										{member.profile?.full_name ||
+											member.profile?.email ||
+											"Unknown"}
+									</p>
+									<p class="text-[11px] text-light/40">
+										{member.profile?.email || ""}
+									</p>
+								</div>
+							</div>
+							<div class="flex items-center gap-2">
+								<span
+									class="px-2 py-0.5 text-[10px] rounded-md capitalize font-body {getRoleColor(
+										member.role,
+									)}">{member.role}</span
+								>
+								{#if isEditor}
+									<button
+										type="button"
+										class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
+										onclick={() => openEditRole(member)}
+										title="Change role"
+									>
+										<span
+											class="material-symbols-rounded"
+											style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;"
+											>swap_horiz</span
+										>
+									</button>
+									<button
+										type="button"
+										class="p-1.5 text-light/40 hover:text-error hover:bg-error/10 rounded-lg transition-colors"
+										onclick={() =>
+											(memberToRemove = member)}
+										title={m.team_remove_btn()}
+									>
+										<span
+											class="material-symbols-rounded"
+											style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;"
+											>person_remove</span
+										>
+									</button>
+								{/if}
+							</div>
+						</div>
+					{/each}
+				</div>
+			</div>
+		{/if}
+	</div>
+</div>
+
+<!-- Add Member Modal -->
+<Modal
+	isOpen={showAddModal}
+	onClose={() => (showAddModal = false)}
+	title={m.team_add_member()}
+>
+	<div class="flex flex-col gap-4">
+		<div class="flex flex-col gap-1.5">
+			<label
+				for="team-member-select"
+				class="text-body-sm text-light/60 font-body"
+				>{m.team_select_member()}</label
+			>
+			<select
+				id="team-member-select"
+				bind:value={selectedUserId}
+				class="bg-dark border border-light/10 rounded-xl px-3 py-2 text-body-sm text-white focus:outline-none focus:border-primary"
+			>
+				<option value="" disabled>{m.team_select_member()}</option>
+				{#each availableMembers as om}
+					<option value={om.user_id}>
+						{om.profiles?.full_name || om.profiles?.email || om.user_id}
+					</option>
+				{/each}
+			</select>
+		</div>
+
+		<div class="flex flex-col gap-1.5">
+			<label
+				for="team-role-select"
+				class="text-body-sm text-light/60 font-body"
+				>{m.team_select_role()}</label
+			>
+			<select
+				id="team-role-select"
+				bind:value={selectedRole}
+				class="bg-dark border border-light/10 rounded-xl px-3 py-2 text-body-sm text-white focus:outline-none focus:border-primary"
+			>
+				{#each roleOptions as opt}
+					<option value={opt.value}>{opt.label}</option>
+				{/each}
+			</select>
+		</div>
+
+		<div class="flex items-center justify-end gap-3 pt-2 border-t border-light/5">
+			<button
+				type="button"
+				class="px-4 py-2 text-body-sm text-light/60 hover:text-white transition-colors"
+				onclick={() => {
+					showAddModal = false;
+					selectedUserId = "";
+					selectedRole = "member";
+				}}
+			>
+				{m.btn_cancel()}
+			</button>
+			<button
+				type="button"
+				disabled={!selectedUserId || adding}
+				class="px-4 py-2 bg-primary text-background rounded-xl font-body text-body-sm hover:bg-primary-hover transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+				onclick={handleAdd}
+			>
+				{adding ? "..." : m.team_add_member()}
+			</button>
+		</div>
+	</div>
+</Modal>
+
+<!-- Edit Role Modal -->
+<Modal
+	isOpen={!!editingMember}
+	onClose={() => (editingMember = null)}
+	title="Change Role"
+>
+	{#if editingMember}
+		<div class="flex flex-col gap-4">
+			<div class="flex items-center gap-3 p-3 bg-dark/30 rounded-xl">
+				<Avatar
+					name={editingMember.profile?.full_name ||
+						editingMember.profile?.email ||
+						"?"}
+					src={editingMember.profile?.avatar_url}
+					size="sm"
+				/>
+				<div>
+					<p class="text-body-sm text-white">
+						{editingMember.profile?.full_name ||
+							editingMember.profile?.email ||
+							"Unknown"}
+					</p>
+					<p class="text-[11px] text-light/40 capitalize">
+						{editingMember.role}
+					</p>
+				</div>
+			</div>
+
+			<div class="flex flex-col gap-1.5">
+				<label
+					for="edit-role-select"
+					class="text-body-sm text-light/60 font-body"
+					>{m.team_select_role()}</label
+				>
+				<select
+					id="edit-role-select"
+					bind:value={editRole}
+					class="bg-dark border border-light/10 rounded-xl px-3 py-2 text-body-sm text-white focus:outline-none focus:border-primary"
+				>
+					{#each roleOptions as opt}
+						<option value={opt.value}>{opt.label}</option>
+					{/each}
+				</select>
+			</div>
+
+			<div
+				class="flex items-center justify-end gap-3 pt-2 border-t border-light/5"
+			>
+				<button
+					type="button"
+					class="px-4 py-2 text-body-sm text-light/60 hover:text-white transition-colors"
+					onclick={() => (editingMember = null)}
+				>
+					{m.btn_cancel()}
+				</button>
+				<button
+					type="button"
+					disabled={updatingRole || editRole === editingMember.role}
+					class="px-4 py-2 bg-primary text-background rounded-xl font-body text-body-sm hover:bg-primary-hover transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+					onclick={handleRoleUpdate}
+				>
+					{updatingRole ? "..." : m.btn_save()}
+				</button>
+			</div>
+		</div>
+	{/if}
+</Modal>
+
+<!-- Remove Confirmation -->
+{#if memberToRemove}
+	<!-- svelte-ignore a11y_no_static_element_interactions -->
+	<!-- svelte-ignore a11y_interactive_supports_focus -->
+	<div
+		class="fixed inset-0 bg-black/60 z-50 flex items-center justify-center p-4"
+		onkeydown={(e) => e.key === "Escape" && (memberToRemove = null)}
+		onclick={(e) => e.target === e.currentTarget && (memberToRemove = null)}
+		role="dialog"
+		aria-modal="true"
+		aria-label={m.team_remove_btn()}
+	>
+		<div
+			class="bg-night rounded-2xl w-full max-w-sm shadow-2xl border border-light/10 p-6"
+		>
+			<h2 class="text-h3 font-heading text-white mb-2">
+				{m.team_remove_btn()}
+			</h2>
+			<p class="text-body-sm text-light/50 mb-6">
+				{m.team_remove_confirm({ name: getMemberName(memberToRemove) })}
+			</p>
+			<div class="flex items-center justify-end gap-3">
+				<button
+					type="button"
+					class="px-4 py-2 text-body-sm text-light/60 hover:text-white transition-colors"
+					onclick={() => (memberToRemove = null)}
+				>
+					{m.btn_cancel()}
+				</button>
+				<button
+					type="button"
+					class="px-4 py-2 bg-error text-white rounded-xl text-body-sm hover:bg-error/80 transition-colors disabled:opacity-50"
+					disabled={removing}
+					onclick={handleRemove}
+				>
+					{removing ? "..." : m.team_remove_btn()}
+				</button>
+			</div>
+		</div>
+	</div>
+{/if}
--- a/src/routes/[orgSlug]/kanban/+layout.svelte
+++ b/src/routes/[orgSlug]/kanban/+layout.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+	import type { Snippet } from "svelte";
+	import { navigating } from "$app/stores";
+	import { PageHeader, ContentSkeleton } from "$lib/components/ui";
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+		};
+		children: Snippet;
+	}
+
+	let { data, children }: Props = $props();
+
+	const isNavigatingHere = $derived(
+		$navigating?.to?.url.pathname.includes("/kanban") ?? false,
+	);
+</script>
+
+<div class="flex flex-col h-full overflow-hidden">
+	<PageHeader title={m.kanban_title()} icon="view_kanban" iconColor="text-purple-400" />
+
+	{#if isNavigatingHere}
+		<ContentSkeleton variant="kanban" />
+	{:else}
+		<div class="flex-1 overflow-hidden">
+			{@render children()}
+		</div>
+	{/if}
+</div>
--- a/src/routes/[orgSlug]/kanban/+page.svelte
+++ b/src/routes/[orgSlug]/kanban/+page.svelte
@@ -494,13 +494,13 @@
 	>
 </svelte:head>

-<div class="flex flex-col h-full p-4 lg:p-5 gap-4">
-	<!-- Header -->
-	<header class="flex items-center gap-2 p-1">
+<div class="flex flex-col h-full">
+	<!-- Board toolbar -->
+	<div class="flex items-center gap-2 px-6 py-3 border-b border-light/5 shrink-0">
 		{#if isRenamingBoard && selectedBoard}
 			<input
 				type="text"
-				class="flex-1 bg-dark border border-primary rounded-lg px-3 py-1 text-white font-heading text-h1 focus:outline-none"
+				class="flex-1 bg-dark border border-primary rounded-lg px-3 py-1 text-white font-heading text-body focus:outline-none"
 				bind:value={renameBoardValue}
 				onkeydown={(e) => {
 					if (e.key === "Enter") confirmBoardRename();
@@ -509,12 +509,30 @@
 				onblur={confirmBoardRename}
 				autofocus
 			/>
-		{:else}
-			<h1 class="flex-1 font-heading text-h1 text-white">
-				{selectedBoard ? selectedBoard.name : m.kanban_title()}
-			</h1>
+		{:else if selectedBoard}
+			<h2 class="font-heading text-body text-white">{selectedBoard.name}</h2>
 		{/if}
-		<Button size="md" onclick={() => (showCreateBoardModal = true)}
+
+		{#if boards.length > 1}
+			<div class="flex gap-1 ml-2">
+				{#each boards as board}
+					<button
+						type="button"
+						class="px-3 py-1 rounded-lg text-[12px] font-body whitespace-nowrap transition-colors {selectedBoard?.id ===
+						board.id
+							? 'bg-primary text-background'
+							: 'text-light/50 hover:text-white hover:bg-dark/50'}"
+						onclick={() => loadBoard(board.id)}
+					>
+						{board.name}
+					</button>
+				{/each}
+			</div>
+		{/if}
+
+		<div class="flex-1"></div>
+
+		<Button size="sm" onclick={() => (showCreateBoardModal = true)}
 			>{m.btn_new()}</Button
 		>
 		<ContextMenu
@@ -539,28 +557,10 @@
 					: []),
 			]}
 		/>
-	</header>
-
-	<!-- Board selector (compact) -->
-	{#if boards.length > 1}
-		<div class="flex gap-2 overflow-x-auto pb-2">
-			{#each boards as board}
-				<button
-					type="button"
-					class="px-4 py-2 rounded-[32px] text-sm font-body whitespace-nowrap transition-colors {selectedBoard?.id ===
-					board.id
-						? 'bg-primary text-night'
-						: 'bg-dark text-light hover:bg-dark/80'}"
-					onclick={() => loadBoard(board.id)}
-				>
-					{board.name}
-				</button>
-			{/each}
-		</div>
-	{/if}
+	</div>

 	<!-- Kanban Board -->
-	<div class="flex-1 overflow-hidden">
+	<div class="flex-1 overflow-hidden p-4">
 		{#if selectedBoard}
 			<KanbanBoard
 				columns={selectedBoard.columns}
--- a/src/routes/[orgSlug]/settings/+layout.svelte
+++ b/src/routes/[orgSlug]/settings/+layout.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+	import type { Snippet } from "svelte";
+	import { navigating } from "$app/stores";
+	import { PageHeader, ContentSkeleton } from "$lib/components/ui";
+	import * as m from "$lib/paraglide/messages";
+
+	interface Props {
+		data: {
+			org: { id: string; name: string; slug: string };
+		};
+		children: Snippet;
+	}
+
+	let { data, children }: Props = $props();
+
+	const isNavigatingHere = $derived(
+		$navigating?.to?.url.pathname.includes("/settings") ?? false,
+	);
+</script>
+
+<div class="flex flex-col h-full overflow-hidden">
+	<PageHeader
+		title={m.settings_title()}
+		icon="settings"
+		iconColor="text-light/50"
+	/>
+
+	{#if isNavigatingHere}
+		<ContentSkeleton variant="settings" />
+	{:else}
+		<div class="flex-1 overflow-auto">
+			{@render children()}
+		</div>
+	{/if}
+</div>
--- a/src/routes/[orgSlug]/settings/+page.svelte
+++ b/src/routes/[orgSlug]/settings/+page.svelte
@@ -274,33 +274,24 @@
 	<title>Settings - {data.org.name} | Root</title>
 </svelte:head>

-<div class="flex flex-col h-full p-4 lg:p-5 gap-4 overflow-auto">
-	<!-- Header -->
-	<div class="flex flex-col gap-4">
-		<header class="flex flex-wrap items-center gap-2 p-1 rounded-[32px]">
-			<Avatar name="Settings" size="md" />
-			<h1 class="flex-1 font-heading text-h1 text-white">
-				{m.settings_title()}
-			</h1>
-			<IconButton title="More options">
-				<Icon name="more_horiz" size={24} />
-			</IconButton>
-		</header>
-
-		<!-- Pill Tab Navigation -->
-		<div class="flex flex-wrap gap-4">
-			{#each tabs as tab}
-				<Button
-					variant={activeTab === tab.id ? "primary" : "secondary"}
-					size="md"
-					onclick={() => (activeTab = tab.id)}
-				>
-					{tab.label}
-				</Button>
-			{/each}
-		</div>
+<div class="flex flex-col h-full">
+	<!-- Tab Navigation -->
+	<div class="flex flex-wrap gap-1 px-6 py-3 border-b border-light/5 shrink-0">
+		{#each tabs as tab}
+			<button
+				type="button"
+				class="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-body-sm font-body transition-colors {activeTab === tab.id
+					? 'bg-primary text-background'
+					: 'text-light/50 hover:text-white hover:bg-dark/50'}"
+				onclick={() => (activeTab = tab.id)}
+			>
+				{tab.label}
+			</button>
+		{/each}
 	</div>

+	<div class="flex-1 overflow-auto p-6">
+
 	<!-- General Tab -->
 	{#if activeTab === "general"}
 		<SettingsGeneral
@@ -331,74 +322,73 @@

 	<!-- Tags Tab -->
 	{#if activeTab === "tags"}
-		<div class="space-y-6 max-w-2xl">
+		<div class="space-y-4 max-w-2xl">
 			<div class="flex items-center justify-between">
 				<div>
-					<h2 class="text-lg font-semibold text-light">
+					<h2 class="text-body font-heading text-white">
 						{m.settings_tags_title()}
 					</h2>
-					<p class="text-sm text-light/50">
+					<p class="text-body-sm text-light/50 mt-0.5">
 						{m.settings_tags_desc()}
 					</p>
 				</div>
-				<Button onclick={() => openTagModal()} icon="add">
+				<Button size="sm" onclick={() => openTagModal()} icon="add">
 					{m.settings_tags_create()}
 				</Button>
 			</div>

 			{#if orgTags.length === 0 && tagsLoaded}
-				<Card>
-					<div class="p-8 text-center">
-						<span
-							class="material-symbols-rounded text-light/20 mb-4 block"
-							style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 48;"
-							>label</span
-						>
-						<p class="text-light/50">{m.settings_tags_empty()}</p>
-					</div>
-				</Card>
+				<div class="bg-dark/30 border border-light/5 rounded-xl p-8 text-center">
+					<span
+						class="material-symbols-rounded text-light/20 mb-3 block"
+						style="font-size: 48px; font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 48;"
+						>label</span
+					>
+					<p class="text-body-sm text-light/40">{m.settings_tags_empty()}</p>
+				</div>
 			{:else}
-				<div class="grid gap-3">
+				<div class="flex flex-col gap-2">
 					{#each orgTags as tag}
-						<Card>
-							<div class="flex items-center justify-between p-4">
-								<div class="flex items-center gap-3">
-									<div
-										class="w-8 h-8 rounded-lg flex items-center justify-center"
-										style="background-color: {tag.color ||
-											'#00A3E0'}"
+						<div class="flex items-center justify-between px-4 py-3 bg-dark/30 border border-light/5 rounded-xl hover:border-light/10 transition-colors">
+							<div class="flex items-center gap-3">
+								<div
+									class="w-7 h-7 rounded-lg flex items-center justify-center shrink-0"
+									style="background-color: {tag.color || '#00A3E0'}"
+								>
+									<span
+										class="material-symbols-rounded text-night"
+										style="font-size: 16px; font-variation-settings: 'FILL' 0, 'wght' 600, 'GRAD' 0, 'opsz' 16;"
+										>label</span
 									>
-										<span
-											class="material-symbols-rounded text-night"
-											style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 600, 'GRAD' 0, 'opsz' 18;"
-											>label</span
-										>
-									</div>
-									<div>
-										<p class="text-light font-medium">
-											{tag.name}
-										</p>
-										<p class="text-xs text-light/40">
-											{tag.color || "#00A3E0"}
-										</p>
-									</div>
 								</div>
-								<div class="flex items-center gap-2">
-									<Button
-										variant="tertiary"
-										size="sm"
-										onclick={() => openTagModal(tag)}
-										>Edit</Button
-									>
-									<Button
-										variant="danger"
-										size="sm"
-										onclick={() => deleteOrgTag(tag)}
-										>Delete</Button
-									>
+								<div>
+									<p class="text-body-sm text-white font-medium">
+										{tag.name}
+									</p>
+									<p class="text-[11px] text-light/30">
+										{tag.color || "#00A3E0"}
+									</p>
 								</div>
 							</div>
-						</Card>
+							<div class="flex items-center gap-1.5">
+								<button
+									type="button"
+									class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors"
+									onclick={() => openTagModal(tag)}
+									title="Edit"
+								>
+									<span class="material-symbols-rounded" style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;">edit</span>
+								</button>
+								<button
+									type="button"
+									class="p-1.5 text-light/40 hover:text-error hover:bg-error/10 rounded-lg transition-colors"
+									onclick={() => deleteOrgTag(tag)}
+									title="Delete"
+								>
+									<span class="material-symbols-rounded" style="font-size: 18px; font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 18;">delete</span>
+								</button>
+							</div>
+						</div>
 					{/each}
 				</div>
 			{/if}
@@ -416,6 +406,7 @@
 			serviceAccountEmail={data.serviceAccountEmail ?? null}
 		/>
 	{/if}
+	</div>
 </div>

 <!-- Create/Edit Tag Modal -->
--- a/src/routes/style/+page.svelte
+++ b/src/routes/style/+page.svelte
@@ -36,97 +36,76 @@
 	<title>Style Guide | Root</title>
 </svelte:head>

-<div class="min-h-screen bg-dark p-8">
-	<div class="max-w-6xl mx-auto space-y-12">
-		<!-- Back Button -->
-		<a
-			href="/"
-			class="inline-flex items-center gap-2 text-light/60 hover:text-light transition-colors"
-		>
-			<svg
-				class="w-5 h-5"
-				viewBox="0 0 24 24"
-				fill="none"
-				stroke="currentColor"
-				stroke-width="2"
-			>
-				<path d="M19 12H5M12 19l-7-7 7-7" />
-			</svg>
-			Back to Home
-		</a>
+<div class="min-h-screen bg-background">
+	<!-- Header -->
+	<header class="border-b border-light/5">
+		<div class="max-w-5xl mx-auto px-6 py-4 flex items-center justify-between">
+			<div class="flex items-center gap-3">
+				<a href="/" class="p-1.5 text-light/40 hover:text-white hover:bg-dark/50 rounded-lg transition-colors">
+					<span class="material-symbols-rounded" style="font-size: 20px;">arrow_back</span>
+				</a>
+				<span class="font-heading text-body text-white">Style Guide</span>
+				<span class="text-[11px] text-light/30 font-body">All UI components and their variants</span>
+			</div>
+		</div>
+	</header>

-		<!-- Header -->
-		<header class="text-center space-y-4">
-			<h1 class="text-4xl font-bold text-light">Root Style Guide</h1>
-			<p class="text-light/60">All UI components and their variants</p>
-		</header>
+	<div class="max-w-5xl mx-auto px-6 py-8 space-y-10">

-		<!-- Colors - Figma Design System -->
+		<!-- Colors -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Colors
-			</h2>
-			<div class="grid grid-cols-2 md:grid-cols-4 lg:grid-cols-6 gap-4">
-				<div class="space-y-2">
-					<div
-						class="w-full h-20 rounded-[32px] bg-background border border-light/20"
-					></div>
-					<p class="text-sm text-light/60">Background</p>
-					<code class="text-xs text-light/40">#05090F</code>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Colors</h2>
+			<div class="grid grid-cols-2 md:grid-cols-4 lg:grid-cols-8 gap-3">
+				<div class="space-y-1.5">
+					<div class="w-full h-16 rounded-xl bg-background border border-light/10"></div>
+					<p class="text-[12px] text-light/60 font-body">Background</p>
+					<code class="text-[10px] text-light/30">#05090F</code>
 				</div>
-				<div class="space-y-2">
-					<div class="w-full h-20 rounded-[32px] bg-night"></div>
-					<p class="text-sm text-light/60">Night</p>
-					<code class="text-xs text-light/40">#0A121F</code>
+				<div class="space-y-1.5">
+					<div class="w-full h-16 rounded-xl bg-night"></div>
+					<p class="text-[12px] text-light/60 font-body">Night</p>
+					<code class="text-[10px] text-light/30">#0A121F</code>
 				</div>
-				<div class="space-y-2">
-					<div class="w-full h-20 rounded-[32px] bg-dark"></div>
-					<p class="text-sm text-light/60">Dark</p>
-					<code class="text-xs text-light/40">#14243E</code>
+				<div class="space-y-1.5">
+					<div class="w-full h-16 rounded-xl bg-dark"></div>
+					<p class="text-[12px] text-light/60 font-body">Dark</p>
+					<code class="text-[10px] text-light/30">#14243E</code>
 				</div>
-				<div class="space-y-2">
-					<div class="w-full h-20 rounded-[32px] bg-light"></div>
-					<p class="text-sm text-light/60">Light</p>
-					<code class="text-xs text-light/40">#E5E6F0</code>
+				<div class="space-y-1.5">
+					<div class="w-full h-16 rounded-xl bg-light"></div>
+					<p class="text-[12px] text-light/60 font-body">Light</p>
+					<code class="text-[10px] text-light/30">#E5E6F0</code>
 				</div>
-				<div class="space-y-2">
-					<div class="w-full h-20 rounded-[32px] bg-primary"></div>
-					<p class="text-sm text-light/60">Primary</p>
-					<code class="text-xs text-light/40">#00A3E0</code>
+				<div class="space-y-1.5">
+					<div class="w-full h-16 rounded-xl bg-primary"></div>
+					<p class="text-[12px] text-light/60 font-body">Primary</p>
+					<code class="text-[10px] text-light/30">#00A3E0</code>
 				</div>
-				<div class="space-y-2">
-					<div class="w-full h-20 rounded-[32px] bg-success"></div>
-					<p class="text-sm text-light/60">Success</p>
-					<code class="text-xs text-light/40">#33E000</code>
+				<div class="space-y-1.5">
+					<div class="w-full h-16 rounded-xl bg-success"></div>
+					<p class="text-[12px] text-light/60 font-body">Success</p>
+					<code class="text-[10px] text-light/30">#33E000</code>
 				</div>
-				<div class="space-y-2">
-					<div class="w-full h-20 rounded-[32px] bg-warning"></div>
-					<p class="text-sm text-light/60">Warning</p>
-					<code class="text-xs text-light/40">#FFAB00</code>
+				<div class="space-y-1.5">
+					<div class="w-full h-16 rounded-xl bg-warning"></div>
+					<p class="text-[12px] text-light/60 font-body">Warning</p>
+					<code class="text-[10px] text-light/30">#FFAB00</code>
 				</div>
-				<div class="space-y-2">
-					<div class="w-full h-20 rounded-[32px] bg-error"></div>
-					<p class="text-sm text-light/60">Error</p>
-					<code class="text-xs text-light/40">#E03D00</code>
+				<div class="space-y-1.5">
+					<div class="w-full h-16 rounded-xl bg-error"></div>
+					<p class="text-[12px] text-light/60 font-body">Error</p>
+					<code class="text-[10px] text-light/30">#E03D00</code>
 				</div>
 			</div>
 		</section>

 		<!-- Buttons -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Buttons
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Buttons</h2>

-			<div class="space-y-6">
+			<div class="space-y-5">
 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Variants
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Variants</h3>
 					<div class="flex flex-wrap gap-3">
 						<Button variant="primary">Primary</Button>
 						<Button variant="secondary">Secondary</Button>
@@ -137,9 +116,7 @@
 				</div>

 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Sizes
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Sizes</h3>
 					<div class="flex flex-wrap items-center gap-3">
 						<Button size="sm">Small</Button>
 						<Button size="md">Medium</Button>
@@ -148,9 +125,7 @@
 				</div>

 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						With Icons (Material Symbols)
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">With Icons</h3>
 					<div class="flex flex-wrap items-center gap-3">
 						<Button icon="add">Add Item</Button>
 						<Button variant="secondary" icon="edit">Edit</Button>
@@ -160,9 +135,7 @@
 				</div>

 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						States
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">States</h3>
 					<div class="flex flex-wrap gap-3">
 						<Button>Normal</Button>
 						<Button disabled>Disabled</Button>
@@ -171,9 +144,7 @@
 				</div>

 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Full Width
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Full Width</h3>
 					<div class="max-w-sm">
 						<Button fullWidth icon="rocket_launch"
 							>Full Width Button</Button
@@ -185,11 +156,7 @@

 		<!-- Inputs -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Inputs
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Inputs</h2>

 			<div class="grid md:grid-cols-2 gap-6">
 				<Input
@@ -229,11 +196,7 @@

 		<!-- Textarea -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Textarea
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Textarea</h2>

 			<div class="grid md:grid-cols-2 gap-6">
 				<Textarea
@@ -251,11 +214,7 @@

 		<!-- Select -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Select
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Select</h2>

 			<div class="grid md:grid-cols-2 gap-6">
 				<Select
@@ -273,17 +232,11 @@

 		<!-- Avatars -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Avatars
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Avatars</h2>

-			<div class="space-y-6">
+			<div class="space-y-5">
 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Sizes
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Sizes</h3>
 					<div class="flex items-end gap-4">
 						<Avatar name="John Doe" size="sm" />
 						<Avatar name="John Doe" size="md" />
@@ -293,9 +246,7 @@
 				</div>

 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						With Status (placeholder)
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">With Status</h3>
 					<div class="flex items-center gap-4">
 						<Avatar name="Online User" size="lg" />
 						<Avatar name="Away User" size="lg" />
@@ -305,9 +256,7 @@
 				</div>

 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Different Names (Color Generation)
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Color Generation</h3>
 					<div class="flex items-center gap-4">
 						<Avatar name="Alice" size="lg" />
 						<Avatar name="Bob" size="lg" />
@@ -321,17 +270,11 @@

 		<!-- Chips -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Chips
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Chips</h2>

-			<div class="space-y-6">
+			<div class="space-y-5">
 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Variants
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Variants</h3>
 					<div class="flex flex-wrap gap-3">
 						<Chip variant="primary">Primary</Chip>
 						<Chip variant="success">Success</Chip>
@@ -345,11 +288,7 @@

 		<!-- List Items -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				List Items
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">List Items</h2>

 			<div class="max-w-[240px] space-y-2">
 				<ListItem icon="info">Default Item</ListItem>
@@ -364,11 +303,7 @@

 		<!-- Org Header -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Organization Header
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Organization Header</h2>

 			<div class="max-w-[240px] space-y-4">
 				<OrgHeader name="Acme Corp" role="Admin" />
@@ -379,11 +314,7 @@

 		<!-- Calendar Day -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Calendar Day
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Calendar Day</h2>

 			<div class="flex gap-1 max-w-[720px]">
 				<CalendarDay day="Mon" isHeader />
@@ -403,17 +334,11 @@

 		<!-- Badges -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Badges
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Badges</h2>

-			<div class="space-y-6">
+			<div class="space-y-5">
 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Variants
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Variants</h3>
 					<div class="flex flex-wrap gap-3">
 						<Badge variant="default">Default</Badge>
 						<Badge variant="primary">Primary</Badge>
@@ -425,9 +350,7 @@
 				</div>

 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Sizes
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Sizes</h3>
 					<div class="flex flex-wrap items-center gap-3">
 						<Badge size="sm">Small</Badge>
 						<Badge size="md">Medium</Badge>
@@ -439,11 +362,7 @@

 		<!-- Cards -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Cards
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Cards</h2>

 			<div class="grid md:grid-cols-3 gap-6">
 				<Card variant="default">
@@ -469,17 +388,11 @@

 		<!-- Toggle -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Toggle
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Toggle</h2>

-			<div class="space-y-6">
+			<div class="space-y-5">
 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Sizes
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Sizes</h3>
 					<div class="flex items-center gap-6">
 						<div class="flex items-center gap-2">
 							<Toggle size="sm" />
@@ -497,9 +410,7 @@
 				</div>

 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						States
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">States</h3>
 					<div class="flex items-center gap-6">
 						<div class="flex items-center gap-2">
 							<Toggle />
@@ -520,17 +431,11 @@

 		<!-- Spinners -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Spinners
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Spinners</h2>

-			<div class="space-y-6">
+			<div class="space-y-5">
 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Sizes
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Sizes</h3>
 					<div class="flex items-center gap-6">
 						<Spinner size="sm" />
 						<Spinner size="md" />
@@ -539,9 +444,7 @@
 				</div>

 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Colors
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Colors</h3>
 					<div class="flex items-center gap-6">
 						<Spinner color="primary" />
 						<Spinner color="light" />
@@ -555,11 +458,7 @@

 		<!-- Modal -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Modal
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Modal</h2>

 			<div>
 				<Button onclick={() => (modalOpen = true)}>Open Modal</Button>
@@ -584,18 +483,12 @@

 		<!-- Typography -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Typography
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Typography</h2>

-			<div class="space-y-6">
+			<div class="space-y-5">
 				<!-- Headings (Tilt Warp) -->
 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Headings &mdash; Tilt Warp
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Headings &mdash; Tilt Warp</h3>
 					<div class="space-y-3">
 						<div class="flex items-baseline gap-4">
 							<span
@@ -644,9 +537,7 @@

 				<!-- Button Text (Tilt Warp) -->
 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Button Text &mdash; Tilt Warp
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Button Text &mdash; Tilt Warp</h3>
 					<div class="space-y-3">
 						<div class="flex items-baseline gap-4">
 							<span
@@ -680,9 +571,7 @@

 				<!-- Body Text (Work Sans) -->
 				<div>
-					<h3 class="text-lg font-medium text-light/80 mb-3">
-						Body &mdash; Work Sans
-					</h3>
+					<h3 class="text-body-sm font-heading text-light/60 mb-2">Body &mdash; Work Sans</h3>
 					<div class="space-y-3">
 						<div class="flex items-baseline gap-4">
 							<span
@@ -721,11 +610,7 @@

 		<!-- Toasts -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Toasts
-			</h2>
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Toasts</h2>
 			<div class="space-y-4">
 				<Toast
 					variant="success"
@@ -752,15 +637,9 @@

 		<!-- Logo -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Logo
-			</h2>
-			<p class="text-light/60">
-				Brand logo component with size variants.
-			</p>
-			<div class="flex items-center gap-8 bg-night p-6 rounded-xl">
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Logo</h2>
+			<p class="text-[12px] text-light/40 font-body">Brand logo component with size variants.</p>
+			<div class="flex items-center gap-8 bg-dark/30 border border-light/5 p-5 rounded-xl">
 				<div class="flex flex-col items-center gap-2">
 					<Logo size="sm" />
 					<span class="text-xs text-light/60">Small</span>
@@ -774,16 +653,9 @@

 		<!-- ContentHeader -->
 		<section class="space-y-4">
-			<h2
-				class="text-2xl font-semibold text-light border-b border-light/10 pb-2"
-			>
-				Content Header
-			</h2>
-			<p class="text-light/60">
-				Page header component with avatar, title, action button, and
-				more menu.
-			</p>
-			<div class="bg-night p-6 rounded-xl space-y-4">
+			<h2 class="font-heading text-body text-white border-b border-light/5 pb-2">Content Header</h2>
+			<p class="text-[12px] text-light/40 font-body">Page header component with avatar, title, action button, and more menu.</p>
+			<div class="bg-dark/30 border border-light/5 p-5 rounded-xl space-y-4">
 				<ContentHeader
 					title="Page Title"
 					actionLabel="+ New"
@@ -796,10 +668,8 @@
 		</section>

 		<!-- Footer -->
-		<footer class="text-center py-8 border-t border-light/10">
-			<p class="text-light/40 text-sm">
-				Root Organization Platform - Style Guide
-			</p>
+		<footer class="text-center py-8 border-t border-light/5">
+			<p class="text-[11px] text-light/30 font-body">Root Organization Platform &mdash; Style Guide</p>
 		</footer>
 	</div>
 </div>
Author	SHA1	Message	Date
AlacrisDevs	edc5f8af85	feat: add event module pages (placeholders + full Team module) - 6 placeholder 'coming soon' pages: tasks, files, schedule, budget, guests, sponsors - Full Team module: add/remove members, change roles, role badges - Uses existing event_members DB table and API layer - i18n keys added for EN and ET (module placeholders + team) - svelte-check: 0 errors, vitest: 112/112 passed	2026-02-07 11:39:51 +02:00
AlacrisDevs	4999836a57	ui: overhaul org settings components (General, Members, Roles, Integrations) - SettingsGeneral: border-based cards, compact danger zone with error border - SettingsMembers: Avatar component, icon buttons, border-based list - SettingsRoles: icon buttons for edit/delete, smaller permission badges - SettingsIntegrations: compact integration cards, Material Symbols for coming-soon - Removed unused Card imports from all settings components - svelte-check: 0 errors, vitest: 112/112 passed	2026-02-07 11:23:49 +02:00
AlacrisDevs	9d5e58f858	ui: overhaul home page, style guide, account settings - Home page: bg-background, border-based org cards, material icons, compact typography - Style guide: new header with back button, rounded-xl swatches, consistent section headings - Account settings: replace bg-background rounded-[32px] with border-based rounded-xl cards - svelte-check: 0 errors, vitest: 112/112 passed	2026-02-07 11:18:23 +02:00
AlacrisDevs	819d5b876a	ui: overhaul files, kanban, calendar, settings, chat modules - FileBrowser: modernize breadcrumbs, toolbar, list/grid items, empty states - KanbanColumn: remove fixed height, border-based styling, compact header - KanbanCard: cleaner border styling, smaller tags, compact footer - Calendar: compact nav bar, border grid, today circle indicator, day view empty state - DocumentViewer: remove bg-night rounded-[32px], border-b header pattern - Settings tags: inline border/rounded-xl cards, icon action buttons - Chat: create +layout.svelte with PageHeader, overhaul sidebar and main area - Chat i18n: add nav_chat, chat_title, chat_subtitle keys (en + et) svelte-check: 0 errors, vitest: 112/112 passed	2026-02-07 11:03:58 +02:00
AlacrisDevs	2913912cb8	feat: UI overhaul - component library + route layouts with instant headers - Created 11 reusable UI components: PageHeader, SectionCard, StatCard, StatusBadge, TabBar, MemberList, ActivityFeed, EventCard, ContentSkeleton, QuickLinkGrid, ModuleCard - Created route-specific +layout.svelte for documents, calendar, kanban, events, settings, account - Each layout renders PageHeader instantly from parent data, shows ContentSkeleton during navigation - Removed full-page PageSkeleton from parent layout - Refactored all pages to use new components instead of inline markup - Overview page: uses StatCard, SectionCard, EventCard, ActivityFeed, MemberList, QuickLinkGrid - Events list: uses EventCard, Button components - Event detail: uses ModuleCard, SectionCard - Settings/Account/Calendar/Kanban: headers in layouts, toolbars in pages - Added i18n keys for overview page (EN + ET) - 0 errors, 112 tests pass	2026-02-07 10:44:53 +02:00