diff --git a/docs/app/assets/css/devframe.css b/docs/app/assets/css/devframe.css
index fb2f5ce2..55f9ff05 100644
--- a/docs/app/assets/css/devframe.css
+++ b/docs/app/assets/css/devframe.css
@@ -46,7 +46,7 @@
   width: 100%;
 }
 
-/* Do not render "description" slot */
-[data-slot="description"] {
+/* Do not render "description" slot in page, as the content are duplicated */
+[data-slot="wrapper"] + [data-slot="description"] {
   display: none;
 }
diff --git a/docs/app/components/AppHeader.vue b/docs/app/components/AppHeader.vue
new file mode 100644
index 00000000..c282074a
--- /dev/null
+++ b/docs/app/components/AppHeader.vue
@@ -0,0 +1,100 @@
+<script setup lang="ts">
+// Shadows the comark-docs layer's AppHeader: adds a color mode toggle to the
+// persistent top-right nav, next to the version history button.
+const { header, footer, assistant } = useAppConfig()
+const content = useDocsContent()
+// const historyOpen = useVersionHistory()
+const assistantOpen = useAssistant()
+const navigation = useMainNavigation()
+</script>
+
+<template>
+  <UHeader :to="prefixLink(header?.to || '/', content.base)">
+    <template #left>
+      <AppHeaderBrand />
+    </template>
+
+    <AppHeaderCenter class="hidden lg:flex" />
+
+    <template #right>
+      <UContentSearchButton
+        v-if="header?.search"
+        :collapsed="false"
+        :icon="false"
+        class="text-muted font-normal hidden lg:inline-flex min-w-[150px]"
+      />
+
+      <UButton
+        v-if="assistant?.enabled"
+        label="Ask AI"
+        color="neutral"
+        variant="outline"
+        @click="assistantOpen = true"
+      />
+
+      <UColorModeButton
+        color="neutral"
+        variant="outline"
+        :ui="{ leadingIcon: 'size-4' }"
+        class="p-2"
+      />
+
+      <!-- <UButton
+        icon="i-lucide-history"
+        :color="content.mode === 'prod' ? 'neutral' : 'warning'"
+        :variant="content.mode === 'prod' ? 'outline' : 'subtle'"
+        aria-label="Version history"
+        :ui="{ leadingIcon: 'size-4' }"
+        class="p-2"
+        @click="historyOpen = !historyOpen"
+      /> -->
+
+      <template v-if="header?.links">
+        <UButton
+          v-for="(link, index) of header?.links"
+          :key="index"
+          v-bind="{ color: 'neutral', variant: 'ghost', ...link }"
+          class="hidden lg:inline-flex"
+        />
+      </template>
+    </template>
+
+    <template #toggle="{ open, toggle }">
+      <IconMenuToggle
+        :open="open"
+        @click="toggle"
+      />
+    </template>
+
+    <template #body>
+      <div class="flex flex-col justify-between h-full">
+        <div class="flex flex-col gap-4">
+          <UContentSearchButton
+            v-if="header?.search"
+            :collapsed="false"
+            size="xl"
+            class="w-full font-normal"
+            :icon="false"
+          />
+          <UNavigationMenu
+            :items="navigation"
+            color="neutral"
+            variant="link"
+            orientation="vertical"
+            :ui="{ root: 'pl-0 -ml-2', link: 'py-2 my-2 text-md' }"
+          />
+        </div>
+        <div class="flex items-center gap-4">
+          <template v-if="footer?.links">
+            <UButton
+              v-for="(link, index) of footer?.links"
+              :key="index"
+              v-bind="{ color: 'neutral', variant: 'ghost', size: 'md', ...link }"
+              class="text-highlighted"
+            />
+          </template>
+        </div>
+      </div>
+    </template>
+  </UHeader>
+</template>