Merge branch 'main' of https://gitlab.epicnabbo.nl/remco/EpicNext-Cms into codex/housekeeping-complete

src/app/(site)/login/page.tsx

@@ -8,6 +8,7 @@ import { Clock } from "@/components/clock";
 import { LanguageSwitcher } from "@/components/language-switcher";
 import { Reveal } from "@/components/motion-reveal";
 import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
+import { SurfaceCard } from "@/components/surface-card";
 import { ThemeSwitcher } from "@/components/theme-switcher";
 import { cached } from "@/lib/cache";
 import { db, User } from "@/lib/db";
@@ -48,7 +49,7 @@ export default async function LoginPage() {
 	]);
 
 	return (
-		<div className="flex flex-col gap-10 pb-14">
+		<div className="mx-auto w-full max-w-6xl flex flex-col gap-8 pb-16">
 			{/* ── Top Bar ── */}
 			<Reveal>
 				<div
@@ -117,12 +118,13 @@ export default async function LoginPage() {
 					</div>
 				</div>
 			</Reveal>
+
 			<Reveal>
-				<div className="flex flex-col lg:flex-row gap-10 stagger-children">
+				<div className="flex flex-col gap-8 lg:flex-row">
 					{/* Left panel */}
 					<div className="lg:w-80 shrink-0 space-y-4">
-						<div
-							className="relative overflow-hidden rounded-2xl border p-6 text-center card-premium"
+						<SurfaceCard
+							className="relative p-6 text-center"
 							style={{
 								borderColor:
 									"color-mix(in srgb, var(--color-primary) 20%, transparent)",
@@ -147,7 +149,7 @@ export default async function LoginPage() {
 									priority
 								/>
 								<div
-									className="inline-flex items-center gap-2 px-3.5 py-1 rounded-full text-xs font-bold uppercase tracking-wider mt-4 mb-3 border backdrop-blur-sm"
+									className="inline-flex items-center gap-2 px-3.5 py-1 rounded-full text-xs font-bold uppercase tracking-wider mt-4 mb-3 border"
 									style={{
 										borderColor:
 											"color-mix(in srgb, var(--color-primary) 18%, transparent)",
@@ -179,136 +181,74 @@ export default async function LoginPage() {
 									{t("welcomeBackSub", { hotelName })}
 								</p>
 							</div>
-						</div>
+						</SurfaceCard>
 
 						{recentUsers.length > 0 && (
-							<div
-								className="overflow-hidden rounded-xl border"
-								style={{
-									borderColor:
-										"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-								}}
+							<SurfaceCard
+								title={th("online", { count: online, hotel: "" }).trim()}
+								icon="/assets/images/icons/navigation/goody.png"
+								bodyClassName="p-4"
 							>
-								<div
-									className="flex items-center gap-2.5 px-4 py-3"
-									style={{
-										background:
-											"linear-gradient(140deg, #0A1F0A 0%, #0F2D0F 20%, #153C15 40%, #1B4A1B 60%, #205820 75%, #1A4A1A 90%, #143814 100%)",
-									}}
-								>
-									<Image
-										src="/assets/images/icons/navigation/goody.png"
-										alt=""
-										width={18}
-										height={18}
-										unoptimized
-									/>
-									<h3
-										className="text-sm font-bold text-white"
-										style={{ fontFamily: "var(--font-nunito)" }}
-									>
-										{th("online", { count: online, hotel: "" }).trim()}
-									</h3>
-								</div>
-								<div
-									className="p-4"
-									style={{
-										background:
-											"color-mix(in srgb, var(--color-surface) 70%, transparent)",
-									}}
-								>
-									<div className="grid grid-cols-4 gap-1.5">
-										{recentUsers.map((u) => (
-											<div
-												key={u.username}
-												className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
-												style={{
-													background:
-														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
-												}}
+								<div className="grid grid-cols-4 gap-1.5">
+									{recentUsers.map((u) => (
+										<div
+											key={u.username}
+											className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+											style={{
+												background:
+													"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+											}}
+										>
+											<UserAvatarThumbnail
+												figure={u.look}
+												alt=""
+												options={{ direction: 2 }}
+												className="rounded-md"
+											/>
+											<span
+												className="text-[8px] font-bold truncate w-full text-center leading-tight"
+												style={{ color: "var(--color-text-readable)" }}
 											>
-												<UserAvatarThumbnail
-													figure={u.look}
-													alt=""
-													options={{ direction: 2 }}
-													className="rounded-md"
-												/>
-												<span
-													className="text-[8px] font-bold truncate w-full text-center leading-tight"
-													style={{ color: "var(--color-text-readable)" }}
-												>
-													{u.username}
-												</span>
-											</div>
-										))}
-									</div>
+												{u.username}
+											</span>
+										</div>
+									))}
 								</div>
-							</div>
+							</SurfaceCard>
 						)}
 
 						{latestUsers.length > 0 && (
-							<div
-								className="overflow-hidden rounded-xl border"
-								style={{
-									borderColor:
-										"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-								}}
+							<SurfaceCard
+								title="Newest citizens"
+								icon="/assets/images/icons/friends.png"
+								bodyClassName="p-4"
 							>
-								<div
-									className="flex items-center gap-2.5 px-4 py-3"
-									style={{
-										background:
-											"linear-gradient(140deg, #5a2d82 0%, #6b3a9e 20%, #7d47b8 40%, #8f54d0 60%, #7d47b8 75%, #6b3a9e 90%, #5a2d82 100%)",
-									}}
-								>
-									<Image
-										src="/assets/images/icons/friends.png"
-										alt=""
-										width={18}
-										height={18}
-										unoptimized
-									/>
-									<h3
-										className="text-sm font-bold text-white"
-										style={{ fontFamily: "var(--font-nunito)" }}
-									>
-										Newest citizens
-									</h3>
-								</div>
-								<div
-									className="p-4"
-									style={{
-										background:
-											"color-mix(in srgb, var(--color-surface) 70%, transparent)",
-									}}
-								>
-									<div className="grid grid-cols-4 gap-1.5">
-										{latestUsers.map((u) => (
-											<div
-												key={u.username}
-												className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
-												style={{
-													background:
-														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
-												}}
+								<div className="grid grid-cols-4 gap-1.5">
+									{latestUsers.map((u) => (
+										<div
+											key={u.username}
+											className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+											style={{
+												background:
+													"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+											}}
+										>
+											<UserAvatarThumbnail
+												figure={u.look}
+												alt=""
+												options={{ direction: 2 }}
+												className="rounded-md"
+											/>
+											<span
+												className="text-[8px] font-bold truncate w-full text-center leading-tight"
+												style={{ color: "var(--color-text-readable)" }}
 											>
-												<UserAvatarThumbnail
-													figure={u.look}
-													alt=""
-													options={{ direction: 2 }}
-													className="rounded-md"
-												/>
-												<span
-													className="text-[8px] font-bold truncate w-full text-center leading-tight"
-													style={{ color: "var(--color-text-readable)" }}
-												>
-													{u.username}
-												</span>
-											</div>
-										))}
-									</div>
+												{u.username}
+											</span>
+										</div>
+									))}
 								</div>
-							</div>
+							</SurfaceCard>
 						)}
 
 						<p
@@ -330,54 +270,26 @@ export default async function LoginPage() {
 
 					{/* Right: form */}
 					<div className="flex-1">
-						<div
-							className="overflow-hidden rounded-xl border"
-							style={{
-								borderColor:
-									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-							}}
+						<SurfaceCard
+							title={t("title")}
+							icon="/assets/images/icons/navigation/me.png"
+							bodyClassName="p-6"
 						>
-							<div
-								className="flex items-center gap-2.5 px-4 py-3"
-								style={{
-									background:
-										"linear-gradient(140deg, #1a3a5c 0%, #1e4a6e 20%, #2a5a80 40%, #3a6a90 60%, #4a7aa0 75%, #3a6a90 90%, #2a5a80 100%)",
+							<p
+								className="text-sm mb-6"
+								style={{ color: "var(--color-text-muted)" }}
+							>
+								{t("subtitle")}
+							</p>
+							<LoginForm
+								captcha={{
+									provider: cfg.provider,
+									siteKey: cfg.siteKey || undefined,
+									field: cfg.field || undefined,
 								}}
-							>
-								<Image
-									src="/assets/images/icons/navigation/me.png"
-									alt=""
-									width={18}
-									height={18}
-									unoptimized
-								/>
-								<h2
-									className="text-sm font-bold text-white"
-									style={{ fontFamily: "var(--font-nunito)" }}
-								>
-									{t("title")}
-								</h2>
-							</div>
-							<div
-								className="p-6"
-								style={{ backgroundColor: "var(--color-surface)" }}
-							>
-								<p
-									className="text-sm mb-6"
-									style={{ color: "var(--color-text-muted)" }}
-								>
-									{t("subtitle")}
-								</p>
-								<LoginForm
-									captcha={{
-										provider: cfg.provider,
-										siteKey: cfg.siteKey || undefined,
-										field: cfg.field || undefined,
-									}}
-									nonce={nonce}
-								/>
-							</div>
-						</div>
+								nonce={nonce}
+							/>
+						</SurfaceCard>
 					</div>
 				</div>
 			</Reveal>

src/app/(site)/me/page.tsx

@@ -7,6 +7,7 @@ import { claimReferral } from "@/actions/referral";
 
 import { Reveal } from "@/components/motion-reveal";
 import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
+import { SurfaceCard } from "@/components/surface-card";
 import { auth } from "@/lib/auth";
 import {
 	db,
@@ -253,8 +254,8 @@ export default async function MePage({
 				) : null}
 
 				<Reveal>
-					<div
-						className="relative overflow-hidden rounded-2xl border p-6 flex items-start gap-6"
+					<SurfaceCard
+						className="relative p-6 flex items-start gap-6"
 						style={{
 							background: `linear-gradient(135deg, color-mix(in srgb, var(--color-primary) 12%, var(--color-surface)), var(--color-surface))`,
 							borderColor:
@@ -342,13 +343,13 @@ export default async function MePage({
 								</span>
 							</div>
 						</div>
-					</div>
+					</SurfaceCard>
 				</Reveal>
 
 				{alertRaw ? (
 					<Reveal delay={0.05}>
-						<div
-							className="rounded-2xl border px-6 py-4 text-center"
+						<SurfaceCard
+							className="px-6 py-4 text-center"
 							style={{
 								background:
 									"color-mix(in srgb, var(--color-accent) 12%, transparent)",
@@ -362,7 +363,7 @@ export default async function MePage({
 							>
 								{alertRaw}
 							</p>
-						</div>
+						</SurfaceCard>
 					</Reveal>
 				) : null}
 
@@ -382,14 +383,9 @@ export default async function MePage({
 							{ value: friendCount.toLocaleString(), label: "Friends" },
 							{ value: lastLoginDate, label: "Last login" },
 						].map((s) => (
-							<div
+							<SurfaceCard
 								key={s.label}
-								className="relative rounded-2xl border p-5 text-center transition-all duration-200 hover:-translate-y-0.5 hover:shadow-lg"
-								style={{
-									background: "var(--color-surface)",
-									borderColor:
-										"color-mix(in srgb, var(--color-primary) 12%, transparent)",
-								}}
+								className="relative p-5 text-center transition-all duration-200 hover:-translate-y-0.5 hover:shadow-lg"
 							>
 								<div
 									className="text-xl md:text-2xl font-black tracking-tight mb-0.5"
@@ -403,20 +399,13 @@ export default async function MePage({
 								>
 									{s.label}
 								</div>
-							</div>
+							</SurfaceCard>
 						))}
 					</div>
 				</Reveal>
 
 				<Reveal delay={0.15}>
-					<div
-						className="rounded-2xl border p-5"
-						style={{
-							background: "var(--color-surface)",
-							borderColor:
-								"color-mix(in srgb, var(--color-primary) 12%, transparent)",
-						}}
-					>
+					<SurfaceCard className="p-5">
 						<div className="flex items-center justify-between mb-4">
 							<div>
 								<h2
@@ -497,18 +486,11 @@ export default async function MePage({
 								))}
 							</div>
 						)}
-					</div>
+					</SurfaceCard>
 				</Reveal>
 
 				<Reveal delay={0.2}>
-					<div
-						className="rounded-2xl border p-5"
-						style={{
-							background: "var(--color-surface)",
-							borderColor:
-								"color-mix(in srgb, var(--color-primary) 12%, transparent)",
-						}}
-					>
+					<SurfaceCard className="p-5">
 						<div className="mb-4">
 							<h2
 								className="text-lg font-black tracking-tight"
@@ -592,19 +574,12 @@ export default async function MePage({
 								</button>
 							)}
 						</div>
-					</div>
+					</SurfaceCard>
 				</Reveal>
 
 				{recentRooms.length > 0 && (
 					<Reveal delay={0.25}>
-						<div
-							className="rounded-2xl border p-5"
-							style={{
-								background: "var(--color-surface)",
-								borderColor:
-									"color-mix(in srgb, var(--color-primary) 12%, transparent)",
-							}}
-						>
+						<SurfaceCard className="p-5">
 							<div className="flex items-center justify-between mb-4">
 								<div>
 									<h2
@@ -656,20 +631,13 @@ export default async function MePage({
 									</Link>
 								))}
 							</div>
-						</div>
+						</SurfaceCard>
 					</Reveal>
 				)}
 
 				{badges.length > 0 && (
 					<Reveal delay={0.3}>
-						<div
-							className="rounded-2xl border p-5"
-							style={{
-								background: "var(--color-surface)",
-								borderColor:
-									"color-mix(in srgb, var(--color-primary) 12%, transparent)",
-							}}
-						>
+						<SurfaceCard className="p-5">
 							<div className="mb-4">
 								<h2
 									className="text-lg font-black tracking-tight"
@@ -697,19 +665,12 @@ export default async function MePage({
 									/>
 								))}
 							</div>
-						</div>
+						</SurfaceCard>
 					</Reveal>
 				)}
 
 				<Reveal delay={0.35}>
-					<div
-						className="rounded-2xl border p-5"
-						style={{
-							background: "var(--color-surface)",
-							borderColor:
-								"color-mix(in srgb, var(--color-primary) 12%, transparent)",
-						}}
-					>
+					<SurfaceCard className="p-5">
 						<h2
 							className="text-lg font-black tracking-tight mb-4"
 							style={{ color: "var(--color-text-readable)" }}
@@ -750,20 +711,13 @@ export default async function MePage({
 								</Link>
 							))}
 						</div>
-					</div>
+					</SurfaceCard>
 				</Reveal>
 			</div>
 		);
 	} catch {
 		content = (
-			<div
-				className="rounded-2xl border p-6 text-center"
-				style={{
-					background: "var(--color-surface)",
-					borderColor:
-						"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-				}}
-			>
+			<SurfaceCard className="p-6 text-center">
 				<p
 					className="text-sm font-bold"
 					style={{ color: "var(--color-text-muted)" }}
@@ -771,7 +725,7 @@ export default async function MePage({
 					We couldn&apos;t load your dashboard right now. Please try again
 					shortly.
 				</p>
-			</div>
+			</SurfaceCard>
 		);
 	}
 

src/app/(site)/page.tsx

@@ -11,6 +11,7 @@ import { Clock } from "@/components/clock";
 import { LanguageSwitcher } from "@/components/language-switcher";
 import { Reveal } from "@/components/motion-reveal";
 import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
+import { SurfaceCard } from "@/components/surface-card";
 import { ThemeSwitcher } from "@/components/theme-switcher";
 import { TypewriterText } from "@/components/typewriter-text";
 import { auth } from "@/lib/auth";
@@ -115,7 +116,7 @@ export default async function Home() {
 	const nonce = (await headers()).get("x-nonce") ?? undefined;
 
 	return (
-		<div className="flex flex-col gap-10 pb-14">
+		<div className="mx-auto w-full max-w-6xl flex flex-col gap-8 pb-16">
 			{/* ── Top Bar ── */}
 			<Reveal>
 				<div
@@ -188,7 +189,7 @@ export default async function Home() {
 			{/* ── Hero ── */}
 			<Reveal>
 				<div
-					className="relative overflow-hidden rounded-2xl border"
+					className="relative overflow-hidden rounded-3xl border"
 					style={{
 						borderColor:
 							"color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
@@ -206,12 +207,12 @@ export default async function Home() {
 						className="absolute inset-0"
 						style={{
 							background:
-								"linear-gradient(135deg, color-mix(in srgb, var(--color-surface) 90%, transparent) 0%, color-mix(in srgb, var(--color-surface) 35%, transparent) 50%, color-mix(in srgb, var(--color-surface) 10%, transparent) 100%)",
+								"linear-gradient(135deg, color-mix(in srgb, var(--color-surface) 92%, transparent) 0%, color-mix(in srgb, var(--color-surface) 45%, transparent) 50%, color-mix(in srgb, var(--color-surface) 12%, transparent) 100%)",
 						}}
 					/>
 					<AmbientOrbs />
 					<div
-						className="relative flex flex-col md:flex-row items-center gap-8 px-6 py-10 md:px-10 md:py-14"
+						className="relative flex flex-col items-center gap-8 px-6 py-12 md:flex-row md:px-12 md:py-16"
 						style={{ zIndex: 2 }}
 					>
 						<div className="flex-1 text-center md:text-left">
@@ -232,7 +233,7 @@ export default async function Home() {
 								{th("online", { count: online, hotel: hotelName })}
 							</div>
 							<h1
-								className="text-4xl md:text-5xl lg:text-6xl font-black leading-[1.05] tracking-tight mb-3"
+								className="text-4xl font-black leading-[1.05] tracking-tight mb-3 md:text-5xl lg:text-6xl"
 								style={{
 									color: "var(--color-text-readable)",
 									fontFamily: "var(--font-nunito)",
@@ -241,7 +242,7 @@ export default async function Home() {
 								<TypewriterText text={tp("welcome", { hotelName })} />
 							</h1>
 							<p
-								className="text-base md:text-lg leading-relaxed max-w-xl mb-7"
+								className="text-base leading-relaxed max-w-xl mb-7 md:text-lg"
 								style={{ color: "var(--color-text-muted)" }}
 							>
 								{th("tagline")}
@@ -320,17 +321,9 @@ export default async function Home() {
 							icon: "/assets/images/icons/catalog.png",
 						},
 					].map((s) => (
-						<div
+						<SurfaceCard
 							key={s.label}
-							className="relative overflow-hidden rounded-xl border p-5 text-center transition-all duration-300 hover:-translate-y-1 hover:shadow-xl card-premium"
-							style={{
-								background:
-									"color-mix(in srgb, var(--color-surface) 70%, transparent)",
-								backdropFilter: "blur(8px)",
-								WebkitBackdropFilter: "blur(8px)",
-								borderColor:
-									"color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
-							}}
+							className="relative p-5 text-center transition-all duration-300 hover:-translate-y-1 hover:shadow-xl"
 						>
 							<div
 								className="absolute -top-6 -right-6 w-20 h-20 rounded-full opacity-[0.06]"
@@ -338,7 +331,7 @@ export default async function Home() {
 							/>
 							<div className="relative">
 								<div
-									className="w-10 h-10 rounded-xl flex items-center justify-center mx-auto mb-2.5 animate-pulse-glow"
+									className="mx-auto mb-2.5 flex h-10 w-10 items-center justify-center rounded-xl"
 									style={{
 										background:
 											"color-mix(in srgb, var(--color-primary) 14%, transparent)",
@@ -353,7 +346,7 @@ export default async function Home() {
 									/>
 								</div>
 								<div
-									className="text-3xl md:text-4xl font-black tracking-tight mb-0.5"
+									className="mb-0.5 text-3xl font-black tracking-tight md:text-4xl"
 									style={{ color: "var(--color-primary)" }}
 								>
 									<AnimatedCounter value={s.value} />
@@ -365,7 +358,7 @@ export default async function Home() {
 									{s.label}
 								</div>
 							</div>
-						</div>
+						</SurfaceCard>
 					))}
 				</div>
 			</Reveal>
@@ -374,57 +367,23 @@ export default async function Home() {
 			<div className="flex flex-col gap-4 md:flex-row">
 				{/* Left: Login & Register */}
 				<Reveal className="flex w-full flex-col gap-4 md:w-1/3 md:flex-shrink-0">
-					<div
-						className="overflow-hidden rounded-xl border"
-						style={{
-							borderColor:
-								"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-						}}
+					<SurfaceCard
+						title={th("login")}
+						icon="/assets/images/icons/navigation/me.png"
+						bodyClassName="p-4"
 					>
-						<div
-							className="flex items-center gap-2.5 px-4 py-3"
-							style={{
-								background:
-									"linear-gradient(140deg, #1a3a5c 0%, #1e4a6e 20%, #2a5a80 40%, #3a6a90 60%, #4a7aa0 75%, #3a6a90 90%, #2a5a80 100%)",
+						<HomeLoginForm
+							captcha={{
+								provider: captcha.provider,
+								siteKey: captcha.siteKey || undefined,
+								field: captcha.field || undefined,
 							}}
-						>
-							<Image
-								src="/assets/images/icons/navigation/me.png"
-								alt=""
-								width={18}
-								height={18}
-								unoptimized
-							/>
-							<h2
-								className="text-sm font-bold text-white"
-								style={{ fontFamily: "var(--font-nunito)" }}
-							>
-								Login
-							</h2>
-						</div>
-						<div
-							className="p-3"
-							style={{ backgroundColor: "var(--color-surface)" }}
-						>
-							<HomeLoginForm
-								captcha={{
-									provider: captcha.provider,
-									siteKey: captcha.siteKey || undefined,
-									field: captcha.field || undefined,
-								}}
-								nonce={nonce}
-							/>
-						</div>
-					</div>
+							nonce={nonce}
+						/>
+					</SurfaceCard>
 
 					<Link href="/register" className="relative block group">
-						<div
-							className="overflow-hidden rounded-xl border transition-all duration-200 group-hover:shadow-lg"
-							style={{
-								borderColor:
-									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-							}}
-						>
+						<SurfaceCard className="transition-all duration-200 group-hover:shadow-lg">
 							<Image
 								src="/assets/images/EnterHubbly.png"
 								alt="Register"
@@ -433,9 +392,9 @@ export default async function Home() {
 								className="block w-full"
 								unoptimized
 							/>
-						</div>
+						</SurfaceCard>
 						<span
-							className="pointer-events-none absolute inset-0 flex items-center text-2xl md:text-3xl font-extrabold text-white"
+							className="pointer-events-none absolute inset-0 flex items-center text-2xl font-extrabold text-white md:text-3xl"
 							style={{
 								marginLeft: "18px",
 								fontFamily: "var(--font-nunito)",
@@ -447,50 +406,24 @@ export default async function Home() {
 					</Link>
 
 					{latestUsers.length > 0 && (
-						<div
-							className="overflow-hidden rounded-xl border"
-							style={{
-								borderColor:
-									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-								backgroundColor: "var(--color-surface)",
-							}}
+						<SurfaceCard
+							title={tp("latestUsers", { count: users.toLocaleString() })}
+							icon="/assets/images/icons/navigation/goody.png"
+							bodyClassName="p-4"
 						>
-							<div
-								className="flex items-center gap-2.5 px-4 py-3"
-								style={{
-									background:
-										"linear-gradient(140deg, #0A1F0A 0%, #0F2D0F 20%, #153C15 40%, #1B4A1B 60%, #205820 75%, #1A4A1A 90%, #143814 100%)",
-								}}
-							>
-								<Image
-									src="/assets/images/icons/navigation/goody.png"
-									alt=""
-									width={18}
-									height={18}
-									unoptimized
-								/>
-								<h2
-									className="text-sm font-bold text-white"
-									style={{ fontFamily: "var(--font-nunito)" }}
-								>
-									{tp("latestUsers", { count: users.toLocaleString() })}
-								</h2>
-							</div>
-							<div className="grid grid-cols-4 gap-2 p-3">
+							<div className="grid grid-cols-4 gap-2">
 								{latestUsers.map((u) => (
 									<div
 										key={u.username}
 										className="flex flex-col items-center gap-1"
 									>
-										<div className="relative overflow-visible">
-											<UserAvatarThumbnail
-												figure={u.look}
-												alt={u.username}
-												options={{ direction: 3 }}
-											/>
-										</div>
+										<UserAvatarThumbnail
+											figure={u.look}
+											alt={u.username}
+											options={{ direction: 3 }}
+										/>
 										<span
-											className="text-[11px] font-bold truncate max-w-[64px] text-center leading-tight"
+											className="max-w-[64px] truncate text-center text-[11px] font-bold leading-tight"
 											style={{ color: "var(--color-text-readable)" }}
 										>
 											{u.username}
@@ -498,187 +431,118 @@ export default async function Home() {
 									</div>
 								))}
 							</div>
-						</div>
+						</SurfaceCard>
 					)}
 				</Reveal>
 
 				{/* Right: News */}
 				<Reveal delay={0.15} className="flex w-full flex-col gap-4 md:w-2/3">
-					<div
-						className="overflow-hidden rounded-xl border"
-						style={{
-							borderColor:
-								"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-							backgroundColor: "var(--color-surface)",
-						}}
+					<SurfaceCard
+						title={tp("latestNews")}
+						icon="/assets/images/icons/article.gif"
+						actionHref="/news"
+						actionLabel={tp("allNews")}
 					>
-						<div
-							className="flex items-center justify-between px-4 py-3"
-							style={{
-								background:
-									"linear-gradient(140deg, #1a3a5c 0%, #1e4a6e 20%, #2a5a80 40%, #3a6a90 60%, #4a7aa0 75%, #3a6a90 90%, #2a5a80 100%)",
-							}}
-						>
-							<div className="flex items-center gap-2.5">
-								<Image
-									src="/assets/images/icons/article.gif"
-									alt=""
-									width={18}
-									height={18}
-									unoptimized
-								/>
-								<h2
-									className="text-sm font-bold text-white"
-									style={{ fontFamily: "var(--font-nunito)" }}
-								>
-									{tp("latestNews")}
-								</h2>
-							</div>
-							<Link
-								href="/news"
-								className="text-xs font-bold text-white/80 hover:text-white hover:underline"
-							>
-								{tp("allNews")}
-							</Link>
-						</div>
-						<div className="p-4">
-							{articles.length > 0 ? (
-								<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
-									{articles.slice(0, 4).map((a) => (
-										<Link
-											key={a.slug}
-											href={`/news/${a.slug}`}
-											className="group relative w-full overflow-hidden rounded-lg transition-all duration-300 hover:shadow-lg hover:-translate-y-0.5"
-											style={{
-												height: "200px",
-												backgroundColor: "var(--color-background)",
-												border:
-													"1px solid color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-											}}
-										>
-											<div className="relative h-full w-full overflow-hidden rounded-lg">
-												<Image
-													src={a.image}
-													alt={a.title}
-													fill
-													sizes="(max-width: 768px) 100vw, 400px"
-													className="rounded-lg object-cover transition-all duration-300 group-hover:scale-105"
-												/>
-												<div className="absolute top-2.5 right-2.5 w-8 h-8 rounded-full flex items-center justify-center bg-black/50 backdrop-blur-sm transition-all duration-300 opacity-0 group-hover:opacity-100 translate-x-1 group-hover:translate-x-0">
-													<span className="text-white text-sm font-bold">
-														→
-													</span>
-												</div>
-												<div
-													className="absolute left-0 w-full p-2.5"
-													style={{
-														bottom: 0,
-														background:
-															"linear-gradient(to top, rgba(0,0,0,0.85) 0%, transparent 100%)",
-													}}
-												>
-													<h3 className="truncate text-base font-bold text-white text-shadow-sm">
-														{a.title}
-													</h3>
-													<p
-														className="text-[11px] font-semibold mt-0.5 opacity-80"
-														style={{ color: "var(--color-text-muted)" }}
-													>
-														{formatDate(a.createdAt, "date", "")}
-													</p>
-												</div>
+						{articles.length > 0 ? (
+							<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+								{articles.slice(0, 4).map((a) => (
+									<Link
+										key={a.slug}
+										href={`/news/${a.slug}`}
+										className="group relative w-full overflow-hidden rounded-xl transition-all duration-300 hover:-translate-y-0.5 hover:shadow-lg"
+										style={{
+											height: "200px",
+											backgroundColor: "var(--color-background)",
+											border:
+												"1px solid color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
+										}}
+									>
+										<div className="relative h-full w-full overflow-hidden rounded-xl">
+											<Image
+												src={a.image}
+												alt={a.title}
+												fill
+												sizes="(max-width: 768px) 100vw, 400px"
+												className="rounded-xl object-cover transition-all duration-300 group-hover:scale-105"
+											/>
+											<div className="absolute right-2.5 top-2.5 flex h-8 w-8 translate-x-1 items-center justify-center rounded-full bg-black/50 opacity-0 backdrop-blur-sm transition-all duration-300 group-hover:translate-x-0 group-hover:opacity-100">
+												<span className="text-sm font-bold text-white">→</span>
 											</div>
-										</Link>
-									))}
-								</div>
-							) : (
-								<p
-									className="py-8 text-center text-sm"
-									style={{ color: "var(--color-text-muted)" }}
-								>
-									{tp("noArticles")}
-								</p>
-							)}
-						</div>
-					</div>
+											<div
+												className="absolute bottom-0 left-0 w-full p-2.5"
+												style={{
+													background:
+														"linear-gradient(to top, rgba(0,0,0,0.85) 0%, transparent 100%)",
+												}}
+											>
+												<h3 className="truncate text-base font-bold text-white text-shadow-sm">
+													{a.title}
+												</h3>
+												<p
+													className="mt-0.5 text-[11px] font-semibold opacity-80"
+													style={{ color: "var(--color-text-muted)" }}
+												>
+													{formatDate(a.createdAt, "date", "")}
+												</p>
+											</div>
+										</div>
+									</Link>
+								))}
+							</div>
+						) : (
+							<p
+								className="py-8 text-center text-sm"
+								style={{ color: "var(--color-text-muted)" }}
+							>
+								{tp("noArticles")}
+							</p>
+						)}
+					</SurfaceCard>
 				</Reveal>
 			</div>
 
 			{/* ── Online users ── */}
 			{recentUsers.length > 0 && (
 				<Reveal>
-					<div
-						className="overflow-hidden rounded-xl border"
-						style={{
-							borderColor:
-								"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-							backgroundColor: "var(--color-surface)",
-						}}
+					<SurfaceCard
+						title={tp("recentUsers")}
+						icon="/assets/images/icons/navigation/goody.png"
+						actionHref="/community"
+						actionLabel={tp("allUsers")}
 					>
-						<div
-							className="flex items-center justify-between px-4 py-3"
-							style={{
-								background:
-									"linear-gradient(140deg, #0A1F0A 0%, #0F2D0F 20%, #153C15 40%, #1B4A1B 60%, #205820 75%, #1A4A1A 90%, #143814 100%)",
-							}}
-						>
-							<div className="flex items-center gap-2.5">
-								<Image
-									src="/assets/images/icons/navigation/goody.png"
-									alt=""
-									width={18}
-									height={18}
-									unoptimized
-								/>
-								<h3
-									className="text-sm font-bold text-white"
-									style={{ fontFamily: "var(--font-nunito)" }}
+						<div className="flex flex-wrap justify-center gap-2">
+							{recentUsers.slice(0, 12).map((u) => (
+								<div
+									key={u.username}
+									className="flex flex-col items-center gap-0.5 rounded-lg px-2 py-1.5 transition-all duration-200 hover:scale-110 hover:shadow-md"
+									style={{
+										background:
+											"color-mix(in srgb, var(--color-primary) 5%, transparent)",
+									}}
 								>
-									{tp("recentUsers")}
-								</h3>
-							</div>
-							<Link
-								href="/community"
-								className="text-xs font-bold text-white/80 hover:text-white hover:underline"
-							>
-								{tp("allUsers")}
-							</Link>
-						</div>
-						<div className="p-4">
-							<div className="flex flex-wrap justify-center gap-2">
-								{recentUsers.slice(0, 12).map((u) => (
-									<div
-										key={u.username}
-										className="flex flex-col items-center gap-0.5 px-2 py-1.5 rounded-lg transition-all duration-200 hover:scale-110 hover:shadow-md"
-										style={{
-											background:
-												"color-mix(in srgb, var(--color-primary) 5%, transparent)",
-										}}
+									<UserAvatarThumbnail
+										figure={u.look}
+										alt={u.username}
+										options={{ direction: 2 }}
+										className="rounded-md"
+									/>
+									<span
+										className="max-w-[50px] truncate text-center text-[9px] font-bold leading-tight"
+										style={{ color: "var(--color-text-readable)" }}
 									>
-										<UserAvatarThumbnail
-											figure={u.look}
-											alt={u.username}
-											options={{ direction: 2 }}
-											className="rounded-md"
-										/>
-										<span
-											className="text-[9px] font-bold truncate max-w-[50px] text-center leading-tight"
-											style={{ color: "var(--color-text-readable)" }}
-										>
-											{u.username}
-										</span>
-									</div>
-								))}
-							</div>
+										{u.username}
+									</span>
+								</div>
+							))}
 						</div>
-					</div>
+					</SurfaceCard>
 				</Reveal>
 			)}
 
 			{/* ── Bottom CTA ── */}
 			<Reveal>
 				<div
-					className="relative overflow-hidden rounded-xl border text-center px-6 py-10"
+					className="relative overflow-hidden rounded-3xl border px-6 py-12 text-center"
 					style={{
 						background: `linear-gradient(135deg, color-mix(in srgb, var(--color-primary) 8%, var(--color-surface)), color-mix(in srgb, var(--color-surface) 70%, transparent))`,
 						borderColor:
@@ -686,7 +550,7 @@ export default async function Home() {
 					}}
 				>
 					<h2
-						className="text-2xl md:text-3xl font-black tracking-tight mb-2"
+						className="mb-2 text-2xl font-black tracking-tight md:text-3xl"
 						style={{
 							color: "var(--color-text-readable)",
 							fontFamily: "var(--font-nunito)",
@@ -695,7 +559,7 @@ export default async function Home() {
 						{tp("joinNow", { hotelName })}
 					</h2>
 					<p
-						className="text-sm mb-6 max-w-sm mx-auto"
+						className="mb-6 max-w-sm mx-auto text-sm"
 						style={{ color: "var(--color-text-muted)" }}
 					>
 						{tp("welcomeBody")}
@@ -725,60 +589,33 @@ export default async function Home() {
 			{/* ── Recent photos ── */}
 			{recentPhotos.length > 0 && (
 				<Reveal>
-					<div
-						className="overflow-hidden rounded-xl border"
-						style={{
-							borderColor:
-								"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-							backgroundColor: "var(--color-surface)",
-						}}
+					<SurfaceCard
+						title={tp("recentPhotos")}
+						icon="/assets/images/icons/camera.png"
 					>
-						<div
-							className="flex items-center gap-2.5 px-4 py-3"
-							style={{
-								background:
-									"linear-gradient(140deg, #5a2d82 0%, #6b3a9e 20%, #7d47b8 40%, #8f54d0 60%, #7d47b8 75%, #6b3a9e 90%, #5a2d82 100%)",
-							}}
-						>
-							<Image
-								src="/assets/images/icons/camera.png"
-								alt=""
-								width={18}
-								height={18}
-								unoptimized
-							/>
-							<h3
-								className="text-sm font-bold text-white"
-								style={{ fontFamily: "var(--font-nunito)" }}
-							>
-								{tp("recentPhotos")}
-							</h3>
+						<div className="mx-auto grid max-w-sm grid-cols-4 gap-2">
+							{recentPhotos.slice(0, 4).map((p) => (
+								<Link
+									key={p.id}
+									href="/photos"
+									className="block aspect-square overflow-hidden rounded-xl border transition-all duration-200 hover:shadow-md"
+									style={{
+										borderColor:
+											"color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
+									}}
+								>
+									<Image
+										src={p.url}
+										alt=""
+										width={200}
+										height={200}
+										className="h-full w-full object-cover transition-transform duration-300 hover:scale-105"
+										unoptimized
+									/>
+								</Link>
+							))}
 						</div>
-						<div className="p-4">
-							<div className="grid grid-cols-4 gap-2 max-w-sm mx-auto">
-								{recentPhotos.slice(0, 4).map((p) => (
-									<Link
-										key={p.id}
-										href="/photos"
-										className="block rounded-lg overflow-hidden aspect-square border transition-all duration-200 hover:shadow-md"
-										style={{
-											borderColor:
-												"color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
-										}}
-									>
-										<Image
-											src={p.url}
-											alt=""
-											width={200}
-											height={200}
-											className="w-full h-full object-cover hover:scale-105 transition-transform duration-300"
-											unoptimized
-										/>
-									</Link>
-								))}
-							</div>
-						</div>
-					</div>
+					</SurfaceCard>
 				</Reveal>
 			)}
 		</div>

src/app/(site)/register/page.tsx

@@ -8,6 +8,7 @@ import { Clock } from "@/components/clock";
 import { LanguageSwitcher } from "@/components/language-switcher";
 import { Reveal } from "@/components/motion-reveal";
 import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
+import { SurfaceCard } from "@/components/surface-card";
 import { ThemeSwitcher } from "@/components/theme-switcher";
 import { cached } from "@/lib/cache";
 import { db, User } from "@/lib/db";
@@ -50,7 +51,7 @@ export default async function RegisterPage() {
 	]);
 
 	return (
-		<div className="flex flex-col gap-10 pb-14">
+		<div className="mx-auto w-full max-w-6xl flex flex-col gap-8 pb-16">
 			{/* ── Top Bar ── */}
 			<Reveal>
 				<div
@@ -119,12 +120,13 @@ export default async function RegisterPage() {
 					</div>
 				</div>
 			</Reveal>
+
 			<Reveal>
-				<div className="flex flex-col lg:flex-row gap-10 stagger-children">
+				<div className="flex flex-col gap-8 lg:flex-row">
 					{/* Left panel */}
 					<div className="lg:w-80 shrink-0 space-y-4">
-						<div
-							className="relative overflow-hidden rounded-2xl border p-6 text-center card-premium"
+						<SurfaceCard
+							className="relative p-6 text-center"
 							style={{
 								borderColor:
 									"color-mix(in srgb, var(--color-primary) 20%, transparent)",
@@ -178,136 +180,74 @@ export default async function RegisterPage() {
 									{th("tagline")}
 								</p>
 							</div>
-						</div>
+						</SurfaceCard>
 
 						{recentUsers.length > 0 && (
-							<div
-								className="overflow-hidden rounded-xl border"
-								style={{
-									borderColor:
-										"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-								}}
+							<SurfaceCard
+								title={tpr("whoIsOnline")}
+								icon="/assets/images/icons/navigation/goody.png"
+								bodyClassName="p-4"
 							>
-								<div
-									className="flex items-center gap-2.5 px-4 py-3"
-									style={{
-										background:
-											"linear-gradient(140deg, #0A1F0A 0%, #0F2D0F 20%, #153C15 40%, #1B4A1B 60%, #205820 75%, #1A4A1A 90%, #143814 100%)",
-									}}
-								>
-									<Image
-										src="/assets/images/icons/navigation/goody.png"
-										alt=""
-										width={18}
-										height={18}
-										unoptimized
-									/>
-									<h3
-										className="text-sm font-bold text-white"
-										style={{ fontFamily: "var(--font-nunito)" }}
-									>
-										{tpr("whoIsOnline")}
-									</h3>
-								</div>
-								<div
-									className="p-4"
-									style={{
-										background:
-											"color-mix(in srgb, var(--color-surface) 70%, transparent)",
-									}}
-								>
-									<div className="grid grid-cols-4 gap-1.5">
-										{recentUsers.map((u) => (
-											<div
-												key={u.username}
-												className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
-												style={{
-													background:
-														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
-												}}
+								<div className="grid grid-cols-4 gap-1.5">
+									{recentUsers.map((u) => (
+										<div
+											key={u.username}
+											className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+											style={{
+												background:
+													"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+											}}
+										>
+											<UserAvatarThumbnail
+												figure={u.look}
+												alt=""
+												options={{ direction: 2 }}
+												className="rounded-md"
+											/>
+											<span
+												className="text-[8px] font-bold truncate w-full text-center leading-tight"
+												style={{ color: "var(--color-text-readable)" }}
 											>
-												<UserAvatarThumbnail
-													figure={u.look}
-													alt=""
-													options={{ direction: 2 }}
-													className="rounded-md"
-												/>
-												<span
-													className="text-[8px] font-bold truncate w-full text-center leading-tight"
-													style={{ color: "var(--color-text-readable)" }}
-												>
-													{u.username}
-												</span>
-											</div>
-										))}
-									</div>
+												{u.username}
+											</span>
+										</div>
+									))}
 								</div>
-							</div>
+							</SurfaceCard>
 						)}
 
 						{latestUsers.length > 0 && (
-							<div
-								className="overflow-hidden rounded-xl border"
-								style={{
-									borderColor:
-										"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-								}}
+							<SurfaceCard
+								title="Newest citizens"
+								icon="/assets/images/icons/friends.png"
+								bodyClassName="p-4"
 							>
-								<div
-									className="flex items-center gap-2.5 px-4 py-3"
-									style={{
-										background:
-											"linear-gradient(140deg, #5a2d82 0%, #6b3a9e 20%, #7d47b8 40%, #8f54d0 60%, #7d47b8 75%, #6b3a9e 90%, #5a2d82 100%)",
-									}}
-								>
-									<Image
-										src="/assets/images/icons/friends.png"
-										alt=""
-										width={18}
-										height={18}
-										unoptimized
-									/>
-									<h3
-										className="text-sm font-bold text-white"
-										style={{ fontFamily: "var(--font-nunito)" }}
-									>
-										Newest citizens
-									</h3>
-								</div>
-								<div
-									className="p-4"
-									style={{
-										background:
-											"color-mix(in srgb, var(--color-surface) 70%, transparent)",
-									}}
-								>
-									<div className="grid grid-cols-4 gap-1.5">
-										{latestUsers.map((u) => (
-											<div
-												key={u.username}
-												className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
-												style={{
-													background:
-														"color-mix(in srgb, var(--color-primary) 4%, transparent)",
-												}}
+								<div className="grid grid-cols-4 gap-1.5">
+									{latestUsers.map((u) => (
+										<div
+											key={u.username}
+											className="flex flex-col items-center gap-0.5 p-1.5 rounded-lg"
+											style={{
+												background:
+													"color-mix(in srgb, var(--color-primary) 4%, transparent)",
+											}}
+										>
+											<UserAvatarThumbnail
+												figure={u.look}
+												alt=""
+												options={{ direction: 2 }}
+												className="rounded-md"
+											/>
+											<span
+												className="text-[10px] font-bold truncate w-full text-center leading-tight"
+												style={{ color: "var(--color-text-readable)" }}
 											>
-												<UserAvatarThumbnail
-													figure={u.look}
-													alt=""
-													options={{ direction: 2 }}
-													className="rounded-md"
-												/>
-												<span
-													className="text-[10px] font-bold truncate w-full text-center leading-tight"
-													style={{ color: "var(--color-text-readable)" }}
-												>
-													{u.username}
-												</span>
-											</div>
-										))}
-									</div>
+												{u.username}
+											</span>
+										</div>
+									))}
 								</div>
-							</div>
+							</SurfaceCard>
 						)}
 
 						<p
@@ -329,54 +269,26 @@ export default async function RegisterPage() {
 
 					{/* Right: form */}
 					<div className="flex-1">
-						<div
-							className="overflow-hidden rounded-xl border"
-							style={{
-								borderColor:
-									"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-							}}
+						<SurfaceCard
+							title={tpr("title")}
+							icon="/assets/images/icons/navigation/me.png"
+							bodyClassName="p-6"
 						>
-							<div
-								className="flex items-center gap-2.5 px-4 py-3"
-								style={{
-									background:
-										"linear-gradient(140deg, #1a3a5c 0%, #1e4a6e 20%, #2a5a80 40%, #3a6a90 60%, #4a7aa0 75%, #3a6a90 90%, #2a5a80 100%)",
+							<p
+								className="text-sm mb-6"
+								style={{ color: "var(--color-text-muted)" }}
+							>
+								{tpr("subtitle")}
+							</p>
+							<RegisterForm
+								hotelName={hotelName}
+								captcha={{
+									provider: cfg.provider,
+									siteKey: cfg.siteKey || undefined,
 								}}
-							>
-								<Image
-									src="/assets/images/icons/navigation/me.png"
-									alt=""
-									width={18}
-									height={18}
-									unoptimized
-								/>
-								<h2
-									className="text-sm font-bold text-white"
-									style={{ fontFamily: "var(--font-nunito)" }}
-								>
-									{tpr("title")}
-								</h2>
-							</div>
-							<div
-								className="p-6"
-								style={{ backgroundColor: "var(--color-surface)" }}
-							>
-								<p
-									className="text-sm mb-6"
-									style={{ color: "var(--color-text-muted)" }}
-								>
-									{tpr("subtitle")}
-								</p>
-								<RegisterForm
-									hotelName={hotelName}
-									captcha={{
-										provider: cfg.provider,
-										siteKey: cfg.siteKey || undefined,
-									}}
-									nonce={nonce}
-								/>
-							</div>
-						</div>
+								nonce={nonce}
+							/>
+						</SurfaceCard>
 					</div>
 				</div>
 			</Reveal>

src/app/(site)/search/page.tsx

@@ -2,6 +2,7 @@ import { and, eq, like } from "drizzle-orm";
 import type { Metadata } from "next";
 import Link from "next/link";
 import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
+import { SurfaceCard } from "@/components/surface-card";
 import { db, Rooms, User } from "@/lib/db";
 
 export const metadata: Metadata = { title: "Search" };
@@ -18,21 +19,14 @@ export default async function SearchPage({
 
 	if (!query) {
 		return (
-			<div
-				className="rounded-2xl border p-10 text-center"
-				style={{
-					background: "var(--color-surface)",
-					borderColor:
-						"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-				}}
-			>
+			<SurfaceCard className="p-10 text-center">
 				<p
 					className="text-sm font-bold"
 					style={{ color: "var(--color-text-muted)" }}
 				>
 					Enter a search term to find users.
 				</p>
-			</div>
+			</SurfaceCard>
 		);
 	}
 
@@ -66,14 +60,7 @@ export default async function SearchPage({
 
 	return (
 		<div className="flex flex-col gap-6">
-			<div
-				className="rounded-2xl border p-4"
-				style={{
-					background: "var(--color-surface)",
-					borderColor:
-						"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-				}}
-			>
+			<SurfaceCard className="p-4">
 				<form action="/search" method="GET" className="flex gap-2">
 					<input
 						type="text"
@@ -99,7 +86,7 @@ export default async function SearchPage({
 						Search
 					</button>
 				</form>
-			</div>
+			</SurfaceCard>
 
 			<p className="text-sm" style={{ color: "var(--color-text-muted)" }}>
 				Results for &quot;{query}&quot; — {users.length} user
@@ -109,14 +96,7 @@ export default async function SearchPage({
 			</p>
 
 			{users.length > 0 && (
-				<div
-					className="rounded-2xl border p-5"
-					style={{
-						background: "var(--color-surface)",
-						borderColor:
-							"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-					}}
-				>
+				<SurfaceCard className="p-5">
 					<h2
 						className="text-lg font-black tracking-tight mb-4"
 						style={{ color: "var(--color-text-readable)" }}
@@ -155,18 +135,11 @@ export default async function SearchPage({
 							</Link>
 						))}
 					</div>
-				</div>
+				</SurfaceCard>
 			)}
 
 			{rooms.length > 0 && (
-				<div
-					className="rounded-2xl border p-5"
-					style={{
-						background: "var(--color-surface)",
-						borderColor:
-							"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-					}}
-				>
+				<SurfaceCard className="p-5">
 					<h2
 						className="text-lg font-black tracking-tight mb-4"
 						style={{ color: "var(--color-text-readable)" }}
@@ -201,25 +174,18 @@ export default async function SearchPage({
 							</Link>
 						))}
 					</div>
-				</div>
+				</SurfaceCard>
 			)}
 
 			{users.length === 0 && rooms.length === 0 && (
-				<div
-					className="rounded-2xl border p-10 text-center"
-					style={{
-						background: "var(--color-surface)",
-						borderColor:
-							"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
-					}}
-				>
+				<SurfaceCard className="p-10 text-center">
 					<p
 						className="text-sm font-bold"
 						style={{ color: "var(--color-text-muted)" }}
 					>
 						No users or rooms found for &quot;{query}&quot;.
 					</p>
-				</div>
+				</SurfaceCard>
 			)}
 		</div>
 	);

src/app/(site)/settings/page.tsx

@@ -5,6 +5,7 @@ import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { updateMotto } from "@/actions/user-settings";
 import { Reveal } from "@/components/motion-reveal";
+import { SurfaceCard } from "@/components/surface-card";
 import { auth } from "@/lib/auth";
 import { db, User } from "@/lib/db";
 import { avatarImageUrl } from "@/lib/format";
@@ -46,19 +47,20 @@ export default async function SettingsPage() {
 		<div className="flex flex-col gap-6 pb-14">
 			{/* Header */}
 			<Reveal>
-				<div
-					className="relative overflow-hidden rounded-xl border px-5 py-4"
+				<SurfaceCard
+					className="relative px-5 py-4"
 					style={{
 						background:
 							"color-mix(in srgb, var(--color-surface) 60%, transparent)",
 						backdropFilter: "blur(14px)",
+						WebkitBackdropFilter: "blur(14px)",
 						borderColor:
 							"color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
 					}}
 				>
 					<div className="flex items-center gap-3">
 						<div
-							className="w-10 h-10 rounded-xl flex items-center justify-center"
+							className="flex h-10 w-10 items-center justify-center rounded-xl"
 							style={{
 								background:
 									"color-mix(in srgb, var(--color-primary) 14%, transparent)",
@@ -90,279 +92,190 @@ export default async function SettingsPage() {
 							</p>
 						</div>
 					</div>
-				</div>
+				</SurfaceCard>
 			</Reveal>
 
 			{/* Profile card */}
 			<Reveal delay={0.05}>
-				<div
-					className="overflow-hidden rounded-xl border card-premium"
-					style={{
-						borderColor:
-							"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-					}}
+				<SurfaceCard
+					title={t("publicProfile")}
+					icon="/assets/images/icons/navigation/me.png"
+					bodyClassName="p-5 flex items-center gap-5"
 				>
-					<div
-						className="flex items-center gap-2.5 px-4 py-3"
-						style={{
-							background:
-								"linear-gradient(140deg, #1a3a5c 0%, #1e4a6e 20%, #2a5a80 40%, #3a6a90 60%, #4a7aa0 75%, #3a6a90 90%, #2a5a80 100%)",
-						}}
-					>
-						<Image
-							src="/assets/images/icons/navigation/me.png"
-							alt=""
-							width={18}
-							height={18}
-							unoptimized
-						/>
-						<h2
-							className="text-sm font-bold text-white"
-							style={{ fontFamily: "var(--font-nunito)" }}
+					<div className="shrink-0">
+						<div
+							className="overflow-hidden rounded-xl border"
+							style={{
+								borderColor:
+									"color-mix(in srgb, var(--color-primary) 15%, transparent)",
+							}}
 						>
-							{t("publicProfile")}
-						</h2>
-					</div>
-					<div
-						className="p-5 flex items-center gap-5"
-						style={{ backgroundColor: "var(--color-surface)" }}
-					>
-						<div className="shrink-0">
-							<div
-								className="rounded-xl overflow-hidden border"
-								style={{
-									borderColor:
-										"color-mix(in srgb, var(--color-primary) 15%, transparent)",
-								}}
-							>
-								<Image
-									src={avatar}
-									alt={`${user.username} avatar`}
-									width={80}
-									height={120}
-									className="block"
-									unoptimized
-								/>
-							</div>
-						</div>
-						<div className="min-w-0 flex-1">
-							<h3
-								className="text-base font-extrabold"
-								style={{ color: "var(--color-text-readable)" }}
-							>
-								{user.username}
-							</h3>
-							<p
-								className="text-sm mt-0.5"
-								style={{ color: "var(--color-text-muted)" }}
-							>
-								{user.motto || (
-									<span style={{ fontStyle: "italic", opacity: 0.5 }}>
-										{t("noMotto")}
-									</span>
-								)}
-							</p>
-							<p
-								className="text-xs mt-1.5 font-medium"
-								style={{
-									color:
-										"color-mix(in srgb, var(--color-text-muted) 70%, transparent)",
-								}}
-							>
-								{user.mail || t("noEmail")}
-							</p>
+							<Image
+								src={avatar}
+								alt={`${user.username} avatar`}
+								width={80}
+								height={120}
+								className="block"
+								unoptimized
+							/>
 						</div>
 					</div>
-				</div>
+					<div className="min-w-0 flex-1">
+						<h3
+							className="text-base font-extrabold"
+							style={{ color: "var(--color-text-readable)" }}
+						>
+							{user.username}
+						</h3>
+						<p
+							className="text-sm mt-0.5"
+							style={{ color: "var(--color-text-muted)" }}
+						>
+							{user.motto || (
+								<span style={{ fontStyle: "italic", opacity: 0.5 }}>
+									{t("noMotto")}
+								</span>
+							)}
+						</p>
+						<p
+							className="text-xs mt-1.5 font-medium"
+							style={{
+								color:
+									"color-mix(in srgb, var(--color-text-muted) 70%, transparent)",
+							}}
+						>
+							{user.mail || t("noEmail")}
+						</p>
+					</div>
+				</SurfaceCard>
 			</Reveal>
 
 			{/* Motto form */}
 			<Reveal delay={0.1}>
-				<div
-					className="overflow-hidden rounded-xl border"
-					style={{
-						borderColor:
-							"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-					}}
+				<SurfaceCard
+					title={t("changeMotto")}
+					icon="/assets/images/icons/star.gif"
+					bodyClassName="p-5"
 				>
-					<div
-						className="flex items-center gap-2.5 px-4 py-3"
-						style={{
-							background:
-								"linear-gradient(140deg, #5a2d82 0%, #6b3a9e 20%, #7d47b8 40%, #8f54d0 60%, #7d47b8 75%, #6b3a9e 90%, #5a2d82 100%)",
-						}}
+					<p
+						className="text-xs mb-4"
+						style={{ color: "var(--color-text-muted)" }}
 					>
-						<Image
-							src="/assets/images/icons/star.gif"
-							alt=""
-							width={18}
-							height={18}
-							unoptimized
+						{t("changeMottoSubtitle")}
+					</p>
+					<form
+						action={updateMotto}
+						className="flex flex-col gap-3"
+						style={{ maxWidth: 520 }}
+					>
+						<input
+							name="motto"
+							defaultValue={user.motto}
+							maxLength={127}
+							placeholder={t("mottoPlaceholder")}
+							aria-label="Motto"
+							className="input-glow w-full rounded-xl border-2 px-4 py-3 text-sm font-medium transition-all focus:outline-none"
+							style={{
+								backgroundColor: "var(--color-background)",
+								color: "var(--color-text-readable)",
+								borderColor:
+									"color-mix(in srgb, var(--color-text-muted) 25%, transparent)",
+							}}
 						/>
-						<h2
-							className="text-sm font-bold text-white"
-							style={{ fontFamily: "var(--font-nunito)" }}
-						>
-							{t("changeMotto")}
-						</h2>
-					</div>
-					<div
-						className="p-5"
-						style={{ backgroundColor: "var(--color-surface)" }}
-					>
-						<p
-							className="text-xs mb-4"
-							style={{ color: "var(--color-text-muted)" }}
-						>
-							{t("changeMottoSubtitle")}
-						</p>
-						<form
-							action={updateMotto}
-							className="flex flex-col gap-3"
-							style={{ maxWidth: 520 }}
-						>
-							<input
-								name="motto"
-								defaultValue={user.motto}
-								maxLength={127}
-								placeholder={t("mottoPlaceholder")}
-								aria-label="Motto"
-								className="input-glow w-full rounded-xl border-2 px-4 py-3 text-sm font-medium transition-all focus:outline-none"
+						<div>
+							<button
+								type="submit"
+								className="btn-shine inline-flex items-center gap-2 font-extrabold text-sm px-5 py-2.5 rounded-xl transition-all duration-200 hover:scale-[1.03] active:scale-95 shadow-lg"
 								style={{
-									backgroundColor: "var(--color-background)",
-									color: "var(--color-text-readable)",
-									borderColor:
-										"color-mix(in srgb, var(--color-text-muted) 25%, transparent)",
+									background: "var(--color-primary)",
+									color: "var(--color-primary-foreground)",
+									boxShadow:
+										"0 4px 20px color-mix(in srgb, var(--color-primary) 30%, transparent)",
 								}}
-							/>
-							<div>
-								<button
-									type="submit"
-									className="btn-shine inline-flex items-center gap-2 font-extrabold text-sm px-5 py-2.5 rounded-xl transition-all duration-200 hover:scale-[1.03] active:scale-95 shadow-lg"
-									style={{
-										background: "var(--color-primary)",
-										color: "var(--color-primary-foreground)",
-										boxShadow:
-											"0 4px 20px color-mix(in srgb, var(--color-primary) 30%, transparent)",
-									}}
-								>
-									{t("saveMotto")}
-								</button>
-							</div>
-						</form>
-					</div>
-				</div>
+							>
+								{t("saveMotto")}
+							</button>
+						</div>
+					</form>
+				</SurfaceCard>
 			</Reveal>
 
 			{/* Security card */}
 			<Reveal delay={0.15}>
-				<div
-					className="overflow-hidden rounded-xl border"
-					style={{
-						borderColor:
-							"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-					}}
+				<SurfaceCard
+					title={t("securityTitle")}
+					icon="/assets/images/icons/navigation/goody.png"
+					bodyClassName="p-5"
 				>
-					<div
-						className="flex items-center gap-2.5 px-4 py-3"
+					<p
+						className="text-xs mb-4"
+						style={{ color: "var(--color-text-muted)" }}
+					>
+						{t("securityDescription")}
+					</p>
+					<Link
+						href="/settings/2fa"
+						className="inline-flex items-center gap-2 font-bold text-sm px-5 py-2.5 rounded-xl border-2 transition-all duration-200 hover:scale-[1.03] active:scale-95 backdrop-blur-sm"
 						style={{
+							borderColor:
+								"color-mix(in srgb, var(--color-text-muted) 20%, transparent)",
+							color: "var(--color-text-readable)",
 							background:
-								"linear-gradient(140deg, #0A1F0A 0%, #0F2D0F 20%, #153C15 40%, #1B4A1B 60%, #205820 75%, #1A4A1A 90%, #143814 100%)",
+								"color-mix(in srgb, var(--color-surface) 50%, transparent)",
 						}}
 					>
-						<Image
-							src="/assets/images/icons/navigation/goody.png"
-							alt=""
-							width={18}
-							height={18}
-							unoptimized
-						/>
-						<h2
-							className="text-sm font-bold text-white"
-							style={{ fontFamily: "var(--font-nunito)" }}
-						>
-							{t("securityTitle")}
-						</h2>
-					</div>
-					<div
-						className="p-5"
-						style={{ backgroundColor: "var(--color-surface)" }}
-					>
-						<p
-							className="text-xs mb-4"
-							style={{ color: "var(--color-text-muted)" }}
-						>
-							{t("securityDescription")}
-						</p>
-						<Link
-							href="/settings/2fa"
-							className="inline-flex items-center gap-2 font-bold text-sm px-5 py-2.5 rounded-xl border-2 transition-all duration-200 hover:scale-[1.03] active:scale-95 backdrop-blur-sm"
-							style={{
-								borderColor:
-									"color-mix(in srgb, var(--color-text-muted) 20%, transparent)",
-								color: "var(--color-text-readable)",
-								background:
-									"color-mix(in srgb, var(--color-surface) 50%, transparent)",
-							}}
-						>
-							{t("twoFactorLink")}
-						</Link>
-					</div>
-				</div>
+						{t("twoFactorLink")}
+					</Link>
+				</SurfaceCard>
 			</Reveal>
 
 			{/* Sessions link */}
 			<Reveal delay={0.2}>
-				<Link
-					href="/settings/sessions"
-					className="block overflow-hidden rounded-xl border transition-all duration-200 hover:shadow-lg hover:-translate-y-0.5"
-					style={{
-						borderColor:
-							"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-					}}
-				>
-					<div
-						className="flex items-center justify-between px-5 py-4"
-						style={{ backgroundColor: "var(--color-surface)" }}
-					>
-						<div className="flex items-center gap-3">
-							<div
-								className="w-10 h-10 rounded-xl flex items-center justify-center"
-								style={{
-									background:
-										"color-mix(in srgb, var(--color-primary) 14%, transparent)",
-								}}
-							>
-								<Image
-									src="/assets/images/icons/navigation/community.png"
-									alt=""
-									width={20}
-									height={20}
-									unoptimized
-								/>
-							</div>
-							<div>
-								<span
-									className="text-sm font-extrabold"
-									style={{ color: "var(--color-text-readable)" }}
-								>
-									Session Management
-								</span>
-								<p
-									className="text-xs mt-0.5"
-									style={{ color: "var(--color-text-muted)" }}
-								>
-									View active sessions and sign out everywhere
-								</p>
-							</div>
-						</div>
-						<span
-							className="text-lg font-bold"
-							style={{ color: "var(--color-text-muted)" }}
+				<Link href="/settings/sessions" className="block">
+					<SurfaceCard className="transition-all duration-200 hover:shadow-lg hover:-translate-y-0.5">
+						<div
+							className="flex items-center justify-between px-5 py-4"
+							style={{ backgroundColor: "var(--color-surface)" }}
 						>
-							→
-						</span>
-					</div>
+							<div className="flex items-center gap-3">
+								<div
+									className="flex h-10 w-10 items-center justify-center rounded-xl"
+									style={{
+										background:
+											"color-mix(in srgb, var(--color-primary) 14%, transparent)",
+									}}
+								>
+									<Image
+										src="/assets/images/icons/navigation/community.png"
+										alt=""
+										width={20}
+										height={20}
+										unoptimized
+									/>
+								</div>
+								<div>
+									<span
+										className="text-sm font-extrabold"
+										style={{ color: "var(--color-text-readable)" }}
+									>
+										Session Management
+									</span>
+									<p
+										className="text-xs mt-0.5"
+										style={{ color: "var(--color-text-muted)" }}
+									>
+										View active sessions and sign out everywhere
+									</p>
+								</div>
+							</div>
+							<span
+								className="text-lg font-bold"
+								style={{ color: "var(--color-text-muted)" }}
+							>
+								→
+							</span>
+						</div>
+					</SurfaceCard>
 				</Link>
 			</Reveal>
 		</div>

src/app/(site)/verify/page.tsx

@@ -3,6 +3,7 @@ import { CheckCircle2, Clock, MailX } from "lucide-react";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { isValidVerificationToken } from "@/actions/email-verify";
+import { SurfaceCard } from "@/components/surface-card";
 import { db, User } from "@/lib/db";
 
 type Status = "verified" | "already" | "invalid" | "unavailable";
@@ -20,38 +21,47 @@ function StatusCard({
 	children: React.ReactNode;
 	color: string;
 }) {
-	const gradientMap: Record<string, string> = {
-		green:
-			"linear-gradient(140deg, #0A2F1A 0%, #0F3D22 20%, #154C2A 40%, #1B5A32 60%, #20683A 75%, #1A5A30 90%, #144826 100%)",
-		yellow:
-			"linear-gradient(140deg, #3A2F0A 0%, #4A3D0F 20%, #5A4C15 40%, #6A5A1B 60%, #7A6820 75%, #6A5A1A 90%, #5A4814 100%)",
-		red: "linear-gradient(140deg, #3A0F0A 0%, #4A1A0F 20%, #5A2515 40%, #6A301B 60%, #7A3B20 75%, #6A301A 90%, #5A2514 100%)",
-		blue: "linear-gradient(140deg, #0A1A3A 0%, #0F254A 20%, #15305A 40%, #1B3B6A 60%, #20467A 75%, #1A3B6A 90%, #14305A 100%)",
+	const tintMap: Record<string, string> = {
+		green: "#16a34a",
+		yellow: "#d97706",
+		red: "#dc2626",
+		blue: "#2563eb",
 	};
+	const tint = tintMap[color] ?? tintMap.blue;
 
 	return (
 		<main className="flex min-h-[60vh] items-center justify-center px-4">
-			<div
-				className="w-full max-w-md overflow-hidden rounded-xl border"
-				style={{
-					borderColor:
-						"color-mix(in srgb, var(--color-text-muted) 12%, transparent)",
-					backgroundColor: "var(--color-surface)",
-				}}
-			>
+			<SurfaceCard className="w-full max-w-md">
 				<div
-					className="flex items-center gap-2.5 px-5 py-4"
-					style={{ background: gradientMap[color] ?? gradientMap.blue }}
+					className="flex items-center gap-2.5 border-b px-5 py-4"
+					style={{
+						background: `color-mix(in srgb, ${tint} 12%, var(--color-surface))`,
+						borderColor:
+							"color-mix(in srgb, var(--color-text-muted) 10%, transparent)",
+					}}
 				>
-					<span className="text-white">{icon}</span>
-					<h1 className="text-sm font-bold text-white">{title}</h1>
+					<span
+						className="flex h-7 w-7 items-center justify-center rounded-lg"
+						style={{
+							background: `color-mix(in srgb, ${tint} 18%, transparent)`,
+							color: tint,
+						}}
+					>
+						{icon}
+					</span>
+					<h1
+						className="text-sm font-bold tracking-tight"
+						style={{ color: "var(--color-text-readable)" }}
+					>
+						{title}
+					</h1>
 				</div>
 				<div className="flex flex-col items-center gap-4 px-6 py-8 text-center">
 					<div
 						className="flex h-16 w-16 items-center justify-center rounded-full"
 						style={{
-							background:
-								"color-mix(in srgb, var(--color-primary) 12%, transparent)",
+							background: `color-mix(in srgb, ${tint} 12%, transparent)`,
+							color: tint,
 						}}
 					>
 						{icon}
@@ -64,7 +74,7 @@ function StatusCard({
 					</p>
 					{children}
 				</div>
-			</div>
+			</SurfaceCard>
 		</main>
 	);
 }

src/app/admin/settings/cms-settings-config.ts

@@ -1,4 +1,3 @@
-import { FALLBACK_HOTEL_NAME } from "@/lib/brand";
 import { HABBO_GAMEDATA_HOTELS } from "@/lib/habbo-gamedata-hotel";
 
 export type FieldType =
@@ -45,13 +44,6 @@ export const SETTINGS_GROUPS: SettingsGroup[] = [
 		icon: "building",
 		description: "Name, branding and defaults shown across the site.",
 		fields: [
-			{
-				key: "hotel_name",
-				label: "Hotel name",
-				type: "text",
-				placeholder: "Epicnabbo",
-				defaultValue: FALLBACK_HOTEL_NAME,
-			},
 			{
 				key: "cms_logo",
 				label: "Logo URL",

src/app/api/home/route.ts

@@ -1,6 +1,6 @@
 import { count, desc, eq } from "drizzle-orm";
+import { env } from "@/env";
 import { apiJson } from "@/lib/api";
-import { FALLBACK_HOTEL_NAME } from "@/lib/brand";
 import { db, User, WebsiteArticles } from "@/lib/db";
 import { resolveHotelName } from "@/lib/hotel-name";
 import { apiCacheKey, cacheSafe, redisCache } from "@/lib/redis-cache";
@@ -38,7 +38,7 @@ export async function GET(_req: Request) {
 		return apiJson(data);
 	} catch {
 		return apiJson(
-			{ articles: [], online: 0, hotelName: FALLBACK_HOTEL_NAME },
+			{ articles: [], online: 0, hotelName: env.HOTEL_NAME },
 			{ status: 200 },
 		);
 	}