diff --git a/docs-ui/src/app/components/[slug]/page.tsx b/docs-ui/src/app/components/[slug]/page.tsx
index d6f98c8f93..1422334471 100644
--- a/docs-ui/src/app/components/[slug]/page.tsx
+++ b/docs-ui/src/app/components/[slug]/page.tsx
@@ -7,9 +7,7 @@ export default async function Page({
 }) {
   const { slug } = await params;
 
-  const { default: Component } = await import(
-    `@/content/components/${slug}.mdx`
-  );
+  const { default: Component } = await import(`@/content/${slug}.mdx`);
 
   return <Component />;
 }
diff --git a/docs-ui/src/app/layout.module.css b/docs-ui/src/app/layout.module.css
index 5c1d113a98..df89f02283 100644
--- a/docs-ui/src/app/layout.module.css
+++ b/docs-ui/src/app/layout.module.css
@@ -5,10 +5,28 @@
   padding-inline: 24px;
 }
 
-.content {
+.contentWrapper {
+  display: flex;
   width: 100%;
   max-width: 1200px;
   margin: 0 auto;
+  justify-content: center;
+  flex-direction: column;
+}
+
+.content {
+  display: flex;
+  gap: 40px;
+}
+
+.contentInner {
+  flex: 1;
+  min-width: 0;
+  overflow-x: hidden;
+}
+
+.toc {
+  display: none;
 }
 
 @media (min-width: 768px) {
@@ -18,3 +36,11 @@
     margin-right: 40px;
   }
 }
+
+@media (min-width: 1280px) {
+  .toc {
+    display: block;
+    width: 240px;
+    flex-shrink: 0;
+  }
+}
diff --git a/docs-ui/src/app/layout.tsx b/docs-ui/src/app/layout.tsx
index 2bafa97d32..738a995795 100644
--- a/docs-ui/src/app/layout.tsx
+++ b/docs-ui/src/app/layout.tsx
@@ -4,6 +4,7 @@ import { Toolbar } from '@/components/Toolbar';
 import { StickyHeader } from '../components/StickyHeader/StickyHeader';
 import { Providers } from './providers';
 import { CustomTheme } from '@/components/CustomTheme';
+import { TableOfContents } from '@/components/TableOfContents';
 import styles from './layout.module.css';
 
 import '../css/globals.css';
