diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1a640b7..3a14408d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -306,3 +306,97 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 - Improved stability of text selection detection for AI helper
 - Fixed locale duplication and routing edge cases
 - Reduced visual overlap issues on small mobile screens
+
+## [0.5.3] - 2026-02-04
+
+### Added
+
+- Quiz performance improvements:
+  - Redis-based answer verification replacing AES encryption
+  - Server-side quiz cache initialization to reduce verification latency
+  - Debug endpoints for inspecting and clearing quiz caches (development only)
+- Caching & data layer:
+  - Persistent Redis caching for static Quiz and Q&A data (TTL removed)
+  - Cache-aside strategy for quiz answers and Q&A content
+- Internationalization & accessibility:
+  - Translations for blog categories, CTA variants, and UI components (en / uk / pl)
+  - Improved aria-label coverage for navigation, cart, theme toggle, and search
+- Developer experience:
+  - Finalized ESLint Flat Config for frontend
+  - Stable Prettier + Tailwind class sorting workflow
+  - Consistent format-on-save behavior across the team
+
+### Changed
+
+- Quiz system refactor:
+  - Simplified answer verification flow using Redis lookups
+  - Improved guest session restoration after quiz completion
+  - Language switch now preserves quiz results for guest users
+- Layout & UI refinements:
+  - Removed duplicate padding on quiz routes
+  - Improved mobile alignment for Quiz Rules and headers
+  - Refined leaderboard component structure and lint stability
+- Shop module cleanup:
+  - Normalized component naming (PascalCase)
+  - Reorganized test structure under domain boundaries
+  - Unified active-state and hover styling across shop routes
+- Blog UI improvements:
+  - Fixed mobile paddings and spacing consistency
+  - Improved responsive header and layout behavior
+
+### Fixed
+
+- Fixed mobile layout misalignment on quiz pages
+- Fixed guest language switch issues on quiz result screen
+- Improved WCAG color contrast compliance across quiz UI
+- Fixed ESLint, Prettier, and test configuration inconsistencies
+- Removed unused files, dead code, and outdated utilities
+- Improved reliability of quiz session restoration and state handling
+
+## [0.5.4] - 2026-02-05
+
+### Added
+
+- Quiz SEO & performance improvements:
+  - Dynamic metadata generation for quizzes list and quiz detail pages
+  - i18n-aware meta titles and descriptions (en / uk / pl)
+  - Browserslist configuration targeting modern browsers
+- Quiz content updates:
+  - Expanded JavaScript Fundamentals quiz from 10 to 40 questions
+- Dashboard UI improvements:
+  - New DynamicGridBackground for cleaner visual hierarchy
+  - Refined ProfileCard and StatsCard layouts
+- Accessibility & i18n:
+  - Improved aria-label coverage across navigation and UI controls
+  - Refined English, Polish, and Ukrainian UI copy and punctuation
+
+### Changed
+
+- Quiz UX refinements:
+  - Countdown timer animation stabilized on tab switch and session restore
+  - Emoji replaced with icon-based indicators for consistent styling
+  - Anti-cheat logic improved to distinguish touch vs mouse events
+- Q&A experience improvements:
+  - Pagination scroll now targets section instead of page top
+  - Mobile tap lock resolved by clearing text selection on interaction
+- Home & layout updates:
+  - Improved code card sizing and responsive behavior
+  - Online users counter repositioned for better mobile UX
+- Shop UX refinements:
+  - Canonicalized legacy “View all” filters
+  - Improved cart CTA behavior and badge layering
+- Blog & CMS:
+  - Refactored blog image rendering and filtering logic
+  - Improved pagination state handling
+- Styling & consistency:
+  - Fixed Tailwind v4 canonical class warnings
+  - Unified token-based styling across dashboard, 404 page, and controls
+
+### Fixed
+
+- Fixed mobile anti-cheat false positives on quiz pages
+- Removed render-blocking Font Awesome CSS
+- Fixed quiz timer progress bar desynchronization
+- Improved table text contrast in dark mode
+- Fixed cart badge overlay issues in header
+- Resolved multiple mobile spacing and padding inconsistencies
diff --git a/frontend/.browserslistrc b/frontend/.browserslistrc
new file mode 100644
index 00000000..80ab2621
--- /dev/null
+++ b/frontend/.browserslistrc
@@ -0,0 +1 @@
+defaults and fully supports es6-module
\ No newline at end of file
diff --git a/frontend/app/[locale]/blog/[slug]/PostDetails.tsx b/frontend/app/[locale]/blog/[slug]/PostDetails.tsx
index f16b593a..733b2723 100644
--- a/frontend/app/[locale]/blog/[slug]/PostDetails.tsx
+++ b/frontend/app/[locale]/blog/[slug]/PostDetails.tsx
@@ -84,7 +84,6 @@ function renderPortableTextSpans(
     const text = child?.text || '';
     if (!text) return null;
     const marks = child?.marks || [];
-    const linkKey = marks.find(mark => linkMap.has(mark));
 
     let node: React.ReactNode = marks.length === 0 ? linkifyText(text) : text;
 
@@ -280,11 +279,14 @@ function renderPortableText(
 
     if (block?._type === 'image' && block?.url) {
       nodes.push(
-        <img
+        <Image
           key={block._key || `image-${i}`}
           src={block.url}
           alt={postTitle || 'Post image'}
-          className="my-6 rounded-xl border border-gray-200"
+          width={1200}
+          height={800}
+          sizes="100vw"
+          className="my-6 h-auto w-full rounded-xl border border-gray-200"
         />
       );
       i += 1;
diff --git a/frontend/app/[locale]/dashboard/page.tsx b/frontend/app/[locale]/dashboard/page.tsx
index 3e5a23a3..d601fa17 100644
--- a/frontend/app/[locale]/dashboard/page.tsx
+++ b/frontend/app/[locale]/dashboard/page.tsx
@@ -4,6 +4,7 @@ import { PostAuthQuizSync } from '@/components/auth/PostAuthQuizSync';
 import { ProfileCard } from '@/components/dashboard/ProfileCard';
 import { QuizSavedBanner } from '@/components/dashboard/QuizSavedBanner';
 import { StatsCard } from '@/components/dashboard/StatsCard';
+import { DynamicGridBackground } from '@/components/shared/DynamicGridBackground';
 import { getUserQuizStats } from '@/db/queries/quiz';
 import { getUserProfile } from '@/db/queries/users';
 import { redirect } from '@/i18n/routing';
@@ -75,42 +76,35 @@ export default async function DashboardPage({
   };
 
   const outlineBtnStyles =
-    'inline-flex items-center justify-center rounded-full border border-slate-200 dark:border-slate-700 bg-white/50 dark:bg-slate-900/50 backdrop-blur-sm px-6 py-2 text-sm font-medium text-slate-600 dark:text-slate-300 transition-colors hover:bg-white hover:text-sky-600 dark:hover:bg-slate-800 dark:hover:text-sky-400';
+    'inline-flex items-center justify-center rounded-full border border-gray-200 dark:border-white/10 bg-white/50 dark:bg-neutral-900/50 backdrop-blur-sm px-6 py-2 text-sm font-medium text-gray-600 dark:text-gray-300 transition-colors hover:bg-white hover:text-(--accent-primary) dark:hover:bg-neutral-800 dark:hover:text-(--accent-primary)';
 
   return (
-    <main className="relative min-h-[calc(100vh-80px)] overflow-hidden">
+    <div className="min-h-screen">
       <PostAuthQuizSync />
-      <div
-        className="pointer-events-none absolute inset-0 -z-10"
-        aria-hidden="true"
+      <DynamicGridBackground
+        showStaticGrid
+        className="min-h-screen bg-gray-50 py-12 transition-colors duration-300 dark:bg-transparent"
       >
-        <div className="absolute inset-0 bg-linear-to-b from-sky-50 via-white to-rose-50 dark:from-slate-950 dark:via-slate-950 dark:to-black" />
-        <div className="absolute top-0 left-1/4 h-96 w-xl -translate-x-1/2 rounded-full bg-sky-300/20 blur-3xl dark:bg-sky-500/10" />
-        <div className="absolute right-0 bottom-0 h-104 w-104 rounded-full bg-violet-300/30 blur-3xl dark:bg-violet-500/10" />
-        <div className="absolute bottom-10 left-10 h-80 w-[20rem] rounded-full bg-pink-300/20 blur-3xl dark:bg-fuchsia-500/10" />
-      </div>
-
-      <div className="relative z-10 mx-auto max-w-5xl px-6 py-12">
-        <header className="mb-12 flex flex-col justify-between gap-6 md:flex-row md:items-center">
-          <div>
-            <h1 className="text-4xl font-black tracking-tight drop-shadow-sm md:text-5xl">
-              <span className="bg-linear-to-r from-sky-400 via-violet-400 to-pink-400 bg-clip-text text-transparent dark:from-sky-400 dark:via-indigo-400 dark:to-fuchsia-500">
-                {t('title')}
-              </span>
-            </h1>
-            <p className="mt-2 text-lg text-slate-600 dark:text-slate-400">
-              {t('subtitle')}
-            </p>
+        <main className="relative z-10 mx-auto max-w-5xl px-6">
+          <header className="mb-12 flex flex-col justify-between gap-6 md:flex-row md:items-center">
+            <div>
+              <h1 className="text-4xl font-black tracking-tight md:text-5xl">
+                <span className="text-(--accent-primary)">{t('title')}</span>
+              </h1>
+              <p className="mt-2 text-lg text-gray-600 dark:text-gray-400">
+                {t('subtitle')}
+              </p>
+            </div>
+
+            <span className={outlineBtnStyles}>{t('supportLink')}</span>
+          </header>
+          <QuizSavedBanner />
+          <div className="grid gap-8 md:grid-cols-2">
+            <ProfileCard user={userForDisplay} locale={locale} />
+            <StatsCard stats={stats} />
           </div>
-
-          <span className={outlineBtnStyles}>{t('supportLink')}</span>
-        </header>
-        <QuizSavedBanner />
-        <div className="grid gap-8 md:grid-cols-2">
-          <ProfileCard user={userForDisplay} locale={locale} />
-          <StatsCard stats={stats} />
-        </div>
-      </div>
-    </main>
+        </main>
+      </DynamicGridBackground>
+    </div>
   );
 }
diff --git a/frontend/app/[locale]/layout.tsx b/frontend/app/[locale]/layout.tsx
index cd9cafba..16875f9a 100644
--- a/frontend/app/[locale]/layout.tsx
+++ b/frontend/app/[locale]/layout.tsx
@@ -10,7 +10,6 @@ import { AppChrome } from '@/components/header/AppChrome';
 import { MainSwitcher } from '@/components/header/MainSwitcher';
 import { CookieBanner } from '@/components/shared/CookieBanner';
 import Footer from '@/components/shared/Footer';
-import { OnlineCounterPopup } from '@/components/shared/OnlineCounterPopup';
 import { ThemeProvider } from '@/components/theme/ThemeProvider';
 import { locales } from '@/i18n/config';
 import { getCurrentUser } from '@/lib/auth';
@@ -73,7 +72,6 @@ export default async function LocaleLayout({
             {children}
           </MainSwitcher>
         </AppChrome>
-        <OnlineCounterPopup />
 
         <Footer />
         <Toaster position="top-right" richColors expand />
diff --git a/frontend/app/[locale]/q&a/page.tsx b/frontend/app/[locale]/q&a/page.tsx
index 69513907..5cd88787 100644
--- a/frontend/app/[locale]/q&a/page.tsx
+++ b/frontend/app/[locale]/q&a/page.tsx
@@ -27,19 +27,21 @@ export default async function QAPage({
   const t = await getTranslations({ locale, namespace: 'qa' });
 
   return (
-    <DynamicGridBackground className="bg-gray-50 py-10 transition-colors duration-300 dark:bg-transparent">
-      <main className="relative z-10 mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
-        <div className="mb-8">
-          <p className="text-sm font-semibold text-(--accent-primary)">
-            {t('pretitle')}
-          </p>
-          <h1 className="text-3xl font-bold">{t('title')}</h1>
-          <p className="text-gray-600 dark:text-gray-400">{t('subtitle')}</p>
-        </div>
-        <Suspense fallback={<>...</>}>
-          <QaSection />
-        </Suspense>
-      </main>
-    </DynamicGridBackground>
+    <div className="min-h-screen">
+      <DynamicGridBackground className="bg-gray-50 py-10 transition-colors duration-300 dark:bg-transparent">
+        <main className="relative z-10 mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
+          <div className="mb-8">
+            <p className="text-sm font-semibold text-(--accent-primary)">
+              {t('pretitle')}
+            </p>
+            <h1 className="text-3xl font-bold">{t('title')}</h1>
+            <p className="text-gray-600 dark:text-gray-400">{t('subtitle')}</p>
+          </div>
+          <Suspense fallback={<>...</>}>
+            <QaSection />
+          </Suspense>
+        </main>
+      </DynamicGridBackground>
+    </div>
   );
 }
diff --git a/frontend/app/[locale]/quiz/[slug]/page.tsx b/frontend/app/[locale]/quiz/[slug]/page.tsx
index 092ccc0d..49ca8c65 100644
--- a/frontend/app/[locale]/quiz/[slug]/page.tsx
+++ b/frontend/app/[locale]/quiz/[slug]/page.tsx
@@ -1,3 +1,4 @@
+import type { Metadata } from 'next';
 import { notFound, redirect } from 'next/navigation';
 import { getTranslations } from 'next-intl/server';
 
@@ -6,6 +7,27 @@ import { stripCorrectAnswers } from '@/db/queries/quiz';
 import { getQuizBySlug, getQuizQuestionsRandomized } from '@/db/queries/quiz';
 import { getCurrentUser } from '@/lib/auth';
 
+type MetadataProps = { params: Promise<{ locale: string; slug: string }> };
+
+export async function generateMetadata({
+  params,
+}: MetadataProps): Promise<Metadata> {
+  const { locale, slug } = await params;
+  const t = await getTranslations({ locale, namespace: 'quiz.page' });
+  const quiz = await getQuizBySlug(slug, locale);
+
+  if (!quiz) {
+    return { title: t('notFoundTitle') };
+  }
+
+  return {
+    title: `${quiz.title} | ${t('metaSuffix')}`,
+    description:
+      quiz.description ??
+      t('metaDescriptionFallback', { title: quiz.title ?? '' }),
+  };
+}
+
 interface QuizPageProps {
   params: Promise<{ locale: string; slug: string }>;
   searchParams: Promise<{ seed?: string }>;
@@ -34,10 +56,10 @@ export default async function QuizPage({
 
   const seed = Number.parseInt(seedParam, 10);
   if (Number.isNaN(seed)) {
-     // eslint-disable-next-line react-hooks/purity -- redirect throws, value never used in render
+    // eslint-disable-next-line react-hooks/purity -- redirect throws, value never used in render
     redirect(`/${locale}/quiz/${slug}?seed=${Date.now()}`);
   }
-  
+
   const questions = await getQuizQuestionsRandomized(quiz.id, locale, seed);
 
   const clientQuestions = stripCorrectAnswers(questions);
diff --git a/frontend/app/[locale]/quizzes/page.tsx b/frontend/app/[locale]/quizzes/page.tsx
index 1c49ac32..8a66ea64 100644
--- a/frontend/app/[locale]/quizzes/page.tsx
+++ b/frontend/app/[locale]/quizzes/page.tsx
@@ -1,3 +1,4 @@
+import type { Metadata } from 'next';
 import { getTranslations } from 'next-intl/server';
 
 import QuizzesSection from '@/components/quiz/QuizzesSection';
@@ -7,6 +8,18 @@ import { getCurrentUser } from '@/lib/auth';
 
 type PageProps = { params: Promise<{ locale: string }> };
 
+export async function generateMetadata({
+  params,
+}: PageProps): Promise<Metadata> {
+  const { locale } = await params;
+  const t = await getTranslations({ locale, namespace: 'quiz.list' });
+
+  return {
+    title: t('metaTitle'),
+    description: t('metaDescription'),
+  };
+}
+
 export const dynamic = 'force-dynamic';
 
 export default async function QuizzesPage({ params }: PageProps) {
diff --git a/frontend/app/[locale]/shop/cart/CartPageClient.tsx b/frontend/app/[locale]/shop/cart/CartPageClient.tsx
index 525906d2..6aa22c43 100644
--- a/frontend/app/[locale]/shop/cart/CartPageClient.tsx
+++ b/frontend/app/[locale]/shop/cart/CartPageClient.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Minus, Plus, ShoppingBag, Trash2 } from 'lucide-react';
+import { Loader2, Minus, Plus, ShoppingBag, Trash2 } from 'lucide-react';
 import Image from 'next/image';
 import { useParams } from 'next/navigation';
 import { useTranslations } from 'next-intl';
@@ -411,10 +411,23 @@ export default function CartPage() {
               />
               <span className={SHOP_CTA_INSET} aria-hidden="true" />
 
-              <span className="relative z-10">
-                {isCheckingOut
-                  ? t('checkout.placing')
-                  : t('checkout.placeOrder')}
+              <span className="relative z-10 inline-flex min-w-0 items-center justify-center gap-2">
+                {isCheckingOut ? (
+                  <Loader2
+                    className="h-4 w-4 animate-spin"
+                    aria-hidden="true"
+                  />
+                ) : null}
+
+                {/* visible label stays stable to avoid wrapping/layout shift */}
+                <span className="truncate whitespace-nowrap">
+                  {t('checkout.placeOrder')}
+                </span>
+
+                {/* screen readers can still get the “placing” state */}
+                {isCheckingOut ? (
+                  <span className="sr-only">{t('checkout.placing')}</span>
+                ) : null}
               </span>
             </button>
 
diff --git a/frontend/app/[locale]/shop/page.tsx b/frontend/app/[locale]/shop/page.tsx
index fa71a45c..4f923a1d 100644
--- a/frontend/app/[locale]/shop/page.tsx
+++ b/frontend/app/[locale]/shop/page.tsx
@@ -52,7 +52,7 @@ export default async function HomePage({
             </h2>
 
             <Link
-              href="/shop/products?filter=new"
+              href="/shop/products?filter=newest"
               className="group border-border text-muted-foreground hover:text-foreground focus-visible:ring-offset-background inline-flex items-center gap-2 rounded-md border bg-transparent px-4 py-2 text-xs font-semibold tracking-[0.25em] uppercase shadow-none transition-[transform,box-shadow,color,filter] duration-500 ease-out hover:-translate-y-0.5 hover:shadow-[var(--shop-card-shadow-hover)] hover:brightness-110 focus-visible:ring-2 focus-visible:ring-[color:var(--color-ring)] focus-visible:ring-offset-2 focus-visible:outline-none sm:text-sm"
               aria-label={t('viewAll')}
             >
diff --git a/frontend/app/[locale]/shop/products/[slug]/page.tsx b/frontend/app/[locale]/shop/products/[slug]/page.tsx
index 8f9c57c2..5b83cc12 100644
--- a/frontend/app/[locale]/shop/products/[slug]/page.tsx
+++ b/frontend/app/[locale]/shop/products/[slug]/page.tsx
@@ -39,7 +39,15 @@ export default async function ProductPage({
     notFound();
   }
   const isUnavailable = result.kind === 'unavailable';
-  const product = result.product as any;
+  const resultProduct = (result as any).product ?? {};
+
+  const product = {
+    ...(publicProduct as any),
+    ...Object.fromEntries(
+      Object.entries(resultProduct).filter(([, v]) => v !== undefined)
+    ),
+  } as any;
+
   const NAV_LINK = cn(
     SHOP_NAV_LINK_BASE,
     SHOP_FOCUS,
@@ -68,13 +76,12 @@ export default async function ProductPage({
 
       <div className="mt-8 grid gap-8 lg:grid-cols-2 lg:gap-16">
         <div className="bg-muted relative aspect-square overflow-hidden rounded-lg">
-          {product.badge && (
+          {badge && badge !== 'NONE' && (
             <span
-              className={`absolute top-4 left-4 z-10 rounded px-2 py-1 text-xs font-semibold uppercase ${
-                badge === 'SALE'
-                  ? 'bg-accent text-accent-foreground'
-                  : 'bg-foreground text-background'
-              }`}
+              className={cn(
+                'absolute top-4 left-4 z-10 rounded px-2 py-1 text-xs font-semibold uppercase',
+                'bg-foreground text-background dark:bg-accent dark:text-accent-foreground'
+              )}
             >
               {badgeLabel}
             </span>
diff --git a/frontend/app/[locale]/shop/products/page.tsx b/frontend/app/[locale]/shop/products/page.tsx
index f4c369da..96d90944 100644
--- a/frontend/app/[locale]/shop/products/page.tsx
+++ b/frontend/app/[locale]/shop/products/page.tsx
@@ -1,11 +1,11 @@
 import { Metadata } from 'next';
-import { redirect } from 'next/navigation';
 import { getTranslations } from 'next-intl/server';
 import { Suspense } from 'react';
 
 import { CatalogProductsClient } from '@/components/shop/CatalogProductsClient';
 import { ProductFilters } from '@/components/shop/ProductFilters';
 import { ProductsToolbar } from '@/components/shop/ProductsToolbar';
+import { redirect } from '@/i18n/routing';
 import { CATALOG_PAGE_SIZE } from '@/lib/config/catalog';
 import { getCatalogProducts } from '@/lib/shop/data';
 import { catalogQuerySchema } from '@/lib/validation/shop';
@@ -22,6 +22,7 @@ type RawSearchParams = {
   size?: string;
   sort?: string;
   page?: string;
+  filter?: string;
 };
 
 interface ProductsPageProps {
@@ -36,19 +37,26 @@ export default async function ProductsPage({
   const resolvedSearchParams = (await searchParams) ?? {};
   const t = await getTranslations('shop.products');
 
-  if (resolvedSearchParams.page) {
+  const hasLegacyFilter = resolvedSearchParams.filter === 'new';
+  const needsCanonical = hasLegacyFilter;
+
+  if (needsCanonical) {
     const qsParams = new URLSearchParams();
 
     for (const [k, v] of Object.entries(resolvedSearchParams)) {
       if (!v) continue;
-      if (k === 'page') continue;
+      if (k === 'filter') continue;
       qsParams.set(k, v);
     }
 
+    if (hasLegacyFilter && !resolvedSearchParams.sort) {
+      qsParams.set('sort', 'newest');
+    }
+
     const qs = qsParams.toString();
     const basePath = `/shop/products`;
 
-    redirect(qs ? `${basePath}?${qs}` : basePath);
+    redirect({ href: qs ? `${basePath}?${qs}` : basePath, locale });
   }
 
   const parsedParams = catalogQuerySchema.safeParse(resolvedSearchParams);
diff --git a/frontend/app/api/shop/catalog/route.ts b/frontend/app/api/shop/catalog/route.ts
index 1b0ad318..e7faff91 100644
--- a/frontend/app/api/shop/catalog/route.ts
+++ b/frontend/app/api/shop/catalog/route.ts
@@ -26,6 +26,7 @@ type RawSearchParams = {
   page?: string;
   limit?: string;
   locale?: string;
+  filter?: string;
 };
 
 function normalizeLocale(input: unknown): 'en' | 'uk' {
@@ -50,10 +51,16 @@ export async function GET(request: NextRequest) {
     request.nextUrl.searchParams.entries()
   ) as RawSearchParams;
 
-  const { locale, ...rest } = raw;
+  const { locale, filter, ...rest } = raw;
   const effectiveLocale = normalizeLocale(locale);
 
-  const parsed = catalogQuerySchema.safeParse(rest);
+  // legacy support: ?filter=new => sort=newest (only if sort not provided)
+  const normalizedRest: Record<string, string | undefined> = { ...rest };
+  if (filter === 'new' && !normalizedRest.sort) {
+    normalizedRest.sort = 'newest';
+  }
+
+  const parsed = catalogQuerySchema.safeParse(normalizedRest);
 
   if (!parsed.success) {
     logWarn('shop_catalog_invalid_query', {
diff --git a/frontend/app/globals.css b/frontend/app/globals.css
index ccc119f9..7ab59b5f 100644
--- a/frontend/app/globals.css
+++ b/frontend/app/globals.css
@@ -1,5 +1,4 @@
 @import url(https://fonts.googleapis.com/css?family=Lato:100,300,400,700);
-@import url(https://raw.github.com/FortAwesome/Font-Awesome/master/docs/assets/css/font-awesome.min.css);
 @import 'tailwindcss';
 
 @custom-variant dark (&:is(.dark *));
@@ -146,11 +145,13 @@
   border-color: var(--qa-accent);
 }
 
-.no-select {
-  -webkit-user-select: none; /* Safari */
-  -moz-user-select: none; /* Firefox */
-  -ms-user-select: none; /* IE10+/Edge */
-  user-select: none; /* Standard */
+.no-select,
+.no-select * {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 
 @keyframes progress {
@@ -237,7 +238,8 @@
     will-change: transform;
   }
 
-  .lg\:left-16.animate-card-breathe {
+  .lg\:left-16.animate-card-breathe,
+  .xl\:left-8.animate-card-breathe {
     transform: rotate(-10deg);
     --card-x: -20px;
     --card-y: -15px;
@@ -246,7 +248,8 @@
     animation-delay: 0s;
   }
 
-  .lg\:right-20.animate-card-breathe {
+  .lg\:right-20.animate-card-breathe,
+  .xl\:right-8.animate-card-breathe {
     transform: rotate(8deg);
     --card-x: 20px;
     --card-y: 15px;
diff --git a/frontend/app/not-found.tsx b/frontend/app/not-found.tsx
index aa61e857..87b2579e 100644
--- a/frontend/app/not-found.tsx
+++ b/frontend/app/not-found.tsx
@@ -26,23 +26,23 @@ export default async function NotFound() {
   return (
     <main className="bg-background relative flex min-h-screen items-center justify-center overflow-hidden transition-colors duration-300">
       <div className="pointer-events-none absolute inset-0 opacity-60">
-        <div className="absolute -top-32 left-1/2 h-96 w-[36rem] -translate-x-1/2 rounded-full bg-[var(--accent-primary)]/20 blur-3xl" />
-        <div className="absolute bottom-[-12rem] left-1/4 h-[22rem] w-[22rem] rounded-full bg-[var(--accent-hover)]/15 blur-3xl" />
-        <div className="absolute right-0 bottom-[-10rem] h-[26rem] w-[26rem] rounded-full bg-[var(--accent-primary)]/25 blur-3xl" />
+        <div className="absolute -top-32 left-1/2 h-96 w-xl -translate-x-1/2 rounded-full bg-(--accent-primary)/20 blur-3xl" />
+        <div className="absolute -bottom-48 left-1/4 h-88 w-88 rounded-full bg-(--accent-hover)/15 blur-3xl" />
+        <div className="absolute right-0 -bottom-40 h-104 w-104 rounded-full bg-(--accent-primary)/25 blur-3xl" />
       </div>
 
       <div className="pointer-events-none absolute inset-0 opacity-40 dark:opacity-60">
-        <span className="absolute top-[18%] left-[10%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
-        <span className="absolute top-[8%] left-[35%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
-        <span className="absolute top-[16%] left-[70%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
-        <span className="absolute top-[40%] left-[80%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
-        <span className="absolute top-[60%] left-[18%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
+        <span className="absolute top-[18%] left-[10%] h-1 w-1 rounded-full bg-(--accent-primary)" />
+        <span className="absolute top-[8%] left-[35%] h-1 w-1 rounded-full bg-(--accent-hover)" />
+        <span className="absolute top-[16%] left-[70%] h-1 w-1 rounded-full bg-(--accent-primary)" />
+        <span className="absolute top-[40%] left-[80%] h-1 w-1 rounded-full bg-(--accent-hover)" />
+        <span className="absolute top-[60%] left-[18%] h-1 w-1 rounded-full bg-(--accent-primary)" />
       </div>
 
       <div className="relative z-10 px-6 py-12 text-center">
         <div className="relative mt-4 inline-block">
           <h1 className="text-4xl font-black tracking-tight sm:text-5xl md:text-6xl lg:text-7xl xl:text-8xl">
-            <span className="relative inline-block bg-gradient-to-r from-[var(--accent-primary)]/70 via-[color-mix(in_srgb,var(--accent-primary)_70%,white)]/70 to-[var(--accent-hover)]/70 bg-clip-text text-transparent">
+            <span className="relative inline-block bg-linear-to-r from-(--accent-primary)/70 via-[color-mix(in_srgb,var(--accent-primary)_70%,white)]/70 to-(--accent-hover)/70 bg-clip-text text-transparent">
               DevL
             </span>
             <span
@@ -51,7 +51,7 @@ export default async function NotFound() {
             >
               Ø
             </span>
-            <span className="relative inline-block bg-gradient-to-r from-[var(--accent-primary)]/70 via-[color-mix(in_srgb,var(--accent-primary)_70%,white)]/70 to-[var(--accent-hover)]/70 bg-clip-text text-transparent">
+            <span className="relative inline-block bg-linear-to-r from-(--accent-primary)/70 via-[color-mix(in_srgb,var(--accent-primary)_70%,white)]/70 to-(--accent-hover)/70 bg-clip-text text-transparent">
               vers
             </span>
           </h1>
@@ -67,7 +67,7 @@ export default async function NotFound() {
 
         <a
           href={`/${locale}`}
-          className="mt-8 inline-flex items-center justify-center rounded-full bg-[var(--accent-primary)] px-6 py-3 text-sm font-medium text-white transition-colors hover:bg-[var(--accent-hover)]"
+          className="mt-8 inline-flex items-center justify-center rounded-full bg-(--accent-primary) px-6 py-3 text-sm font-medium text-white transition-colors hover:bg-(--accent-hover)"
         >
           {t.backHome}
         </a>
diff --git a/frontend/components/blog/BlogFilters.tsx b/frontend/components/blog/BlogFilters.tsx
index ed127b2f..7daa3399 100644
--- a/frontend/components/blog/BlogFilters.tsx
+++ b/frontend/components/blog/BlogFilters.tsx
@@ -192,7 +192,6 @@ export default function BlogFilters({
     name: string;
     norm: string;
   } | null>(null);
-  const [currentPage, setCurrentPage] = useState(1);
   const lastFiltersRef = useRef<{
     author: string;
     category: string;
@@ -327,11 +326,6 @@ export default function BlogFilters({
     didClearSearchRef.current = true;
   }, [pathname, router, searchParams, searchQuery]);
 
-  useEffect(() => {
-    if (currentPage === parsedPage) return;
-    setCurrentPage(parsedPage);
-  }, [currentPage, parsedPage]);
-
   const resolvedAuthor = useMemo(() => {
     const normParam = normalizeAuthor(authorParam);
     if (!normParam) return selectedAuthor;
@@ -363,12 +357,11 @@ export default function BlogFilters({
       prevFilters.query !== nextFilters.query;
     if (!hasChanged) return;
     lastFiltersRef.current = nextFilters;
-    if (currentPage !== 1) {
-      setCurrentPage(1);
+    if (parsedPage !== 1) {
       updatePageParam(1);
     }
   }, [
-    currentPage,
+    parsedPage,
     resolvedAuthor?.norm,
     resolvedCategory?.norm,
     searchQueryNormalized,
@@ -402,7 +395,7 @@ export default function BlogFilters({
   }, [locale, resolvedAuthor?.name]);
 
   useEffect(() => {
-    if (!resolvedAuthor) return;
+    if (!resolvedAuthor?.norm) return;
     const frame = window.requestAnimationFrame(() => {
       authorHeadingRef.current?.scrollIntoView({
         behavior: 'smooth',
@@ -446,6 +439,7 @@ export default function BlogFilters({
     1,
     Math.ceil(filteredPosts.length / POSTS_PER_PAGE)
   );
+  const currentPage = Math.min(parsedPage, totalPages);
   const paginatedPosts = useMemo(() => {
     const start = (currentPage - 1) * POSTS_PER_PAGE;
     return filteredPosts.slice(start, start + POSTS_PER_PAGE);
@@ -462,10 +456,9 @@ export default function BlogFilters({
   }, [selectedAuthorData]);
 
   useEffect(() => {
-    if (currentPage <= totalPages) return;
-    setCurrentPage(totalPages);
+    if (parsedPage <= totalPages) return;
     updatePageParam(totalPages);
-  }, [currentPage, totalPages, updatePageParam]);
+  }, [parsedPage, totalPages, updatePageParam]);
 
   const scrollToCategoryFilters = useCallback(() => {
     const target = categoryFiltersRef.current || postsGridRef.current;
@@ -494,11 +487,14 @@ export default function BlogFilters({
                 href={`/blog/${featuredPost.slug.current}`}
                 className="group block"
               >
-                <div className="h-[300px] overflow-hidden rounded-3xl border-0 shadow-[0_12px_30px_rgba(0,0,0,0.12)] sm:h-[340px] md:h-full md:min-h-[400px] lg:min-h-[440px]">
-                  <img
+                <div className="relative h-[300px] overflow-hidden rounded-3xl border-0 shadow-[0_12px_30px_rgba(0,0,0,0.12)] sm:h-[340px] md:h-full md:min-h-[400px] lg:min-h-[440px]">
+                  <Image
                     src={featuredPost.mainImage}
                     alt={featuredPost.title}
-                    className="block h-full w-full scale-[1.02] border-0 object-cover transition-transform duration-300 group-hover:scale-[1.05]"
+                    fill
+                    sizes="(max-width: 640px) 100vw, (max-width: 1024px) 60vw, 720px"
+                    className="scale-[1.02] object-cover transition-transform duration-300 group-hover:scale-[1.05]"
+                    priority
                   />
                 </div>
               </Link>
@@ -689,7 +685,6 @@ export default function BlogFilters({
           totalPages={totalPages}
           onPageChange={page => {
             pendingScrollRef.current = true;
-            setCurrentPage(page);
             updatePageParam(page);
           }}
           accentColor="var(--accent-primary)"
diff --git a/frontend/components/blog/BlogHeaderSearch.tsx b/frontend/components/blog/BlogHeaderSearch.tsx
index c73d34f7..f21f635d 100644
--- a/frontend/components/blog/BlogHeaderSearch.tsx
+++ b/frontend/components/blog/BlogHeaderSearch.tsx
@@ -95,7 +95,7 @@ export function BlogHeaderSearch() {
     return () => {
       active = false;
     };
-  }, [open, items.length, isLoading]);
+  }, [open, items.length, isLoading, locale]);
 
   useEffect(() => {
     if (!open) return;
diff --git a/frontend/components/dashboard/ProfileCard.tsx b/frontend/components/dashboard/ProfileCard.tsx
index c5c276d0..d171f01e 100644
--- a/frontend/components/dashboard/ProfileCard.tsx
+++ b/frontend/components/dashboard/ProfileCard.tsx
@@ -17,22 +17,20 @@ export function ProfileCard({ user, locale }: ProfileCardProps) {
   const t = useTranslations('dashboard.profile');
 
   const cardStyles = `
-    relative overflow-hidden rounded-[2rem]
-    border border-slate-200/70 dark:border-slate-700/80
-    bg-white/60 dark:bg-slate-900/60 backdrop-blur-md
-    shadow-[0_18px_45px_rgba(15,23,42,0.05)]
-    dark:shadow-[0_22px_60px_rgba(0,0,0,0.2)]
-    p-8 transition-all hover:border-sky-200 dark:hover:border-sky-800
+    relative overflow-hidden rounded-2xl
+    border border-gray-100 dark:border-white/5
+    bg-white/60 dark:bg-neutral-900/60 backdrop-blur-xl
+    p-8 transition-all hover:border-(--accent-primary)/30 dark:hover:border-(--accent-primary)/30
   `;
 
   return (
     <section className={cardStyles} aria-labelledby="profile-heading">
       <div className="flex items-start gap-6">
         <div
-          className="relative rounded-full bg-gradient-to-br from-sky-400 to-pink-400 p-[3px]"
+          className="relative rounded-full bg-linear-to-br from-(--accent-primary) to-(--accent-hover) p-0.75"
           aria-hidden="true"
         >
-          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-white text-3xl font-bold text-slate-700 dark:bg-slate-900 dark:text-slate-200">
+          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-white text-3xl font-bold text-gray-700 dark:bg-neutral-900 dark:text-gray-200">
             {user.name?.[0]?.toUpperCase() || user.email[0].toUpperCase()}
           </div>
         </div>
@@ -40,35 +38,35 @@ export function ProfileCard({ user, locale }: ProfileCardProps) {
         <div className="flex-1">
           <h2
             id="profile-heading"
-            className="text-2xl font-bold text-slate-800 dark:text-slate-100"
+            className="text-2xl font-bold text-gray-900 dark:text-white"
           >
             {user.name || t('defaultName')}
           </h2>
-          <p className="font-mono text-sm text-slate-500 dark:text-slate-400">
+          <p className="font-mono text-sm text-gray-500 dark:text-gray-400">
             {user.email}
           </p>
 
-          <div className="mt-3 inline-flex items-center rounded-full bg-sky-100 px-3 py-1 text-xs font-bold tracking-wider text-sky-700 uppercase dark:bg-sky-900/30 dark:text-sky-300">
+          <div className="mt-3 inline-flex items-center rounded-full bg-(--accent-primary)/10 px-3 py-1 text-xs font-bold tracking-wider text-(--accent-primary) uppercase">
             {user.role || t('defaultRole')}
           </div>
         </div>
       </div>
 
-      <dl className="mt-8 grid grid-cols-2 gap-6 border-t border-slate-100 pt-6 dark:border-slate-800/50">
+      <dl className="mt-8 grid grid-cols-2 gap-6 border-t border-gray-100 pt-6 dark:border-white/5">
         <div>
-          <dt className="text-xs font-semibold tracking-wider text-slate-400 uppercase">
+          <dt className="text-xs font-semibold tracking-wider text-gray-400 uppercase">
             {t('totalPoints')}
           </dt>
 
-          <dd className="mt-1 text-3xl font-black text-slate-800 dark:text-white">
+          <dd className="mt-1 text-3xl font-black text-gray-900 dark:text-white">
             {user.points}
           </dd>
         </div>
         <div>
-          <dt className="text-xs font-semibold tracking-wider text-slate-400 uppercase">
+          <dt className="text-xs font-semibold tracking-wider text-gray-400 uppercase">
             {t('joined')}
           </dt>
-          <dd className="mt-2 text-lg font-medium text-slate-700 dark:text-slate-300">
+          <dd className="mt-2 text-lg font-medium text-gray-700 dark:text-gray-300">
             {user.createdAt
               ? new Date(user.createdAt).toLocaleDateString(locale)
               : '-'}
diff --git a/frontend/components/dashboard/QuizSavedBanner.tsx b/frontend/components/dashboard/QuizSavedBanner.tsx
index 4bae4a13..59597350 100644
--- a/frontend/components/dashboard/QuizSavedBanner.tsx
+++ b/frontend/components/dashboard/QuizSavedBanner.tsx
@@ -37,12 +37,12 @@ export function QuizSavedBanner() {
   if (!info) return null;
 
   return (
-    <div className="mb-6 rounded-xl border border-green-200 bg-green-50 p-4 dark:border-green-800 dark:bg-green-900/20">
+    <div className="mb-6 rounded-xl border border-green-500/20 bg-green-500/10 p-4 backdrop-blur-sm">
       <div className="space-y-2 text-center">
-        <p className="text-lg font-medium text-green-800 dark:text-green-200">
+        <p className="text-lg font-medium text-green-700 dark:text-green-300">
           🎉 {t('title')}
         </p>
-        <p className="text-green-700 dark:text-green-300">
+        <p className="text-green-600 dark:text-green-400">
           {t('scored')}{' '}
           <strong>
             {info.score}/{info.total}
@@ -62,13 +62,13 @@ export function QuizSavedBanner() {
         <div className="flex justify-center gap-3 pt-2">
           <Link
             href="/leaderboard"
-            className="text-green-600 underline hover:no-underline dark:text-green-400"
+            className="font-medium text-green-600 underline hover:no-underline dark:text-green-400"
           >
             {t('viewLeaderboard')}
           </Link>
           <Link
             href={`/quiz/${info.quizSlug}`}
-            className="text-green-600 underline hover:no-underline dark:text-green-400"
+            className="font-medium text-green-600 underline hover:no-underline dark:text-green-400"
           >
             {t('tryAgain')}
           </Link>
diff --git a/frontend/components/dashboard/StatsCard.tsx b/frontend/components/dashboard/StatsCard.tsx
index 2679c3f1..f989d1cd 100644
--- a/frontend/components/dashboard/StatsCard.tsx
+++ b/frontend/components/dashboard/StatsCard.tsx
@@ -18,28 +18,24 @@ export function StatsCard({ stats }: StatsCardProps) {
   const hasActivity = stats && stats.totalAttempts > 0;
 
   const cardStyles = `
-    relative overflow-hidden rounded-[2rem]
-    border border-slate-200/70 dark:border-slate-700/80
-    bg-white/60 dark:bg-slate-900/60 backdrop-blur-md
-    shadow-[0_18px_45px_rgba(15,23,42,0.05)]
-    dark:shadow-[0_22px_60px_rgba(0,0,0,0.2)]
-    p-8 transition-all hover:border-sky-200 dark:hover:border-sky-800
+    relative overflow-hidden rounded-2xl
+    border border-gray-100 dark:border-white/5
+    bg-white/60 dark:bg-neutral-900/60 backdrop-blur-xl
+    p-8 transition-all hover:border-[var(--accent-primary)]/30 dark:hover:border-[var(--accent-primary)]/30
     flex flex-col items-center justify-center text-center
   `;
 
   const primaryBtnStyles = `
     group relative inline-flex items-center justify-center rounded-full
     px-8 py-3 text-sm font-semibold tracking-widest uppercase text-white
-    bg-gradient-to-r from-sky-500 via-indigo-500 to-pink-500
-    shadow-[0_4px_14px_rgba(56,189,248,0.4)]
-    dark:shadow-[0_4px_20px_rgba(129,140,248,0.4)]
-    transition-all hover:scale-105 hover:shadow-lg
+    bg-[var(--accent-primary)] hover:bg-[var(--accent-hover)]
+    transition-all hover:scale-105
   `;
 
   return (
     <section className={cardStyles} aria-labelledby="stats-heading">
       <div
-        className="mb-6 rounded-full bg-slate-50 p-4 shadow-inner dark:bg-slate-800/50"
+        className="mb-6 rounded-full bg-gray-100 p-4 dark:bg-neutral-800/50"
         aria-hidden="true"
       >
         <span className="text-4xl">📊</span>
@@ -47,40 +43,36 @@ export function StatsCard({ stats }: StatsCardProps) {
 
       <h3
         id="stats-heading"
-        className="mb-2 text-xl font-bold text-slate-800 dark:text-slate-100"
+        className="mb-2 text-xl font-bold text-gray-900 dark:text-white"
       >
         {t('title')}
       </h3>
 
       {!hasActivity ? (
         <>
-          <p className="mx-auto mb-8 max-w-xs text-slate-500 dark:text-slate-400">
+          <p className="mx-auto mb-8 max-w-xs text-gray-500 dark:text-gray-400">
             {t('noActivity')}
           </p>
           <Link href="/quizzes" className={primaryBtnStyles}>
             <span className="relative z-10">{t('startQuiz')}</span>
-            <span
-              className="absolute inset-0 rounded-full bg-gradient-to-r from-white/20 to-transparent opacity-0 transition-opacity group-hover:opacity-100"
-              aria-hidden="true"
-            />
           </Link>
         </>
       ) : (
         <dl className="mt-2 grid w-full grid-cols-2 gap-4">
-          <div className="rounded-2xl border border-slate-100 bg-slate-50/50 p-4 dark:border-slate-700 dark:bg-slate-800/50">
-            <dt className="mb-1 flex items-center justify-center gap-2 text-xs font-semibold tracking-wider text-slate-400 uppercase">
+          <div className="rounded-xl border border-gray-100 bg-gray-50/50 p-4 dark:border-white/5 dark:bg-neutral-800/50">
+            <dt className="mb-1 flex items-center justify-center gap-2 text-xs font-semibold tracking-wider text-gray-400 uppercase">
               <History className="h-3 w-3" /> {t('attempts')}
             </dt>
-            <dd className="text-2xl font-black text-slate-800 dark:text-white">
+            <dd className="text-2xl font-black text-gray-900 dark:text-white">
               {stats?.totalAttempts}
             </dd>
           </div>
 
-          <div className="rounded-2xl border border-slate-100 bg-slate-50/50 p-4 dark:border-slate-700 dark:bg-slate-800/50">
-            <dt className="mb-1 flex items-center justify-center gap-2 text-xs font-semibold tracking-wider text-slate-400 uppercase">
+          <div className="rounded-xl border border-gray-100 bg-gray-50/50 p-4 dark:border-white/5 dark:bg-neutral-800/50">
+            <dt className="mb-1 flex items-center justify-center gap-2 text-xs font-semibold tracking-wider text-gray-400 uppercase">
               <TrendingUp className="h-3 w-3" /> {t('avgScore')}
             </dt>
-            <dd className="text-2xl font-black text-slate-800 dark:text-white">
+            <dd className="text-2xl font-black text-gray-900 dark:text-white">
               {stats?.averageScore}%
             </dd>
           </div>
diff --git a/frontend/components/home/CodeCard.tsx b/frontend/components/home/CodeCard.tsx
index 1e60b02f..0f658566 100644
--- a/frontend/components/home/CodeCard.tsx
+++ b/frontend/components/home/CodeCard.tsx
@@ -18,17 +18,19 @@ export function CodeCard({ fileName, snippet, className }: CodeCardProps) {
 
       <div className="absolute top-2/3 -right-1 -bottom-2 -left-1 rounded-2xl bg-[var(--accent-primary)]/15 blur-md" />
 
-      <div className="bg-card/90 relative max-w-[200px] min-w-[180px] overflow-hidden rounded-2xl border border-[var(--accent-primary)]/20 px-3.5 py-3 shadow-2xl backdrop-blur-xl dark:shadow-[var(--accent-primary)]/10">
-        <div className="text-muted-foreground/80 mb-2 flex items-center justify-between text-[9px]">
+      <div className="bg-card/90 relative max-w-[200px] min-w-[180px] overflow-hidden rounded-2xl border border-[var(--accent-primary)]/20 px-3.5 py-3 shadow-2xl backdrop-blur-xl lg:max-w-[220px] lg:min-w-[200px] lg:px-4 lg:py-3.5 xl:max-w-[240px] xl:min-w-[220px] xl:px-4 xl:py-3.5 dark:shadow-[var(--accent-primary)]/10">
+        <div className="text-muted-foreground/80 mb-2 flex items-center justify-between text-[9px] lg:text-[10px] xl:text-xs">
           <div className="flex items-center gap-1">
-            <span className="h-1.5 w-1.5 rounded-full bg-red-400/80 shadow-sm" />
-            <span className="h-1.5 w-1.5 rounded-full bg-yellow-400/80 shadow-sm" />
-            <span className="h-1.5 w-1.5 rounded-full bg-green-400/80 shadow-sm" />
+            <span className="h-1.5 w-1.5 rounded-full bg-red-400/80 shadow-sm lg:h-2 lg:w-2" />
+            <span className="h-1.5 w-1.5 rounded-full bg-yellow-400/80 shadow-sm lg:h-2 lg:w-2" />
+            <span className="h-1.5 w-1.5 rounded-full bg-green-400/80 shadow-sm lg:h-2 lg:w-2" />
           </div>
-          <span className="text-[8.5px] font-medium">{fileName}</span>
+          <span className="text-[8.5px] font-medium lg:text-[9.5px] xl:text-[10.5px]">
+            {fileName}
+          </span>
         </div>
 
-        <code className="text-foreground/85 relative z-10 block font-mono text-[10px] leading-relaxed whitespace-pre">
+        <code className="text-foreground/85 relative z-10 block font-mono text-[10px] leading-relaxed whitespace-pre lg:text-[11px] xl:text-xs">
           {snippet}
         </code>
       </div>
diff --git a/frontend/components/home/HeroCodeCards.tsx b/frontend/components/home/HeroCodeCards.tsx
index 106a2e95..e8e21244 100644
--- a/frontend/components/home/HeroCodeCards.tsx
+++ b/frontend/components/home/HeroCodeCards.tsx
@@ -5,7 +5,7 @@ export function HeroCodeCards() {
     <>
       <CodeCard
         fileName="arrays.ts"
-        className="lg:top-0 lg:left-16"
+        className="lg:top-0 lg:left-16 xl:-top-2 xl:left-8"
         snippet={
           <>
             <span className="text-[var(--accent-primary)]">type</span> Arr1 = [
@@ -31,7 +31,7 @@ export function HeroCodeCards() {
 
       <CodeCard
         fileName="utils.js"
-        className="lg:right-20 lg:bottom-16"
+        className="lg:right-20 lg:bottom-14 xl:right-8 xl:bottom-4"
         snippet={
           <>
             <span className="text-[var(--accent-primary)]">function</span> sum(
diff --git a/frontend/components/home/HeroSection.tsx b/frontend/components/home/HeroSection.tsx
index 90998053..eba79791 100644
--- a/frontend/components/home/HeroSection.tsx
+++ b/frontend/components/home/HeroSection.tsx
@@ -1,16 +1,20 @@
 'use client';
 
 import { useTranslations } from 'next-intl';
+import * as React from 'react';
+
+import { OnlineCounterPopup } from '@/components/shared/OnlineCounterPopup';
 
 import { HeroBackground } from './HeroBackground';
 import { HeroCodeCards } from './HeroCodeCards';
 import { InteractiveCTAButton } from './InteractiveCTAButton';
 
 export default function HeroSection() {
+  const ctaRef = React.useRef<HTMLAnchorElement>(null);
   const t = useTranslations('homepage');
 
   return (
-    <section className="relative flex min-h-[calc(100vh-260px)] items-center overflow-hidden bg-gray-50 transition-colors duration-300 sm:min-h-[calc(100vh-280px)] md:min-h-[85vh] lg:min-h-[100vh] dark:bg-black">
+    <section className="relative flex min-h-[calc(100vh-200px)] items-center overflow-hidden bg-gray-50 transition-colors duration-300 sm:min-h-[calc(100vh-280px)] md:min-h-[85vh] lg:min-h-screen dark:bg-black">
       <HeroBackground />
 
       <div className="relative mx-auto flex w-full max-w-5xl flex-col items-center px-6 py-8 text-center sm:py-12 md:py-28 lg:py-[7.5rem] xl:py-32">
@@ -40,7 +44,8 @@ export default function HeroSection() {
         </p>
 
         <div className="mt-6 sm:mt-8 md:mt-14 lg:mt-16">
-          <InteractiveCTAButton />
+          <InteractiveCTAButton ref={ctaRef} />
+          <OnlineCounterPopup ctaRef={ctaRef} />
         </div>
       </div>
     </section>
diff --git a/frontend/components/home/InteractiveCTAButton.tsx b/frontend/components/home/InteractiveCTAButton.tsx
index 80d3dc2d..381ddb74 100644
--- a/frontend/components/home/InteractiveCTAButton.tsx
+++ b/frontend/components/home/InteractiveCTAButton.tsx
@@ -3,171 +3,163 @@
 import { AnimatePresence, motion } from 'framer-motion';
 import { Heart } from 'lucide-react';
 import { useTranslations } from 'next-intl';
-import React from 'react';
+import * as React from 'react';
 
 import { Link } from '@/i18n/routing';
 
-export function InteractiveCTAButton() {
-  const t = useTranslations('homepage');
+export const InteractiveCTAButton = React.forwardRef<HTMLAnchorElement>(
+  function InteractiveCTAButton(_, ref) {
+    const t = useTranslations('homepage');
 
-  const [variantIndex, setVariantIndex] = React.useState(1);
-  const [isHovered, setIsHovered] = React.useState(false);
+    const [variantIndex, setVariantIndex] = React.useState(1);
+    const [isHovered, setIsHovered] = React.useState(false);
+    const [currentText, setCurrentText] = React.useState(t('cta'));
+    const [isFirstRender, setIsFirstRender] = React.useState(true);
 
-  const textVariants = [
-    t('ctaVariants.1'),
-    t('ctaVariants.2'),
-    t('ctaVariants.3'),
-    t('ctaVariants.4'),
-    t('ctaVariants.5'),
-    t('ctaVariants.6'),
-    t('ctaVariants.7'),
-    t('ctaVariants.8'),
-  ];
+    const textVariants = [
+      t('ctaVariants.1'),
+      t('ctaVariants.2'),
+      t('ctaVariants.3'),
+      t('ctaVariants.4'),
+      t('ctaVariants.5'),
+      t('ctaVariants.6'),
+      t('ctaVariants.7'),
+      t('ctaVariants.8'),
+    ];
 
-  const defaultVariant = t('cta');
-  const hoverVariant = textVariants[variantIndex];
+    React.useEffect(() => {
+      setIsFirstRender(false);
+    }, []);
 
-  const handleEnter = () => {
-    if (!window.matchMedia('(hover: hover)').matches) return;
-    setIsHovered(true);
-  };
+    const handleEnter = () => {
+      if (!window.matchMedia('(hover: hover)').matches) return;
+      setIsHovered(true);
+      setCurrentText(textVariants[variantIndex]);
+    };
 
-  const handleLeave = () => {
-    if (!window.matchMedia('(hover: hover)').matches) return;
-    setIsHovered(false);
-    setVariantIndex(prev => (prev + 1) % textVariants.length);
-  };
+    const handleLeave = () => {
+      if (!window.matchMedia('(hover: hover)').matches) return;
+      setIsHovered(false);
+      setVariantIndex(prev => (prev + 1) % textVariants.length);
+    };
 
-  const particles = Array.from({ length: 12 }, (_, i) => ({
-    id: i,
-    angle: (i * 360) / 8,
-  }));
+    const particles = Array.from({ length: 12 }, (_, i) => ({
+      id: i,
+      angle: (i * 360) / 12,
+    }));
 
-  return (
-    <Link
-      href="/q&a"
-      onMouseEnter={handleEnter}
-      onMouseLeave={handleLeave}
-      className="group relative inline-flex items-center justify-center overflow-visible rounded-2xl px-8 py-3 text-xs font-semibold tracking-[0.25em] text-white uppercase shadow-[0_18px_45px_rgba(30,94,255,0.35)] transition-shadow duration-500 ease-out hover:shadow-[0_22px_55px_rgba(30,94,255,0.45)] focus-visible:ring-2 focus-visible:ring-[var(--accent-primary)] focus-visible:ring-offset-2 focus-visible:outline-none active:scale-95 active:shadow-xl active:brightness-110 sm:px-10 md:px-12 md:py-3.5 md:text-sm lg:py-4 dark:shadow-[0_22px_60px_rgba(255,45,85,0.5)] dark:hover:shadow-[0_28px_70px_rgba(255,45,85,0.6)]"
-    >
-      {/* Базовий градієнт з анімацією */}
-      <motion.span
-        className="absolute inset-0 rounded-2xl"
-        style={{
-          background:
-            'linear-gradient(135deg, var(--accent-primary) 0%, var(--accent-hover) 100%)',
-        }}
-        animate={{
-          background: isHovered
-            ? [
-                'linear-gradient(135deg, var(--accent-primary) 0%, var(--accent-hover) 100%)',
-                'linear-gradient(225deg, var(--accent-hover) 0%, var(--accent-primary) 100%)',
-                'linear-gradient(315deg, var(--accent-primary) 0%, var(--accent-hover) 100%)',
-                'linear-gradient(45deg, var(--accent-hover) 0%, var(--accent-primary) 100%)',
-              ]
-            : 'linear-gradient(135deg, var(--accent-primary) 0%, var(--accent-hover) 100%)',
-        }}
-        transition={{
-          duration: 2,
-          repeat: isHovered ? Infinity : 0,
-          ease: 'linear',
-        }}
-      />
+    return (
+      <Link
+        ref={ref}
+        href="/q&a"
+        onMouseEnter={handleEnter}
+        onMouseLeave={handleLeave}
+        className="group relative inline-flex items-center justify-center overflow-visible rounded-2xl px-8 py-3 text-xs font-semibold tracking-[0.25em] text-white uppercase shadow-[0_18px_45px_rgba(30,94,255,0.35)] transition-shadow duration-500 ease-out hover:shadow-[0_22px_55px_rgba(30,94,255,0.45)] focus-visible:ring-2 focus-visible:ring-[var(--accent-primary)] focus-visible:ring-offset-2 focus-visible:outline-none active:scale-95 active:shadow-xl active:brightness-110 sm:px-10 md:px-12 md:py-3.5 md:text-sm lg:py-4 dark:shadow-[0_22px_60px_rgba(255,45,85,0.5)] dark:hover:shadow-[0_28px_70px_rgba(255,45,85,0.6)]"
+      >
+        <motion.span
+          className="absolute inset-0 rounded-2xl"
+          style={{
+            background:
+              'linear-gradient(135deg, var(--accent-primary) 0%, var(--accent-hover) 100%)',
+          }}
+          animate={{
+            background: isHovered
+              ? [
+                  'linear-gradient(135deg, var(--accent-primary) 0%, var(--accent-hover) 100%)',
+                  'linear-gradient(225deg, var(--accent-hover) 0%, var(--accent-primary) 100%)',
+                  'linear-gradient(315deg, var(--accent-primary) 0%, var(--accent-hover) 100%)',
+                  'linear-gradient(45deg, var(--accent-hover) 0%, var(--accent-primary) 100%)',
+                ]
+              : 'linear-gradient(135deg, var(--accent-primary) 0%, var(--accent-hover) 100%)',
+          }}
+          transition={{
+            duration: 2,
+            repeat: isHovered ? Infinity : 0,
+            ease: 'linear',
+          }}
+        />
 
-      {/* М'яка неонова підсвітка */}
-      <motion.span
-        className="pointer-events-none absolute inset-0 rounded-2xl"
-        initial={{ opacity: 0 }}
-        animate={{
-          opacity: isHovered ? [0.15, 0.25, 0.15] : 0,
-        }}
-        transition={{
-          duration: 2.5,
-          repeat: isHovered ? Infinity : 0,
-          ease: 'easeInOut',
-        }}
-        style={{
-          boxShadow: `
+        <motion.span
+          className="pointer-events-none absolute inset-0 rounded-2xl"
+          initial={{ opacity: 0 }}
+          animate={{
+            opacity: isHovered ? [0.15, 0.25, 0.15] : 0,
+          }}
+          transition={{
+            duration: 2.5,
+            repeat: isHovered ? Infinity : 0,
+            ease: 'easeInOut',
+          }}
+          style={{
+            boxShadow: `
             0 0 30px 3px var(--accent-primary),
             0 0 50px 5px var(--accent-hover)
           `,
-        }}
-      />
+          }}
+        />
 
-      {/* Орбітальні частинки - БЛИЗЬКО навколо кнопки */}
-      <AnimatePresence>
-        {isHovered &&
-          particles.map(particle => (
-            <motion.span
-              key={particle.id}
-              className="pointer-events-none absolute h-3 w-3"
-              style={{
-                left: '50%',
-                top: '50%',
-                marginLeft: '-6px',
-                marginTop: '-6px',
-              }}
-              initial={{ x: 0, y: 0, scale: 0, opacity: 0 }}
-              animate={{
-                x: [0, Math.cos((particle.angle * Math.PI) / 180) * 160, 0],
-                y: [0, Math.sin((particle.angle * Math.PI) / 180) * 60, 0],
-                scale: [0.7, 1, 0.7],
-                opacity: [0, 0.9, 0],
-              }}
-              transition={{
-                duration: 2,
-                repeat: Infinity,
-                ease: 'easeInOut',
-                delay: particle.id * 0.1,
-              }}
-            >
-              <Heart
-                size={14}
-                fill="var(--accent-primary)"
-                color="var(--accent-primary)"
+        <AnimatePresence>
+          {isHovered &&
+            particles.map(particle => (
+              <motion.span
+                key={particle.id}
+                className="pointer-events-none absolute h-3 w-3"
                 style={{
-                  filter: 'drop-shadow(0 0 6px var(--accent-primary))',
+                  left: '50%',
+                  top: '50%',
+                  marginLeft: '-6px',
+                  marginTop: '-6px',
                 }}
-              />
-            </motion.span>
-          ))}
-      </AnimatePresence>
+                initial={{ x: 0, y: 0, scale: 0, opacity: 0 }}
+                animate={{
+                  x: [0, Math.cos((particle.angle * Math.PI) / 180) * 230, 0],
+                  y: [0, Math.sin((particle.angle * Math.PI) / 180) * 60, 0],
+                  scale: [0.7, 1, 0.7],
+                  opacity: [0, 0.9, 0],
+                }}
+                transition={{
+                  duration: 2,
+                  repeat: Infinity,
+                  ease: 'easeInOut',
+                  delay: particle.id * 0.1,
+                }}
+              >
+                <Heart
+                  size={14}
+                  fill="var(--accent-primary)"
+                  color="var(--accent-primary)"
+                  style={{
+                    filter: 'drop-shadow(0 0 6px var(--accent-primary))',
+                  }}
+                />
+              </motion.span>
+            ))}
+        </AnimatePresence>
 
-      {/* Внутрішній shine overlay */}
-      <span
-        className="pointer-events-none absolute inset-[1px] rounded-2xl"
-        style={{
-          background:
-            'linear-gradient(180deg, rgba(255,255,255,0.25) 0%, transparent 50%, rgba(0,0,0,0.1) 100%)',
-        }}
-      />
+        <span
+          className="pointer-events-none absolute inset-[1px] rounded-2xl"
+          style={{
+            background:
+              'linear-gradient(180deg, rgba(255,255,255,0.25) 0%, transparent 50%, rgba(0,0,0,0.1) 100%)',
+          }}
+        />
 
-      {/* Текст з анімацією */}
-      <span className="relative z-10 flex items-center justify-center">
-        <AnimatePresence mode="wait">
-          {!isHovered ? (
+        <span className="relative z-10 flex items-center justify-center">
+          <AnimatePresence mode="wait">
             <motion.span
-              key="default"
-              initial={{ opacity: 0, y: 10 }}
+              key={currentText}
+              initial={
+                isFirstRender ? { opacity: 1, y: 0 } : { opacity: 0, y: 10 }
+              }
               animate={{ opacity: 1, y: 0 }}
               exit={{ opacity: 0, y: -10 }}
               transition={{ duration: 0.3, ease: 'easeOut' }}
             >
-              {defaultVariant}
+              {currentText}
             </motion.span>
-          ) : (
-            <motion.span
-              key={`hover-${variantIndex}`}
-              initial={{ opacity: 0, y: 10 }}
-              animate={{ opacity: 1, y: 0 }}
-              exit={{ opacity: 0, y: -10 }}
-              transition={{ duration: 0.3, ease: 'easeOut' }}
-            >
-              {hoverVariant}
-            </motion.span>
-          )}
-        </AnimatePresence>
-      </span>
-    </Link>
-  );
-}
+          </AnimatePresence>
+        </span>
+      </Link>
+    );
+  }
+);
diff --git a/frontend/components/q&a/AIWordHelper.tsx b/frontend/components/q&a/AIWordHelper.tsx
index 9a31059a..2f2e35b0 100644
--- a/frontend/components/q&a/AIWordHelper.tsx
+++ b/frontend/components/q&a/AIWordHelper.tsx
@@ -373,7 +373,7 @@ export default function AIWordHelper({
 
   const renderGuestCTA = () => (
     <div className="flex flex-col items-center justify-center gap-4 px-4 py-8 text-center">
-      <div className="flex h-16 w-16 items-center justify-center rounded-full bg-gradient-to-br from-blue-500 to-purple-600">
+      <div className="flex h-16 w-16 items-center justify-center rounded-full bg-linear-to-br from-blue-500 to-purple-600">
         <Sparkles className="h-8 w-8 text-white" />
       </div>
       <h3 className="text-lg font-semibold text-gray-900 dark:text-gray-100">
@@ -387,8 +387,8 @@ export default function AIWordHelper({
           href="/login"
           className={cn(
             'rounded-lg px-4 py-2 text-sm font-medium',
-            'bg-[var(--accent-primary)] text-white',
-            'hover:bg-[var(--accent-hover)]',
+            'bg-(--accent-primary) text-white',
+            'hover:bg-(--accent-hover)',
             'transition-colors'
           )}
         >
@@ -468,7 +468,7 @@ export default function AIWordHelper({
               'text-gray-500 dark:text-gray-400',
               'hover:bg-gray-100 dark:hover:bg-neutral-800',
               'transition-colors',
-              'focus:ring-2 focus:ring-[var(--accent-primary)] focus:outline-none'
+              'focus:ring-2 focus:ring-(--accent-primary) focus:outline-none'
             )}
             aria-label={t('close')}
           >
@@ -494,7 +494,7 @@ export default function AIWordHelper({
                   className={cn(
                     'rounded-lg px-4 py-2 text-sm font-medium transition-colors',
                     activeLocale === loc
-                      ? 'bg-[var(--accent-primary)] text-white'
+                      ? 'bg-(--accent-primary) text-white'
                       : 'bg-gray-100 text-gray-700 hover:bg-gray-200 dark:bg-neutral-800 dark:text-gray-300 dark:hover:bg-neutral-700'
                   )}
                 >
@@ -506,7 +506,7 @@ export default function AIWordHelper({
             <div className="flex-1 overflow-y-auto p-4">
               {isLoading && (
                 <div className="flex flex-col items-center justify-center gap-3 py-8">
-                  <Loader2 className="h-8 w-8 animate-spin text-[var(--accent-primary)]" />
+                  <Loader2 className="h-8 w-8 animate-spin text-(--accent-primary)" />
                   <p className="text-sm text-gray-600 dark:text-gray-400">
                     {t('loading')}
                   </p>
@@ -560,7 +560,7 @@ export default function AIWordHelper({
                                 ? 'cursor-not-allowed bg-gray-200 text-gray-500 dark:bg-gray-700 dark:text-gray-400'
                                 : rateLimitState.retryAttempts >= 3
                                   ? 'bg-amber-500 text-white hover:bg-amber-600'
-                                  : 'bg-[var(--accent-primary)] text-white hover:bg-[var(--accent-hover)]'
+                                  : 'bg-(--accent-primary) text-white hover:bg-(--accent-hover)'
                             )}
                           >
                             {rateLimitState.retryAttempts >= 5 ? (
@@ -644,7 +644,7 @@ export default function AIWordHelper({
                                   rel="noopener noreferrer"
                                   className={cn(
                                     'flex items-center gap-3 rounded-lg px-4 py-3',
-                                    'bg-gradient-to-r from-pink-50 to-purple-50 dark:from-pink-900/20 dark:to-purple-900/20',
+                                    'bg-linear-to-r from-pink-50 to-purple-50 dark:from-pink-900/20 dark:to-purple-900/20',
                                     'hover:from-pink-100 hover:to-purple-100 dark:hover:from-pink-900/30 dark:hover:to-purple-900/30',
                                     'border border-pink-200 dark:border-pink-800',
                                     'transition-colors',
@@ -723,7 +723,7 @@ export default function AIWordHelper({
                                 ? 'cursor-not-allowed bg-gray-200 text-gray-500 dark:bg-gray-700 dark:text-gray-400'
                                 : serviceErrorState.retryAttempts >= 3
                                   ? 'bg-blue-500 text-white hover:bg-blue-600'
-                                  : 'bg-[var(--accent-primary)] text-white hover:bg-[var(--accent-hover)]'
+                                  : 'bg-(--accent-primary) text-white hover:bg-(--accent-hover)'
                             )}
                           >
                             {serviceErrorState.retryAttempts >= 5 ? (
@@ -753,8 +753,8 @@ export default function AIWordHelper({
                             onClick={fetchExplanation}
                             className={cn(
                               'flex items-center gap-2 rounded-lg px-4 py-2',
-                              'bg-[var(--accent-primary)] text-white',
-                              'hover:bg-[var(--accent-hover)]',
+                              'bg-(--accent-primary) text-white',
+                              'hover:bg-(--accent-hover)',
                               'transition-colors',
                               'text-sm font-medium'
                             )}
@@ -770,7 +770,7 @@ export default function AIWordHelper({
 
               {explanation && !isLoading && !error && (
                 <div className="prose prose-sm dark:prose-invert max-w-none">
-                  <div className="leading-relaxed whitespace-pre-wrap text-gray-800 dark:text-gray-200 [&>*]:my-2">
+                  <div className="leading-relaxed whitespace-pre-wrap text-gray-800 *:my-2 dark:text-gray-200">
                     {formatExplanation(explanation[activeLocale])}
                   </div>
                 </div>
diff --git a/frontend/components/q&a/AccordionList.tsx b/frontend/components/q&a/AccordionList.tsx
index c68a50b7..62fb62d7 100644
--- a/frontend/components/q&a/AccordionList.tsx
+++ b/frontend/components/q&a/AccordionList.tsx
@@ -244,7 +244,7 @@ function renderTable(
 ): ReactNode {
   return (
     <div key={index} className="my-2 overflow-x-auto">
-      <table className="min-w-full border-collapse border border-gray-300 text-sm">
+      <table className="min-w-full border-collapse border border-gray-300 text-sm text-gray-900 dark:text-gray-900">
         <thead>
           <tr className="bg-gray-100">
             {block.header.map((cell, i) => (
@@ -363,6 +363,14 @@ export default function AccordionList({ items }: { items: QuestionEntry[] }) {
     onTermClick: handleCachedTermClick,
   };
 
+  const clearSelection = useCallback(() => {
+    if (typeof window === 'undefined') return;
+    const selection = window.getSelection?.();
+    if (selection && !selection.isCollapsed) {
+      selection.removeAllRanges();
+    }
+  }, []);
+
   return (
     <>
       <Accordion type="single" collapsible className="w-full">
@@ -382,7 +390,10 @@ export default function AccordionList({ items }: { items: QuestionEntry[] }) {
                   : undefined
               }
             >
-              <AccordionTrigger className="px-4 hover:no-underline">
+              <AccordionTrigger
+                className="px-4 hover:no-underline"
+                onPointerDown={clearSelection}
+              >
                 {q.question}
               </AccordionTrigger>
               <AccordionContent className="px-4">
diff --git a/frontend/components/q&a/FloatingExplainButton.tsx b/frontend/components/q&a/FloatingExplainButton.tsx
index e04d6384..dea9c5c6 100644
--- a/frontend/components/q&a/FloatingExplainButton.tsx
+++ b/frontend/components/q&a/FloatingExplainButton.tsx
@@ -58,14 +58,14 @@ export default function FloatingExplainButton({
         'fixed z-50',
         'px-3 py-1.5',
         'text-sm font-medium',
-        'bg-[var(--accent-primary)] text-white',
+        'bg-(--accent-primary) text-white',
         'rounded-full',
         'border border-transparent',
         'shadow-lg',
-        'hover:bg-[var(--accent-hover)]',
+        'hover:bg-(--accent-hover)',
         'transition-all duration-200',
         'animate-in fade-in-0 zoom-in-95',
-        'focus:ring-2 focus:ring-[var(--accent-primary)] focus:ring-offset-2 focus:outline-none'
+        'focus:ring-2 focus:ring-(--accent-primary) focus:ring-offset-2 focus:outline-none'
       )}
       style={{
         left: `${position.x}px`,
diff --git a/frontend/components/q&a/QaSection.tsx b/frontend/components/q&a/QaSection.tsx
index ddbc64af..e16c7cc9 100644
--- a/frontend/components/q&a/QaSection.tsx
+++ b/frontend/components/q&a/QaSection.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useTranslations } from 'next-intl';
+import { useCallback, useEffect, useRef } from 'react';
 
 import AccordionList from '@/components/q&a/AccordionList';
 import { Pagination } from '@/components/q&a/Pagination';
@@ -14,6 +15,8 @@ import { cn } from '@/lib/utils';
 
 export default function TabsSection() {
   const t = useTranslations('qa');
+  const sectionRef = useRef<HTMLDivElement>(null);
+  const pendingScrollRef = useRef(false);
   const {
     active,
     currentPage,
@@ -25,8 +28,37 @@ export default function TabsSection() {
     totalPages,
   } = useQaTabs();
 
+  const clearSelection = useCallback(() => {
+    if (typeof window === 'undefined') return;
+    const selection = window.getSelection?.();
+    if (selection && !selection.isCollapsed) {
+      selection.removeAllRanges();
+    }
+  }, []);
+
+  const onPageChange = useCallback(
+    (page: number) => {
+      clearSelection();
+      pendingScrollRef.current = true;
+      handlePageChange(page);
+    },
+    [clearSelection, handlePageChange]
+  );
+
+  useEffect(() => {
+    if (!pendingScrollRef.current || isLoading) return;
+    pendingScrollRef.current = false;
+    const frame = window.requestAnimationFrame(() => {
+      sectionRef.current?.scrollIntoView({
+        behavior: 'smooth',
+        block: 'start',
+      });
+    });
+    return () => window.cancelAnimationFrame(frame);
+  }, [currentPage, isLoading]);
+
   return (
-    <div className="w-full">
+    <div className="w-full" ref={sectionRef}>
       <Tabs value={active} onValueChange={handleCategoryChange}>
         <TabsList className="mb-6 flex !h-auto !w-full flex-wrap items-stretch justify-start gap-3 !bg-transparent !p-0">
           {categoryData.map(category => {
@@ -76,7 +108,7 @@ export default function TabsSection() {
         <Pagination
           currentPage={currentPage}
           totalPages={totalPages}
-          onPageChange={handlePageChange}
+          onPageChange={onPageChange}
           accentColor={
             categoryTabStyles[active as keyof typeof categoryTabStyles].accent
           }
diff --git a/frontend/components/q&a/useQaTabs.ts b/frontend/components/q&a/useQaTabs.ts
index 8a9af778..ff8617b3 100644
--- a/frontend/components/q&a/useQaTabs.ts
+++ b/frontend/components/q&a/useQaTabs.ts
@@ -131,7 +131,6 @@ export function useQaTabs() {
     (page: number) => {
       setCurrentPage(page);
       updateUrl(active, page);
-      window.scrollTo({ top: 0, behavior: 'smooth' });
     },
     [active, updateUrl]
   );
diff --git a/frontend/components/quiz/CountdownTimer.tsx b/frontend/components/quiz/CountdownTimer.tsx
index 8d286c97..ea13bede 100644
--- a/frontend/components/quiz/CountdownTimer.tsx
+++ b/frontend/components/quiz/CountdownTimer.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { TriangleAlert } from 'lucide-react';
+import { Clock, TriangleAlert } from 'lucide-react';
 import { useTranslations } from 'next-intl';
 import { useEffect, useState } from 'react';
 
@@ -21,19 +21,32 @@ export function CountdownTimer({
 }: CountdownTimerProps) {
   const t = useTranslations('quiz.timer');
   const endTime = startedAt.getTime() + timeLimitSeconds * 1000;
-  const [remainingSeconds, setRemainingSeconds] = useState(() =>
-    Math.max(0, Math.floor((endTime - Date.now()) / 1000))
-  );
+  const [remainingSeconds, setRemainingSeconds] = useState(timeLimitSeconds);
+  const [isSynced, setIsSynced] = useState(false);
+  const [prevEndTime, setPrevEndTime] = useState(endTime);
+
+  if (endTime !== prevEndTime) {
+    setPrevEndTime(endTime);
+    setIsSynced(false);
+    setRemainingSeconds(timeLimitSeconds);
+  }
 
   useEffect(() => {
     if (!isActive) return;
 
+    let synced = false;
+
     const interval = setInterval(() => {
       const now = Date.now();
       const remaining = Math.max(0, Math.floor((endTime - now) / 1000));
 
       setRemainingSeconds(remaining);
 
+      if (!synced) {
+        synced = true;
+        setIsSynced(true);
+      }
+
       if (remaining === 0) {
         clearInterval(interval);
         queueMicrotask(onTimeUp);
@@ -48,6 +61,7 @@ export function CountdownTimer({
 
     const handleVisibilityChange = () => {
       if (!document.hidden) {
+        setIsSynced(false);
         const remaining = Math.max(
           0,
           Math.floor((endTime - Date.now()) / 1000)
@@ -101,7 +115,8 @@ export function CountdownTimer({
       <div className="h-2 overflow-hidden rounded-full bg-gray-200 dark:bg-gray-700">
         <div
           className={cn(
-            'h-full transition-all duration-1000 ease-linear',
+            'h-full',
+            isSynced && 'transition-all duration-1000 ease-linear',
             getProgressBarColor()
           )}
           style={{ width: `${percentage}%` }}
@@ -120,7 +135,8 @@ export function CountdownTimer({
             </>
           ) : (
             <>
-              <span aria-hidden="true">⏰</span> {t('hurryUp')}
+              <Clock className="inline h-4 w-4" aria-hidden="true" />{' '}
+              {t('hurryUp')}
             </>
           )}
         </p>
diff --git a/frontend/components/shared/Footer.tsx b/frontend/components/shared/Footer.tsx
index 7535f632..d4a71d83 100644
--- a/frontend/components/shared/Footer.tsx
+++ b/frontend/components/shared/Footer.tsx
@@ -3,6 +3,7 @@
 import { Github, Linkedin, Send } from 'lucide-react';
 import { useSelectedLayoutSegments } from 'next/navigation';
 import { useTranslations } from 'next-intl';
+import type { Ref } from 'react';
 
 import { ThemeToggle } from '@/components/theme/ThemeToggle';
 import { Link } from '@/i18n/routing';
@@ -18,12 +19,17 @@ const SOCIAL = [
   { label: 'Telegram', href: 'https://t.me/devloversteam', Icon: Send },
 ] as const;
 
-export default function Footer() {
+export default function Footer({
+  footerRef,
+}: {
+  footerRef?: Ref<HTMLElement>;
+}) {
   const t = useTranslations('footer');
   const segments = useSelectedLayoutSegments();
   const isShop = segments.includes('shop');
   return (
     <footer
+      ref={footerRef}
       className={cn(
         'border-border bg-background/90 supports-[backdrop-filter]:bg-background/50 relative overflow-hidden border-t backdrop-blur ' +
           '[--footer-brand:var(--accent-primary)] [--footer-hover:var(--accent-hover)] [--theme-toggle-hover:var(--footer-hover)]',
diff --git a/frontend/components/shared/HeaderButton.tsx b/frontend/components/shared/HeaderButton.tsx
index 3aff8b5f..3fc3f123 100644
--- a/frontend/components/shared/HeaderButton.tsx
+++ b/frontend/components/shared/HeaderButton.tsx
@@ -101,7 +101,7 @@ export function HeaderButton({
   );
 
   const baseClasses = `
-    group relative
+    group relative z-0
     inline-flex items-center
     text-sm font-medium
     rounded-lg
@@ -122,7 +122,7 @@ export function HeaderButton({
 
     const defaultBadgeClasses = `
       pointer-events-none
-      absolute -right-1 -top-1
+      absolute -right-1 -top-1  z-20
       flex h-5 min-w-5 items-center justify-center
       rounded-full px-1
       text-[11px] font-semibold leading-none tabular-nums
diff --git a/frontend/components/shared/LanguageSwitcher.tsx b/frontend/components/shared/LanguageSwitcher.tsx
index 5be57b6e..57cf777e 100644
--- a/frontend/components/shared/LanguageSwitcher.tsx
+++ b/frontend/components/shared/LanguageSwitcher.tsx
@@ -44,15 +44,15 @@ export default function LanguageSwitcher() {
     <div className="relative" ref={dropdownRef}>
       <button
         onClick={() => setIsOpen(!isOpen)}
-        className="group text-muted-foreground flex items-center gap-1.5 font-medium transition-colors active:text-[var(--accent-hover)]"
+        className="group text-muted-foreground flex items-center gap-1.5 font-medium transition-colors active:text-(--accent-hover)"
         aria-label="Change language"
       >
-        <Globe className="h-4 w-4 transition-colors group-hover:[color:var(--accent-hover)] group-active:[color:var(--accent-hover)]" />
-        <span className="transition-colors group-hover:[color:var(--accent-hover)] group-active:[color:var(--accent-hover)]">
+        <Globe className="h-4 w-4 transition-colors group-hover:text-(--accent-hover) group-active:text-(--accent-hover)" />
+        <span className="transition-colors group-hover:text-(--accent-hover) group-active:text-(--accent-hover)">
           {localeLabels[currentLocale]}
         </span>
         <svg
-          className={`h-4 w-4 transition-all group-hover:[color:var(--accent-hover)] group-active:[color:var(--accent-hover)] ${
+          className={`h-4 w-4 transition-all group-hover:text-(--accent-hover) group-active:text-(--accent-hover) ${
             isOpen ? 'rotate-180' : ''
           }`}
           fill="none"
@@ -69,7 +69,7 @@ export default function LanguageSwitcher() {
       </button>
 
       {isOpen && (
-        <div className="absolute right-0 z-[60] mt-2 w-20 rounded-md border border-gray-200 bg-white py-2 shadow-lg dark:border-neutral-800 dark:bg-neutral-900">
+        <div className="absolute right-0 z-50 mt-2 w-20 rounded-md border border-gray-200 bg-white py-2 shadow-lg dark:border-neutral-800 dark:bg-neutral-900">
           {locales.map(locale => (
             <Link
               key={locale}
@@ -81,9 +81,9 @@ export default function LanguageSwitcher() {
                 }
                 setIsOpen(false);
               }}
-              className={`block px-4 py-2 text-sm transition active:text-[var(--accent-hover)] ${
+              className={`block px-4 py-2 text-sm transition active:text-(--accent-hover) ${
                 currentLocale === locale
-                  ? 'text-muted-foreground [background-color:color-mix(in_srgb,var(--accent-primary)_10%,transparent)] font-medium'
+                  ? 'text-muted-foreground bg-(--accent-primary)/10 font-medium'
                   : 'text-muted-foreground hover:bg-secondary active:bg-secondary'
               }`}
             >
diff --git a/frontend/components/shared/OnlineCounterPopup.tsx b/frontend/components/shared/OnlineCounterPopup.tsx
index 417bce17..e5dda43e 100644
--- a/frontend/components/shared/OnlineCounterPopup.tsx
+++ b/frontend/components/shared/OnlineCounterPopup.tsx
@@ -2,12 +2,20 @@
 
 import { Users } from 'lucide-react';
 import { useTranslations } from 'next-intl';
-import { useEffect, useState } from 'react';
+import { useEffect, useLayoutEffect, useState } from 'react';
 
-export function OnlineCounterPopup() {
+type OnlineCounterPopupProps = {
+  ctaRef: React.RefObject<HTMLAnchorElement | null>;
+};
+
+export function OnlineCounterPopup({ ctaRef }: OnlineCounterPopupProps) {
   const t = useTranslations('onlineCounter');
   const [online, setOnline] = useState<number | null>(null);
   const [show, setShow] = useState(false);
+  const [position, setPosition] = useState<{ top: number; isMobile: boolean }>({
+    top: 0,
+    isMobile: true,
+  });
 
   useEffect(() => {
     if (sessionStorage.getItem('shown')) return;
@@ -23,6 +31,51 @@ export function OnlineCounterPopup() {
       .catch(() => setOnline(null));
   }, []);
 
+  useLayoutEffect(() => {
+    const calculatePosition = () => {
+      const mobile = window.innerWidth < 768;
+      let newTop = 0;
+
+      if (mobile && ctaRef.current) {
+        const rect = ctaRef.current.getBoundingClientRect();
+        const desired = rect.bottom + window.scrollY + rect.height + 14;
+        const popupHeight = 56;
+        const safeBottom = 16;
+        const max =
+          window.scrollY + window.innerHeight - popupHeight - safeBottom;
+        newTop = Math.min(desired, max);
+      }
+
+      setPosition({ top: newTop, isMobile: mobile });
+    };
+
+    calculatePosition();
+  }, [ctaRef]);
+  useEffect(() => {
+    const handleResize = () => {
+      const mobile = window.innerWidth < 768;
+      let newTop = 0;
+
+      if (mobile && ctaRef.current) {
+        const rect = ctaRef.current.getBoundingClientRect();
+        const desired = rect.bottom + window.scrollY + rect.height + 14;
+        const popupHeight = 56;
+        const safeBottom = 16;
+        const max =
+          window.scrollY + window.innerHeight - popupHeight - safeBottom;
+        newTop = Math.min(desired, max);
+      }
+
+      setPosition({ top: newTop, isMobile: mobile });
+    };
+
+    window.addEventListener('resize', handleResize);
+
+    return () => {
+      window.removeEventListener('resize', handleResize);
+    };
+  }, [ctaRef]);
+
   if (!online) return null;
 
   const getText = (count: number) => {
@@ -34,13 +87,16 @@ export function OnlineCounterPopup() {
   };
 
   return (
-    <div className="fixed right-0 bottom-[30vh] left-0 z-50 flex justify-center md:right-12 md:bottom-[10vh] md:left-auto md:justify-end md:pr-0">
+    <div
+      className="fixed right-0 left-0 z-50 flex justify-center md:right-12 md:bottom-[10vh] md:left-auto md:justify-end"
+      style={position.isMobile ? { top: position.top } : undefined}
+    >
       <div
         className={`transition-all duration-500 ease-out ${
           show
             ? 'translate-y-0 scale-100 opacity-100'
             : 'translate-y-4 scale-90 opacity-0'
-        } `}
+        }`}
       >
         <div className="relative">
           <div className="absolute -inset-1.5 rounded-3xl bg-[var(--accent-primary)]/15 blur-xl sm:-inset-2 dark:bg-[var(--accent-primary)]/20" />
@@ -94,7 +150,6 @@ export function OnlineCounterPopup() {
             </div>
 
             <div className="absolute top-0 right-0 left-0 h-px bg-gradient-to-r from-transparent via-[var(--accent-primary)]/30 to-transparent" />
-
             <div className="absolute top-1/4 bottom-1/4 left-0 w-px bg-gradient-to-b from-transparent via-[var(--accent-primary)]/20 to-transparent" />
             <div className="absolute top-1/4 right-0 bottom-1/4 w-px bg-gradient-to-b from-transparent via-[var(--accent-primary)]/20 to-transparent" />
           </div>
@@ -108,7 +163,6 @@ export function OnlineCounterPopup() {
             className="absolute -top-1.5 left-1/3 h-1 w-1 animate-ping rounded-full bg-[var(--accent-primary)]/50 dark:bg-[var(--accent-primary)]/60"
             style={{ animationDelay: '1s' }}
           />
-
           <div
             className="absolute top-1/4 -left-1 h-1 w-1 animate-ping rounded-full bg-[var(--accent-primary)]/40 dark:bg-[var(--accent-primary)]/50"
             style={{ animationDelay: '1.5s' }}
@@ -117,7 +171,6 @@ export function OnlineCounterPopup() {
             className="absolute top-2/3 -right-1 h-1 w-1 animate-ping rounded-full bg-[var(--accent-primary)]/40 dark:bg-[var(--accent-primary)]/50"
             style={{ animationDelay: '2s' }}
           />
-
           <div
             className="absolute -bottom-1 left-1/4 h-0.5 w-0.5 animate-ping rounded-full bg-[var(--accent-primary)]/50 sm:h-1 sm:w-1 dark:bg-[var(--accent-primary)]/60"
             style={{ animationDelay: '0.8s' }}
diff --git a/frontend/components/shop/AddToCartButton.tsx b/frontend/components/shop/AddToCartButton.tsx
index 046211a6..3e73db31 100644
--- a/frontend/components/shop/AddToCartButton.tsx
+++ b/frontend/components/shop/AddToCartButton.tsx
@@ -12,6 +12,7 @@ import {
   SHOP_CTA_BASE,
   SHOP_CTA_INSET,
   SHOP_CTA_WAVE,
+  SHOP_DISABLED,
   SHOP_FOCUS,
   SHOP_SIZE_CHIP_BASE,
   SHOP_STEPPER_BUTTON_BASE,
@@ -29,7 +30,9 @@ interface AddToCartButtonProps {
 export function AddToCartButton({ product }: AddToCartButtonProps) {
   const { addToCart } = useCart();
   const t = useTranslations('shop.product');
+  const tCartActions = useTranslations('shop.cart.actions');
   const tColors = useTranslations('shop.catalog.colors');
+
   const [selectedSize, setSelectedSize] = useState<string | undefined>(
     product.sizes?.[0]
   );
@@ -39,6 +42,17 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
   const [quantity, setQuantity] = useState(1);
   const [added, setAdded] = useState(false);
 
+  const stockRaw = (product as any).stock as unknown;
+  const stockNum =
+    typeof stockRaw === 'number'
+      ? stockRaw
+      : typeof stockRaw === 'string' && stockRaw.trim().length > 0
+        ? Number(stockRaw)
+        : NaN;
+
+  const maxQty =
+    Number.isFinite(stockNum) && stockNum > 0 ? Math.floor(stockNum) : null;
+
   const translateColor = (color: string): string => {
     const colorSlug = color.toLowerCase();
     try {
@@ -51,7 +65,12 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
   const handleAddToCart = () => {
     if (!product.inStock) return;
 
-    addToCart(product, quantity, selectedSize, selectedColor);
+    const safeQty =
+      maxQty === null ? quantity : Math.min(Math.max(1, quantity), maxQty);
+
+    if (safeQty !== quantity) setQuantity(safeQty);
+
+    addToCart(product, safeQty, selectedSize, selectedColor);
     setAdded(true);
     setTimeout(() => setAdded(false), 2000);
   };
@@ -68,6 +87,7 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
   const colorGroupId = useId();
   const sizeGroupId = useId();
   const quantityGroupId = useId();
+
   const ctaBaseVar = added
     ? '--shop-hero-btn-success-bg'
     : '--shop-hero-btn-bg';
@@ -75,6 +95,9 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
     ? '--shop-hero-btn-success-bg-hover'
     : '--shop-hero-btn-bg-hover';
 
+  const decDisabled = quantity <= 1;
+  const incDisabled = maxQty !== null ? quantity >= maxQty : false;
+
   return (
     <section className="mt-8 space-y-6" aria-label={t('purchaseOptions')}>
       {product.colors && product.colors.length > 0 ? (
@@ -171,12 +194,14 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
         <div className="mt-3 flex items-center gap-3">
           <button
             type="button"
-            onClick={() => setQuantity(Math.max(1, quantity - 1))}
+            onClick={() => setQuantity(q => Math.max(1, q - 1))}
+            disabled={decDisabled}
             className={cn(
               SHOP_STEPPER_BUTTON_BASE,
               SHOP_CHIP_INTERACTIVE,
               SHOP_CHIP_HOVER,
-              SHOP_FOCUS
+              SHOP_FOCUS,
+              SHOP_DISABLED
             )}
             aria-label={t('decreaseQuantity')}
           >
@@ -189,17 +214,32 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
 
           <button
             type="button"
-            onClick={() => setQuantity(quantity + 1)}
+            onClick={() =>
+              setQuantity(q =>
+                maxQty === null ? q + 1 : Math.min(maxQty, q + 1)
+              )
+            }
+            disabled={incDisabled}
             className={cn(
               SHOP_STEPPER_BUTTON_BASE,
               SHOP_CHIP_INTERACTIVE,
               SHOP_CHIP_HOVER,
-              SHOP_FOCUS
+              SHOP_FOCUS,
+              SHOP_DISABLED
             )}
             aria-label={t('increaseQuantity')}
           >
             <Plus className="h-4 w-4" aria-hidden="true" />
           </button>
+
+          {maxQty !== null && incDisabled ? (
+            <span
+              className="text-muted-foreground ml-3 text-xs whitespace-nowrap"
+              role="status"
+            >
+              {tCartActions('maxStock', { stock: maxQty })}
+            </span>
+          ) : null}
         </div>
       </section>
 
@@ -222,21 +262,16 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
       >
         {product.inStock ? (
           <>
-            {/* base gradient */}
             <span
               className="absolute inset-0"
               style={shopCtaGradient(ctaBaseVar, ctaHoverVar)}
               aria-hidden="true"
             />
-
-            {/* hover wave overlay */}
             <span
               className={SHOP_CTA_WAVE}
               style={shopCtaGradient(ctaHoverVar, ctaBaseVar)}
               aria-hidden="true"
             />
-
-            {/* glass inset */}
             <span className={SHOP_CTA_INSET} aria-hidden="true" />
           </>
         ) : null}
diff --git a/frontend/components/shop/ProductCard.tsx b/frontend/components/shop/ProductCard.tsx
index 9472bff0..140c25d2 100644
--- a/frontend/components/shop/ProductCard.tsx
+++ b/frontend/components/shop/ProductCard.tsx
@@ -51,8 +51,7 @@ export function ProductCard({ product }: ProductCardProps) {
         <span
           className={cn(
             'absolute top-3 left-3 z-10 rounded px-2 py-1 text-xs font-semibold uppercase',
-            product.badge === 'SALE' && 'bg-accent text-accent-foreground',
-            product.badge === 'NEW' && 'bg-foreground text-background'
+            'bg-foreground text-background dark:bg-accent dark:text-accent-foreground'
           )}
         >
           {t(`badges.${product.badge}`)}
diff --git a/frontend/components/shop/ProductSort.tsx b/frontend/components/shop/ProductSort.tsx
index ccf01fd4..8e7b116e 100644
--- a/frontend/components/shop/ProductSort.tsx
+++ b/frontend/components/shop/ProductSort.tsx
@@ -75,6 +75,7 @@ export function ProductSort({ className }: ProductSortProps) {
           value={currentSort}
           onChange={e => handleSort(e.target.value)}
           className={cn(
+            'peer',
             SHOP_SELECT_BASE,
             SHOP_SELECT_INTERACTIVE,
             SHOP_FOCUS,
diff --git a/frontend/components/tests/blog/blog-card.test.tsx b/frontend/components/tests/blog/blog-card.test.tsx
index 826bee0e..6d1c308c 100644
--- a/frontend/components/tests/blog/blog-card.test.tsx
+++ b/frontend/components/tests/blog/blog-card.test.tsx
@@ -7,7 +7,8 @@ import type { Author, Post } from '@/components/blog/BlogFilters';
 
 vi.mock('next/image', () => ({
   __esModule: true,
-  default: (props: any) => <img {...props} />,
+  // eslint-disable-next-line @next/next/no-img-element
+  default: (props: any) => <img alt={props.alt ?? ''} {...props} />,
 }));
 
 vi.mock('next/link', () => ({
diff --git a/frontend/components/tests/blog/blog-filters.test.tsx b/frontend/components/tests/blog/blog-filters.test.tsx
index c4b8bcd6..a3ed3cff 100644
--- a/frontend/components/tests/blog/blog-filters.test.tsx
+++ b/frontend/components/tests/blog/blog-filters.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
 import { render, screen, waitFor } from '@testing-library/react';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import type { Author, Post } from '@/components/blog/BlogFilters';
 import BlogFilters from '@/components/blog/BlogFilters';
diff --git a/frontend/components/tests/blog/blog-header-search.test.tsx b/frontend/components/tests/blog/blog-header-search.test.tsx
index 53f06a99..f2c3081e 100644
--- a/frontend/components/tests/blog/blog-header-search.test.tsx
+++ b/frontend/components/tests/blog/blog-header-search.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { BlogHeaderSearch } from '@/components/blog/BlogHeaderSearch';
 
diff --git a/frontend/components/tests/q&a/use-qa-tabs.test.tsx b/frontend/components/tests/q&a/use-qa-tabs.test.tsx
index da82fe87..75793854 100644
--- a/frontend/components/tests/q&a/use-qa-tabs.test.tsx
+++ b/frontend/components/tests/q&a/use-qa-tabs.test.tsx
@@ -44,7 +44,6 @@ describe('useQaTabs', () => {
       }),
     });
     vi.stubGlobal('fetch', fetchMock);
-    vi.stubGlobal('scrollTo', vi.fn());
     routerReplace.mockClear();
     searchParamsValue = new URLSearchParams();
   });
@@ -85,7 +84,6 @@ describe('useQaTabs', () => {
     expect(routerReplace).toHaveBeenCalledWith('/q&a?page=2', {
       scroll: false,
     });
-    expect(window.scrollTo).toHaveBeenCalled();
   });
 
   it('updates category and URL on category change', async () => {
diff --git a/frontend/db/seed-quiz-javascript.ts b/frontend/db/seed-quiz-javascript.ts
index 540ae82c..a622757d 100644
--- a/frontend/db/seed-quiz-javascript.ts
+++ b/frontend/db/seed-quiz-javascript.ts
@@ -1,3 +1,5 @@
+import 'dotenv/config';
+
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
@@ -75,7 +77,7 @@ async function loadQuestions(partNumber: number): Promise<QuestionData[]> {
   return partData.questions;
 }
 
-async function ensureQuizExists(): Promise<string> {
+async function ensureQuizExists(forceDelete: boolean): Promise<string> {
   console.log('Ensuring quiz exists...');
 
   const [category] = await db
@@ -93,14 +95,24 @@ async function ensureQuizExists(): Promise<string> {
   const existing = await db.query.quizzes.findFirst({
     where: eq(quizzes.slug, QUIZ_METADATA.slug),
   });
+
   if (existing) {
-    const existingAttempt = await db.query.quizAttempts.findFirst({
-      where: eq(quizAttempts.quizId, existing.id),
-    });
-    if (existingAttempt) {
-      throw new Error(
-        `Quiz ${QUIZ_METADATA.slug} has existing attempts. Aborting to avoid data loss.`
-      );
+    const existingAttempts = await db
+      .select()
+      .from(quizAttempts)
+      .where(eq(quizAttempts.quizId, existing.id))
+      .limit(1);
+
+    if (existingAttempts.length > 0) {
+      if (!forceDelete) {
+        throw new Error(
+          `Quiz ${QUIZ_METADATA.slug} has existing attempts. Use --force to delete them.`
+        );
+      }
+
+      console.log('Deleting existing attempts (--force flag used)...');
+      await db.delete(quizAttempts).where(eq(quizAttempts.quizId, existing.id));
+      console.log('Attempts deleted.');
     }
 
     await db.delete(quizQuestions).where(eq(quizQuestions.quizId, existing.id));
@@ -211,22 +223,24 @@ async function seedQuestions(
 
 async function seedQuizFromJson() {
   const args = process.argv.slice(2);
-  const partArg = args[0];
+  const forceDelete = args.includes('--force');
+  const partArg = args.find(arg => arg !== '--force');
 
   if (!partArg) {
     console.error('Error: Please specify which part to upload');
-    console.log(
-      'Usage: npx tsx db/seeds/seed-quiz-javascript.ts <part-number>'
-    );
-    console.log('Example: npx tsx db/seeds/seed-quiz-javascript.ts 1');
-    console.log('Or upload all: npx tsx db/seeds/seed-quiz-javascript.ts all');
+    console.log('Usage: npx tsx db/seed-quiz-javascript.ts <part-number> [--force]');
+    console.log('Example: npx tsx db/seed-quiz-javascript.ts 1');
+    console.log('         npx tsx db/seed-quiz-javascript.ts all --force');
     process.exit(1);
   }
 
   console.log('Starting JavaScript quiz seed...\n');
+  if (forceDelete) {
+    console.log('WARNING: --force flag used. Existing attempts will be deleted.\n');
+  }
 
   try {
-    const quizId = await ensureQuizExists();
+    const quizId = await ensureQuizExists(forceDelete);
 
     if (partArg.toLowerCase() === 'all') {
       console.log('Uploading all parts...\n');
diff --git a/frontend/hooks/useAntiCheat.ts b/frontend/hooks/useAntiCheat.ts
index 752e898f..2f89420a 100644
--- a/frontend/hooks/useAntiCheat.ts
+++ b/frontend/hooks/useAntiCheat.ts
@@ -22,6 +22,7 @@ export function useAntiCheat(isActive: boolean = true) {
   const [isTabActive, setIsTabActive] = useState(true);
   const [showWarning, setShowWarning] = useState(false);
   const warningTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+  const lastInteractionWasTouch = useRef(false);
 
   const addViolation = useCallback(
     (type: AntiCheatViolation['type']) => {
@@ -64,7 +65,10 @@ export function useAntiCheat(isActive: boolean = true) {
 
     const handleContextMenu = (e: MouseEvent) => {
       e.preventDefault();
-      addViolation('context-menu');
+      
+      if (!lastInteractionWasTouch.current) {
+        addViolation('context-menu');
+      }
     };
 
     const handleVisibilityChange = () => {
@@ -76,16 +80,29 @@ export function useAntiCheat(isActive: boolean = true) {
       }
     };
 
+    const handleTouchStart = () => {
+      lastInteractionWasTouch.current = true;
+    };
+
+    const handleMouseDown = () => {
+      lastInteractionWasTouch.current = false;
+    };
+
     document.addEventListener('copy', handleCopy);
     document.addEventListener('paste', handlePaste);
     document.addEventListener('contextmenu', handleContextMenu);
     document.addEventListener('visibilitychange', handleVisibilityChange);
+    document.addEventListener('touchstart', handleTouchStart, { passive: true });
+    document.addEventListener('mousedown', handleMouseDown);
+
 
     return () => {
       document.removeEventListener('copy', handleCopy);
       document.removeEventListener('paste', handlePaste);
       document.removeEventListener('contextmenu', handleContextMenu);
       document.removeEventListener('visibilitychange', handleVisibilityChange);
+      document.removeEventListener('touchstart', handleTouchStart);
+      document.removeEventListener('mousedown', handleMouseDown);
 
       if (warningTimeoutRef.current) {
         clearTimeout(warningTimeoutRef.current);
diff --git a/frontend/lib/home/cta-variants.ts b/frontend/lib/home/cta-variants.ts
deleted file mode 100644
index ef0bc67f..00000000
--- a/frontend/lib/home/cta-variants.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-export interface CTAVariant {
-  text: string;
-  gradient: string;
-  gradientDark: string;
-  shadow: string;
-  shadowDark: string;
-  ring: string;
-}
-
-export const createCTAVariants = (ctaText: string): CTAVariant[] => [
-  {
-    text: `${ctaText} 1`,
-    gradient: 'from-[var(--accent-primary)] to-[var(--accent-hover)]',
-    gradientDark:
-      'dark:from-[var(--accent-primary)] dark:to-[var(--accent-hover)]',
-    shadow: 'shadow-[0_18px_45px_rgba(30,94,255,0.35)]',
-    shadowDark: 'dark:shadow-[0_22px_60px_rgba(255,45,85,0.5)]',
-    ring: 'focus-visible:ring-[var(--accent-primary)]',
-  },
-  {
-    text: `${ctaText} 2`,
-    gradient: 'from-[#60a5fa] to-[#3b82f6]',
-    gradientDark: 'dark:from-[#ff6b9d] dark:to-[#ff477e]',
-    shadow: 'shadow-[0_18px_45px_rgba(96,165,250,0.35)]',
-    shadowDark: 'dark:shadow-[0_22px_60px_rgba(255,107,157,0.5)]',
-    ring: 'focus-visible:ring-[#60a5fa] dark:focus-visible:ring-[#ff6b9d]',
-  },
-  {
-    text: `${ctaText} 3`,
-    gradient: 'from-[#2563eb] to-[#1e40af]',
-    gradientDark: 'dark:from-[#f87171] dark:to-[#ef4444]',
-    shadow: 'shadow-[0_18px_45px_rgba(37,99,235,0.35)]',
-    shadowDark: 'dark:shadow-[0_22px_60px_rgba(239,68,68,0.5)]',
-    ring: 'focus-visible:ring-[#2563eb] dark:focus-visible:ring-[#f87171]',
-  },
-  {
-    text: `${ctaText} 4`,
-    gradient: 'from-[#3b82f6] to-[#2563eb]',
-    gradientDark: 'dark:from-[#fb7185] dark:to-[#e11d48]',
-    shadow: 'shadow-[0_18px_45px_rgba(59,130,246,0.35)]',
-    shadowDark: 'dark:shadow-[0_22px_60px_rgba(225,29,72,0.5)]',
-    ring: 'focus-visible:ring-[#3b82f6] dark:focus-visible:ring-[#fb7185]',
-  },
-  {
-    text: `${ctaText} 5`,
-    gradient: 'from-[#2563eb] to-[#1d4ed8]',
-    gradientDark: 'dark:from-[#fca5a5] dark:to-[#ef4444]',
-    shadow: 'shadow-[0_18px_45px_rgba(37,99,235,0.35)]',
-    shadowDark: 'dark:shadow-[0_22px_60px_rgba(239,68,68,0.5)]',
-    ring: 'focus-visible:ring-[#2563eb] dark:focus-visible:ring-[#fca5a5]',
-  },
-];
diff --git a/frontend/lib/tests/quiz/quiz-crypto.test.ts b/frontend/lib/tests/quiz/quiz-crypto.test.ts
new file mode 100644
index 00000000..6a2a332f
--- /dev/null
+++ b/frontend/lib/tests/quiz/quiz-crypto.test.ts
@@ -0,0 +1,162 @@
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+
+import {
+  createEncryptedAnswersBlob,
+  decryptAnswers,
+  encryptAnswers,
+} from '@/lib/quiz/quiz-crypto';
+
+import {
+  createCorrectAnswersMap,
+  createMockQuestions,
+  resetFactoryCounters,
+} from '../factories/quiz/quiz';
+import { cleanupQuizTestEnv, setupQuizTestEnv } from './setup';
+
+describe('quiz-crypto', () => {
+  // Setup: set encryption key before each test
+  beforeEach(() => {
+    setupQuizTestEnv();
+    resetFactoryCounters();
+  });
+
+  // Cleanup: remove encryption key after each test
+  afterEach(() => {
+    cleanupQuizTestEnv();
+  });
+
+  describe('encryptAnswers', () => {
+    it('returns a base64 string', () => {
+      const answers = { 'q-1': 'a-1' };
+
+      const result = encryptAnswers(answers);
+
+      // Base64 pattern: letters, numbers, +, /, ends with optional =
+      expect(result).toMatch(/^[A-Za-z0-9+/]+=*$/);
+    });
+
+    it('returns different output for same input (random IV)', () => {
+      const answers = { 'q-1': 'a-1' };
+
+      const result1 = encryptAnswers(answers);
+      const result2 = encryptAnswers(answers);
+
+      // Each encryption uses random IV, so outputs differ
+      expect(result1).not.toBe(result2);
+    });
+
+    it('handles empty object', () => {
+      const result = encryptAnswers({});
+
+      expect(result).toBeDefined();
+      expect(typeof result).toBe('string');
+    });
+
+    it('handles multiple questions', () => {
+      const answers = {
+        'q-1': 'a-1',
+        'q-2': 'a-2',
+        'q-3': 'a-3',
+      };
+
+      const result = encryptAnswers(answers);
+
+      expect(result).toBeDefined();
+      expect(result.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe('decryptAnswers', () => {
+    it('decrypts back to original data', () => {
+      const original = { 'q-1': 'a-1', 'q-2': 'a-2' };
+
+      const encrypted = encryptAnswers(original);
+      const decrypted = decryptAnswers(encrypted);
+
+      expect(decrypted).toEqual(original);
+    });
+
+    it('returns null for tampered data', () => {
+      const original = { 'q-1': 'a-1' };
+      const encrypted = encryptAnswers(original);
+
+      // Tamper: change last 5 characters
+      const tampered = encrypted.slice(0, -5) + 'XXXXX';
+
+      const result = decryptAnswers(tampered);
+
+      expect(result).toBeNull();
+    });
+
+    it('returns null for invalid base64', () => {
+      const result = decryptAnswers('not-valid-base64!!!');
+
+      expect(result).toBeNull();
+    });
+
+    it('returns null for empty string', () => {
+      const result = decryptAnswers('');
+
+      expect(result).toBeNull();
+    });
+
+    it('returns null for truncated data', () => {
+      const original = { 'q-1': 'a-1' };
+      const encrypted = encryptAnswers(original);
+
+      // Truncate: remove half of the data
+      const truncated = encrypted.slice(0, encrypted.length / 2);
+
+      const result = decryptAnswers(truncated);
+
+      expect(result).toBeNull();
+    });
+  });
+
+  describe('createEncryptedAnswersBlob', () => {
+    it('creates encrypted blob from questions', () => {
+      const questions = createMockQuestions(3);
+
+      const blob = createEncryptedAnswersBlob(questions);
+
+      expect(blob).toBeDefined();
+      expect(typeof blob).toBe('string');
+      expect(blob.length).toBeGreaterThan(0);
+    });
+
+    it('encrypted blob decrypts to correct answers map', () => {
+      const questions = createMockQuestions(3);
+      const expectedMap = createCorrectAnswersMap(questions);
+
+      const blob = createEncryptedAnswersBlob(questions);
+      const decrypted = decryptAnswers(blob);
+
+      expect(decrypted).toEqual(expectedMap);
+    });
+
+    it('handles questions with no correct answer', () => {
+      const questions = [
+        {
+          id: 'q-no-correct',
+          answers: [
+            { id: 'a-1', isCorrect: false },
+            { id: 'a-2', isCorrect: false },
+          ],
+        },
+      ];
+
+      const blob = createEncryptedAnswersBlob(questions);
+      const decrypted = decryptAnswers(blob);
+
+      // Question with no correct answer is not included in map
+      expect(decrypted).toEqual({});
+    });
+
+    it('handles empty questions array', () => {
+      const blob = createEncryptedAnswersBlob([]);
+      const decrypted = decryptAnswers(blob);
+
+      expect(decrypted).toEqual({});
+    });
+  });
+});
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 53dd4e7d..eb73aff6 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -46,14 +46,14 @@
   "homepage": {
     "title": "DevLovers",
     "subtitle": "Platform for Technical Interview Preparation",
-    "description": "Master frontend, backend, and full-stack development with our interview questions, quizzes, and learning materials.",
+    "description": "Build real confidence in frontend, backend, and full-stack development through interactive interview questions, quizzes, and practical explanations",
     "cta": "Take the first step",
     "ctaVariants": {
-      "1": "No pressure. Just start.",
+      "1": "No pressure, just start",
       "2": "This might actually be fun",
       "3": "You're already halfway",
       "4": "One click from progress",
-      "5": "You clicked. That counts.",
+      "5": "You clicked, that counts",
       "6": "Brave move, by the way",
       "7": "Okay, now it's happening",
       "8": "Hello, new commit"
@@ -85,12 +85,17 @@
     "metaTitle": "Quizzes | DevLovers",
     "metaDescription": "Test your knowledge with interactive quizzes",
     "page": {
+      "notFoundTitle": "Quiz Not Found",
+      "metaSuffix": "DevLovers Quiz",
+      "metaDescriptionFallback": "Take the {title} quiz and test your knowledge.",
       "noQuestions": "No questions available for this quiz",
       "questionsLabel": "Questions",
       "timeLabel": "Time",
       "minutes": "min"
     },
     "list": {
+      "metaTitle": "Quizzes | DevLovers",
+      "metaDescription": "Test your knowledge with interactive quizzes on React, Angular, Vue, Node.js and more.",
       "title": "Quizzes",
       "practice": "Practice",
       "subtitle": "Choose a quiz to test your knowledge",
@@ -206,7 +211,7 @@
   },
   "blog": {
     "title": "All Blog Posts",
-    "subtitle": "Explore the latest articles in Tech, News, and Career Growth, covering trends, ideas, and practical insights.",
+    "subtitle": "Explore the latest articles in Tech, News, and Career Growth, covering trends, ideas, and practical insights",
     "metaTitle": "Blog | DevLovers",
     "metaDescription": "Explore the latest articles and insights",
     "all": "All",
@@ -256,7 +261,7 @@
       "viewAll": "View all",
       "hero": {
         "headline": "Code. Create. Collect.",
-        "subheadline": "Join thousands of developers who express their passion through premium merch.",
+        "subheadline": "Join thousands of developers who express their passion through premium merch",
         "cta": "Browse all products"
       },
       "comingSoon": {
@@ -267,6 +272,7 @@
     },
     "product": {
       "soldOut": "Sold out",
+      "maxStock": "Max {stock} in stock",
       "color": "Color",
       "size": "Size",
       "quantity": "Quantity",
@@ -303,7 +309,7 @@
     "cart": {
       "title": "Your cart",
       "empty": "Your cart is empty",
-      "emptyDescription": "Looks like you haven't added any items to your cart yet.",
+      "emptyDescription": "Looks like you haven't added any items to your cart yet",
       "startShopping": "Start shopping",
       "itemsLabel": "Cart items",
       "summary": {
@@ -316,7 +322,7 @@
       "checkout": {
         "placeOrder": "Place order",
         "placing": "Placing order...",
-        "message": "You'll either be redirected to secure payment or see confirmation if payment is not required in this environment.",
+        "message": "You'll either be redirected to secure payment or see confirmation if payment is not required in this environment",
         "notRedirected": "If you are not redirected automatically, open your order",
         "goToOrder": "Go to order"
       },
@@ -327,20 +333,20 @@
         "maxStock": "Max {stock} in stock"
       },
       "alerts": {
-        "itemsRemoved": "Some items were removed from your cart because they are unavailable or out of stock."
+        "itemsRemoved": "Some items were removed from your cart because they are unavailable or out of stock"
       }
     },
     "admin": {
       "page": {
         "title": "Shop Admin",
-        "description": "Administrative tools for the merch shop.",
+        "description": "Administrative tools for the merch shop",
         "productsSection": {
           "title": "Products",
-          "description": "Create, edit, activate, feature."
+          "description": "Create, edit, activate, feature"
         },
         "ordersSection": {
           "title": "Orders",
-          "description": "Review and manage orders."
+          "description": "Review and manage orders"
         }
       },
       "topbar": {
@@ -462,45 +468,45 @@
       },
       "sort": {
         "featured": "Featured",
-        "priceAsc": "Price: Low to High",
-        "priceDesc": "Price: High to Low",
+        "priceAsc": "Price ↑",
+        "priceDesc": "Price ↓",
         "newest": "Newest"
       }
     },
     "products": {
       "title": "All Products",
       "noProductsFound": "No products found",
-      "adjustFilters": "Try adjusting your filters to find what you're looking for.",
+      "adjustFilters": "Try adjusting your filters to find what you're looking for",
       "backToProducts": "Back to all products",
-      "notAvailable": "This product is not available in your locale/currency.",
+      "notAvailable": "This product is not available in your locale/currency",
       "loadMore": "Load more",
       "shopNow": "Shop now"
     },
     "checkout": {
       "errors": {
         "missingOrderId": "Missing order id",
-        "missingOrderIdDescription": "We couldn't identify your order. Please return to your cart or browse products.",
+        "missingOrderIdDescription": "We couldn't identify your order. Please return to your cart or browse products",
         "orderNotFound": "Order not found",
-        "orderNotFoundDescription": "We couldn't find this order. It may have been removed or never existed.",
+        "orderNotFoundDescription": "We couldn't find this order. It may have been removed or never existed",
         "invalidOrder": "Invalid order",
         "unableToLoad": "Unable to load order",
-        "unableToCheckout": "Unable to start checkout right now.",
-        "unexpectedResponse": "Unexpected checkout response.",
-        "tryAgainLater": "Please try again later."
+        "unableToCheckout": "Unable to start checkout right now",
+        "unexpectedResponse": "Unexpected checkout response",
+        "tryAgainLater": "Please try again later"
       },
       "missingOrder": {
-        "message": "We couldn't identify your order. Please return to your cart or browse products."
+        "message": "We couldn't identify your order. Please return to your cart or browse products"
       },
       "notFoundOrder": {
-        "message": "We couldn't find this order. It may have been removed or never existed."
+        "message": "We couldn't find this order. It may have been removed or never existed"
       },
       "success": {
         "title": "Thank you for your order",
         "orderLabel": "Order",
-        "received": "We've received your order.",
-        "paymentConfirmed": "Payment has been confirmed.",
-        "paymentProcessing": "Payment is still being processed. This page will update automatically.",
-        "paymentsDisabled": "Payments are disabled in this environment. You were not charged for this order.",
+        "received": "We've received your order",
+        "paymentConfirmed": "Payment has been confirmed",
+        "paymentProcessing": "Payment is still being processed. This page will update automatically",
+        "paymentsDisabled": "Payments are disabled in this environment. You were not charged for this order",
         "orderSummary": "Order summary",
         "totalAmount": "Total amount",
         "items": "Items",
@@ -510,11 +516,11 @@
       },
       "error": {
         "paymentFailed": "Payment failed",
-        "paymentFailedDescription": "The payment for this order was not completed. You can try again or contact support.",
+        "paymentFailedDescription": "The payment for this order was not completed. You can try again or contact support",
         "paymentUnclear": "Payment status unclear",
-        "paymentUnclearDescription": "We could not confirm a payment failure for this order.",
-        "notCompleted": "The payment for this order was not completed. You can try again or contact support.",
-        "couldNotConfirm": "We could not confirm a payment failure for this order.",
+        "paymentUnclearDescription": "We could not confirm a payment failure for this order",
+        "notCompleted": "The payment for this order was not completed. You can try again or contact support",
+        "couldNotConfirm": "We could not confirm a payment failure for this order",
         "orderDetails": "Order details",
         "order": "Order",
         "orderLabel": "Order",
@@ -530,7 +536,7 @@
         "title": "Secure checkout",
         "payForOrder": "Pay for order #{orderId}",
         "paymentDetails": "Payment details",
-        "completePayment": "Complete payment to place your order.",
+        "completePayment": "Complete payment to place your order",
         "amountDue": "Amount due",
         "orderSummary": "Order summary",
         "items": "Items",
@@ -539,9 +545,9 @@
         "viewConfirmation": "View confirmation",
         "continueShopping": "Continue shopping",
         "statusMessages": {
-          "alreadyPaid": "This order is already paid.",
-          "previousFailed": "The previous payment attempt failed. Please try again.",
-          "completePayment": "Complete payment to finish your order."
+          "alreadyPaid": "This order is already paid",
+          "previousFailed": "The previous payment attempt failed. Please try again",
+          "completePayment": "Complete payment to finish your order"
         }
       },
       "actions": {
@@ -553,10 +559,10 @@
     },
     "orders": {
       "title": "My orders",
-      "subtitle": "Your most recent orders (up to 50).",
+      "subtitle": "Your most recent orders (up to 50)",
       "backToShop": "Back to shop",
       "empty": {
-        "message": "No orders yet.",
+        "message": "No orders yet",
         "browseProducts": "Browse products"
       },
       "table": {
@@ -609,10 +615,10 @@
     "metaDescription": "Learn about DevLovers - the platform for technical interview preparation",
     "hero": {
       "titleHighlight": "Debug your skills",
-      "titleRest": "before the recruiter does.",
+      "titleRest": "before the recruiter does",
       "description": "Stop guessing. We decoded the chaotic interview process into a structured roadmap.",
       "descriptionHighlight": "Compile your scattered knowledge",
-      "descriptionRest": "into a production-ready skillset and land that offer.",
+      "descriptionRest": "into a production-ready skillset and land that offer",
       "stats": {
         "quizzesPassed": "Quizzes Passed",
         "githubStars": "GitHub Stars",
@@ -735,7 +741,7 @@
       "heading": "Pricing",
       "badge": "No Hidden Fees",
       "title": "Invest in your brain,",
-      "titleHighlight": "not our subscriptions.",
+      "titleHighlight": "not our subscriptions",
       "subtitle": "We believe knowledge should be accessible. So we don't sell courses. But servers heat up and coffee runs out. The choice is yours.",
       "junior": {
         "title": "Junior Engineer",
@@ -898,9 +904,9 @@
   },
   "dashboard": {
     "metaTitle": "Dashboard | DevLovers",
-    "metaDescription": "Track your progress and quiz performance.",
+    "metaDescription": "Track your progress and quiz performance",
     "title": "Dashboard",
-    "subtitle": "Welcome back to your training ground.",
+    "subtitle": "Welcome back to your training ground",
     "supportLink": "Support & Feedback",
     "profile": {
       "defaultName": "Developer",
@@ -910,7 +916,7 @@
     },
     "stats": {
       "title": "Quiz Statistics",
-      "noActivity": "Ready to level up? Challenge yourself with a new quiz.",
+      "noActivity": "Ready to level up? Challenge yourself with a new quiz",
       "startQuiz": "Start a Quiz",
       "attempts": "Attempts",
       "avgScore": "Avg Score",
@@ -940,7 +946,7 @@
     },
     "guest": {
       "title": "Unlock AI Explanations",
-      "description": "Sign in or create an account to get instant AI-powered explanations of technical terms.",
+      "description": "Sign in or create an account to get instant AI-powered explanations of technical terms",
       "login": "Log In",
       "signup": "Sign Up"
     },
diff --git a/frontend/messages/pl.json b/frontend/messages/pl.json
index 385af803..255327cb 100644
--- a/frontend/messages/pl.json
+++ b/frontend/messages/pl.json
@@ -46,17 +46,17 @@
   "homepage": {
     "title": "DevLovers",
     "subtitle": "Platforma do Przygotowania do Rozmów Kwalifikacyjnych",
-    "description": "Opanuj frontend, backend i full-stack development dzięki naszym pytaniom do rozmów kwalifikacyjnych, quizom i materiałom edukacyjnym.",
+    "description": "Zbuduj prawdziwą pewność w frontend, backend i full-stack development dzięki interaktywnym pytaniom rekrutacyjnym, quizom i praktycznym wyjaśnieniom",
     "cta": "Rozpocznij naukę",
     "ctaVariants": {
-      "1": "Bez presji. Po prostu zacznij.",
-      "2": "To może być ciekawsze, niż myślisz.",
-      "3": "Właśnie tutaj to się zaczyna.",
-      "4": "Jesteś już w połowie drogi.",
-      "5": "Jeden klik do postępu.",
-      "6": "Klik był — to się liczy.",
-      "7": "Postęp ważniejszy niż perfekcja.",
-      "8": "Zacząć to też funkcja."
+      "1": "Bez presji. Po prostu zacznij",
+      "2": "To może być ciekawsze, niż myślisz",
+      "3": "Właśnie tutaj to się zaczyna",
+      "4": "Jesteś już w połowie drogi",
+      "5": "Jeden klik do postępu",
+      "6": "Klik był — to się liczy",
+      "7": "Postęp ważniejszy niż perfekcja",
+      "8": "Zacząć to też funkcja"
     }
   },
   "qa": {
@@ -85,12 +85,17 @@
     "metaTitle": "Quizy | DevLovers",
     "metaDescription": "Sprawdź swoją wiedzę dzięki interaktywnym quizom",
     "page": {
+      "notFoundTitle": "Quiz nie znaleziony",
+      "metaSuffix": "Quiz DevLovers",
+      "metaDescriptionFallback": "Rozwiąż quiz {title} i sprawdź swoją wiedzę.",
       "noQuestions": "Brak dostępnych pytań dla tego quizu",
       "questionsLabel": "Pytania",
       "timeLabel": "Czas",
       "minutes": "min"
     },
     "list": {
+      "metaTitle": "Quizy | DevLovers",
+      "metaDescription": "Sprawdź swoją wiedzę z React, Angular, Vue, Node.js i innych technologii.",
       "title": "Quizy",
       "practice": "Ćwicz",
       "subtitle": "Wybierz quiz, aby sprawdzić swoją wiedzę",
@@ -206,7 +211,7 @@
   },
   "blog": {
     "title": "Wszystkie Wpisy na Blogu",
-    "subtitle": "Poznaj najnowsze artykuły z Tech, News i Career Growth — trendy, idee i praktyczne wskazówki.",
+    "subtitle": "Poznaj najnowsze artykuły z Tech, News i Career Growth — trendy, idee i praktyczne wskazówki",
     "metaTitle": "Blog | DevLovers",
     "metaDescription": "Odkryj najnowsze artykuły i spostrzeżenia",
     "all": "Wszystkie",
@@ -256,7 +261,7 @@
       "viewAll": "Zobacz wszystko",
       "hero": {
         "headline": "Koduj. Twórz. Kolekcjonuj.",
-        "subheadline": "Dołącz do tysięcy deweloperów, którzy wyrażają swoją pasję poprzez premium merch.",
+        "subheadline": "Dołącz do tysięcy deweloperów, którzy wyrażają swoją pasję poprzez premium merch",
         "cta": "Przeglądaj wszystkie produkty"
       },
       "comingSoon": {
@@ -267,6 +272,7 @@
     },
     "product": {
       "soldOut": "Wyprzedane",
+      "maxStock": "Maksymalnie {stock} w magazynie",
       "color": "Kolor",
       "size": "Rozmiar",
       "quantity": "Ilość",
@@ -303,7 +309,7 @@
     "cart": {
       "title": "Twój koszyk",
       "empty": "Twój koszyk jest pusty",
-      "emptyDescription": "Wygląda na to, że nie dodałeś jeszcze żadnych produktów do koszyka.",
+      "emptyDescription": "Wygląda na to, że nie dodałeś jeszcze żadnych produktów do koszyka",
       "startShopping": "Rozpocznij zakupy",
       "itemsLabel": "Produkty w koszyku",
       "summary": {
@@ -316,7 +322,7 @@
       "checkout": {
         "placeOrder": "Złóż zamówienie",
         "placing": "Składanie zamówienia...",
-        "message": "Zostaniesz przekierowany do bezpiecznej płatności lub zobaczysz potwierdzenie, jeśli płatność nie jest wymagana w tym środowisku.",
+        "message": "Zostaniesz przekierowany do bezpiecznej płatności lub zobaczysz potwierdzenie, jeśli płatność nie jest wymagana w tym środowisku",
         "notRedirected": "Jeśli nie zostałeś automatycznie przekierowany, otwórz swoje zamówienie",
         "goToOrder": "Przejdź do zamówienia"
       },
@@ -327,20 +333,20 @@
         "maxStock": "Maksymalnie {stock} w magazynie"
       },
       "alerts": {
-        "itemsRemoved": "Niektóre produkty zostały usunięte z koszyka, ponieważ są niedostępne lub wyprzedane."
+        "itemsRemoved": "Niektóre produkty zostały usunięte z koszyka, ponieważ są niedostępne lub wyprzedane"
       }
     },
     "admin": {
       "page": {
         "title": "Panel administracyjny sklepu",
-        "description": "Narzędzia administracyjne dla sklepu z gadżetami.",
+        "description": "Narzędzia administracyjne dla sklepu z gadżetami",
         "productsSection": {
           "title": "Produkty",
-          "description": "Twórz, edytuj, aktywuj, promuj."
+          "description": "Twórz, edytuj, aktywuj, promuj"
         },
         "ordersSection": {
           "title": "Zamówienia",
-          "description": "Przeglądaj i zarządzaj zamówieniami."
+          "description": "Przeglądaj i zarządzaj zamówieniami"
         }
       },
       "topbar": {
@@ -462,45 +468,45 @@
       },
       "sort": {
         "featured": "Polecane",
-        "priceAsc": "Cena: od najniższej",
-        "priceDesc": "Cena: od najwyższej",
+        "priceAsc": "Cena ↑",
+        "priceDesc": "Cena ↓",
         "newest": "Najnowsze"
       }
     },
     "products": {
       "title": "Wszystkie produkty",
       "noProductsFound": "Nie znaleziono produktów",
-      "adjustFilters": "Spróbuj dostosować filtry, aby znaleźć to, czego szukasz.",
+      "adjustFilters": "Spróbuj dostosować filtry, aby znaleźć to, czego szukasz",
       "backToProducts": "Wróć do wszystkich produktów",
-      "notAvailable": "Ten produkt nie jest dostępny dla twojej lokalizacji/waluty.",
+      "notAvailable": "Ten produkt nie jest dostępny dla twojej lokalizacji/waluty",
       "loadMore": "Załaduj więcej",
       "shopNow": "Kup teraz"
     },
     "checkout": {
       "errors": {
         "missingOrderId": "Brak identyfikatora zamówienia",
-        "missingOrderIdDescription": "Nie mogliśmy zidentyfikować twojego zamówienia. Wróć do koszyka lub przeglądaj produkty.",
+        "missingOrderIdDescription": "Nie mogliśmy zidentyfikować twojego zamówienia. Wróć do koszyka lub przeglądaj produkty",
         "orderNotFound": "Zamówienie nie znalezione",
-        "orderNotFoundDescription": "Nie mogliśmy znaleźć tego zamówienia. Mogło zostać usunięte lub nigdy nie istniało.",
+        "orderNotFoundDescription": "Nie mogliśmy znaleźć tego zamówienia. Mogło zostać usunięte lub nigdy nie istniało",
         "invalidOrder": "Nieprawidłowe zamówienie",
         "unableToLoad": "Nie można załadować zamówienia",
-        "unableToCheckout": "Nie można rozpocząć procesu zakupu.",
-        "unexpectedResponse": "Nieoczekiwana odpowiedź przy zakupie.",
-        "tryAgainLater": "Spróbuj ponownie później."
+        "unableToCheckout": "Nie można rozpocząć procesu zakupu",
+        "unexpectedResponse": "Nieoczekiwana odpowiedź przy zakupie",
+        "tryAgainLater": "Spróbuj ponownie później"
       },
       "missingOrder": {
-        "message": "Nie mogliśmy zidentyfikować twojego zamówienia. Wróć do koszyka lub przeglądaj produkty."
+        "message": "Nie mogliśmy zidentyfikować twojego zamówienia. Wróć do koszyka lub przeglądaj produkty"
       },
       "notFoundOrder": {
-        "message": "Nie mogliśmy znaleźć tego zamówienia. Mogło zostać usunięte lub nigdy nie istniało."
+        "message": "Nie mogliśmy znaleźć tego zamówienia. Mogło zostać usunięte lub nigdy nie istniało"
       },
       "success": {
         "title": "Dziękujemy za zamówienie",
         "orderLabel": "Zamówienie",
-        "received": "Otrzymaliśmy twoje zamówienie.",
-        "paymentConfirmed": "Płatność została potwierdzona.",
-        "paymentProcessing": "Płatność jest nadal przetwarzana. Ta strona zaktualizuje się automatycznie.",
-        "paymentsDisabled": "Płatności są wyłączone w tym środowisku. Nie zostałeś obciążony za to zamówienie.",
+        "received": "Otrzymaliśmy twoje zamówienie",
+        "paymentConfirmed": "Płatność została potwierdzona",
+        "paymentProcessing": "Płatność jest nadal przetwarzana. Ta strona zaktualizuje się automatycznie",
+        "paymentsDisabled": "Płatności są wyłączone w tym środowisku. Nie zostałeś obciążony za to zamówienie",
         "orderSummary": "Podsumowanie zamówienia",
         "totalAmount": "Łączna kwota",
         "items": "Produkty",
@@ -510,11 +516,11 @@
       },
       "error": {
         "paymentFailed": "Płatność nie powiodła się",
-        "paymentFailedDescription": "Płatność za to zamówienie nie została zakończona. Możesz spróbować ponownie lub skontaktować się z pomocą.",
+        "paymentFailedDescription": "Płatność za to zamówienie nie została zakończona. Możesz spróbować ponownie lub skontaktować się z pomocą",
         "paymentUnclear": "Status płatności nieznany",
-        "paymentUnclearDescription": "Nie mogliśmy potwierdzić błędu płatności dla tego zamówienia.",
-        "notCompleted": "Płatność za to zamówienie nie została zakończona. Możesz spróbować ponownie lub skontaktować się z pomocą.",
-        "couldNotConfirm": "Nie mogliśmy potwierdzić błędu płatności dla tego zamówienia.",
+        "paymentUnclearDescription": "Nie mogliśmy potwierdzić błędu płatności dla tego zamówienia",
+        "notCompleted": "Płatność za to zamówienie nie została zakończona. Możesz spróbować ponownie lub skontaktować się z pomocą",
+        "couldNotConfirm": "Nie mogliśmy potwierdzić błędu płatności dla tego zamówienia",
         "orderDetails": "Szczegóły zamówienia",
         "order": "Zamówienie",
         "orderLabel": "Zamówienie",
@@ -530,7 +536,7 @@
         "title": "Bezpieczna płatność",
         "payForOrder": "Zapłać za zamówienie #{orderId}",
         "paymentDetails": "Szczegóły płatności",
-        "completePayment": "Dokończ płatność, aby złożyć zamówienie.",
+        "completePayment": "Dokończ płatność, aby złożyć zamówienie",
         "amountDue": "Do zapłaty",
         "orderSummary": "Podsumowanie zamówienia",
         "items": "Produkty",
@@ -539,9 +545,9 @@
         "viewConfirmation": "Zobacz potwierdzenie",
         "continueShopping": "Kontynuuj zakupy",
         "statusMessages": {
-          "alreadyPaid": "To zamówienie jest już opłacone.",
-          "previousFailed": "Poprzednia próba płatności nie powiodła się. Spróbuj ponownie.",
-          "completePayment": "Dokończ płatność, aby sfinalizować zamówienie."
+          "alreadyPaid": "To zamówienie jest już opłacone",
+          "previousFailed": "Poprzednia próba płatności nie powiodła się. Spróbuj ponownie",
+          "completePayment": "Dokończ płatność, aby sfinalizować zamówienie"
         }
       },
       "actions": {
@@ -553,10 +559,10 @@
     },
     "orders": {
       "title": "Moje zamówienia",
-      "subtitle": "Twoje najnowsze zamówienia (do 50).",
+      "subtitle": "Twoje najnowsze zamówienia (do 50)",
       "backToShop": "Wróć do sklepu",
       "empty": {
-        "message": "Brak zamówień.",
+        "message": "Brak zamówień",
         "browseProducts": "Przeglądaj produkty"
       },
       "table": {
@@ -609,10 +615,10 @@
     "metaDescription": "Dowiedz się więcej o DevLovers — platformie do przygotowań do rozmów kwalifikacyjnych",
     "hero": {
       "titleHighlight": "Zdebuguj swoje umiejętności",
-      "titleRest": "zanim zrobi to rekruter.",
+      "titleRest": "zanim zrobi to rekruter",
       "description": "Przestań zgadywać. Zamieniliśmy chaotyczny proces rozmów w uporządkowaną mapę drogową.",
       "descriptionHighlight": "Przekształć rozproszoną wiedzę",
-      "descriptionRest": "w gotowy do produkcji zestaw umiejętności i zdobądź ofertę.",
+      "descriptionRest": "w gotowy do produkcji zestaw umiejętności i zdobądź ofertę",
       "stats": {
         "quizzesPassed": "Ukończonych quizów",
         "githubStars": "Gwiazdek na GitHub",
@@ -762,7 +768,7 @@
       "heading": "Cennik",
       "badge": "Bez ukrytych opłat",
       "title": "Inwestuj w swój mózg,",
-      "titleHighlight": "nie w nasze subskrypcje.",
+      "titleHighlight": "nie w nasze subskrypcje",
       "subtitle": "Wierzymy, że wiedza powinna być dostępna. Dlatego nie sprzedajemy kursów. Ale serwery się grzeją, a kawa się kończy. Wybór należy do ciebie.",
       "junior": {
         "title": "Junior Engineer",
@@ -925,9 +931,9 @@
   },
   "dashboard": {
     "metaTitle": "Panel | DevLovers",
-    "metaDescription": "Śledź swój postęp i wyniki quizów.",
+    "metaDescription": "Śledź swój postęp i wyniki quizów",
     "title": "Panel użytkownika",
-    "subtitle": "Witaj z powrotem na swoim placu treningowym.",
+    "subtitle": "Witaj z powrotem na swoim placu treningowym",
     "supportLink": "Wsparcie i opinie",
     "profile": {
       "defaultName": "Programista",
@@ -937,7 +943,7 @@
     },
     "stats": {
       "title": "Statystyki quizów",
-      "noActivity": "Gotowy na rozwój? Sprawdź się w nowym quizie.",
+      "noActivity": "Gotowy na rozwój? Sprawdź się w nowym quizie",
       "startQuiz": "Rozpocznij quiz",
       "attempts": "Próby",
       "avgScore": "Średni wynik",
@@ -967,7 +973,7 @@
     },
     "guest": {
       "title": "Odblokuj wyjaśnienia AI",
-      "description": "Zaloguj się lub utwórz konto, aby otrzymywać natychmiastowe wyjaśnienia terminów technicznych generowane przez AI.",
+      "description": "Zaloguj się lub utwórz konto, aby otrzymywać natychmiastowe wyjaśnienia terminów technicznych generowane przez AI",
       "login": "Zaloguj się",
       "signup": "Zarejestruj się"
     },
diff --git a/frontend/messages/uk.json b/frontend/messages/uk.json
index 9f141a38..85047ccd 100644
--- a/frontend/messages/uk.json
+++ b/frontend/messages/uk.json
@@ -46,17 +46,17 @@
   "homepage": {
     "title": "DevLovers",
     "subtitle": "Платформа для підготовки до технічних співбесід",
-    "description": "Опануйте frontend, backend та full-stack-розробку за допомогою наших питань для співбесід, квізів і навчальних матеріалів.",
+    "description": "Сформуй справжню впевненість у frontend, backend та full-stack розробці завдяки інтерактивним питанням для співбесід, квізам і практичним поясненням",
     "cta": "Зроби перший крок",
     "ctaVariants": {
-      "1": "Без тиску. Просто почни.",
-      "2": "Це може бути цікавіше, ніж здається.",
-      "3": "Ось тут усе й починається.",
-      "4": "Ти вже на пів шляху.",
-      "5": "Один клік до прогресу.",
-      "6": "Ну все, процес пішов.",
+      "1": "Без тиску. Просто почни",
+      "2": "Це може бути цікавіше, ніж здається",
+      "3": "Ось тут усе й починається",
+      "4": "Ти вже на пів шляху",
+      "5": "Один клік до прогресу",
+      "6": "Ну все, процес пішов",
       "7": "Простіше, ніж виглядає",
-      "8": "Почати — це теж фіча."
+      "8": "Почати — це теж фіча"
     }
   },
   "qa": {
@@ -85,12 +85,17 @@
     "metaTitle": "Квізи | DevLovers",
     "metaDescription": "Перевірте свої знання з допомогою інтерактивних квізів",
     "page": {
+      "notFoundTitle": "Квіз не знайдено",
+      "metaSuffix": "Квіз DevLovers",
+      "metaDescriptionFallback": "Пройдіть квіз {title} та перевірте свої знання.",
       "noQuestions": "Немає питань для цього квізу",
       "questionsLabel": "Питань",
       "timeLabel": "Час",
       "minutes": "хв"
     },
     "list": {
+      "metaTitle": "Квізи | DevLovers",
+      "metaDescription": "Перевірте свої знання з React, Angular, Vue, Node.js та інших технологій.",
       "title": "Квізи",
       "practice": "Практика",
       "subtitle": "Оберіть квіз, щоб перевірити свої знання",
@@ -206,7 +211,7 @@
   },
   "blog": {
     "title": "Усі статті блогу",
-    "subtitle": "Досліджуйте найсвіжіші статті про Tech, News та Career Growth із трендами, ідеями й практичними інсайтами.",
+    "subtitle": "Досліджуйте найсвіжіші статті про Tech, News та Career Growth із трендами, ідеями й практичними інсайтами",
     "metaTitle": "Блог | DevLovers",
     "metaDescription": "Досліджуйте останні статті та корисні матеріали",
     "all": "Усі",
@@ -256,7 +261,7 @@
       "viewAll": "Переглянути все",
       "hero": {
         "headline": "Кодуй. Створюй. Колекціонуй.",
-        "subheadline": "Приєднуйтесь до тисяч розробників, які виражають свою пристрасть через преміум мерч.",
+        "subheadline": "Приєднуйтесь до тисяч розробників, які виражають свою пристрасть через преміум мерч",
         "cta": "Переглянути всі товари"
       },
       "comingSoon": {
@@ -267,6 +272,7 @@
     },
     "product": {
       "soldOut": "Розпродано",
+      "maxStock": "Максимум {stock} в наявності",
       "color": "Колір",
       "size": "Розмір",
       "quantity": "Кількість",
@@ -303,7 +309,7 @@
     "cart": {
       "title": "Ваш кошик",
       "empty": "Ваш кошик порожній",
-      "emptyDescription": "Схоже, ви ще не додали жодного товару до кошика.",
+      "emptyDescription": "Схоже, ви ще не додали жодного товару до кошика",
       "startShopping": "Почати покупки",
       "itemsLabel": "Товари в кошику",
       "summary": {
@@ -316,7 +322,7 @@
       "checkout": {
         "placeOrder": "Оформити замовлення",
         "placing": "Оформлення замовлення...",
-        "message": "Ви будете перенаправлені на безпечну оплату або побачите підтвердження, якщо оплата не потрібна в цьому середовищі.",
+        "message": "Ви будете перенаправлені на безпечну оплату або побачите підтвердження, якщо оплата не потрібна в цьому середовищі",
         "notRedirected": "Якщо ви не були автоматично перенаправлені, відкрийте ваше замовлення",
         "goToOrder": "Перейти до замовлення"
       },
@@ -327,20 +333,20 @@
         "maxStock": "Максимум {stock} в наявності"
       },
       "alerts": {
-        "itemsRemoved": "Деякі товари були видалені з вашого кошика, оскільки вони недоступні або закінчилися на складі."
+        "itemsRemoved": "Деякі товари були видалені з вашого кошика, оскільки вони недоступні або закінчилися на складі"
       }
     },
     "admin": {
       "page": {
         "title": "Адміністрування магазину",
-        "description": "Інструменти адміністрування магазину мерчу.",
+        "description": "Інструменти адміністрування магазину мерчу",
         "productsSection": {
           "title": "Товари",
-          "description": "Створювати, редагувати, активувати, рекомендувати."
+          "description": "Створювати, редагувати, активувати, рекомендувати"
         },
         "ordersSection": {
           "title": "Замовлення",
-          "description": "Переглядати та керувати замовленнями."
+          "description": "Переглядати та керувати замовленнями"
         }
       },
       "topbar": {
@@ -462,45 +468,45 @@
       },
       "sort": {
         "featured": "Рекомендовані",
-        "priceAsc": "Ціна: від низької до високої",
-        "priceDesc": "Ціна: від високої до низької",
-        "newest": "Найновіші"
+        "priceAsc": "Ціна ↑",
+        "priceDesc": "Ціна ↓",
+        "newest": "Нові"
       }
     },
     "products": {
       "title": "Всі товари",
       "noProductsFound": "Товарів не знайдено",
-      "adjustFilters": "Спробуйте змінити фільтри, щоб знайти те, що ви шукаєте.",
+      "adjustFilters": "Спробуйте змінити фільтри, щоб знайти те, що ви шукаєте",
       "backToProducts": "Назад до всіх товарів",
-      "notAvailable": "Цей товар недоступний для вашої локалі/валюти.",
+      "notAvailable": "Цей товар недоступний для вашої локалі/валюти",
       "loadMore": "Завантажити ще",
       "shopNow": "Купити зараз"
     },
     "checkout": {
       "errors": {
         "missingOrderId": "Відсутній ідентифікатор замовлення",
-        "missingOrderIdDescription": "Ми не змогли ідентифікувати ваше замовлення. Будь ласка, поверніться до кошика або перегляньте товари.",
+        "missingOrderIdDescription": "Ми не змогли ідентифікувати ваше замовлення. Будь ласка, поверніться до кошика або перегляньте товари",
         "orderNotFound": "Замовлення не знайдено",
-        "orderNotFoundDescription": "Ми не змогли знайти це замовлення. Можливо, його було видалено або воно ніколи не існувало.",
+        "orderNotFoundDescription": "Ми не змогли знайти це замовлення. Можливо, його було видалено або воно ніколи не існувало",
         "invalidOrder": "Недійсне замовлення",
         "unableToLoad": "Не вдається завантажити замовлення",
-        "unableToCheckout": "Не вдається розпочати оформлення замовлення зараз.",
-        "unexpectedResponse": "Неочікувана відповідь оформлення замовлення.",
-        "tryAgainLater": "Будь ласка, спробуйте пізніше."
+        "unableToCheckout": "Не вдається розпочати оформлення замовлення зараз",
+        "unexpectedResponse": "Неочікувана відповідь оформлення замовлення",
+        "tryAgainLater": "Будь ласка, спробуйте пізніше"
       },
       "missingOrder": {
-        "message": "Ми не змогли ідентифікувати ваше замовлення. Будь ласка, поверніться до кошика або перегляньте товари."
+        "message": "Ми не змогли ідентифікувати ваше замовлення. Будь ласка, поверніться до кошика або перегляньте товари"
       },
       "notFoundOrder": {
-        "message": "Ми не змогли знайти це замовлення. Можливо, його було видалено або воно ніколи не існувало."
+        "message": "Ми не змогли знайти це замовлення. Можливо, його було видалено або воно ніколи не існувало"
       },
       "success": {
         "title": "Дякуємо за ваше замовлення",
         "orderLabel": "Замовлення",
-        "received": "Ми отримали ваше замовлення.",
-        "paymentConfirmed": "Оплату підтверджено.",
-        "paymentProcessing": "Оплата все ще обробляється. Ця сторінка оновиться автоматично.",
-        "paymentsDisabled": "Платежі вимкнено в цьому середовищі. З вас не було знято плату за це замовлення.",
+        "received": "Ми отримали ваше замовлення",
+        "paymentConfirmed": "Оплату підтверджено",
+        "paymentProcessing": "Оплата все ще обробляється. Ця сторінка оновиться автоматично",
+        "paymentsDisabled": "Платежі вимкнено в цьому середовищі. З вас не було знято плату за це замовлення",
         "orderSummary": "Підсумок замовлення",
         "totalAmount": "Загальна сума",
         "items": "Товари",
@@ -510,11 +516,11 @@
       },
       "error": {
         "paymentFailed": "Помилка оплати",
-        "paymentFailedDescription": "Оплату цього замовлення не завершено. Ви можете спробувати ще раз або зв'язатися з підтримкою.",
+        "paymentFailedDescription": "Оплату цього замовлення не завершено. Ви можете спробувати ще раз або зв'язатися з підтримкою",
         "paymentUnclear": "Статус оплати неясний",
-        "paymentUnclearDescription": "Ми не змогли підтвердити помилку оплати для цього замовлення.",
-        "notCompleted": "Оплату цього замовлення не завершено. Ви можете спробувати ще раз або зв'язатися з підтримкою.",
-        "couldNotConfirm": "Ми не змогли підтвердити помилку оплати для цього замовлення.",
+        "paymentUnclearDescription": "Ми не змогли підтвердити помилку оплати для цього замовлення",
+        "notCompleted": "Оплату цього замовлення не завершено. Ви можете спробувати ще раз або зв'язатися з підтримкою",
+        "couldNotConfirm": "Ми не змогли підтвердити помилку оплати для цього замовлення",
         "orderDetails": "Деталі замовлення",
         "order": "Замовлення",
         "orderLabel": "Замовлення",
@@ -530,7 +536,7 @@
         "title": "Безпечна оплата",
         "payForOrder": "Оплатити замовлення #{orderId}",
         "paymentDetails": "Деталі оплати",
-        "completePayment": "Завершіть оплату, щоб оформити замовлення.",
+        "completePayment": "Завершіть оплату, щоб оформити замовлення",
         "amountDue": "До сплати",
         "orderSummary": "Підсумок замовлення",
         "items": "Товари",
@@ -539,9 +545,9 @@
         "viewConfirmation": "Переглянути підтвердження",
         "continueShopping": "Продовжити покупки",
         "statusMessages": {
-          "alreadyPaid": "Це замовлення вже оплачено.",
-          "previousFailed": "Попередня спроба оплати не вдалася. Будь ласка, спробуйте ще раз.",
-          "completePayment": "Завершіть оплату, щоб завершити замовлення."
+          "alreadyPaid": "Це замовлення вже оплачено",
+          "previousFailed": "Попередня спроба оплати не вдалася. Будь ласка, спробуйте ще раз",
+          "completePayment": "Завершіть оплату, щоб завершити замовлення"
         }
       },
       "actions": {
@@ -553,10 +559,10 @@
     },
     "orders": {
       "title": "Мої замовлення",
-      "subtitle": "Ваші останні замовлення (до 50).",
+      "subtitle": "Ваші останні замовлення (до 50)",
       "backToShop": "Назад до магазину",
       "empty": {
-        "message": "Замовлень поки немає.",
+        "message": "Замовлень поки немає",
         "browseProducts": "Переглянути товари"
       },
       "table": {
@@ -609,10 +615,10 @@
     "metaDescription": "Дізнайтеся більше про DevLovers — платформу для підготовки до технічних співбесід",
     "hero": {
       "titleHighlight": "Знайди свої баги",
-      "titleRest": "поки це не зробив рекрутер.",
+      "titleRest": "поки це не зробив рекрутер",
       "description": "Досить гадати. Ми розклали хаос співбесід на зрозумілу дорожню карту.",
       "descriptionHighlight": "Систематизуй свої знання",
-      "descriptionRest": "у готовий до продакшену скілсет і отримай офер.",
+      "descriptionRest": "у готовий до продакшену скілсет і отримай офер",
       "stats": {
         "quizzesPassed": "Пройдено квізів",
         "githubStars": "Зірок на GitHub",
@@ -738,7 +744,7 @@
       "heading": "Тарифи",
       "badge": "Без прихованих платежів",
       "title": "Інвестуй у свій мозок,",
-      "titleHighlight": "а не в наші підписки.",
+      "titleHighlight": "а не в наші підписки",
       "subtitle": "Ми віримо, що знання мають бути доступними. Тому ми не продаємо курси. Але сервери гріються, а кава закінчується. Вибір за тобою.",
       "junior": {
         "title": "Junior Engineer",
@@ -901,9 +907,9 @@
   },
   "dashboard": {
     "metaTitle": "Панель | DevLovers",
-    "metaDescription": "Відстежуйте свій прогрес та результати квізів.",
+    "metaDescription": "Відстежуйте свій прогрес та результати квізів",
     "title": "Кабінет користувача",
-    "subtitle": "З поверненням на вашу навчальну площадку.",
+    "subtitle": "З поверненням на вашу навчальну площадку",
     "supportLink": "Підтримка та відгуки",
     "profile": {
       "defaultName": "Розробник",
@@ -913,7 +919,7 @@
     },
     "stats": {
       "title": "Статистика квізів",
-      "noActivity": "Готові прокачатися? Випробуйте себе в новому квізі.",
+      "noActivity": "Готові прокачатися? Випробуйте себе в новому квізі",
       "startQuiz": "Почати квіз",
       "attempts": "Спроби",
       "avgScore": "Середній бал",
@@ -943,7 +949,7 @@
     },
     "guest": {
       "title": "Розблокуй AI Пояснення",
-      "description": "Увійдіть або зареєструйтесь, щоб отримати миттєві пояснення технічних термінів від AI.",
+      "description": "Увійдіть або зареєструйтесь, щоб отримати миттєві пояснення технічних термінів від AI",
       "login": "Увійти",
       "signup": "Зареєструватися"
     },
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c8ab5d7e..fbac15c3 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "frontend",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "frontend",
-      "version": "0.5.2",
+      "version": "0.5.4",
       "dependencies": {
         "@neondatabase/serverless": "^1.0.2",
         "@portabletext/react": "^5.0.0",
@@ -101,17 +101,17 @@
       }
     },
     "node_modules/@asamuzakjp/css-color": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.1.tgz",
-      "integrity": "sha512-B0Hv6G3gWGMn0xKJ0txEi/jM5iFpT3MfDxmhZFb4W047GvytCf1DHQ1D69W3zHI4yWe2aTZAA0JnbMZ7Xc8DuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.2.tgz",
+      "integrity": "sha512-NfBUvBaYgKIuq6E/RBLY1m0IohzNHAYyaJGuTK79Z23uNwmz2jl1mPsC5ZxCCxylinKhT1Amn5oNTlx1wN8cQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.4",
-        "@csstools/css-color-parser": "^3.1.0",
-        "@csstools/css-parser-algorithms": "^3.0.5",
-        "@csstools/css-tokenizer": "^3.0.4",
-        "lru-cache": "^11.2.4"
+        "@csstools/css-calc": "^3.0.0",
+        "@csstools/css-color-parser": "^4.0.1",
+        "@csstools/css-parser-algorithms": "^4.0.0",
+        "@csstools/css-tokenizer": "^4.0.0",
+        "lru-cache": "^11.2.5"
       }
     },
     "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
@@ -125,9 +125,9 @@
       }
     },
     "node_modules/@asamuzakjp/dom-selector": {
-      "version": "6.7.7",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.7.7.tgz",
-      "integrity": "sha512-8CO/UQ4tzDd7ula+/CVimJIVWez99UJlbMyIgk8xOnhAVPKLnBZmUFYVgugS441v2ZqUq5EnSh6B0Ua0liSFAA==",
+      "version": "6.7.8",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.7.8.tgz",
+      "integrity": "sha512-stisC1nULNc9oH5lakAj8MH88ZxeGxzyWNDfbdCxvJSJIvDsHNZqYvscGTgy/ysgXWLJPt6K/4t0/GjvtKcFJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -212,9 +212,9 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.0.tgz",
-      "integrity": "sha512-vSH118/wwM/pLR38g/Sgk05sNtro6TlTJKuiMXDaZqPUfjTFcudpCOt00IhOfj+1BFAX+UFAlzCU+6WXr3GLFQ==",
+      "version": "7.29.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
+      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -416,9 +416,9 @@
       }
     },
     "node_modules/@csstools/color-helpers": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
-      "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.0.1.tgz",
+      "integrity": "sha512-NmXRccUJMk2AWA5A7e5a//3bCIMyOu2hAtdRYrhPPHjDxINuCwX1w6rnIZ4xjLcp0ayv6h8Pc3X0eJUGiAAXHQ==",
       "dev": true,
       "funding": [
         {
@@ -432,13 +432,13 @@
       ],
       "license": "MIT-0",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       }
     },
     "node_modules/@csstools/css-calc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
-      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.0.0.tgz",
+      "integrity": "sha512-q4d82GTl8BIlh/dTnVsWmxnbWJeb3kiU8eUH71UxlxnS+WIaALmtzTL8gR15PkYOexMQYVk0CO4qIG93C1IvPA==",
       "dev": true,
       "funding": [
         {
@@ -452,17 +452,17 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.5",
-        "@csstools/css-tokenizer": "^3.0.4"
+        "@csstools/css-parser-algorithms": "^4.0.0",
+        "@csstools/css-tokenizer": "^4.0.0"
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
-      "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.0.1.tgz",
+      "integrity": "sha512-vYwO15eRBEkeF6xjAno/KQ61HacNhfQuuU/eGwH67DplL0zD5ZixUa563phQvUelA07yDczIXdtmYojCphKJcw==",
       "dev": true,
       "funding": [
         {
@@ -476,21 +476,21 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/color-helpers": "^5.1.0",
-        "@csstools/css-calc": "^2.1.4"
+        "@csstools/color-helpers": "^6.0.1",
+        "@csstools/css-calc": "^3.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.5",
-        "@csstools/css-tokenizer": "^3.0.4"
+        "@csstools/css-parser-algorithms": "^4.0.0",
+        "@csstools/css-tokenizer": "^4.0.0"
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
-      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.0.tgz",
+      "integrity": "sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==",
       "dev": true,
       "funding": [
         {
@@ -504,10 +504,10 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.4"
+        "@csstools/css-tokenizer": "^4.0.0"
       }
     },
     "node_modules/@csstools/css-syntax-patches-for-csstree": {
@@ -528,9 +528,9 @@
       "license": "MIT-0"
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
-      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.0.tgz",
+      "integrity": "sha512-QxULHAm7cNu72w97JUNCBFODFaXpbDg+dP8b/oWFAZ2MTRppA3U00Y2L1HqaS4J6yBqxwa/Y3nMBaxVKbB/NsA==",
       "dev": true,
       "funding": [
         {
@@ -544,7 +544,7 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       }
     },
     "node_modules/@emnapi/core": {
@@ -1888,9 +1888,9 @@
       }
     },
     "node_modules/@neondatabase/serverless/node_modules/@types/node": {
-      "version": "22.19.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.8.tgz",
-      "integrity": "sha512-ebO/Yl+EAvVe8DnMfi+iaAyIqYdK0q/q0y0rw82INWEKJOBe6b/P3YWE8NW7oOlF/nXFNrHwhARrN/hdgDkraA==",
+      "version": "22.19.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.7.tgz",
+      "integrity": "sha512-MciR4AKGHWl7xwxkBa6xUGxQJ4VBOmPTF7sL+iGzuahOFaO0jHCsuEfS80pan1ef4gWId1oWOweIhrDEYLuaOw==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -3916,9 +3916,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.19.31",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.31.tgz",
-      "integrity": "sha512-5jsi0wpncvTD33Sh1UCgacK37FFwDn+EG7wCmEvs62fCvBL+n8/76cAYDok21NF6+jaVWIqKwCZyX7Vbu8eB3A==",
+      "version": "20.19.30",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.30.tgz",
+      "integrity": "sha512-WJtwWJu7UdlvzEAUm484QNg5eAoq5QR08KDNx7g45Usrs2NtOPiX8ugDqmKdXkyL03rBqU5dYNYVQetEpBHq2g==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -3962,9 +3962,9 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "19.2.10",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.10.tgz",
-      "integrity": "sha512-WPigyYuGhgZ/cTPRXB2EwUw+XvsRA3GqHlsP4qteqrnnjDrApbS7MxcGr/hke5iUoeB7E/gQtrs9I37zAJ0Vjw==",
+      "version": "19.2.13",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.13.tgz",
+      "integrity": "sha512-KkiJeU6VbYbUOp5ITMIc7kBfqlYkKA5KhEHVrGMmUUMt7NeaZg65ojdPk+FtNrBAOXNVM5QM72jnADjM+XVRAQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -5281,9 +5281,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001767",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001767.tgz",
-      "integrity": "sha512-34+zUAMhSH+r+9eKmYG+k2Rpt8XttfE4yXAjoZvkAPs15xcYQhyBYdalJ65BzivAvGRMViEjy6oKr/S91loekQ==",
+      "version": "1.0.30001766",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz",
+      "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==",
       "funding": [
         {
           "type": "opencollective",
@@ -5964,14 +5964,14 @@
       "license": "MIT"
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.4",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.4.tgz",
-      "integrity": "sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.19.0.tgz",
+      "integrity": "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "tapable": "^2.3.0"
       },
       "engines": {
         "node": ">=10.13.0"
@@ -7517,12 +7517,12 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "12.30.1",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.30.1.tgz",
-      "integrity": "sha512-nt3NMBb9wrsC/TlPi6Blg3Zzzf8DkSidCT8dFa3ha3ierU8AF20tqP0eQ3CyGVZdwytVjd4vF/fWE0Uoa+qzdg==",
+      "version": "12.29.2",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.29.2.tgz",
+      "integrity": "sha512-lSNRzBJk4wuIy0emYQ/nfZ7eWhqud2umPKw2QAQki6uKhZPKm2hRQHeQoHTG9MIvfobb+A/LbEWPJU794ZUKrg==",
       "license": "MIT",
       "dependencies": {
-        "motion-dom": "^12.30.1",
+        "motion-dom": "^12.29.2",
         "motion-utils": "^12.29.2",
         "tslib": "^2.4.0"
       },
@@ -7698,9 +7698,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.1.tgz",
-      "integrity": "sha512-EoY1N2xCn44xU6750Sx7OjOIT59FkmstNc3X6y5xpz7D5cBtZRe/3pSlTkDJgqsOk3WwZPkWfonhhUJfttQo3w==",
+      "version": "4.13.3",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.3.tgz",
+      "integrity": "sha512-vp8Cj/+9Q/ibZUrq1rhy8mCTQpCk31A3uu9wc1C50yAb3x2pFHOsGdAZQ7jD86ARayyxZUViYeIztW+GE8dcrg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7714,7 +7714,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
       "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -9332,14 +9332,14 @@
       }
     },
     "node_modules/magicast": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.1.tgz",
-      "integrity": "sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.2.tgz",
+      "integrity": "sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@babel/types": "^7.28.5",
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "source-map-js": "^1.2.1"
       }
     },
@@ -9522,9 +9522,9 @@
       }
     },
     "node_modules/motion-dom": {
-      "version": "12.30.1",
-      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.30.1.tgz",
-      "integrity": "sha512-QXB+iFJRzZTqL+Am4a1CRoHdH+0Nq12wLdqQQZZsfHlp9AMt6PA098L/61oVZsDA+Ep3QSGudzpViyRrhYhGcQ==",
+      "version": "12.29.2",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.29.2.tgz",
+      "integrity": "sha512-/k+NuycVV8pykxyiTCoFzIVLA95Nb1BFIVvfSu9L50/6K6qNeAYtkxXILy/LRutt7AzaYDc2myj0wkCVVYAPPA==",
       "license": "MIT",
       "dependencies": {
         "motion-utils": "^12.29.2"
@@ -9725,9 +9725,8 @@
       "version": "0.5.18",
       "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.18.tgz",
       "integrity": "sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==",
+      "extraneous": true,
       "license": "Apache-2.0",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "tslib": "^2.8.0"
       }
@@ -11589,22 +11588,22 @@
       }
     },
     "node_modules/tldts": {
-      "version": "7.0.21",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.21.tgz",
-      "integrity": "sha512-Plu6V8fF/XU6d2k8jPtlQf5F4Xx2hAin4r2C2ca7wR8NK5MbRTo9huLUWRe28f3Uk8bYZfg74tit/dSjc18xnw==",
+      "version": "7.0.22",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.22.tgz",
+      "integrity": "sha512-nqpKFC53CgopKPjT6Wfb6tpIcZXHcI6G37hesvikhx0EmUGPkZrujRyAjgnmp1SHNgpQfKVanZ+KfpANFt2Hxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^7.0.21"
+        "tldts-core": "^7.0.22"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "7.0.21",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.21.tgz",
-      "integrity": "sha512-oVOMdHvgjqyzUZH1rOESgJP1uNe2bVrfK0jUHHmiM2rpEiRbf3j4BrsIc6JigJRbHGanQwuZv/R+LTcHsw+bLA==",
+      "version": "7.0.22",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.22.tgz",
+      "integrity": "sha512-KgbTDC5wzlL6j/x6np6wCnDSMUq4kucHNm00KXPbfNzmllCmtmvtykJHfmgdHntwIeupW04y8s1N/43S1PkQDw==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/frontend/package.json b/frontend/package.json
index 27828b13..9e8866a0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/studio/package-lock.json b/studio/package-lock.json
index 17c8340c..1a469d4b 100644
--- a/studio/package-lock.json
+++ b/studio/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "devlovers",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "devlovers",
-      "version": "0.5.2",
+      "version": "0.5.4",
       "license": "UNLICENSED",
       "dependencies": {
         "@sanity/orderable-document-list": "^1.4.2",
@@ -25,53 +25,63 @@
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
-      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-3.0.0.tgz",
+      "integrity": "sha512-zYt6cz+ivnTmiT/ksRVriMBOiuoUpDCJJlZ5KPl2/FRdvwU3f7MPh9qftvbkXJThragzUZieit2nyHUyw53Seg==",
       "license": "MIT",
       "dependencies": {
-        "@actions/exec": "^1.1.1",
-        "@actions/http-client": "^2.0.1"
+        "@actions/exec": "^3.0.0",
+        "@actions/http-client": "^4.0.0"
       }
     },
     "node_modules/@actions/exec": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
-      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-3.0.0.tgz",
+      "integrity": "sha512-6xH/puSoNBXb72VPlZVm7vQ+svQpFyA96qdDBvhB8eNZOE8LtPf9L4oAsfzK/crCL8YZ+19fKYVnM63Sl+Xzlw==",
       "license": "MIT",
       "dependencies": {
-        "@actions/io": "^1.0.1"
+        "@actions/io": "^3.0.2"
       }
     },
     "node_modules/@actions/github": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz",
-      "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-9.0.0.tgz",
+      "integrity": "sha512-yJ0RoswsAaKcvkmpCE4XxBRiy/whH2SdTBHWzs0gi4wkqTDhXMChjSdqBz/F4AeiDlP28rQqL33iHb+kjAMX6w==",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/http-client": "^3.0.2",
+        "@octokit/core": "^7.0.6",
+        "@octokit/plugin-paginate-rest": "^14.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^17.0.0",
+        "@octokit/request": "^10.0.7",
+        "@octokit/request-error": "^7.1.0",
+        "undici": "^6.23.0"
+      }
+    },
+    "node_modules/@actions/github/node_modules/@actions/http-client": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-3.0.2.tgz",
+      "integrity": "sha512-JP38FYYpyqvUsz+Igqlc/JG6YO9PaKuvqjM3iGvaLqFnJ7TFmcLyy2IDrY0bI0qCQug8E9K+elv5ZNfw62ZJzA==",
       "license": "MIT",
       "dependencies": {
-        "@actions/http-client": "^2.2.0",
-        "@octokit/core": "^5.0.1",
-        "@octokit/plugin-paginate-rest": "^9.2.2",
-        "@octokit/plugin-rest-endpoint-methods": "^10.4.0",
-        "@octokit/request": "^8.4.1",
-        "@octokit/request-error": "^5.1.1",
-        "undici": "^5.28.5"
+        "tunnel": "^0.0.6",
+        "undici": "^6.23.0"
       }
     },
     "node_modules/@actions/http-client": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
-      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-4.0.0.tgz",
+      "integrity": "sha512-QuwPsgVMsD6qaPD57GLZi9sqzAZCtiJT8kVBCDpLtxhL5MydQ4gS+DrejtZZPdIYyB1e95uCK9Luyds7ybHI3g==",
       "license": "MIT",
       "dependencies": {
         "tunnel": "^0.0.6",
-        "undici": "^5.25.4"
+        "undici": "^6.23.0"
       }
     },
     "node_modules/@actions/io": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
-      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-3.0.2.tgz",
+      "integrity": "sha512-nRBchcMM+QK1pdjO7/idu86rbJI5YHUKCvKs0KxnSYbVe3F51UfGxuZX4Qy/fWlp6l7gWFwIkrOzN+oUK03kfw==",
       "license": "MIT"
     },
     "node_modules/@architect/asap": {
@@ -343,9 +353,9 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.0.tgz",
-      "integrity": "sha512-vSH118/wwM/pLR38g/Sgk05sNtro6TlTJKuiMXDaZqPUfjTFcudpCOt00IhOfj+1BFAX+UFAlzCU+6WXr3GLFQ==",
+      "version": "7.29.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
+      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.29.0",
@@ -2828,15 +2838,6 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@fastify/busboy": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
-      "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@floating-ui/core": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.4.tgz",
@@ -3282,9 +3283,9 @@
       }
     },
     "node_modules/@isaacs/brace-expansion": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
-      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz",
+      "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==",
       "license": "MIT",
       "dependencies": {
         "@isaacs/balanced-match": "^4.0.1"
@@ -3417,9 +3418,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@lezer/common": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.0.tgz",
-      "integrity": "sha512-PNGcolp9hr4PJdXR4ix7XtixDrClScvtSCYW3rQG106oVMOOI+jFb+0+J3mbeL/53g1Zd6s0kJzaw6Ri68GmAA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.1.tgz",
+      "integrity": "sha512-6YRVG9vBkaY7p1IVxL4s44n5nUnaNnGM2/AckNgYOnxTG2kWh1vR8BMxPseWPjRNpb5VtXnMpeYAEAADoRV1Iw==",
       "license": "MIT"
     },
     "node_modules/@lezer/highlight": {
@@ -3737,162 +3738,131 @@
       }
     },
     "node_modules/@octokit/auth-token": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
-      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
+      "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==",
       "license": "MIT",
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz",
-      "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.6.tgz",
+      "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/auth-token": "^4.0.0",
-        "@octokit/graphql": "^7.1.0",
-        "@octokit/request": "^8.4.1",
-        "@octokit/request-error": "^5.1.1",
-        "@octokit/types": "^13.0.0",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/auth-token": "^6.0.0",
+        "@octokit/graphql": "^9.0.3",
+        "@octokit/request": "^10.0.6",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "before-after-hook": "^4.0.0",
+        "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/endpoint": {
-      "version": "9.0.6",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
-      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.2.tgz",
+      "integrity": "sha512-4zCpzP1fWc7QlqunZ5bSEjxc6yLAlRTnDwKtgXfcI/FxxGoqedDG8V2+xJ60bV2kODqcGB+nATdtap/XYq2NZQ==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.1.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/graphql": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
-      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.3.tgz",
+      "integrity": "sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/request": "^8.4.1",
-        "@octokit/types": "^13.0.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/request": "^10.0.6",
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "version": "27.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
+      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
       "license": "MIT"
     },
     "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
-      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-14.0.0.tgz",
+      "integrity": "sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^12.6.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
-        "@octokit/core": "5"
-      }
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
-      "version": "20.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
-      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
-      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^20.0.0"
+        "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "10.4.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
-      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-17.0.0.tgz",
+      "integrity": "sha512-B5yCyIlOJFPqUUeiD0cnBJwWJO8lkJs5d8+ze9QDP6SvfiXSz1BF+91+0MeI1d2yxgOhU/O+CvtiZ9jSkHhFAw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^12.6.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
-        "@octokit/core": "5"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
-      "version": "20.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
-      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
-      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^20.0.0"
+        "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/request": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
-      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
+      "version": "10.0.7",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.7.tgz",
+      "integrity": "sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/endpoint": "^9.0.6",
-        "@octokit/request-error": "^5.1.1",
-        "@octokit/types": "^13.1.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/endpoint": "^11.0.2",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "fast-content-type-parse": "^3.0.0",
+        "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/request-error": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
-      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz",
+      "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.1.0",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
+      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
+        "@octokit/openapi-types": "^27.0.0"
       }
     },
     "node_modules/@pkgjs/parseargs": {
@@ -4213,6 +4183,9 @@
       }
     },
     "node_modules/@rolldown/pluginutils": {
+      "version": "1.0.0-rc.2",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.2.tgz",
+      "integrity": "sha512-izyXV/v+cHiRfozX62W9htOAvwMo4/bXKDrQ+vom1L1qRuexPock/7VZDAhnpHCLNejd3NJ6hiab+tO0D44Rgw==",
       "version": "1.0.0-rc.2",
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.2.tgz",
       "integrity": "sha512-izyXV/v+cHiRfozX62W9htOAvwMo4/bXKDrQ+vom1L1qRuexPock/7VZDAhnpHCLNejd3NJ6hiab+tO0D44Rgw==",
@@ -4911,12 +4884,12 @@
       }
     },
     "node_modules/@sanity/import/node_modules/glob": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
-      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.1.tgz",
+      "integrity": "sha512-B7U/vJpE3DkJ5WXTgTpTRN63uV42DseiXXKMwG14LQBXmsdeIoHAPbU/MEo6II0k5ED74uc2ZGTC6MwHFQhF6w==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "minimatch": "^10.1.1",
+        "minimatch": "^10.1.2",
         "minipass": "^7.1.2",
         "path-scurry": "^2.0.0"
       },
@@ -4937,12 +4910,12 @@
       }
     },
     "node_modules/@sanity/import/node_modules/minimatch": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
-      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.2.tgz",
+      "integrity": "sha512-fu656aJ0n2kcXwsnwnv9g24tkU5uSmOlTjd6WyyaKm2Z+h1qmY6bAjrcaIxF/BslFqbZ8UBtbJi7KgQOZD2PTw==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "@isaacs/brace-expansion": "^5.0.0"
+        "@isaacs/brace-expansion": "^5.0.1"
       },
       "engines": {
         "node": "20 || >=22"
@@ -5643,9 +5616,9 @@
       }
     },
     "node_modules/@sanity/runtime-cli/node_modules/ora": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-9.1.0.tgz",
-      "integrity": "sha512-53uuLsXHOAJl5zLrUrzY9/kE+uIFEx7iaH4g2BIJQK4LZjY4LpCCYZVKDWIkL+F01wAaCg93duQ1whnK/AmY1A==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-9.3.0.tgz",
+      "integrity": "sha512-lBX72MWFduWEf7v7uWf5DHp9Jn5BI8bNPGuFgtXMmr2uDz2Gz2749y3am3agSDdkhHPHYmmxEGSKH85ZLGzgXw==",
       "license": "MIT",
       "dependencies": {
         "chalk": "^5.6.2",
@@ -5654,7 +5627,7 @@
         "is-interactive": "^2.0.0",
         "is-unicode-supported": "^2.1.0",
         "log-symbols": "^7.0.1",
-        "stdin-discarder": "^0.2.2",
+        "stdin-discarder": "^0.3.1",
         "string-width": "^8.1.0"
       },
       "engines": {
@@ -5932,13 +5905,13 @@
       }
     },
     "node_modules/@sanity/template-validator": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/@sanity/template-validator/-/template-validator-2.4.3.tgz",
-      "integrity": "sha512-pce+x6opIjiL5jg4bJba6x0+mCT7pFDCwOjYcu5ZOmaQ/mWxypjjPtzWp3+QU6mfCP/bb9z4zKj+PSGIT3q/zw==",
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/@sanity/template-validator/-/template-validator-2.4.6.tgz",
+      "integrity": "sha512-PTDYF5TWCvpcXGThCk1Ngn+/sfQ27VqVyNBc7FYo9nCt6vfjFWUGUGbb3Qfrk/NcOhe9CyoV6g7ieZcHUZijtQ==",
       "license": "MIT",
       "dependencies": {
-        "@actions/core": "^1.11.1",
-        "@actions/github": "^6.0.0",
+        "@actions/core": "^3.0.0",
+        "@actions/github": "^9.0.0",
         "yaml": "^2.6.1"
       },
       "bin": {
@@ -6583,9 +6556,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.2.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.2.0.tgz",
-      "integrity": "sha512-DZ8VwRFUNzuqJ5khrvwMXHmvPe+zGayJhr2CDNiKB1WBE1ST8Djl00D0IC4vvNmHMdj6DlbYRIaFE7WHjlDl5w==",
+      "version": "25.2.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.2.1.tgz",
+      "integrity": "sha512-CPrnr8voK8vC6eEtyRzvMpgp3VyVRhgclonE7qYi6P9sXwYb59ucfrnmFBTaP0yUi8Gk4yZg/LlTJULGxvTNsg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -6605,9 +6578,9 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "19.2.10",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.10.tgz",
-      "integrity": "sha512-WPigyYuGhgZ/cTPRXB2EwUw+XvsRA3GqHlsP4qteqrnnjDrApbS7MxcGr/hke5iUoeB7E/gQtrs9I37zAJ0Vjw==",
+      "version": "19.2.13",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.13.tgz",
+      "integrity": "sha512-KkiJeU6VbYbUOp5ITMIc7kBfqlYkKA5KhEHVrGMmUUMt7NeaZg65ojdPk+FtNrBAOXNVM5QM72jnADjM+XVRAQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -7598,9 +7571,9 @@
       }
     },
     "node_modules/before-after-hook": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
-      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-4.0.0.tgz",
+      "integrity": "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==",
       "license": "Apache-2.0"
     },
     "node_modules/binary-extensions": {
@@ -7854,9 +7827,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001767",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001767.tgz",
-      "integrity": "sha512-34+zUAMhSH+r+9eKmYG+k2Rpt8XttfE4yXAjoZvkAPs15xcYQhyBYdalJ65BzivAvGRMViEjy6oKr/S91loekQ==",
+      "version": "1.0.30001766",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz",
+      "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==",
       "funding": [
         {
           "type": "opencollective",
@@ -8767,12 +8740,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/deprecation": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
-      "license": "ISC"
-    },
     "node_modules/detect-node-es": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
@@ -8964,9 +8931,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.283",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.283.tgz",
-      "integrity": "sha512-3vifjt1HgrGW/h76UEeny+adYApveS9dH2h3p57JYzBSXJIKUJAvtmIytDKjcSCt9xHfrNCFJ7gts6vkhuq++w==",
+      "version": "1.5.286",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
+      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -9590,6 +9557,22 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "license": "MIT"
     },
+    "node_modules/fast-content-type-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-3.0.0.tgz",
+      "integrity": "sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -10059,12 +10042,12 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "12.29.3",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.29.3.tgz",
-      "integrity": "sha512-naVvtFA7IiRTU5n7w7Nj51QFVWu955bU0p9H0gGC4AbhHDQR0TcohoEYwdOZXWEkXrEYNTl95EDOxsjDqn1AvQ==",
+      "version": "12.29.2",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.29.2.tgz",
+      "integrity": "sha512-lSNRzBJk4wuIy0emYQ/nfZ7eWhqud2umPKw2QAQki6uKhZPKm2hRQHeQoHTG9MIvfobb+A/LbEWPJU794ZUKrg==",
       "license": "MIT",
       "dependencies": {
-        "motion-dom": "^12.29.2",
+        "motion-dom": "^12.33.0",
         "motion-utils": "^12.29.2",
         "tslib": "^2.4.0"
       },
@@ -10471,6 +10454,7 @@
       "version": "10.5.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
       "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -13009,18 +12993,18 @@
       "license": "MIT"
     },
     "node_modules/module-alias": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz",
-      "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.3.4.tgz",
+      "integrity": "sha512-bOclZt8hkpuGgSSoG07PKmvzTizROilUTvLNyrMqvlC9snhs7y7GzjNWAVbISIOlhCP1T14rH1PDAV9iNyBq/w==",
       "license": "MIT"
     },
     "node_modules/motion": {
-      "version": "12.29.3",
-      "resolved": "https://registry.npmjs.org/motion/-/motion-12.29.3.tgz",
-      "integrity": "sha512-susHRkAolcmJQNy7xkV8UJ1DrB2Rg9IDTHnGR2ASXBCzc1L9eC5GVLj08zUU6ZnNLNX6Jb7urD6N0IJjOSGQBQ==",
+      "version": "12.29.2",
+      "resolved": "https://registry.npmjs.org/motion/-/motion-12.29.2.tgz",
+      "integrity": "sha512-jMpHdAzEDF1QQ055cB+1lOBLdJ6ialVWl6QQzpJI2OvmHequ7zFVHM2mx0HNAy+Tu4omUlApfC+4vnkX0geEOg==",
       "license": "MIT",
       "dependencies": {
-        "framer-motion": "^12.29.3",
+        "framer-motion": "^12.29.2",
         "tslib": "^2.4.0"
       },
       "peerDependencies": {
@@ -13041,9 +13025,9 @@
       }
     },
     "node_modules/motion-dom": {
-      "version": "12.29.2",
-      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.29.2.tgz",
-      "integrity": "sha512-/k+NuycVV8pykxyiTCoFzIVLA95Nb1BFIVvfSu9L50/6K6qNeAYtkxXILy/LRutt7AzaYDc2myj0wkCVVYAPPA==",
+      "version": "12.33.0",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.33.0.tgz",
+      "integrity": "sha512-XRPebVypsl0UM+7v0Hr8o9UAj0S2djsQWRdHBd5iVouVpMrQqAI0C/rDAT3QaYnXnHuC5hMcwDHCboNeyYjPoQ==",
       "license": "MIT",
       "dependencies": {
         "motion-utils": "^12.29.2"
@@ -14805,9 +14789,9 @@
       }
     },
     "node_modules/remeda": {
-      "version": "2.33.4",
-      "resolved": "https://registry.npmjs.org/remeda/-/remeda-2.33.4.tgz",
-      "integrity": "sha512-ygHswjlc/opg2VrtiYvUOPLjxjtdKvjGz1/plDhkG66hjNjFr1xmfrs2ClNFo/E6TyUFiwYNh53bKV26oBoMGQ==",
+      "version": "2.33.5",
+      "resolved": "https://registry.npmjs.org/remeda/-/remeda-2.33.5.tgz",
+      "integrity": "sha512-FqmpPA9i9T5EGcqgyHf9kHjefnyCZM1M3kSdZjPk1j2StGNoJyoYp0807RYcjNkQ1UpsEQa5qzgsjLY4vYtT8g==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/remeda"
@@ -16304,9 +16288,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/stdin-discarder": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz",
-      "integrity": "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.3.1.tgz",
+      "integrity": "sha512-reExS1kSGoElkextOcPkel4NE99S0BWxjUHQeDFnR8S993JxpPX7KU4MNmO19NXhlJp+8dmdCbKQVNgLJh2teA==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -17189,15 +17173,12 @@
       }
     },
     "node_modules/undici": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
-      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.23.0.tgz",
+      "integrity": "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==",
       "license": "MIT",
-      "dependencies": {
-        "@fastify/busboy": "^2.0.0"
-      },
       "engines": {
-        "node": ">=14.0"
+        "node": ">=18.17"
       }
     },
     "node_modules/undici-types": {
@@ -17304,9 +17285,9 @@
       }
     },
     "node_modules/universal-user-agent": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
-      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
+      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
       "license": "ISC"
     },
     "node_modules/update-browserslist-db": {
diff --git a/studio/package.json b/studio/package.json
index daf8f218..38630738 100644
--- a/studio/package.json
+++ b/studio/package.json
@@ -1,7 +1,7 @@
 {
   "name": "devlovers",
   "private": true,
-  "version": "0.5.2",
+  "version": "0.5.4",
   "main": "package.json",
   "license": "UNLICENSED",
   "scripts": {