diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml
index a9b8fb8..fbbc796 100644
--- a/.gitea/workflows/workflow.yml
+++ b/.gitea/workflows/workflow.yml
@@ -41,7 +41,7 @@ jobs:
         run: yarn lint
 
       - name: Type Check
-        run: yarn check:shadcn-excluded
+        run: yarn check
 
   publish:
     needs: build # Only runs if tests/lint pass
diff --git a/.storybook/Decorator.svelte b/.storybook/Decorator.svelte
index 9fb3e94..38af10e 100644
--- a/.storybook/Decorator.svelte
+++ b/.storybook/Decorator.svelte
@@ -4,7 +4,7 @@
 
     This provides:
     - ResponsiveManager context for breakpoint tracking
-    - TooltipProvider for shadcn Tooltip components
+    - TooltipProvider for tooltip components
 -->
 <script lang="ts">
 import { createResponsiveManager } from '$shared/lib';
diff --git a/README.md b/README.md
index 7673a60..f0f01d0 100644
--- a/README.md
+++ b/README.md
@@ -8,14 +8,14 @@ A modern font exploration and comparison tool for browsing fonts from Google Fon
 - **Side-by-Side Comparison**: Compare up to 4 fonts simultaneously with customizable text, size, and typography settings
 - **Advanced Filtering**: Filter by category, provider, character subsets, and weight
 - **Virtual Scrolling**: Fast, smooth browsing of thousands of fonts
-- **Responsive UI**: Beautiful interface built with shadcn components and Tailwind CSS
+- **Responsive UI**: Beautiful interface built with Tailwind CSS
 - **Type-Safe**: Full TypeScript coverage with strict mode enabled
 
 ## Tech Stack
 
 - **Framework**: Svelte 5 with reactive primitives (runes)
 - **Styling**: Tailwind CSS v4
-- **Components**: shadcn-svelte (via bits-ui)
+- **Components**: Bits UI primitives
 - **State Management**: TanStack Query for async data
 - **Architecture**: Feature-Sliced Design (FSD)
 - **Quality**: oxlint (linting), dprint (formatting), lefthook (git hooks)
diff --git a/components.json b/components.json
deleted file mode 100644
index ffab50d..0000000
--- a/components.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$schema": "https://shadcn-svelte.com/schema.json",
-  "tailwind": {
-    "css": "src/app.css",
-    "baseColor": "zinc"
-  },
-  "aliases": {
-    "components": "$shared/shadcn/ui",
-    "utils": "$shared/shadcn/utils/shadcn-utils",
-    "ui": "$shared/shadcn/ui",
-    "hooks": "$shared/shadcn/hooks",
-    "lib": "$shared"
-  },
-  "typescript": true,
-  "registry": "https://shadcn-svelte.com/registry"
-}
diff --git a/lefthook.yml b/lefthook.yml
index d0cf91e..23fb521 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -17,7 +17,7 @@ pre-push:
       run: yarn tsc --noEmit
 
     svelte-check:
-      run: yarn check:shadcn-excluded --threshold warning
+      run: yarn check --threshold warning
 
     format-check:
       glob: "*.{ts,js,svelte,json,md}"
diff --git a/package.json b/package.json
index 113ce24..673d68d 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "prepare": "svelte-check --tsconfig ./tsconfig.json || echo ''",
     "check": "svelte-check",
     "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
-    "check:shadcn-excluded": "svelte-check --no-tsconfig --ignore \"src/shared/shadcn\"",
     "lint": "oxlint",
     "format": "dprint fmt",
     "format:check": "dprint check",
