diff --git a/docs/docs.json b/docs/docs.json
index 637adb52..fd152090 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -22,8 +22,9 @@
   "navbar": {
     "links": [
       {
-        "label": "Support",
-        "href": "mailto:support@agentic.so"
+        "label": "Contact",
+        "href": "https://docs.agentic.so/contact",
+        "icon": "envelope"
       }
     ],
     "primary": {
@@ -101,9 +102,9 @@
           "icon": "store"
         },
         {
-          "anchor": "Docs",
-          "href": "https://docs.agentic.so",
-          "icon": "book-open-cover"
+          "anchor": "Contact",
+          "href": "https://docs.agentic.so/contact",
+          "icon": "envelope"
         },
         {
           "anchor": "GitHub",
diff --git a/docs/index.mdx b/docs/index.mdx
index 76015003..189a4cc7 100644
--- a/docs/index.mdx
+++ b/docs/index.mdx
@@ -1,16 +1,17 @@
 ---
-title: Home
+title: Agentic Docs
 description: Agentic is the App Store for LLM Tools.
 ---
 
+## Choose your adventure
+
 <Columns cols={2}>
-  <Card title='MCP Marketplace' href='/marketplace' icon='store'>
-    Agentic's marketplace is a curated collection of high quality LLM tools
-    – all of which are exposed as both MCP servers and simple HTTP APIs.
+  <Card title='MCP Marketplace Docs' href='/marketplace' icon='store'>
+    For developers interested in consuming Agentic tools.
   </Card>
-  <Card title='Publishing MCPs' href='/publishing' icon='upload'>
-    Publish any MCP server or OpenAPI service to Agentic's MCP Marketplace and
-    offer your LLM tools as products to an audience of over 20k AI engineers.
+  <Card title='Publishing MCP Docs' href='/publishing' icon='upload'>
+    For developers interested in publishing their own MCP server or OpenAPI
+    service to Agentic.
   </Card>
 </Columns>
 
diff --git a/docs/marketplace/index.mdx b/docs/marketplace/index.mdx
index 914a6347..079790cd 100644
--- a/docs/marketplace/index.mdx
+++ b/docs/marketplace/index.mdx
@@ -1,23 +1,6 @@
 ---
 title: Quick Start
-description: A quick start guide to using MCP tools on the Agentic marketplace.
+description: A quick start on using tools from Agentic's MCP marketplace.
 ---
 
-<Columns cols={2}>
-  <Card
-    title='Quick Start'
-    href='/marketplace/quick-start'
-    icon='rocket-launch'
-  >
-    TODO
-  </Card>
-  <Card
-    title='View MCP Marketplace'
-    href='https://agentic.so/marketplace'
-    icon='arrow-up-right-from-square'
-  >
-    TODO
-  </Card>
-</Columns>
-
 **TODO**
diff --git a/docs/publishing/config/auth.mdx b/docs/publishing/config/auth.mdx
index 02a29d42..3d92a6f0 100644
--- a/docs/publishing/config/auth.mdx
+++ b/docs/publishing/config/auth.mdx
@@ -16,7 +16,7 @@ Your project's users will sign into Agentic, subscribe to your project using Str
 
 Agentic's MCP gateway will then track all usage of your project based on API keys.
 
-See [Origin Metadata](/publishing/origin-metadata) for details on how Agentic's MCP gateway passes customer auth and subscription information to your origin server.
+See [Origin Metadata](/publishing/origin/metadata) for details on how Agentic's MCP gateway passes customer auth and subscription information to your origin server.
 
 ## Alpha Features
 
diff --git a/docs/publishing/config/index.mdx b/docs/publishing/config/index.mdx
index e790456b..eebb4f1a 100644
--- a/docs/publishing/config/index.mdx
+++ b/docs/publishing/config/index.mdx
@@ -8,7 +8,7 @@ Every Agentic project needs a config file (`agentic.config.ts`, `agentic.config.
 <Note>
   Configuring your project can feel a little overwhelming. Feel free to [reach
   out to us](/contact) if you're considering using Agentic's MCP Gateway, and
-  I'd be happy to help walk you through getting your product set up for success.
+  I'd be happy to help walk you through setting your product up for success.
 </Note>
 
 ## Config Fields
@@ -165,5 +165,5 @@ See [Tool Config](/publishing/config/tool-config) for details.
 <Note>
   Configuring your project can feel a little overwhelming. Feel free to [reach
   out to us](/contact) if you're considering using Agentic's MCP Gateway, and
-  I'd be happy to help walk you through getting your product set up for success.
+  I'd be happy to help walk you through setting your product up for success.
 </Note>
diff --git a/docs/publishing/config/tool-config.mdx b/docs/publishing/config/tool-config.mdx
index 214ff14e..b7088f76 100644
--- a/docs/publishing/config/tool-config.mdx
+++ b/docs/publishing/config/tool-config.mdx
@@ -148,5 +148,5 @@ See [Rate Limits](/publishing/config/rate-limits) for details.
   Configuring your project can feel a little overwhelming with the amount of
   options available. Feel free to [reach out to us](/contact) if you're
   considering using Agentic's MCP Gateway, and I'd be happy to help walk you
-  through getting your product set up for success.
+  through setting your product up for success.
 </Note>
diff --git a/docs/publishing/guides/ts-openapi-hono.mdx b/docs/publishing/guides/ts-openapi-hono.mdx
index 859dba89..cc655d91 100644
--- a/docs/publishing/guides/ts-openapi-hono.mdx
+++ b/docs/publishing/guides/ts-openapi-hono.mdx
@@ -106,4 +106,4 @@ We recommend deploying your server to a cloud provider like [Cloudflare Workers]
 
 ## 4. Deploy your origin OpenAPI service to Agentic
 
-Now that you have a publicly available MCP server, you can follow the [existing OpenAPI server guide](/publishing/guides/existing-openapi-server) to deploy it to Agentic.
+Now that you have a publicly available MCP server, you can follow the [existing OpenAPI server guide](/publishing/guides/existing-openapi-service) to deploy it to Agentic.