diff --git a/public/sitemap.xml b/public/sitemap.xml
index 8cf8be30..543f8775 100644
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -2,532 +2,525 @@
     
     <url>
         <loc>https://kagent.dev/agents</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/blog</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/community</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/concepts/agents</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/concepts/architecture</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/concepts</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/concepts/tools</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/examples/a2a-agents</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/examples/a2a-byo</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/examples/discord-a2a</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/examples/documentation</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/examples</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/examples/slack-a2a</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/getting-started/first-agent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/getting-started/first-mcp-tool</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/getting-started</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/getting-started/quickstart</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/getting-started/system-prompts</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/getting-started/tracing</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/introduction/installation</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/introduction</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/introduction/what-is-kagent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/resources/api-ref</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/resources/faq</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/resources/helm</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/resources</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/resources/release-notes</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/resources/troubleshooting</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/supported-providers/anthropic</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/supported-providers/azure-openai</loc>
-        <lastmod>2025-08-21</lastmod>
-        <changefreq>weekly</changefreq>
-        <priority>0.8</priority>
-    </url>
-    
-    <url>
-        <loc>https://kagent.dev/docs/kagent/supported-providers/custom-models</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/supported-providers/gemini</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/supported-providers/google-vertexai</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/supported-providers/ollama</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/supported-providers/openai</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kagent/supported-providers</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/deploy/install-controller</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/deploy</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/deploy/server</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/develop/fastmcp-python</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/develop/mcp-go</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/develop</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/introduction</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/quickstart</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/reference/api-ref</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/reference/kmcp-add-tool</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/reference/kmcp-build</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/reference/kmcp-deploy</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/reference/kmcp-init</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/reference/kmcp-install</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/reference/kmcp-run</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/reference/kmcp-secrets</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/reference</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs/kmcp/secrets</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/docs</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/page.tsx</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/agents/argo-rollouts-conversion-agent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/agents/cilium-crd-agent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/agents/helm-agent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/agents/istio-agent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/agents/k8s-agent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/agents/kgateway-agent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/agents/observability-agent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/agents/promql-agent</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools/istio</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools/kubernetes</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools/prometheus</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools/documentation</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools/helm</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools/argo</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools/grafana</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools/other</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
     
     <url>
         <loc>https://kagent.dev/tools/cilium</loc>
-        <lastmod>2025-08-21</lastmod>
+        <lastmod>2025-09-03</lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
diff --git a/src/app/docs/kagent/supported-providers/page.mdx b/src/app/docs/kagent/supported-providers/page.mdx
index a4d5b4e7..2e73e964 100644
--- a/src/app/docs/kagent/supported-providers/page.mdx
+++ b/src/app/docs/kagent/supported-providers/page.mdx
@@ -25,7 +25,6 @@ import QuickLink from '@/components/quick-link';
     <QuickLink title="Ollama" description="Learn how to configure Ollama models for kagent." href="/docs/kagent/supported-providers/ollama" />
     <QuickLink title="Gemini" description="Learn how to configure Gemini models for kagent." href="/docs/kagent/supported-providers/gemini" />
     <QuickLink title="Google Vertex AI" description="Learn how to configure Google Vertex AI models for kagent." href="/docs/kagent/supported-providers/google-vertexai" />
-    <QuickLink title="Custom models" description="Learn how to configure custom models for kagent." href="/docs/kagent/supported-providers/custom-models" />
     </div>
 </div>
 
diff --git a/src/config/navigation.json b/src/config/navigation.json
index ff7a23c4..93084793 100644
--- a/src/config/navigation.json
+++ b/src/config/navigation.json
@@ -120,11 +120,6 @@
             "title": "OpenAI",
             "href": "/docs/kagent/supported-providers/openai",
             "description": "Learn how to configure OpenAI models in kagent."
-          },
-          {
-            "title": "Custom Models",
-            "href": "/docs/kagent/supported-providers/custom-models",
-            "description": "Learn how to configure custom AI models in kagent."
           }
         ]
       },
@@ -168,18 +163,18 @@
           {
             "title": "API docs",
             "href": "/docs/kagent/resources/api-ref",
-            "description": "kagent API reference docs"
-          },
-          {
-            "title": "FAQs",
-            "href": "/docs/kagent/resources/faq",
-            "description": "Find answers to frequently asked questions about kagent."
+            "description": "kagent API reference documentation"
           },
           {
             "title": "Helm Chart Configuration",
             "href": "/docs/kagent/resources/helm",
             "description": "kagent Helm chart configuration reference"
           },
+          {
+            "title": "FAQs",
+            "href": "/docs/kagent/resources/faq",
+            "description": "Find answers to frequently asked questions about kagent."
+          },
           {
             "title": "Release Notes",
             "href": "/docs/kagent/resources/release-notes",
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index bd0c391d..eaa4bf72 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,6 +1,15 @@
-import { clsx, type ClassValue } from "clsx"
+import { type ClassValue, clsx } from "clsx"
 import { twMerge } from "tailwind-merge"
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs))
 }
