diff --git a/.vscode/settings.json b/.vscode/settings.json
index 750b2255..7dae54ee 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -18,6 +18,7 @@
   ],
   "deno.importMap": "./supabase/functions/import_map.json",
   "editor.formatOnSave": true,
+  "editor.wordWrap": "on",
   "[svelte]": {
     "editor.defaultFormatter": "svelte.svelte-vscode"
   },
diff --git a/apps/dashboard/src/app.css b/apps/dashboard/src/app.css
index a1b3aaca..2fd6b20f 100644
--- a/apps/dashboard/src/app.css
+++ b/apps/dashboard/src/app.css
@@ -8,32 +8,6 @@
 
 @custom-variant dark (&:where(.dark, .dark *));
 
-/**
- * Shared z-index scale, mirrored from `packages/ui/src/index.css`.
- *
- * Dashboard code has its own (unprefixed) Tailwind pipeline, separate from `@cio/ui`'s
- * `ui:`-prefixed one — a `ui:`-prefixed utility only compiles if that exact class string is
- * also used somewhere under `packages/ui/src`. So dashboard-only usages (page headers, the
- * course sidebar, dropdowns/selects that need to escape a sticky header or a modal) must use
- * these unprefixed names instead. Keep the two scales numerically in sync; see
- * `packages/ui/README.md` for the full write-up of each layer.
- */
-@utility z-app-bar {
-  z-index: 100;
-}
-
-@utility z-app-bar-elevated {
-  z-index: 150;
-}
-
-@utility z-modal {
-  z-index: 200;
-}
-
-@utility z-menu-elevated {
-  z-index: 250;
-}
-
 /* Geist variable font — self-hosted */
 @font-face {
   font-family: 'Geist';
diff --git a/apps/dashboard/src/lib/features/ai-assistant/chat-header.svelte b/apps/dashboard/src/lib/features/ai-assistant/chat-header.svelte
index 53c7d60b..6c64f077 100644
--- a/apps/dashboard/src/lib/features/ai-assistant/chat-header.svelte
+++ b/apps/dashboard/src/lib/features/ai-assistant/chat-header.svelte
@@ -229,7 +229,7 @@
             </Button>
           {/snippet}
         </Popover.Trigger>
-        <Popover.Content class="ui:p-0! z-200! w-72" align="center">
+        <Popover.Content class="ui:p-0! w-72" align="center">
           <ChatHistoryPopover
             {conversations}
             {activeConversationId}
diff --git a/apps/dashboard/src/lib/features/cohort/components/cohort-header.svelte b/apps/dashboard/src/lib/features/cohort/components/cohort-header.svelte
index d0db1033..f5f333e2 100644
--- a/apps/dashboard/src/lib/features/cohort/components/cohort-header.svelte
+++ b/apps/dashboard/src/lib/features/cohort/components/cohort-header.svelte
@@ -5,7 +5,7 @@
 </script>
 
 <header
-  class="border-border ui:bg-background z-app-bar sticky top-0 flex h-12 w-full shrink-0 items-center gap-2 border-b backdrop-blur transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-8"
+  class="border-border ui:bg-background ui:z-app-bar sticky top-0 flex h-12 w-full shrink-0 items-center gap-2 border-b backdrop-blur transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-8"
 >
   <div class="flex w-full items-center gap-2 px-4">
     <Sidebar.Trigger />
diff --git a/apps/dashboard/src/lib/features/cohort/components/sidebar/cohort-sidebar.svelte b/apps/dashboard/src/lib/features/cohort/components/sidebar/cohort-sidebar.svelte
index 019a9267..723e22c3 100644
--- a/apps/dashboard/src/lib/features/cohort/components/sidebar/cohort-sidebar.svelte
+++ b/apps/dashboard/src/lib/features/cohort/components/sidebar/cohort-sidebar.svelte
@@ -29,7 +29,7 @@
 {#if !isOrgLoaded}
   <SidebarSkeleton />
 {:else}
-  <Sidebar.Root collapsible="icon">
+  <Sidebar.Root collapsible="icon" class="ui:z-app-bar-elevated">
     <Sidebar.Header>
       <OrgLogo />
     </Sidebar.Header>
diff --git a/apps/dashboard/src/lib/features/course/components/course-header.svelte b/apps/dashboard/src/lib/features/course/components/course-header.svelte
index e51c1c1e..6135d87f 100644
--- a/apps/dashboard/src/lib/features/course/components/course-header.svelte
+++ b/apps/dashboard/src/lib/features/course/components/course-header.svelte
@@ -59,7 +59,7 @@
 </script>
 
 <header
-  class="border-border ui:bg-background z-app-bar sticky top-0 flex h-12 w-full shrink-0 items-center gap-2 border-b backdrop-blur transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-8"
+  class="border-border ui:bg-background ui:z-app-bar sticky top-0 flex h-12 w-full shrink-0 items-center gap-2 border-b backdrop-blur transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-8"
 >
   <div class="flex w-full items-center gap-2 px-4">
     <Sidebar.Trigger />
diff --git a/apps/dashboard/src/lib/features/course/components/exercise/mark-exercise-modal.svelte b/apps/dashboard/src/lib/features/course/components/exercise/mark-exercise-modal.svelte
index 6dad6499..2bdcdff7 100644
--- a/apps/dashboard/src/lib/features/course/components/exercise/mark-exercise-modal.svelte
+++ b/apps/dashboard/src/lib/features/course/components/exercise/mark-exercise-modal.svelte
@@ -296,7 +296,7 @@
               >
                 <EllipsisVerticalIcon class="h-5 w-5" />
               </DropdownMenu.Trigger>
-              <DropdownMenu.Content align="end" class="z-menu-elevated">
+              <DropdownMenu.Content align="end">
                 <DropdownMenu.Item
                   class="text-red-600"
                   onclick={() => {
@@ -366,7 +366,7 @@
               <Select.Trigger class="w-full">
                 {status.text}
               </Select.Trigger>
-              <Select.Content class="z-menu-elevated">
+              <Select.Content>
                 {#each SELECTABLE_STATUS as statusOption}
                   <Select.Item value={statusOption.id.toString()}>
                     {statusOption.text}
diff --git a/apps/dashboard/src/lib/features/course/components/lesson/document/document.svelte b/apps/dashboard/src/lib/features/course/components/lesson/document/document.svelte
index 90bec091..93ccfc7f 100644
--- a/apps/dashboard/src/lib/features/course/components/lesson/document/document.svelte
+++ b/apps/dashboard/src/lib/features/course/components/lesson/document/document.svelte
@@ -339,7 +339,7 @@
 
 <!-- PDF Viewer Modal -->
 {#if pdfViewerOpen}
-  <div class="z-modal fixed inset-0 flex flex-col bg-white dark:bg-neutral-800">
+  <div class="ui:z-modal fixed inset-0 flex flex-col bg-white dark:bg-neutral-800">
     <!-- Header -->
     <div class="flex items-center justify-between border-b border-gray-200 bg-white px-4 py-3 dark:bg-neutral-800">
       <div class="flex items-center space-x-4">
diff --git a/apps/dashboard/src/lib/features/course/components/sidebar/course-sidebar.svelte b/apps/dashboard/src/lib/features/course/components/sidebar/course-sidebar.svelte
index c9663300..4dd2079f 100644
--- a/apps/dashboard/src/lib/features/course/components/sidebar/course-sidebar.svelte
+++ b/apps/dashboard/src/lib/features/course/components/sidebar/course-sidebar.svelte
@@ -118,7 +118,7 @@
 {#if !isOrgLoaded}
   <SidebarSkeleton />
 {:else}
-  <Sidebar.Root collapsible="icon" class="z-app-bar-elevated!" mobileOverlayClass="z-app-bar-elevated!">
+  <Sidebar.Root collapsible="icon" class="ui:z-app-bar-elevated" mobileOverlayClass="ui:z-app-bar-elevated">
     <Sidebar.Header>
       <CourseSidebarLogo isStudent={$isStudentExperience} />
     </Sidebar.Header>
diff --git a/apps/dashboard/src/lib/features/course/pages/exercise.svelte b/apps/dashboard/src/lib/features/course/pages/exercise.svelte
index 339c06d9..1d689ca2 100644
--- a/apps/dashboard/src/lib/features/course/pages/exercise.svelte
+++ b/apps/dashboard/src/lib/features/course/pages/exercise.svelte
@@ -592,7 +592,7 @@
   }
 </script>
 
-<Page.Header isSticky={true} class="z-app-bar! top-12! min-h-[36px]">
+<Page.Header isSticky={true} class="ui:z-app-bar top-12! min-h-[36px]">
   <Page.HeaderContent>
     <Page.Title class="flex flex-col gap-2">
       <span>{exerciseDisplayTitle}</span>
@@ -638,7 +638,7 @@
                       </Button>
                     {/snippet}
                   </DropdownMenu.Trigger>
-                  <DropdownMenu.Content align="end" class="z-menu-elevated!">
+                  <DropdownMenu.Content align="end">
                     <DropdownMenu.Item onclick={addSectionFromHeader}>
                       {$t('course.navItem.lessons.exercises.all_exercises.add_section')}
                     </DropdownMenu.Item>
@@ -677,7 +677,7 @@
                       </Button>
                     {/snippet}
                   </DropdownMenu.Trigger>
-                  <DropdownMenu.Content align="end" class="z-menu-elevated!">
+                  <DropdownMenu.Content align="end">
                     {#if hasSections($questionnaire.sections)}
                       <DropdownMenu.Item onclick={() => (reorderQuestions = !reorderQuestions)}>
                         {reorderQuestions
diff --git a/apps/dashboard/src/lib/features/side-panel/side-panel-rail.svelte b/apps/dashboard/src/lib/features/side-panel/side-panel-rail.svelte
index 922cf0d7..889ece02 100644
--- a/apps/dashboard/src/lib/features/side-panel/side-panel-rail.svelte
+++ b/apps/dashboard/src/lib/features/side-panel/side-panel-rail.svelte
@@ -148,7 +148,7 @@
     <div class="hidden shrink-0 md:block md:w-(--side-panel-width)"></div>
 
     <aside
-      class="ui:bg-background z-app-bar fixed inset-y-0 right-0 flex h-screen w-full flex-col border-l md:w-(--side-panel-width)"
+      class="ui:bg-background ui:z-app-bar fixed inset-y-0 right-0 flex h-screen w-full flex-col border-l md:w-(--side-panel-width)"
       aria-label={t.get(def.titleKey)}
     >
       <button
diff --git a/apps/dashboard/src/lib/features/tag/pages/tags-admin.svelte b/apps/dashboard/src/lib/features/tag/pages/tags-admin.svelte
index 8caf05c4..46e4a1e6 100644
--- a/apps/dashboard/src/lib/features/tag/pages/tags-admin.svelte
+++ b/apps/dashboard/src/lib/features/tag/pages/tags-admin.svelte
@@ -383,7 +383,7 @@
                 : $t('tags_admin.tag_modal.select_category')}
             </p>
           </Select.Trigger>
-          <Select.Content class="z-menu-elevated">
+          <Select.Content>
             {#each tagApi.tagGroups as group (group.id)}
               <Select.Item value={group.id}>{group.name}</Select.Item>
             {/each}
@@ -409,7 +409,7 @@
               </Button>
             {/snippet}
           </Popover.Trigger>
-          <Popover.Content align="start" class="z-250! w-44 p-3">
+          <Popover.Content align="start" class="w-44 p-3">
             <div class="grid grid-cols-5 gap-2">
               {#each TAG_COLOR_OPTIONS as color (color)}
                 <Button
diff --git a/apps/dashboard/src/lib/features/ui/course-landing-page/components/editor/pricing-form.svelte b/apps/dashboard/src/lib/features/ui/course-landing-page/components/editor/pricing-form.svelte
index 5367a37a..bdff5961 100644
--- a/apps/dashboard/src/lib/features/ui/course-landing-page/components/editor/pricing-form.svelte
+++ b/apps/dashboard/src/lib/features/ui/course-landing-page/components/editor/pricing-form.svelte
@@ -49,7 +49,7 @@
       <Select.Trigger class="w-full">
         <p>{course.currency === 'NGN' ? 'NGN' : 'USD'}</p>
       </Select.Trigger>
-      <Select.Content class="z-menu-elevated">
+      <Select.Content>
         <Select.Item value="NGN">NGN</Select.Item>
         <Select.Item value="USD">USD</Select.Item>
       </Select.Content>
diff --git a/packages/ui/src/base/dropdown-menu/dropdown-menu-content.svelte b/packages/ui/src/base/dropdown-menu/dropdown-menu-content.svelte
index 3e86e994..f4b08fcd 100644
--- a/packages/ui/src/base/dropdown-menu/dropdown-menu-content.svelte
+++ b/packages/ui/src/base/dropdown-menu/dropdown-menu-content.svelte
@@ -24,7 +24,7 @@
     {sideOffset}
     {preventScroll}
     class={cn(
-      'ui:bg-popover ui:text-popover-foreground ui:data-[state=open]:animate-in ui:data-[state=closed]:animate-out ui:data-[state=closed]:fade-out-0 ui:data-[state=open]:fade-in-0 ui:data-[state=closed]:zoom-out-95 ui:data-[state=open]:zoom-in-95 ui:data-[side=bottom]:slide-in-from-top-2 ui:data-[side=left]:slide-in-from-right-2 ui:data-[side=right]:slide-in-from-left-2 ui:data-[side=top]:slide-in-from-bottom-2 ui:max-h-(--bits-dropdown-menu-content-available-height) ui:origin-(--bits-dropdown-menu-content-transform-origin) ui:z-50 ui:min-w-32 ui:overflow-y-auto ui:overflow-x-hidden ui:rounded-md ui:border ui:p-1 ui:shadow-md ui:outline-none',
+      'ui:bg-popover ui:text-popover-foreground ui:data-[state=open]:animate-in ui:data-[state=closed]:animate-out ui:data-[state=closed]:fade-out-0 ui:data-[state=open]:fade-in-0 ui:data-[state=closed]:zoom-out-95 ui:data-[state=open]:zoom-in-95 ui:data-[side=bottom]:slide-in-from-top-2 ui:data-[side=left]:slide-in-from-right-2 ui:data-[side=right]:slide-in-from-left-2 ui:data-[side=top]:slide-in-from-bottom-2 ui:max-h-(--bits-dropdown-menu-content-available-height) ui:origin-(--bits-dropdown-menu-content-transform-origin) ui:z-menu-elevated ui:min-w-32 ui:overflow-y-auto ui:overflow-x-hidden ui:rounded-md ui:border ui:p-1 ui:shadow-md ui:outline-none',
       className
     )}
     {...restProps}
diff --git a/packages/ui/src/base/dropdown-menu/dropdown-menu-sub-content.svelte b/packages/ui/src/base/dropdown-menu/dropdown-menu-sub-content.svelte
index c0aa630f..406c115a 100644
--- a/packages/ui/src/base/dropdown-menu/dropdown-menu-sub-content.svelte
+++ b/packages/ui/src/base/dropdown-menu/dropdown-menu-sub-content.svelte
@@ -9,7 +9,7 @@
   bind:ref
   data-slot="dropdown-menu-sub-content"
   class={cn(
-    'ui:bg-popover ui:text-popover-foreground ui:data-[state=open]:animate-in ui:data-[state=closed]:animate-out ui:data-[state=closed]:fade-out-0 ui:data-[state=open]:fade-in-0 ui:data-[state=closed]:zoom-out-95 ui:data-[state=open]:zoom-in-95 ui:data-[side=bottom]:slide-in-from-top-2 ui:data-[side=left]:slide-in-from-right-2 ui:data-[side=right]:slide-in-from-left-2 ui:data-[side=top]:slide-in-from-bottom-2 ui:origin-(--bits-dropdown-menu-content-transform-origin) ui:z-50 ui:min-w-32 ui:overflow-hidden ui:rounded-md ui:border ui:p-1 ui:shadow-lg',
+    'ui:bg-popover ui:text-popover-foreground ui:data-[state=open]:animate-in ui:data-[state=closed]:animate-out ui:data-[state=closed]:fade-out-0 ui:data-[state=open]:fade-in-0 ui:data-[state=closed]:zoom-out-95 ui:data-[state=open]:zoom-in-95 ui:data-[side=bottom]:slide-in-from-top-2 ui:data-[side=left]:slide-in-from-right-2 ui:data-[side=right]:slide-in-from-left-2 ui:data-[side=top]:slide-in-from-bottom-2 ui:origin-(--bits-dropdown-menu-content-transform-origin) ui:z-menu-elevated ui:min-w-32 ui:overflow-hidden ui:rounded-md ui:border ui:p-1 ui:shadow-lg',
     className
   )}
   {...restProps}
diff --git a/packages/ui/src/base/popover/popover-content.svelte b/packages/ui/src/base/popover/popover-content.svelte
index 64615e52..c1e13c9b 100644
--- a/packages/ui/src/base/popover/popover-content.svelte
+++ b/packages/ui/src/base/popover/popover-content.svelte
@@ -21,7 +21,7 @@
     {sideOffset}
     {align}
     class={cn(
-      'ui:bg-popover ui:text-popover-foreground ui:data-[state=open]:animate-in ui:data-[state=closed]:animate-out ui:data-[state=closed]:fade-out-0 ui:data-[state=open]:fade-in-0 ui:data-[state=closed]:zoom-out-95 ui:data-[state=open]:zoom-in-95 ui:data-[side=bottom]:slide-in-from-top-2 ui:data-[side=left]:slide-in-from-right-2 ui:data-[side=right]:slide-in-from-left-2 ui:data-[side=top]:slide-in-from-bottom-2 ui:origin-(--bits-popover-content-transform-origin) ui:outline-hidden ui:z-50 ui:w-72 ui:rounded-md ui:border ui:p-4 ui:shadow-md',
+      'ui:bg-popover ui:text-popover-foreground ui:data-[state=open]:animate-in ui:data-[state=closed]:animate-out ui:data-[state=closed]:fade-out-0 ui:data-[state=open]:fade-in-0 ui:data-[state=closed]:zoom-out-95 ui:data-[state=open]:zoom-in-95 ui:data-[side=bottom]:slide-in-from-top-2 ui:data-[side=left]:slide-in-from-right-2 ui:data-[side=right]:slide-in-from-left-2 ui:data-[side=top]:slide-in-from-bottom-2 ui:origin-(--bits-popover-content-transform-origin) ui:outline-hidden ui:z-menu-elevated ui:w-72 ui:rounded-md ui:border ui:p-4 ui:shadow-md',
       className
     )}
     {...restProps}
diff --git a/packages/ui/src/base/select/select-content.svelte b/packages/ui/src/base/select/select-content.svelte
index 608adcbd..cb406221 100644
--- a/packages/ui/src/base/select/select-content.svelte
+++ b/packages/ui/src/base/select/select-content.svelte
@@ -22,7 +22,7 @@
     {sideOffset}
     data-slot="select-content"
     class={cn(
-      'ui:bg-popover ui:text-popover-foreground ui:data-[state=open]:animate-in ui:data-[state=closed]:animate-out ui:data-[state=closed]:fade-out-0 ui:data-[state=open]:fade-in-0 ui:data-[state=closed]:zoom-out-95 ui:data-[state=open]:zoom-in-95 ui:data-[side=bottom]:slide-in-from-top-2 ui:data-[side=left]:slide-in-from-right-2 ui:data-[side=right]:slide-in-from-left-2 ui:data-[side=top]:slide-in-from-bottom-2 ui:max-h-(--bits-select-content-available-height) ui:origin-(--bits-select-content-transform-origin) ui:relative ui:z-50 ui:min-w-32 ui:overflow-y-auto ui:overflow-x-hidden ui:rounded-md ui:border ui:shadow-md ui:data-[side=bottom]:translate-y-1 ui:data-[side=left]:-translate-x-1 ui:data-[side=right]:translate-x-1 ui:data-[side=top]:-translate-y-1',
+      'ui:bg-popover ui:text-popover-foreground ui:data-[state=open]:animate-in ui:data-[state=closed]:animate-out ui:data-[state=closed]:fade-out-0 ui:data-[state=open]:fade-in-0 ui:data-[state=closed]:zoom-out-95 ui:data-[state=open]:zoom-in-95 ui:data-[side=bottom]:slide-in-from-top-2 ui:data-[side=left]:slide-in-from-right-2 ui:data-[side=right]:slide-in-from-left-2 ui:data-[side=top]:slide-in-from-bottom-2 ui:max-h-(--bits-select-content-available-height) ui:origin-(--bits-select-content-transform-origin) ui:relative ui:z-menu-elevated ui:min-w-32 ui:overflow-y-auto ui:overflow-x-hidden ui:rounded-md ui:border ui:shadow-md ui:data-[side=bottom]:translate-y-1 ui:data-[side=left]:-translate-x-1 ui:data-[side=right]:translate-x-1 ui:data-[side=top]:-translate-y-1',
       className
     )}
     {...restProps}