@@ -53,9 +54,14 @@ export default async function RootLayout({
           <Sidebar />
           {/* <StickyHeader /> */}
           <div className={styles.container}>
-            <div className={styles.content}>
+            <div className={styles.contentWrapper}>
               <Toolbar version={packageVersion} />
-              {children}
+              <div className={styles.content}>
+                <div className={styles.contentInner}>{children}</div>
+                <aside className={styles.toc}>
+                  <TableOfContents />
+                </aside>
+              </div>
             </div>
           </div>
           <CustomTheme />
diff --git a/docs-ui/src/components/CodeBlock/index.tsx b/docs-ui/src/components/CodeBlock/index.tsx
index 96fdb6bea5..1467bca465 100644
--- a/docs-ui/src/components/CodeBlock/index.tsx
+++ b/docs-ui/src/components/CodeBlock/index.tsx
@@ -9,15 +9,24 @@ export interface CodeBlockProps {
   code?: string;
 }
 
-export async function CodeBlock({ lang = 'tsx', title, code }: CodeBlockProps) {
-  const out = await codeToHtml(code || '', {
-    lang: lang,
+export async function CodeBlock(props: CodeBlockProps) {
+  const { lang = 'tsx', title, code } = props;
+  let out = await codeToHtml(code || '', {
+    lang,
+    transformers: [transformerNotationDiff({ matchAlgorithm: 'v3' })],
     themes: {
-      light: 'min-light',
+      light: 'github-dark',
       dark: 'min-dark',
     },
-    transformers: [transformerNotationDiff({ matchAlgorithm: 'v3' })],
   });
 
+  // Remove background-color from the pre tag to use our theme colors
+  out = out.replace(
+    /style="([^"]*?)background-color:[^;]+;?([^"]*?)"/g,
+    'style="$1$2"',
+  );
+  // Clean up empty style attributes
+  out = out.replace(/style=""\s?/g, '');
+
   return <CodeBlockClient out={out} title={title} />;
 }
diff --git a/docs-ui/src/components/CodeBlock/styles.module.css b/docs-ui/src/components/CodeBlock/styles.module.css
index d786140482..30e1837f60 100644
--- a/docs-ui/src/components/CodeBlock/styles.module.css
+++ b/docs-ui/src/components/CodeBlock/styles.module.css
@@ -1,33 +1,29 @@
 .codeBlock {
-  border-radius: 4px;
-  border: 1px solid var(--border);
+  border-radius: 8px;
   position: relative;
   background: transparent;
   overflow-x: auto;
   font-family: var(--font-mono);
-  background-color: #fff;
+  background-color: var(--code-bg);
   margin-bottom: 1rem;
 }
 
-[data-theme-mode='dark'] .codeBlock {
-  background-color: #121212;
-}
-
 .title {
-  border-bottom: 1px solid var(--border);
   padding: 12px 20px;
   font-size: 0.8125rem;
-  color: var(--primary);
+  color: #fff;
   font-family: var(--font-regular);
   font-weight: var(--font-weight-bold);
+  background-color: var(--code-title);
 }
 
 .title code {
-  background-color: var(--surface-1);
+  background-color: rgba(255, 255, 255, 0.1);
   padding: 0.2rem 0.375rem;
   border-radius: 0.25rem;
-  color: var(--secondary);
-  font-size: 0.8125rem;
+  color: #fff;
+  font-size: 0.75rem;
+  font-weight: var(--font-weight-bold);
 }
 
 .code {
diff --git a/docs-ui/src/components/Snippet/styles.module.css b/docs-ui/src/components/Snippet/styles.module.css
index bb0d1cbc50..3141564293 100644
--- a/docs-ui/src/components/Snippet/styles.module.css
+++ b/docs-ui/src/components/Snippet/styles.module.css
@@ -5,9 +5,9 @@
 }
 
 .preview {
-  border-radius: 4px;
+  border-radius: 8px;
   box-shadow: inset 0 0 0 1px var(--border);
-  background-color: var(--bg);
+  background-color: var(--bui-bg);
   padding: 1px;
   position: relative;
 }
diff --git a/docs-ui/src/components/TableOfContents/TableOfContents.module.css b/docs-ui/src/components/TableOfContents/TableOfContents.module.css
new file mode 100644
index 0000000000..7275c24520
--- /dev/null
+++ b/docs-ui/src/components/TableOfContents/TableOfContents.module.css
@@ -0,0 +1,93 @@
+.container {
+  position: sticky;
+  top: 24px;
+  max-height: calc(100vh - 48px);
+  overflow-y: auto;
+  padding: 16px 0;
+}
+
+.list {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  position: relative;
+}
+
+.list::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  width: 2px;
+  background-color: var(--border);
+}
+
+.indicator {
+  position: absolute;
+  left: 0;
+  width: 2px;
+  background-color: var(--primary);
+  transition: top 0.3s cubic-bezier(0.4, 0, 0.2, 1),
+    height 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  pointer-events: none;
+  z-index: 1;
+}
+
+.item {
+  position: relative;
+  margin: 0;
+}
+
+.itemNested {
+  padding-left: 16px;
+}
+
+.link {
+  display: block;
+  width: 100%;
+  text-align: left;
+  background: none;
+  border: none;
+  padding: 6px 16px;
+  font-size: 0.875rem;
+  color: var(--text-secondary);
+  cursor: pointer;
+  transition: color 0.2s ease;
+  line-height: 1.4;
+  position: relative;
+}
+
+.link:hover {
+  color: var(--text);
+}
+
+.itemActive .link {
+  color: var(--primary);
+  font-weight: 500;
+}
+
+/* Hide scrollbar for webkit browsers */
+.container::-webkit-scrollbar {
+  width: 4px;
+}
+
+.container::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.container::-webkit-scrollbar-thumb {
+  background: var(--border);
+  border-radius: 2px;
+}
+
+.container::-webkit-scrollbar-thumb:hover {
+  background: var(--text-secondary);
+}
+
+/* Responsive: hide on smaller screens */
+@media (max-width: 1280px) {
+  .container {
+    display: none;
+  }
+}
diff --git a/docs-ui/src/components/TableOfContents/TableOfContents.tsx b/docs-ui/src/components/TableOfContents/TableOfContents.tsx
new file mode 100644
index 0000000000..d18265415b
--- /dev/null
+++ b/docs-ui/src/components/TableOfContents/TableOfContents.tsx
@@ -0,0 +1,132 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { usePathname } from 'next/navigation';
+import styles from './TableOfContents.module.css';
+
+interface Heading {
+  id: string;
+  text: string;
+  level: number;
+}
+
+export function TableOfContents() {
+  const [headings, setHeadings] = useState<Heading[]>([]);
+  const [activeId, setActiveId] = useState<string>('');
+  const [indicatorTop, setIndicatorTop] = useState<number>(0);
+  const [indicatorHeight, setIndicatorHeight] = useState<number>(0);
+  const pathname = usePathname();
+
+  useEffect(() => {
+    // Extract all H2 and H3 headings from the document
+    const elements = Array.from(
+      document.querySelectorAll('h2[id], h3[id]'),
+    ) as HTMLHeadingElement[];
+
+    const headingData: Heading[] = elements.map(element => ({
+      id: element.id,
+      text: (element.textContent || '').replace('#', '').trim(),
+      level: parseInt(element.tagName.substring(1)),
+    }));
+
+    setHeadings(headingData);
+
+    // Set initial active heading (first visible heading or first heading)
+    if (headingData.length > 0) {
+      const viewportTop = window.scrollY + 100; // offset for header
+      const visibleHeading = elements.find(element => {
+        const rect = element.getBoundingClientRect();
+        return rect.top + window.scrollY >= viewportTop - 200;
+      });
+      setActiveId(visibleHeading?.id || headingData[0].id);
+    }
+
+    // Set up IntersectionObserver to track visible headings
+    const observerOptions = {
+      rootMargin: '-80px 0px -80% 0px',
+      threshold: 1,
+    };
+
+    const observerCallback = (entries: IntersectionObserverEntry[]) => {
+      entries.forEach(entry => {
+        if (entry.isIntersecting) {
+          setActiveId(entry.target.id);
+        }
+      });
+    };
+
+    const observer = new IntersectionObserver(
+      observerCallback,
+      observerOptions,
+    );
+
+    elements.forEach(element => observer.observe(element));
+
+    return () => {
+      elements.forEach(element => observer.unobserve(element));
+    };
+  }, [pathname]);
+
+  // Update indicator position when activeId changes
+  useEffect(() => {
+    if (activeId) {
+      const activeElement = document.querySelector(
+        `[data-toc-id="${activeId}"]`,
+      ) as HTMLElement;
+      if (activeElement) {
+        const list = activeElement.closest('ul');
+        if (list) {
+          const listRect = list.getBoundingClientRect();
+          const elementRect = activeElement.getBoundingClientRect();
+          setIndicatorTop(elementRect.top - listRect.top);
+          setIndicatorHeight(elementRect.height);
+        }
+      }
+    }
+  }, [activeId, headings]);
+
+  const handleClick = (id: string) => {
+    const element = document.getElementById(id);
+    if (element) {
+      element.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      // Update URL without scrolling (already handled above)
+      window.history.pushState(null, '', `#${id}`);
+    }
+  };
+
+  if (headings.length === 0) {
+    return null;
+  }
+
+  return (
+    <nav className={styles.container}>
+      <ul className={styles.list}>
+        {indicatorHeight > 0 && (
+          <div
+            className={styles.indicator}
+            style={{
+              top: `${indicatorTop}px`,
+              height: `${indicatorHeight}px`,
+            }}
+          />
+        )}
+        {headings.map((heading, index) => (
+          <li
+            key={`${heading.id}-${index}`}
+            data-toc-id={heading.id}
+            className={`${styles.item} ${
+              heading.level === 3 ? styles.itemNested : ''
+            } ${activeId === heading.id ? styles.itemActive : ''}`}
+          >
+            <button
+              onClick={() => handleClick(heading.id)}
+              className={styles.link}
+            >
+              {heading.text}
+            </button>
+          </li>
+        ))}
+      </ul>
+    </nav>
+  );
+}
diff --git a/docs-ui/src/components/TableOfContents/index.ts b/docs-ui/src/components/TableOfContents/index.ts
new file mode 100644
index 0000000000..ffe4593ca7
--- /dev/null
+++ b/docs-ui/src/components/TableOfContents/index.ts
@@ -0,0 +1 @@
+export { TableOfContents } from './TableOfContents';
diff --git a/docs-ui/src/content/components/avatar.mdx b/docs-ui/src/content/avatar.mdx
similarity index 100%
rename from docs-ui/src/content/components/avatar.mdx
rename to docs-ui/src/content/avatar.mdx
diff --git a/docs-ui/src/content/components/avatar.props.ts b/docs-ui/src/content/avatar.props.ts
similarity index 100%
rename from docs-ui/src/content/components/avatar.props.ts
rename to docs-ui/src/content/avatar.props.ts
diff --git a/docs-ui/src/content/components/box.mdx b/docs-ui/src/content/box.mdx
similarity index 100%
rename from docs-ui/src/content/components/box.mdx
rename to docs-ui/src/content/box.mdx
diff --git a/docs-ui/src/content/components/box.props.ts b/docs-ui/src/content/box.props.ts
similarity index 100%
rename from docs-ui/src/content/components/box.props.ts
rename to docs-ui/src/content/box.props.ts
diff --git a/docs-ui/src/content/components/button-icon.mdx b/docs-ui/src/content/button-icon.mdx
similarity index 100%
rename from docs-ui/src/content/components/button-icon.mdx
rename to docs-ui/src/content/button-icon.mdx
diff --git a/docs-ui/src/content/components/button-icon.props.ts b/docs-ui/src/content/button-icon.props.ts
similarity index 100%
rename from docs-ui/src/content/components/button-icon.props.ts
rename to docs-ui/src/content/button-icon.props.ts
diff --git a/docs-ui/src/content/components/button-link.mdx b/docs-ui/src/content/button-link.mdx
similarity index 100%
rename from docs-ui/src/content/components/button-link.mdx
rename to docs-ui/src/content/button-link.mdx
diff --git a/docs-ui/src/content/components/button-link.props.ts b/docs-ui/src/content/button-link.props.ts
similarity index 94%
rename from docs-ui/src/content/components/button-link.props.ts
rename to docs-ui/src/content/button-link.props.ts
index 758d6fd811..2bd4e2196a 100644
--- a/docs-ui/src/content/components/button-link.props.ts
+++ b/docs-ui/src/content/button-link.props.ts
@@ -1,5 +1,5 @@
-import { classNamePropDefs, stylePropDefs } from '../../utils/propDefs';
-import type { PropDef } from '../../utils/propDefs';
+import { classNamePropDefs, stylePropDefs } from '@/utils/propDefs';
+import type { PropDef } from '@/utils/propDefs';
 
 export const buttonLinkPropDefs: Record<string, PropDef> = {
   variant: {
diff --git a/docs-ui/src/content/components/button.mdx b/docs-ui/src/content/button.mdx
similarity index 100%
rename from docs-ui/src/content/components/button.mdx
rename to docs-ui/src/content/button.mdx
diff --git a/docs-ui/src/content/components/button.props.ts b/docs-ui/src/content/button.props.ts
similarity index 94%
rename from docs-ui/src/content/components/button.props.ts
rename to docs-ui/src/content/button.props.ts
index 4647c20956..a3bb2659bf 100644
--- a/docs-ui/src/content/components/button.props.ts
+++ b/docs-ui/src/content/button.props.ts
@@ -1,5 +1,5 @@
-import { classNamePropDefs, stylePropDefs } from '../../utils/propDefs';
-import type { PropDef } from '../../utils/propDefs';
+import { classNamePropDefs, stylePropDefs } from '@/utils/propDefs';
+import type { PropDef } from '@/utils/propDefs';
 
 export const buttonPropDefs: Record<string, PropDef> = {
   variant: {
diff --git a/docs-ui/src/content/components/card.mdx b/docs-ui/src/content/card.mdx
similarity index 100%
rename from docs-ui/src/content/components/card.mdx
rename to docs-ui/src/content/card.mdx
diff --git a/docs-ui/src/content/components/card.props.ts b/docs-ui/src/content/card.props.ts
similarity index 100%
rename from docs-ui/src/content/components/card.props.ts
rename to docs-ui/src/content/card.props.ts
diff --git a/docs-ui/src/content/components/checkbox.mdx b/docs-ui/src/content/checkbox.mdx
similarity index 100%
rename from docs-ui/src/content/components/checkbox.mdx
rename to docs-ui/src/content/checkbox.mdx
diff --git a/docs-ui/src/content/components/checkbox.props.ts b/docs-ui/src/content/checkbox.props.ts
similarity index 100%
rename from docs-ui/src/content/components/checkbox.props.ts
rename to docs-ui/src/content/checkbox.props.ts
diff --git a/docs-ui/src/content/components/collapsible.mdx b/docs-ui/src/content/collapsible.mdx
similarity index 100%
rename from docs-ui/src/content/components/collapsible.mdx
rename to docs-ui/src/content/collapsible.mdx
diff --git a/docs-ui/src/content/components/collapsible.props.ts b/docs-ui/src/content/collapsible.props.ts
similarity index 100%
rename from docs-ui/src/content/components/collapsible.props.ts
rename to docs-ui/src/content/collapsible.props.ts
diff --git a/docs-ui/src/content/components/container.mdx b/docs-ui/src/content/container.mdx
similarity index 100%
rename from docs-ui/src/content/components/container.mdx
rename to docs-ui/src/content/container.mdx
diff --git a/docs-ui/src/content/components/container.props.ts b/docs-ui/src/content/container.props.ts
similarity index 100%
rename from docs-ui/src/content/components/container.props.ts
rename to docs-ui/src/content/container.props.ts
diff --git a/docs-ui/src/content/components/dialog.mdx b/docs-ui/src/content/dialog.mdx
similarity index 100%
rename from docs-ui/src/content/components/dialog.mdx
rename to docs-ui/src/content/dialog.mdx
diff --git a/docs-ui/src/content/components/dialog.props.ts b/docs-ui/src/content/dialog.props.ts
similarity index 100%
rename from docs-ui/src/content/components/dialog.props.ts
rename to docs-ui/src/content/dialog.props.ts
diff --git a/docs-ui/src/content/components/flex.mdx b/docs-ui/src/content/flex.mdx
similarity index 100%
rename from docs-ui/src/content/components/flex.mdx
rename to docs-ui/src/content/flex.mdx
diff --git a/docs-ui/src/content/components/flex.props.ts b/docs-ui/src/content/flex.props.ts
similarity index 100%
rename from docs-ui/src/content/components/flex.props.ts
rename to docs-ui/src/content/flex.props.ts
diff --git a/docs-ui/src/content/components/grid.mdx b/docs-ui/src/content/grid.mdx
similarity index 100%
rename from docs-ui/src/content/components/grid.mdx
rename to docs-ui/src/content/grid.mdx
diff --git a/docs-ui/src/content/components/grid.props.ts b/docs-ui/src/content/grid.props.ts
similarity index 100%
rename from docs-ui/src/content/components/grid.props.ts
rename to docs-ui/src/content/grid.props.ts
diff --git a/docs-ui/src/content/components/header-page.mdx b/docs-ui/src/content/header-page.mdx
similarity index 100%
rename from docs-ui/src/content/components/header-page.mdx
rename to docs-ui/src/content/header-page.mdx
diff --git a/docs-ui/src/content/components/header-page.props.ts b/docs-ui/src/content/header-page.props.ts
similarity index 100%
rename from docs-ui/src/content/components/header-page.props.ts
rename to docs-ui/src/content/header-page.props.ts
diff --git a/docs-ui/src/content/components/header.mdx b/docs-ui/src/content/header.mdx
similarity index 100%
rename from docs-ui/src/content/components/header.mdx
rename to docs-ui/src/content/header.mdx
diff --git a/docs-ui/src/content/components/header.props.ts b/docs-ui/src/content/header.props.ts
similarity index 100%
rename from docs-ui/src/content/components/header.props.ts
rename to docs-ui/src/content/header.props.ts
diff --git a/docs-ui/src/content/components/link.mdx b/docs-ui/src/content/link.mdx
similarity index 100%
rename from docs-ui/src/content/components/link.mdx
rename to docs-ui/src/content/link.mdx
diff --git a/docs-ui/src/content/components/link.props.ts b/docs-ui/src/content/link.props.ts
similarity index 100%
rename from docs-ui/src/content/components/link.props.ts
rename to docs-ui/src/content/link.props.ts
diff --git a/docs-ui/src/content/components/menu.mdx b/docs-ui/src/content/menu.mdx
similarity index 100%
rename from docs-ui/src/content/components/menu.mdx
rename to docs-ui/src/content/menu.mdx
diff --git a/docs-ui/src/content/components/menu.props.ts b/docs-ui/src/content/menu.props.ts
similarity index 100%
rename from docs-ui/src/content/components/menu.props.ts
rename to docs-ui/src/content/menu.props.ts
diff --git a/docs-ui/src/content/components/password-field.mdx b/docs-ui/src/content/password-field.mdx
similarity index 100%
rename from docs-ui/src/content/components/password-field.mdx
rename to docs-ui/src/content/password-field.mdx
diff --git a/docs-ui/src/content/components/password-field.props.ts b/docs-ui/src/content/password-field.props.ts
similarity index 100%
rename from docs-ui/src/content/components/password-field.props.ts
rename to docs-ui/src/content/password-field.props.ts
diff --git a/docs-ui/src/content/components/radio-group.mdx b/docs-ui/src/content/radio-group.mdx
similarity index 100%
rename from docs-ui/src/content/components/radio-group.mdx
rename to docs-ui/src/content/radio-group.mdx
diff --git a/docs-ui/src/content/components/radio-group.props.ts b/docs-ui/src/content/radio-group.props.ts
similarity index 100%
rename from docs-ui/src/content/components/radio-group.props.ts
rename to docs-ui/src/content/radio-group.props.ts
diff --git a/docs-ui/src/content/components/search-field.mdx b/docs-ui/src/content/search-field.mdx
similarity index 100%
rename from docs-ui/src/content/components/search-field.mdx
rename to docs-ui/src/content/search-field.mdx
diff --git a/docs-ui/src/content/components/search-field.props.ts b/docs-ui/src/content/search-field.props.ts
similarity index 100%
rename from docs-ui/src/content/components/search-field.props.ts
rename to docs-ui/src/content/search-field.props.ts
diff --git a/docs-ui/src/content/components/select.mdx b/docs-ui/src/content/select.mdx
similarity index 100%
rename from docs-ui/src/content/components/select.mdx
rename to docs-ui/src/content/select.mdx
diff --git a/docs-ui/src/content/components/select.props.ts b/docs-ui/src/content/select.props.ts
similarity index 100%
rename from docs-ui/src/content/components/select.props.ts
rename to docs-ui/src/content/select.props.ts
diff --git a/docs-ui/src/content/components/skeleton.mdx b/docs-ui/src/content/skeleton.mdx
similarity index 100%
rename from docs-ui/src/content/components/skeleton.mdx
rename to docs-ui/src/content/skeleton.mdx
diff --git a/docs-ui/src/content/components/skeleton.props.ts b/docs-ui/src/content/skeleton.props.ts
similarity index 100%
rename from docs-ui/src/content/components/skeleton.props.ts
rename to docs-ui/src/content/skeleton.props.ts
diff --git a/docs-ui/src/content/components/switch.mdx b/docs-ui/src/content/switch.mdx
similarity index 100%
rename from docs-ui/src/content/components/switch.mdx
rename to docs-ui/src/content/switch.mdx
diff --git a/docs-ui/src/content/components/switch.props.ts b/docs-ui/src/content/switch.props.ts
similarity index 100%
rename from docs-ui/src/content/components/switch.props.ts
rename to docs-ui/src/content/switch.props.ts
diff --git a/docs-ui/src/content/components/table.mdx b/docs-ui/src/content/table.mdx
similarity index 100%
rename from docs-ui/src/content/components/table.mdx
rename to docs-ui/src/content/table.mdx
diff --git a/docs-ui/src/content/components/table.props.ts b/docs-ui/src/content/table.props.ts
similarity index 99%
rename from docs-ui/src/content/components/table.props.ts
rename to docs-ui/src/content/table.props.ts
index d46c6b8ea7..443526182e 100644
--- a/docs-ui/src/content/components/table.props.ts
+++ b/docs-ui/src/content/table.props.ts
@@ -2,7 +2,7 @@ import {
   classNamePropDefs,
   stylePropDefs,
   type PropDef,
-} from '../../utils/propDefs';
+} from '@/utils/propDefs';
 
 export const tablePropDefs: Record<string, PropDef> = {
   selectionBehavior: {
diff --git a/docs-ui/src/content/components/tabs.mdx b/docs-ui/src/content/tabs.mdx
similarity index 100%
rename from docs-ui/src/content/components/tabs.mdx
rename to docs-ui/src/content/tabs.mdx
diff --git a/docs-ui/src/content/components/tabs.props.ts b/docs-ui/src/content/tabs.props.ts
similarity index 100%
rename from docs-ui/src/content/components/tabs.props.ts
rename to docs-ui/src/content/tabs.props.ts
diff --git a/docs-ui/src/content/components/tag-group.mdx b/docs-ui/src/content/tag-group.mdx
similarity index 100%
rename from docs-ui/src/content/components/tag-group.mdx
rename to docs-ui/src/content/tag-group.mdx
diff --git a/docs-ui/src/content/components/tag-group.props.ts b/docs-ui/src/content/tag-group.props.ts
similarity index 100%
rename from docs-ui/src/content/components/tag-group.props.ts
rename to docs-ui/src/content/tag-group.props.ts
diff --git a/docs-ui/src/content/components/text-field.mdx b/docs-ui/src/content/text-field.mdx
similarity index 100%
rename from docs-ui/src/content/components/text-field.mdx
rename to docs-ui/src/content/text-field.mdx
diff --git a/docs-ui/src/content/components/text-field.props.ts b/docs-ui/src/content/text-field.props.ts
similarity index 100%
rename from docs-ui/src/content/components/text-field.props.ts
rename to docs-ui/src/content/text-field.props.ts
diff --git a/docs-ui/src/content/components/text.mdx b/docs-ui/src/content/text.mdx
similarity index 100%
rename from docs-ui/src/content/components/text.mdx
rename to docs-ui/src/content/text.mdx
diff --git a/docs-ui/src/content/components/text.props.ts b/docs-ui/src/content/text.props.ts
similarity index 100%
rename from docs-ui/src/content/components/text.props.ts
rename to docs-ui/src/content/text.props.ts
diff --git a/docs-ui/src/content/components/tooltip.mdx b/docs-ui/src/content/tooltip.mdx
similarity index 100%
rename from docs-ui/src/content/components/tooltip.mdx
rename to docs-ui/src/content/tooltip.mdx
diff --git a/docs-ui/src/content/components/tooltip.props.ts b/docs-ui/src/content/tooltip.props.ts
similarity index 100%
rename from docs-ui/src/content/components/tooltip.props.ts
rename to docs-ui/src/content/tooltip.props.ts
diff --git a/docs-ui/src/content/components/visually-hidden.mdx b/docs-ui/src/content/visually-hidden.mdx
similarity index 100%
rename from docs-ui/src/content/components/visually-hidden.mdx
rename to docs-ui/src/content/visually-hidden.mdx
diff --git a/docs-ui/src/content/components/visually-hidden.props.ts b/docs-ui/src/content/visually-hidden.props.ts
similarity index 100%
rename from docs-ui/src/content/components/visually-hidden.props.ts
rename to docs-ui/src/content/visually-hidden.props.ts
diff --git a/docs-ui/src/css/globals.css b/docs-ui/src/css/globals.css
index be75bad36d..dcc348a9ee 100644
--- a/docs-ui/src/css/globals.css
+++ b/docs-ui/src/css/globals.css
@@ -15,11 +15,15 @@
   --border: #e5e5e5;
   --border2: #cdcdcd;
   --surface-1: #f4f4f4;
+  --code-bg: #3e444f;
+  --code-title: #505865;
 }
 
 [data-theme-mode='dark'] {
   --bg: #000000;
   --bg-hover: #202020;
+  --code-bg: #202020;
+  --code-title: #292929;
   --primary: #fff;
   --secondary: #818181;
   --action: #202020;
diff --git a/docs-ui/src/css/mdx.module.css b/docs-ui/src/css/mdx.module.css
index 6a65995003..7cc2422ecd 100644
--- a/docs-ui/src/css/mdx.module.css
+++ b/docs-ui/src/css/mdx.module.css
@@ -49,3 +49,27 @@
 .a:hover {
   text-decoration: underline;
 }
+
+.headingWithAnchor {
+  position: relative;
+  scroll-margin-top: 80px;
+}
+
+.anchorLink {
+  color: inherit;
+  text-decoration: none;
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.anchorHash {
+  opacity: 0;
+  transition: opacity 0.2s;
+  font-size: 0.8em;
+  color: var(--text-secondary);
+}
+
+.anchorLink:hover .anchorHash {
+  opacity: 1;
+}
diff --git a/docs-ui/src/mdx-components.tsx b/docs-ui/src/mdx-components.tsx
index 01a865ae3d..3e3efbe1ee 100644
--- a/docs-ui/src/mdx-components.tsx
+++ b/docs-ui/src/mdx-components.tsx
@@ -4,10 +4,61 @@ import Image, { ImageProps } from 'next/image';
 import { CodeBlock } from '@/components/CodeBlock';
 import styles from './css/mdx.module.css';
 
+// Utility function to generate slug from heading text
+function slugify(text: string): string {
+  return text
+    .toString()
+    .toLowerCase()
+    .trim()
+    .replace(/\s+/g, '-')
+    .replace(/[^\w\-]+/g, '')
+    .replace(/\-\-+/g, '-')
+    .replace(/^-+/, '')
+    .replace(/-+$/, '');
+}
+
+// Component for heading with anchor link
+function HeadingWithAnchor({
+  level,
+  children,
+  className,
+}: {
+  level: number;
+  children: ReactNode;
+  className: string;
+}) {
+  const text =
+    typeof children === 'string'
+      ? children
+      : Array.isArray(children)
+      ? children.join('')
+      : '';
+  const id = slugify(text);
+
+  const Tag = `h${level}` as keyof JSX.IntrinsicElements;
+
+  return (
+    <Tag id={id} className={`${className} ${styles.headingWithAnchor}`}>
+      <a href={`#${id}`} className={styles.anchorLink}>
+        {children}
+        <span className={styles.anchorHash}>#</span>
+      </a>
+    </Tag>
+  );
+}
+
 export const formattedMDXComponents: MDXComponents = {
   h1: ({ children }) => <h1 className={styles.h1}>{children as ReactNode}</h1>,
-  h2: ({ children }) => <h2 className={styles.h2}>{children as ReactNode}</h2>,
-  h3: ({ children }) => <h3 className={styles.h3}>{children as ReactNode}</h3>,
+  h2: ({ children }) => (
+    <HeadingWithAnchor level={2} className={styles.h2}>
+      {children as ReactNode}
+    </HeadingWithAnchor>
+  ),
+  h3: ({ children }) => (
+    <HeadingWithAnchor level={3} className={styles.h3}>
+      {children as ReactNode}
+    </HeadingWithAnchor>
+  ),
   p: ({ children }) => <p className={styles.p}>{children as ReactNode}</p>,
   a: ({ children, href }) => (
     <a href={href} className={styles.a}>
diff --git a/docs-ui/src/utils/data.ts b/docs-ui/src/utils/data.ts
index 98f042e6de..ae150b4c1e 100644
--- a/docs-ui/src/utils/data.ts
+++ b/docs-ui/src/utils/data.ts
@@ -125,16 +125,3 @@ export const components: Page[] = [
     slug: 'visually-hidden',
   },
 ];
-
-export type ScreenSize = {
-  title: string;
-  slug: string;
-  width: number;
-};
-
-export const screenSizes: ScreenSize[] = [
-  { title: 'Mobile', slug: 'mobile', width: 390 },
-  { title: 'Tablet', slug: 'tablet', width: 768 },
-  { title: 'Desktop', slug: 'desktop', width: 1280 },
-  { title: 'Wide', slug: 'wide', width: 1600 },
-];