+
+export function generateAnchorId(text: string): string {
+  return text
+    .toLowerCase()
+    .replace(/[^a-z0-9\s-]/g, '') // Remove special characters except spaces and hyphens
+    .replace(/\s+/g, '-') // Replace spaces with hyphens
+    .replace(/-+/g, '-') // Replace multiple hyphens with single hyphen
+    .replace(/^-|-$/g, '') // Remove leading/trailing hyphens
+}
diff --git a/src/mdx-components.tsx b/src/mdx-components.tsx
index 5a4b0f3a..c3164a74 100644
--- a/src/mdx-components.tsx
+++ b/src/mdx-components.tsx
@@ -5,6 +5,7 @@ import { Tabs } from "./components/mdx/tabs";
 import SmartLink from "./components/mdx/smart-link";
 import { CodeBlock } from "./components/mdx/code-block";
 import Image from "next/image";
+import { generateAnchorId } from "@/lib/utils";
 
 function YouTube ({ id } : { id : string }){
   return (
@@ -23,26 +24,78 @@ export function useMDXComponents(components: MDXComponents): MDXComponents {
   return useMemo(
     () => ({
       // Headings
-      h1: ({ children, ...props }) => (
-        <h1 className="scroll-m-20 text-4xl font-bold tracking-tight mb-8 mt-12 first:mt-0 text-foreground" {...props}>
-          {children}
-        </h1>
-      ),
-      h2: ({ children, ...props }) => (
-        <h2 className="scroll-m-20 text-3xl font-semibold tracking-tight mb-6 mt-10 text-foreground" {...props}>
-          {children}
-        </h2>
-      ),
-      h3: ({ children, ...props }) => (
-        <h3 className="scroll-m-20 text-2xl font-semibold tracking-tight mb-4 mt-8 text-foreground" {...props}>
-          {children}
-        </h3>
-      ),
-      h4: ({ children, ...props }) => (
-        <h4 className="scroll-m-20 text-xl font-semibold tracking-tight mb-4 mt-6 text-foreground" {...props}>
-          {children}
-        </h4>
-      ),
+      h1: ({ children, ...props }) => {
+        const text = typeof children === 'string' ? children : '';
+        const id = generateAnchorId(text);
+        return (
+          <h1 id={id} className="scroll-m-20 text-4xl font-bold tracking-tight mb-8 mt-12 first:mt-0 text-foreground group" {...props}>
+            {children}
+            <a href={`#${id}`} className="ml-2 opacity-0 group-hover:opacity-100 transition-opacity text-muted-foreground hover:text-foreground">
+              #
+            </a>
+          </h1>
+        );
+      },
+      h2: ({ children, ...props }) => {
+        const text = typeof children === 'string' ? children : '';
+        const id = generateAnchorId(text);
+        return (
+          <h2 id={id} className="scroll-m-20 text-3xl font-semibold tracking-tight mb-6 mt-10 text-foreground group" {...props}>
+            {children}
+            <a href={`#${id}`} className="ml-2 opacity-0 group-hover:opacity-100 transition-opacity text-muted-foreground hover:text-foreground">
+              #
+            </a>
+          </h2>
+        );
+      },
+      h3: ({ children, ...props }) => {
+        const text = typeof children === 'string' ? children : '';
+        const id = generateAnchorId(text);
+        return (
+          <h3 id={id} className="scroll-m-20 text-2xl font-semibold tracking-tight mb-4 mt-8 text-foreground group" {...props}>
+            {children}
+            <a href={`#${id}`} className="ml-2 opacity-0 group-hover:opacity-100 transition-opacity text-muted-foreground hover:text-foreground">
+              #
+            </a>
+          </h3>
+        );
+      },
+      h4: ({ children, ...props }) => {
+        const text = typeof children === 'string' ? children : '';
+        const id = generateAnchorId(text);
+        return (
+          <h4 id={id} className="scroll-m-20 text-xl font-semibold tracking-tight mb-4 mt-6 text-foreground group" {...props}>
+            {children}
+            <a href={`#${id}`} className="ml-2 opacity-0 group-hover:opacity-100 transition-opacity text-muted-foreground hover:text-foreground">
+              #
+            </a>
+          </h4>
+        );
+      },
+      h5: ({ children, ...props }) => {
+        const text = typeof children === 'string' ? children : '';
+        const id = generateAnchorId(text);
+        return (
+          <h5 id={id} className="scroll-m-20 text-lg font-semibold tracking-tight mb-3 mt-6 text-foreground group" {...props}>
+            {children}
+            <a href={`#${id}`} className="ml-2 opacity-0 group-hover:opacity-100 transition-opacity text-muted-foreground hover:text-foreground">
+              #
+            </a>
+          </h5>
+        );
+      },
+      h6: ({ children, ...props }) => {
+        const text = typeof children === 'string' ? children : '';
+        const id = generateAnchorId(text);
+        return (
+          <h6 id={id} className="scroll-m-20 text-base font-semibold tracking-tight mb-3 mt-6 text-foreground group" {...props}>
+            {children}
+            <a href={`#${id}`} className="ml-2 opacity-0 group-hover:opacity-100 transition-opacity text-muted-foreground hover:text-foreground">
+              #
+            </a>
+          </h6>
+        );
+      },
       // Paragraph
       p: ({ children, ...props }) => (
         <p className="leading-7 mb-6 text-muted-foreground" {...props}>