diff --git a/src/app/ui/Layout.svelte b/src/app/ui/Layout.svelte
index 9feb665..1ad1c7f 100644
--- a/src/app/ui/Layout.svelte
+++ b/src/app/ui/Layout.svelte
@@ -17,7 +17,7 @@
 import { themeManager } from '$features/ChangeAppTheme';
 import GD from '$shared/assets/GD.svg';
 import { ResponsiveProvider } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import {
     type Snippet,
     onDestroy,
@@ -78,7 +78,7 @@ onDestroy(() => themeManager.destroy());
 <ResponsiveProvider>
     <div
         id="app-root"
-        class={cn(
+        class={clsx(
             'min-h-screen w-auto flex flex-col bg-surface dark:bg-dark-bg',
             theme === 'dark' ? 'dark' : '',
         )}
diff --git a/src/entities/Font/ui/FontApplicator/FontApplicator.svelte b/src/entities/Font/ui/FontApplicator/FontApplicator.svelte
index 3fbfa9a..f048040 100644
--- a/src/entities/Font/ui/FontApplicator/FontApplicator.svelte
+++ b/src/entities/Font/ui/FontApplicator/FontApplicator.svelte
@@ -6,7 +6,7 @@
     - Adds smooth transition when font appears
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 import { prefersReducedMotion } from 'svelte/motion';
 import {
@@ -64,7 +64,7 @@ const transitionClasses = $derived(
     style:font-family={shouldReveal
     ? `'${font.name}'`
     : 'system-ui, -apple-system, sans-serif'}
-    class={cn(
+    class={clsx(
         transitionClasses,
         // If reduced motion is on, we skip the transform/blur entirely
         !shouldReveal
diff --git a/src/features/GetFonts/ui/FiltersControl/FilterControls.svelte b/src/features/GetFonts/ui/FiltersControl/FilterControls.svelte
index 8ccda10..a735646 100644
--- a/src/features/GetFonts/ui/FiltersControl/FilterControls.svelte
+++ b/src/features/GetFonts/ui/FiltersControl/FilterControls.svelte
@@ -6,10 +6,10 @@
 <script lang="ts">
 import { fontStore } from '$entities/Font';
 import type { ResponsiveManager } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import { Button } from '$shared/ui';
 import { Label } from '$shared/ui';
 import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
+import clsx from 'clsx';
 import {
     getContext,
     untrack,
@@ -45,7 +45,7 @@ function handleReset() {
 </script>
 
 <div
-    class={cn(
+    class={clsx(
         'flex flex-col md:flex-row justify-between items-start md:items-center',
         'gap-1 md:gap-6',
         'pt-6 mt-6 md:pt-8 md:mt-8',
@@ -77,7 +77,7 @@ function handleReset() {
         variant="ghost"
         size={isMobileOrTabletPortrait ? 'xs' : 'sm'}
         onclick={handleReset}
-        class={cn('group font-mono tracking-widest text-neutral-400', isMobileOrTabletPortrait && 'px-0')}
+        class={clsx('group font-mono tracking-widest text-neutral-400', isMobileOrTabletPortrait && 'px-0')}
         iconPosition="left"
     >
         {#snippet icon()}
diff --git a/src/features/SetupFont/ui/TypographyMenu/TypographyMenu.svelte b/src/features/SetupFont/ui/TypographyMenu/TypographyMenu.svelte
index 6f517e9..05bd94e 100644
--- a/src/features/SetupFont/ui/TypographyMenu/TypographyMenu.svelte
+++ b/src/features/SetupFont/ui/TypographyMenu/TypographyMenu.svelte
@@ -12,7 +12,6 @@ import {
     MULTIPLIER_S,
 } from '$entities/Font';
 import type { ResponsiveManager } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import {
     ComboControl,
     ControlGroup,
@@ -21,6 +20,7 @@ import {
 import Settings2Icon from '@lucide/svelte/icons/settings-2';
 import XIcon from '@lucide/svelte/icons/x';
 import { Popover } from 'bits-ui';
+import clsx from 'clsx';
 import { getContext } from 'svelte';
 import { cubicOut } from 'svelte/easing';
 import { fly } from 'svelte/transition';
@@ -74,7 +74,7 @@ $effect(() => {
                 {#snippet child({ props })}
                     <button
                         {...props}
-                        class={cn(
+                        class={clsx(
                             'inline-flex items-center justify-center',
                             'size-8 p-0',
                             'border border-transparent rounded-none',
@@ -95,7 +95,7 @@ $effect(() => {
                     side="top"
                     align="start"
                     sideOffset={8}
-                    class={cn(
+                    class={clsx(
                         'z-50 w-72',
                         'bg-surface dark:bg-dark-card',
                         'border border-subtle',
@@ -149,11 +149,11 @@ $effect(() => {
         </Popover.Root>
     {:else}
         <div
-            class={cn('w-full md:w-auto', className)}
+            class={clsx('w-full md:w-auto', className)}
             transition:fly={{ y: 100, duration: 200, easing: cubicOut }}
         >
             <div
-                class={cn(
+                class={clsx(
                     'flex items-center gap-1 md:gap-2 p-1.5 md:p-2',
                     'bg-surface/95 dark:bg-dark-bg/95 backdrop-blur-xl',
                     'border border-subtle',
diff --git a/src/shared/lib/storybook/MockIcon.svelte b/src/shared/lib/storybook/MockIcon.svelte
index d5b6fc4..53e1ec8 100644
--- a/src/shared/lib/storybook/MockIcon.svelte
+++ b/src/shared/lib/storybook/MockIcon.svelte
@@ -7,7 +7,7 @@
     correctly via the HTML element's class attribute.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type {
     Component,
     Snippet,
@@ -32,7 +32,7 @@ let { icon: Icon, class: className, attrs = {} }: Props = $props();
 </script>
 
 {#if Icon}
-    {@const __iconClass__ = cn('size-4', className)}
+    {@const __iconClass__ = clsx('size-4', className)}
     <!-- Render icon component dynamically with class prop -->
     <Icon
         class={__iconClass__}
diff --git a/src/shared/lib/storybook/Providers.svelte b/src/shared/lib/storybook/Providers.svelte
index 24fda3a..7c2f2f9 100644
--- a/src/shared/lib/storybook/Providers.svelte
+++ b/src/shared/lib/storybook/Providers.svelte
@@ -4,7 +4,6 @@
 
     Provides:
     - responsive: ResponsiveManager context for breakpoint tracking
-    - tooltip: Tooltip.Provider context for shadcn Tooltip components
     - Additional Radix UI providers can be added here as needed
 -->
 <script lang="ts">
diff --git a/src/shared/shadcn/hooks/is-mobile.svelte.ts b/src/shared/shadcn/hooks/is-mobile.svelte.ts
deleted file mode 100644
index 2dfb0eb..0000000
--- a/src/shared/shadcn/hooks/is-mobile.svelte.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { MediaQuery } from 'svelte/reactivity';
-
-const DEFAULT_MOBILE_BREAKPOINT = 768;
-
-export class IsMobile extends MediaQuery {
-    constructor(breakpoint: number = DEFAULT_MOBILE_BREAKPOINT) {
-        super(`max-width: ${breakpoint - 1}px`);
-    }
-}
diff --git a/src/shared/shadcn/ui/popover/index.ts b/src/shared/shadcn/ui/popover/index.ts
deleted file mode 100644
index e5456bb..0000000
--- a/src/shared/shadcn/ui/popover/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import Close from './popover-close.svelte';
-import Content from './popover-content.svelte';
-import Portal from './popover-portal.svelte';
-import Trigger from './popover-trigger.svelte';
-import Root from './popover.svelte';
-
-export {
-    Close,
-    Close as PopoverClose,
-    Content,
-    Content as PopoverContent,
-    Portal,
-    Portal as PopoverPortal,
-    Root,
-    //
-    Root as Popover,
-    Trigger,
-    Trigger as PopoverTrigger,
-};
diff --git a/src/shared/shadcn/ui/popover/popover-close.svelte b/src/shared/shadcn/ui/popover/popover-close.svelte
deleted file mode 100644
index 71124e2..0000000
--- a/src/shared/shadcn/ui/popover/popover-close.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-import { Popover as PopoverPrimitive } from 'bits-ui';
-
-let { ref = $bindable(null), ...restProps }: PopoverPrimitive.CloseProps = $props();
-</script>
-
-<PopoverPrimitive.Close bind:ref data-slot="popover-close" {...restProps} />
diff --git a/src/shared/shadcn/ui/popover/popover-content.svelte b/src/shared/shadcn/ui/popover/popover-content.svelte
deleted file mode 100644
index 304e895..0000000
--- a/src/shared/shadcn/ui/popover/popover-content.svelte
+++ /dev/null
@@ -1,34 +0,0 @@
-<script lang="ts">
-import {
-    type WithoutChildrenOrChild,
-    cn,
-} from '$shared/shadcn/utils/shadcn-utils.js';
-import { Popover as PopoverPrimitive } from 'bits-ui';
-import type { ComponentProps } from 'svelte';
-import PopoverPortal from './popover-portal.svelte';
-
-let {
-    ref = $bindable(null),
-    class: className,
-    sideOffset = 4,
-    align = 'center',
-    portalProps,
-    ...restProps
-}: PopoverPrimitive.ContentProps & {
-    portalProps?: WithoutChildrenOrChild<ComponentProps<typeof PopoverPortal>>;
-} = $props();
-</script>
-
-<PopoverPortal {...portalProps}>
-    <PopoverPrimitive.Content
-        bind:ref
-        data-slot="popover-content"
-        {sideOffset}
-        {align}
-        class={cn(
-            'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-end-2 data-[side=right]:slide-in-from-start-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--bits-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden',
-            className,
-        )}
-        {...restProps}
-    />
-</PopoverPortal>
diff --git a/src/shared/shadcn/ui/popover/popover-portal.svelte b/src/shared/shadcn/ui/popover/popover-portal.svelte
deleted file mode 100644
index 8e68a02..0000000
--- a/src/shared/shadcn/ui/popover/popover-portal.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-import { Popover as PopoverPrimitive } from 'bits-ui';
-
-let { ...restProps }: PopoverPrimitive.PortalProps = $props();
-</script>
-
-<PopoverPrimitive.Portal {...restProps} />
diff --git a/src/shared/shadcn/ui/popover/popover-trigger.svelte b/src/shared/shadcn/ui/popover/popover-trigger.svelte
deleted file mode 100644
index 1192af2..0000000
--- a/src/shared/shadcn/ui/popover/popover-trigger.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils.js';
-import { Popover as PopoverPrimitive } from 'bits-ui';
-
-let {
-    ref = $bindable(null),
-    class: className,
-    ...restProps
-}: PopoverPrimitive.TriggerProps = $props();
-</script>
-
-<PopoverPrimitive.Trigger
-    bind:ref
-    data-slot="popover-trigger"
-    class={cn('', className)}
-    {...restProps}
-/>
diff --git a/src/shared/shadcn/ui/popover/popover.svelte b/src/shared/shadcn/ui/popover/popover.svelte
deleted file mode 100644
index 7cd4812..0000000
--- a/src/shared/shadcn/ui/popover/popover.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-import { Popover as PopoverPrimitive } from 'bits-ui';
-
-let { open = $bindable(false), ...restProps }: PopoverPrimitive.RootProps = $props();
-</script>
-
-<PopoverPrimitive.Root bind:open {...restProps} />
diff --git a/src/shared/shadcn/ui/tooltip/index.ts b/src/shared/shadcn/ui/tooltip/index.ts
deleted file mode 100644
index 247b714..0000000
--- a/src/shared/shadcn/ui/tooltip/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import Content from './tooltip-content.svelte';
-import Portal from './tooltip-portal.svelte';
-import Provider from './tooltip-provider.svelte';
-import Trigger from './tooltip-trigger.svelte';
-import Root from './tooltip.svelte';
-
-export {
-    Content,
-    Content as TooltipContent,
-    Portal,
-    Portal as TooltipPortal,
-    Provider,
-    Provider as TooltipProvider,
-    Root,
-    //
-    Root as Tooltip,
-    Trigger,
-    Trigger as TooltipTrigger,
-};
diff --git a/src/shared/shadcn/ui/tooltip/tooltip-content.svelte b/src/shared/shadcn/ui/tooltip/tooltip-content.svelte
deleted file mode 100644
index 8e4e4c3..0000000
--- a/src/shared/shadcn/ui/tooltip/tooltip-content.svelte
+++ /dev/null
@@ -1,53 +0,0 @@
-<script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils.js';
-import type { WithoutChildrenOrChild } from '$shared/shadcn/utils/shadcn-utils.js';
-import { Tooltip as TooltipPrimitive } from 'bits-ui';
-import type { ComponentProps } from 'svelte';
-import TooltipPortal from './tooltip-portal.svelte';
-
-let {
-    ref = $bindable(null),
-    class: className,
-    sideOffset = 0,
-    side = 'top',
-    children,
-    arrowClasses,
-    portalProps,
-    ...restProps
-}: TooltipPrimitive.ContentProps & {
-    arrowClasses?: string;
-    portalProps?: WithoutChildrenOrChild<ComponentProps<typeof TooltipPortal>>;
-} = $props();
-</script>
-
-<TooltipPortal {...portalProps}>
-    <TooltipPrimitive.Content
-        bind:ref
-        data-slot="tooltip-content"
-        {sideOffset}
-        {side}
-        class={cn(
-            'bg-foreground text-background animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-end-2 data-[side=right]:slide-in-from-start-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--bits-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance',
-            className,
-        )}
-        {...restProps}
-    >
-        {@render children?.()}
-        <TooltipPrimitive.Arrow>
-            {#snippet child({ props })}
-                <div
-                    class={cn(
-                        'bg-primary z-50 size-2.5 rotate-45 rounded-[2px]',
-                        'data-[side=top]:translate-x-1/2 data-[side=top]:translate-y-[calc(-50%_+_2px)]',
-                        'data-[side=bottom]:-translate-x-1/2 data-[side=bottom]:-translate-y-[calc(-50%_+_1px)]',
-                        'data-[side=right]:translate-x-[calc(50%_+_2px)] data-[side=right]:translate-y-1/2',
-                        'data-[side=left]:-translate-y-[calc(50%_-_3px)]',
-                        arrowClasses,
-                    )}
-                    {...props}
-                >
-                </div>
-            {/snippet}
-        </TooltipPrimitive.Arrow>
-    </TooltipPrimitive.Content>
-</TooltipPortal>
diff --git a/src/shared/shadcn/ui/tooltip/tooltip-portal.svelte b/src/shared/shadcn/ui/tooltip/tooltip-portal.svelte
deleted file mode 100644
index d52ed4e..0000000
--- a/src/shared/shadcn/ui/tooltip/tooltip-portal.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-import { Tooltip as TooltipPrimitive } from 'bits-ui';
-
-let { ...restProps }: TooltipPrimitive.PortalProps = $props();
-</script>
-
-<TooltipPrimitive.Portal {...restProps} />
diff --git a/src/shared/shadcn/ui/tooltip/tooltip-provider.svelte b/src/shared/shadcn/ui/tooltip/tooltip-provider.svelte
deleted file mode 100644
index 7795b7f..0000000
--- a/src/shared/shadcn/ui/tooltip/tooltip-provider.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-import { Tooltip as TooltipPrimitive } from 'bits-ui';
-
-let { ...restProps }: TooltipPrimitive.ProviderProps = $props();
-</script>
-
-<TooltipPrimitive.Provider {...restProps} />
diff --git a/src/shared/shadcn/ui/tooltip/tooltip-trigger.svelte b/src/shared/shadcn/ui/tooltip/tooltip-trigger.svelte
deleted file mode 100644
index 16086d4..0000000
--- a/src/shared/shadcn/ui/tooltip/tooltip-trigger.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-import { Tooltip as TooltipPrimitive } from 'bits-ui';
-
-let { ref = $bindable(null), ...restProps }: TooltipPrimitive.TriggerProps = $props();
-</script>
-
-<TooltipPrimitive.Trigger bind:ref data-slot="tooltip-trigger" {...restProps} />
diff --git a/src/shared/shadcn/ui/tooltip/tooltip.svelte b/src/shared/shadcn/ui/tooltip/tooltip.svelte
deleted file mode 100644
index 6a316fc..0000000
--- a/src/shared/shadcn/ui/tooltip/tooltip.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-import { Tooltip as TooltipPrimitive } from 'bits-ui';
-
-let { open = $bindable(false), ...restProps }: TooltipPrimitive.RootProps = $props();
-</script>
-
-<TooltipPrimitive.Root bind:open {...restProps} />
diff --git a/src/shared/shadcn/utils/shadcn-utils.ts b/src/shared/shadcn/utils/shadcn-utils.ts
deleted file mode 100644
index 155cee4..0000000
--- a/src/shared/shadcn/utils/shadcn-utils.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-    type ClassValue,
-    clsx,
-} from 'clsx';
-import { twMerge } from 'tailwind-merge';
-
-/**
- * Utility function to merge Tailwind CSS classes
- * Combines clsx for conditional classes and tailwind-merge to handle conflicts
- */
-export function cn(...inputs: ClassValue[]) {
-    return twMerge(clsx(inputs));
-}
-
-/**
- * Type utility to add a ref property to HTML element attributes
- * Used in shadcn-svelte components to support element references
- * @template T - The attributes type (e.g., HTMLAttributes<HTMLDivElement>)
- * @template E - The element type (e.g., HTMLDivElement)
- */
-export type WithElementRef<T, E extends HTMLElement = HTMLElement> = T & {
-    /**
-     * Reference to the DOM element
-     */
-    ref?: E | null;
-};
-
-/**
- * Type utility to remove 'children' and 'child' properties from a type
- * Used in shadcn-svelte components that use Snippets instead of children
- * @template T - The type to remove children from
- */
-export type WithoutChildren<T> = Omit<T, 'children'>;
-
-/**
- * Type utility to remove 'children' and 'child' properties from a type
- * Used in shadcn-svelte components that use Snippets instead of children
- * @template T - The type to remove children and child from
- */
-export type WithoutChildrenOrChild<T> = Omit<T, 'children' | 'child'>;
diff --git a/src/shared/ui/Badge/Badge.svelte b/src/shared/ui/Badge/Badge.svelte
index a0bc653..3e81110 100644
--- a/src/shared/ui/Badge/Badge.svelte
+++ b/src/shared/ui/Badge/Badge.svelte
@@ -3,11 +3,11 @@
     Pill badge with border and optional status dot.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import {
     type LabelSize,
     labelSizeConfig,
 } from '$shared/ui/Label/config';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 import type { HTMLAttributes } from 'svelte/elements';
 
@@ -64,7 +64,7 @@ let {
 </script>
 
 <span
-    class={cn(
+    class={clsx(
         'inline-flex items-center gap-1 px-2 py-0.5 border rounded-full',
         'font-mono uppercase tracking-wide',
         labelSizeConfig[size],
diff --git a/src/shared/ui/Button/Button.svelte b/src/shared/ui/Button/Button.svelte
index cc5ee6f..7726942 100644
--- a/src/shared/ui/Button/Button.svelte
+++ b/src/shared/ui/Button/Button.svelte
@@ -3,7 +3,7 @@
     design-system button. Uppercase, zero border-radius, Space Grotesk.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 import type { HTMLButtonAttributes } from 'svelte/elements';
 import type {
@@ -71,7 +71,7 @@ let {
 const isIconOnly = $derived(!!icon && !children);
 
 const variantStyles: Record<ButtonVariant, string> = {
-    primary: cn(
+    primary: clsx(
         'bg-swiss-red text-white',
         'hover:bg-swiss-red/90',
         'active:bg-swiss-red/80',
@@ -87,7 +87,7 @@ const variantStyles: Record<ButtonVariant, string> = {
         'disabled:cursor-not-allowed',
         'disabled:transform-none',
     ),
-    secondary: cn(
+    secondary: clsx(
         'bg-surface dark:bg-paper',
         'text-swiss-black dark:text-neutral-200',
         'border border-black/10 dark:border-white/10',
@@ -98,7 +98,7 @@ const variantStyles: Record<ButtonVariant, string> = {
         'disabled:text-neutral-400 dark:disabled:text-neutral-600',
         'disabled:cursor-not-allowed',
     ),
-    outline: cn(
+    outline: clsx(
         'bg-transparent',
         'text-swiss-black dark:text-neutral-200',
         'border border-black/20 dark:border-white/20',
@@ -109,7 +109,7 @@ const variantStyles: Record<ButtonVariant, string> = {
         'disabled:text-neutral-400 dark:disabled:text-neutral-600',
         'disabled:cursor-not-allowed',
     ),
-    ghost: cn(
+    ghost: clsx(
         'bg-transparent',
         'text-secondary',
         'border border-transparent',
@@ -119,7 +119,7 @@ const variantStyles: Record<ButtonVariant, string> = {
         'disabled:text-neutral-400 dark:disabled:text-neutral-600',
         'disabled:cursor-not-allowed',
     ),
-    icon: cn(
+    icon: clsx(
         'bg-surface dark:bg-dark-bg',
         'text-secondary',
         'border border-transparent',
@@ -130,8 +130,8 @@ const variantStyles: Record<ButtonVariant, string> = {
         'disabled:text-neutral-400 dark:disabled:text-neutral-600',
         'disabled:cursor-not-allowed',
     ),
-    tertiary: cn(
-        // Font override — must come after base in cn() to win via tailwind-merge
+    tertiary: clsx(
+        // Font override — must come after base in clsx() to win via tailwind-merge
         'font-secondary font-medium normal-case tracking-normal',
         // Inactive state
         'bg-transparent',
@@ -175,7 +175,7 @@ const activeStyles: Partial<Record<ButtonVariant, string>> = {
     icon: 'bg-paper dark:bg-paper text-brand border-subtle',
 };
 
-const classes = $derived(cn(
+const classes = $derived(clsx(
     // Base
     'inline-flex items-center justify-center',
     'font-primary font-bold tracking-tight uppercase',
diff --git a/src/shared/ui/Button/ButtonGroup.svelte b/src/shared/ui/Button/ButtonGroup.svelte
index 3e1881f..783b33e 100644
--- a/src/shared/ui/Button/ButtonGroup.svelte
+++ b/src/shared/ui/Button/ButtonGroup.svelte
@@ -4,7 +4,7 @@
     Use for segmented controls, view toggles, or any mutually exclusive button set.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 import type { HTMLAttributes } from 'svelte/elements';
 
@@ -23,7 +23,7 @@ let { children, class: className, ...rest }: Props = $props();
 </script>
 
 <div
-    class={cn(
+    class={clsx(
         'flex items-center gap-1 p-1',
         'bg-surface dark:bg-dark-bg',
         'border border-subtle',
diff --git a/src/shared/ui/ComboControl/ComboControl.svelte b/src/shared/ui/ComboControl/ComboControl.svelte
index b261147..ea7c4d8 100644
--- a/src/shared/ui/ComboControl/ComboControl.svelte
+++ b/src/shared/ui/ComboControl/ComboControl.svelte
@@ -5,12 +5,12 @@
 -->
 <script lang="ts">
 import type { TypographyControl } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import { Slider } from '$shared/ui';
 import { Button } from '$shared/ui/Button';
 import MinusIcon from '@lucide/svelte/icons/minus';
 import PlusIcon from '@lucide/svelte/icons/plus';
 import { Popover } from 'bits-ui';
+import clsx from 'clsx';
 import TechText from '../TechText/TechText.svelte';
 
 interface Props {
@@ -78,7 +78,7 @@ const displayLabel = $derived(label ?? controlLabel ?? '');
 -->
 {#if reduced}
     <div
-        class={cn(
+        class={clsx(
             'flex gap-4 items-end w-full',
             className,
         )}
@@ -98,7 +98,7 @@ const displayLabel = $derived(label ?? controlLabel ?? '');
 
     <!-- ── FULL MODE ──────────────────────────────────────────────────────────────── -->
 {:else}
-    <div class={cn('flex items-center px-1 relative', className)}>
+    <div class={clsx('flex items-center px-1 relative', className)}>
         <!-- Decrease button -->
         <Button
             variant="icon"
@@ -119,7 +119,7 @@ const displayLabel = $derived(label ?? controlLabel ?? '');
                     {#snippet child({ props })}
                         <button
                             {...props}
-                            class={cn(
+                            class={clsx(
                                 'flex flex-col items-center justify-center w-14 py-1',
                                 'select-none rounded-none transition-all duration-150',
                                 'border border-transparent',
diff --git a/src/shared/ui/ControlGroup/ControlGroup.svelte b/src/shared/ui/ControlGroup/ControlGroup.svelte
index d987bd0..98a4c17 100644
--- a/src/shared/ui/ControlGroup/ControlGroup.svelte
+++ b/src/shared/ui/ControlGroup/ControlGroup.svelte
@@ -3,7 +3,7 @@
     Labeled container for form controls
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 
 interface Props {
@@ -24,7 +24,7 @@ interface Props {
 const { label, children, class: className }: Props = $props();
 </script>
 
-<div class={cn('flex flex-col gap-3 py-6 border-b border-subtle last:border-0', className)}>
+<div class={clsx('flex flex-col gap-3 py-6 border-b border-subtle last:border-0', className)}>
     <div class="flex justify-between items-center text-xs font-primary font-bold tracking-tight text-neutral-900 dark:text-neutral-100 uppercase leading-none">
         {label}
     </div>
diff --git a/src/shared/ui/Divider/Divider.svelte b/src/shared/ui/Divider/Divider.svelte
index 8085069..1edd45d 100644
--- a/src/shared/ui/Divider/Divider.svelte
+++ b/src/shared/ui/Divider/Divider.svelte
@@ -3,7 +3,7 @@
     1px separator line, horizontal or vertical.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 
 interface Props {
     /**
@@ -24,7 +24,7 @@ let {
 </script>
 
 <div
-    class={cn(
+    class={clsx(
         'bg-black/10 dark:bg-white/10',
         orientation === 'horizontal' ? 'w-full h-px' : 'w-px h-full',
         className,
diff --git a/src/shared/ui/FilterGroup/FilterGroup.svelte b/src/shared/ui/FilterGroup/FilterGroup.svelte
index 3235c1f..153e6f7 100644
--- a/src/shared/ui/FilterGroup/FilterGroup.svelte
+++ b/src/shared/ui/FilterGroup/FilterGroup.svelte
@@ -4,11 +4,11 @@
 -->
 <script lang="ts">
 import type { Filter } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import { Button } from '$shared/ui';
 import { Label } from '$shared/ui';
 import ChevronUpIcon from '@lucide/svelte/icons/chevron-up';
 import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
+import clsx from 'clsx';
 import { cubicOut } from 'svelte/easing';
 import {
     draw,
@@ -68,7 +68,7 @@ $effect(() => {
     </svg>
 {/snippet}
 
-<div class={cn('flex flex-col', className)}>
+<div class={clsx('flex flex-col', className)}>
     <Label
         variant="default"
         size="sm"
diff --git a/src/shared/ui/Footnote/Footnote.svelte b/src/shared/ui/Footnote/Footnote.svelte
index aa48360..84193ec 100644
--- a/src/shared/ui/Footnote/Footnote.svelte
+++ b/src/shared/ui/Footnote/Footnote.svelte
@@ -3,7 +3,7 @@
     Provides classes for styling footnotes
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 
 interface Props {
@@ -26,14 +26,14 @@ const { children, class: className, render }: Props = $props();
 
 {#if render}
     {@render render({
-    class: cn(
+    class: clsx(
         'font-mono text-3xs sm:text-2xs lowercase tracking-wider-mono text-text-soft',
         className,
     ),
 })}
 {:else if children}
     <span
-        class={cn(
+        class={clsx(
             'font-mono text-3xs sm:text-2xs lowercase tracking-wider-mono text-text-soft',
             className,
         )}
diff --git a/src/shared/ui/Input/Input.svelte b/src/shared/ui/Input/Input.svelte
index b8a33ad..faa5944 100644
--- a/src/shared/ui/Input/Input.svelte
+++ b/src/shared/ui/Input/Input.svelte
@@ -3,8 +3,8 @@
     design-system input. Zero border-radius, Space Grotesk, precise states.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import XIcon from '@lucide/svelte/icons/x';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 import { cubicOut } from 'svelte/easing';
 import type { HTMLInputAttributes } from 'svelte/elements';
@@ -90,7 +90,7 @@ const hasRightSlot = $derived(!!rightIcon || showClearButton);
 const cfg = $derived(inputSizeConfig[size]);
 const styles = $derived(inputVariantConfig[variant]);
 
-const inputClasses = $derived(cn(
+const inputClasses = $derived(clsx(
     'font-primary rounded-none outline-none transition-all duration-200',
     'text-neutral-900 dark:text-neutral-100',
     'placeholder:text-neutral-400 dark:placeholder:text-neutral-600',
@@ -107,8 +107,8 @@ const inputClasses = $derived(cn(
 ));
 </script>
 
-<div class={cn('flex flex-col gap-1', fullWidth && 'w-full')}>
-    <div class={cn('relative group', fullWidth && 'w-full')}>
+<div class={clsx('flex flex-col gap-1', fullWidth && 'w-full')}>
+    <div class={clsx('relative group', fullWidth && 'w-full')}>
         <!-- Left icon slot -->
         {#if leftIcon}
             <div class="absolute left-3 top-1/2 -translate-y-1/2 text-neutral-400 dark:text-neutral-600 pointer-events-none z-10 flex items-center">
@@ -147,7 +147,7 @@ const inputClasses = $derived(cn(
     <!-- Helper / error text -->
     {#if helperText}
         <span
-            class={cn(
+            class={clsx(
                 'text-2xs font-mono tracking-wide px-1',
                 error ? 'text-brand ' : 'text-secondary',
             )}
diff --git a/src/shared/ui/Label/Label.svelte b/src/shared/ui/Label/Label.svelte
index beda71a..aca6776 100644
--- a/src/shared/ui/Label/Label.svelte
+++ b/src/shared/ui/Label/Label.svelte
@@ -3,7 +3,7 @@
     Inline monospace label. The base primitive for all micrographic text.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 import {
     type LabelFont,
@@ -72,7 +72,7 @@ let {
 </script>
 
 <span
-    class={cn(
+    class={clsx(
         'font-mono tracking-widest leading-none',
         'inline-flex items-center gap-1.5',
         font === 'primary' && 'font-primary tracking-tight',
diff --git a/src/shared/ui/Logo/Logo.svelte b/src/shared/ui/Logo/Logo.svelte
index b3c098b..dee6821 100644
--- a/src/shared/ui/Logo/Logo.svelte
+++ b/src/shared/ui/Logo/Logo.svelte
@@ -3,8 +3,8 @@
     Project logo with apropriate styles
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import { Badge } from '$shared/ui';
+import clsx from 'clsx';
 
 interface Props {
     /**
@@ -18,7 +18,7 @@ const { class: className }: Props = $props();
 const title = 'GLYPHDIFF';
 </script>
 
-<div class={cn('flex items-center gap-2 md:gap-3 select-none', className)}>
+<div class={clsx('flex items-center gap-2 md:gap-3 select-none', className)}>
     <h1 class="font-logo font-extrabold text-base md:text-xl tracking-tight text-swiss-black dark:text-neutral-200">
         {title}
     </h1>
diff --git a/src/shared/ui/PerspectivePlan/PerspectivePlan.svelte b/src/shared/ui/PerspectivePlan/PerspectivePlan.svelte
index 6f971f0..2ad7f74 100644
--- a/src/shared/ui/PerspectivePlan/PerspectivePlan.svelte
+++ b/src/shared/ui/PerspectivePlan/PerspectivePlan.svelte
@@ -5,7 +5,7 @@
 -->
 <script lang="ts">
 import type { PerspectiveManager } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import { type Snippet } from 'svelte';
 
 interface Props {
@@ -73,7 +73,7 @@ const isVisible = $derived(manager.isFront);
 </script>
 
 <div
-    class={cn('will-change-transform', className)}
+    class={clsx('will-change-transform', className)}
     style:transform-style="preserve-3d"
     style:transform={style?.transform}
     style:filter={style?.filter}
diff --git a/src/shared/ui/Section/SectionHeader/SectionHeader.svelte b/src/shared/ui/Section/SectionHeader/SectionHeader.svelte
index 89e6be5..592c53d 100644
--- a/src/shared/ui/Section/SectionHeader/SectionHeader.svelte
+++ b/src/shared/ui/Section/SectionHeader/SectionHeader.svelte
@@ -3,8 +3,8 @@
     Numbered section heading with optional subtitle and pulse dot.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import { Label } from '$shared/ui';
+import clsx from 'clsx';
 
 interface Props {
     /**
@@ -41,7 +41,7 @@ let {
 const indexStr = $derived(String(index).padStart(2, '0'));
 </script>
 
-<div class={cn('flex items-center gap-3 md:gap-4 mb-2', className)}>
+<div class={clsx('flex items-center gap-3 md:gap-4 mb-2', className)}>
     <div class="flex items-center gap-2">
         {#if pulse}
             <span class="w-1.5 h-1.5 bg-brand rounded-full animate-pulse"></span>
diff --git a/src/shared/ui/Section/SectionSeparator/SectionSeparator.svelte b/src/shared/ui/Section/SectionSeparator/SectionSeparator.svelte
index fd55462..5a98005 100644
--- a/src/shared/ui/Section/SectionSeparator/SectionSeparator.svelte
+++ b/src/shared/ui/Section/SectionSeparator/SectionSeparator.svelte
@@ -3,7 +3,7 @@
     A horizontal separator line used to visually separate sections within a page.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 
 interface Props {
     /**
@@ -15,4 +15,4 @@ interface Props {
 const { class: className = '' }: Props = $props();
 </script>
 
-<div class={cn('w-full h-px bg-swiss-black/5 dark:bg-white/10 my-8 md:my-12', className)}></div>
+<div class={clsx('w-full h-px bg-swiss-black/5 dark:bg-white/10 my-8 md:my-12', className)}></div>
diff --git a/src/shared/ui/SidebarContainer/SidebarContainer.svelte b/src/shared/ui/SidebarContainer/SidebarContainer.svelte
index 15932e2..bb4dd7d 100644
--- a/src/shared/ui/SidebarContainer/SidebarContainer.svelte
+++ b/src/shared/ui/SidebarContainer/SidebarContainer.svelte
@@ -4,7 +4,7 @@
 -->
 <script lang="ts">
 import type { ResponsiveManager } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 import { getContext } from 'svelte';
 import { cubicOut } from 'svelte/easing';
@@ -79,7 +79,7 @@ function close() {
         The inner div stays w-80 so Sidebar layout never reflows mid-animation.
     -->
     <div
-        class={cn(
+        class={clsx(
             'shrink-0 z-30 h-full relative',
             'overflow-hidden',
             'will-change-[width]',
diff --git a/src/shared/ui/Skeleton/Skeleton.svelte b/src/shared/ui/Skeleton/Skeleton.svelte
index 95cfd74..5cd3062 100644
--- a/src/shared/ui/Skeleton/Skeleton.svelte
+++ b/src/shared/ui/Skeleton/Skeleton.svelte
@@ -3,7 +3,7 @@
     Generic loading placeholder with shimmer animation.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type { HTMLAttributes } from 'svelte/elements';
 
 interface Props extends HTMLAttributes<HTMLDivElement> {
@@ -18,7 +18,7 @@ let { class: className, animate = true, ...rest }: Props = $props();
 </script>
 
 <div
-    class={cn(
+    class={clsx(
         'rounded-md bg-background-subtle/50 backdrop-blur-sm',
         animate && 'animate-pulse',
         className,
diff --git a/src/shared/ui/Stat/Stat.svelte b/src/shared/ui/Stat/Stat.svelte
index 80e6855..83fbc7c 100644
--- a/src/shared/ui/Stat/Stat.svelte
+++ b/src/shared/ui/Stat/Stat.svelte
@@ -3,8 +3,8 @@
     A single key:value pair in Space Mono. Optional trailing divider.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import { Label } from '$shared/ui';
+import clsx from 'clsx';
 import type { ComponentProps } from 'svelte';
 
 interface Props extends Pick<ComponentProps<typeof Label>, 'variant'> {
@@ -36,7 +36,7 @@ let {
 }: Props = $props();
 </script>
 
-<div class={cn('flex items-center gap-1', className)}>
+<div class={clsx('flex items-center gap-1', className)}>
     <Label variant="muted" size="xs">{label}:</Label>
     <Label {variant} size="xs" bold>{value}</Label>
 </div>
diff --git a/src/shared/ui/Stat/StatGroup.svelte b/src/shared/ui/Stat/StatGroup.svelte
index 662d45f..78e729b 100644
--- a/src/shared/ui/Stat/StatGroup.svelte
+++ b/src/shared/ui/Stat/StatGroup.svelte
@@ -3,8 +3,8 @@
     Renders multiple Stat components in a row with auto-separators.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import { Stat } from '$shared/ui';
+import clsx from 'clsx';
 import type { ComponentProps } from 'svelte';
 
 interface StatItem extends Partial<Pick<ComponentProps<typeof Stat>, 'variant'>> {
@@ -26,7 +26,7 @@ interface Props {
 let { stats, class: className }: Props = $props();
 </script>
 
-<div class={cn('flex items-center gap-4', className)}>
+<div class={clsx('flex items-center gap-4', className)}>
     {#each stats as stat, i}
         <Stat
             label={stat.label}
diff --git a/src/shared/ui/TechText/TechText.svelte b/src/shared/ui/TechText/TechText.svelte
index 6e3de7a..b40bae6 100644
--- a/src/shared/ui/TechText/TechText.svelte
+++ b/src/shared/ui/TechText/TechText.svelte
@@ -3,13 +3,13 @@
     Monospace <code> element for technical values, measurements, identifiers.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import {
     type LabelSize,
     type LabelVariant,
     labelSizeConfig,
     labelVariantConfig,
 } from '$shared/ui/Label/config';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 
 interface Props {
@@ -42,7 +42,7 @@ let {
 </script>
 
 <code
-    class={cn(
+    class={clsx(
         'font-mono tracking-tight tabular-nums',
         labelSizeConfig[size],
         labelVariantConfig[variant],
diff --git a/src/shared/ui/VirtualList/VirtualList.svelte b/src/shared/ui/VirtualList/VirtualList.svelte
index 17b64a3..56f1ffb 100644
--- a/src/shared/ui/VirtualList/VirtualList.svelte
+++ b/src/shared/ui/VirtualList/VirtualList.svelte
@@ -11,7 +11,7 @@
 <script lang="ts" generics="T">
 import { createVirtualizer } from '$shared/lib';
 import { throttle } from '$shared/lib/utils';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 import type { HTMLAttributes } from 'svelte/elements';
 
@@ -295,13 +295,13 @@ $effect(() => {
 {/snippet}
 
 {#if useWindowScroll}
-    <div class={cn('relative w-full', className)} bind:this={viewportRef} {...rest}>
+    <div class={clsx('relative w-full', className)} bind:this={viewportRef} {...rest}>
         {@render content()}
     </div>
 {:else}
     <div
         bind:this={viewportRef}
-        class={cn(
+        class={clsx(
             'relative overflow-y-auto overflow-x-hidden',
             'rounded-md bg-background',
             'w-full',
diff --git a/src/widgets/ComparisonView/ui/Character/Character.svelte b/src/widgets/ComparisonView/ui/Character/Character.svelte
index d822163..de3957b 100644
--- a/src/widgets/ComparisonView/ui/Character/Character.svelte
+++ b/src/widgets/ComparisonView/ui/Character/Character.svelte
@@ -4,7 +4,7 @@
 -->
 <script lang="ts">
 import { typographySettingsStore } from '$features/SetupFont';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import { comparisonStore } from '../../model';
 
 interface Props {
@@ -52,7 +52,7 @@ $effect(() => {
     >
         {#each [0, 1] as s (s)}
             <span
-                class={cn(
+                class={clsx(
                     'char-inner',
                     'transition-colors duration-300',
                     isPast
diff --git a/src/widgets/ComparisonView/ui/Header/Header.svelte b/src/widgets/ComparisonView/ui/Header/Header.svelte
index 3b2d98e..3439216 100644
--- a/src/widgets/ComparisonView/ui/Header/Header.svelte
+++ b/src/widgets/ComparisonView/ui/Header/Header.svelte
@@ -5,7 +5,6 @@
 <script lang="ts">
 import { ThemeSwitch } from '$features/ChangeAppTheme';
 import type { ResponsiveManager } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import {
     Badge,
     Divider,
@@ -17,6 +16,7 @@ import {
 } from '$shared/ui';
 import PanelLeftClose from '@lucide/svelte/icons/panel-left-close';
 import PanelLeftOpen from '@lucide/svelte/icons/panel-left-open';
+import clsx from 'clsx';
 import { getContext } from 'svelte';
 import { comparisonStore } from '../../model';
 
@@ -49,7 +49,7 @@ const fontBName = $derived(comparisonStore.fontB?.name ?? '');
 </script>
 
 <header
-    class={cn(
+    class={clsx(
         'flex items-center justify-between',
         'px-4 md:px-8 py-4 md:py-6',
         'h-16 md:h-20 z-20',
diff --git a/src/widgets/ComparisonView/ui/Sidebar/Sidebar.svelte b/src/widgets/ComparisonView/ui/Sidebar/Sidebar.svelte
index 89da369..ae8c7aa 100644
--- a/src/widgets/ComparisonView/ui/Sidebar/Sidebar.svelte
+++ b/src/widgets/ComparisonView/ui/Sidebar/Sidebar.svelte
@@ -5,12 +5,12 @@
     Content (font list, controls) is injected via snippets.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import {
     ButtonGroup,
     Label,
     ToggleButton,
 } from '$shared/ui';
+import clsx from 'clsx';
 import type { Snippet } from 'svelte';
 import {
     type Side,
@@ -40,7 +40,7 @@ let {
 </script>
 
 <div
-    class={cn(
+    class={clsx(
         'flex flex-col h-full',
         'w-80',
         'bg-surface dark:bg-dark-bg',
diff --git a/src/widgets/ComparisonView/ui/SliderArea/SliderArea.svelte b/src/widgets/ComparisonView/ui/SliderArea/SliderArea.svelte
index f01f65d..13dbd10 100644
--- a/src/widgets/ComparisonView/ui/SliderArea/SliderArea.svelte
+++ b/src/widgets/ComparisonView/ui/SliderArea/SliderArea.svelte
@@ -17,8 +17,8 @@ import {
 import {
     CharacterComparisonEngine,
 } from '$shared/lib/helpers/CharacterComparisonEngine/CharacterComparisonEngine.svelte';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import { Loader } from '$shared/ui';
+import clsx from 'clsx';
 import { getContext } from 'svelte';
 import { Spring } from 'svelte/motion';
 import { fade } from 'svelte/transition';
@@ -186,10 +186,10 @@ const scaleClass = $derived(
     Outer flex container — fills parent.
     The paper div inside scales down when the sidebar opens on desktop.
 -->
-<div class={cn('flex-1 relative flex items-center justify-center p-0 overflow-hidden bg-surface dark:bg-dark-bg', className)}>
+<div class={clsx('flex-1 relative flex items-center justify-center p-0 overflow-hidden bg-surface dark:bg-dark-bg', className)}>
     <!-- Paper surface -->
     <div
-        class={cn(
+        class={clsx(
             'w-full h-full flex flex-col items-center justify-center relative',
             'bg-paper dark:bg-dark-card',
             'shadow-2xl shadow-black/5 dark:shadow-black/20',
@@ -253,7 +253,7 @@ const scaleClass = $derived(
     </div>
 
     <TypographyMenu
-        class={cn(
+        class={clsx(
             'absolute bottom-4 sm:bottom-5 right-4 sm:left-1/2 sm:right-[unset] sm:-translate-x-1/2 z-50',
         )}
     />
diff --git a/src/widgets/ComparisonView/ui/Thumb/Thumb.svelte b/src/widgets/ComparisonView/ui/Thumb/Thumb.svelte
index 128a469..d89dc33 100644
--- a/src/widgets/ComparisonView/ui/Thumb/Thumb.svelte
+++ b/src/widgets/ComparisonView/ui/Thumb/Thumb.svelte
@@ -4,7 +4,7 @@
     1px red vertical rule with square handles at top and bottom.
 -->
 <script lang="ts">
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
+import clsx from 'clsx';
 import { cubicOut } from 'svelte/easing';
 import { fade } from 'svelte/transition';
 
@@ -31,7 +31,7 @@ let { sliderPos, isDragging }: Props = $props();
 >
     <!-- Top handle -->
     <div
-        class={cn(
+        class={clsx(
             'w-5 h-5 md:w-6 md:h-6',
             '-ml-2.5 md:-ml-3',
             'mt-2 md:mt-4',
@@ -47,7 +47,7 @@ let { sliderPos, isDragging }: Props = $props();
 
     <!-- Bottom handle -->
     <div
-        class={cn(
+        class={clsx(
             'w-5 h-5 md:w-6 md:h-6',
             '-ml-2.5 md:-ml-3',
             'mb-2 md:mb-4',
diff --git a/src/widgets/FontSearch/ui/FontSearchSection/FontSearchSection.svelte b/src/widgets/FontSearch/ui/FontSearchSection/FontSearchSection.svelte
index a39f92c..c791998 100644
--- a/src/widgets/FontSearch/ui/FontSearchSection/FontSearchSection.svelte
+++ b/src/widgets/FontSearch/ui/FontSearchSection/FontSearchSection.svelte
@@ -5,8 +5,8 @@
 <script lang="ts">
 import { NavigationWrapper } from '$entities/Breadcrumb';
 import type { ResponsiveManager } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import { Section } from '$shared/ui';
+import clsx from 'clsx';
 import {
     getContext,
     untrack,
@@ -38,7 +38,7 @@ $effect(() => {
             headerAction={registerAction}
         >
             {#snippet content({ className })}
-                <div class={cn(className, !responsive.isDesktopLarge && 'col-start-0 col-span-2')}>
+                <div class={clsx(className, !responsive.isDesktopLarge && 'col-start-0 col-span-2')}>
                     <FontSearch bind:showFilters={isExpanded} />
                 </div>
             {/snippet}
diff --git a/src/widgets/SampleList/ui/SampleListSection/SampleListSection.svelte b/src/widgets/SampleList/ui/SampleListSection/SampleListSection.svelte
index 2c89f84..cb4f1dc 100644
--- a/src/widgets/SampleList/ui/SampleListSection/SampleListSection.svelte
+++ b/src/widgets/SampleList/ui/SampleListSection/SampleListSection.svelte
@@ -6,11 +6,11 @@
 import { NavigationWrapper } from '$entities/Breadcrumb';
 import { fontStore } from '$entities/Font';
 import type { ResponsiveManager } from '$shared/lib';
-import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import {
     Label,
     Section,
 } from '$shared/ui';
+import clsx from 'clsx';
 import { getContext } from 'svelte';
 import { layoutManager } from '../../model';
 import LayoutSwitch from '../LayoutSwitch/LayoutSwitch.svelte';
@@ -50,7 +50,7 @@ const responsive = getContext<ResponsiveManager>('responsive');
             {/snippet}
 
             {#snippet content({ className })}
-                <div class={cn(className, !responsive.isDesktopLarge && 'col-start-0 col-span-2')}>
+                <div class={clsx(className, !responsive.isDesktopLarge && 'col-start-0 col-span-2')}>
                     <SampleList />
                 </div>
             {/snippet}
diff --git a/tsconfig.json b/tsconfig.json
index c215265..ca9ec1e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -43,7 +43,6 @@
   "exclude": [
     "node_modules",
     "dist",
-    "src/shared/shadcn/**/*",
     "node_modules/**/*"
   ]
 }
diff --git a/vitest.config.ts b/vitest.config.ts
index 3e26d12..3ed6693 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -20,7 +20,6 @@ export default defineConfig({
             'dist',
             'e2e',
             '.storybook',
-            'src/shared/shadcn/**/*',
         ],
         restoreMocks: true,
         coverage: {
@@ -38,7 +37,6 @@ export default defineConfig({
                 '**/*.spec.ts',
                 '**/*.d.ts',
                 '**/*.stories.svelte',
-                'src/shared/shadcn/**/*',
                 'vitest.config.ts',
             ],
             thresholds: {