diff --git a/documentation/docs/guides/interactive-chat/mcp-ui.md b/documentation/docs/guides/interactive-chat/mcp-ui.md
index 60517823f585..8086b1f84a3f 100644
--- a/documentation/docs/guides/interactive-chat/mcp-ui.md
+++ b/documentation/docs/guides/interactive-chat/mcp-ui.md
@@ -2,7 +2,7 @@
 sidebar_position: 1
 title: MCP-UI Extensions
 sidebar_label: MCP-UI Extensions
-description: Learn how Goose can render graphical and interactive UI components from MCP-UI-enabled extensions
+description: Learn how goose can render graphical and interactive UI components from MCP-UI-enabled extensions
 ---
 
 import Tabs from '@theme/Tabs';
@@ -11,7 +11,7 @@ import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
 import CLIExtensionInstructions from '@site/src/components/CLIExtensionInstructions';
 import { PanelLeft } from 'lucide-react';
 
-Extensions built on MCP-UI allow Goose Desktop to provide interactive and engaging user experiences. Imagine using a graphical, clickable UI instead of reading text responses and typing all your prompts:
+Extensions built on MCP-UI allow goose Desktop to provide interactive and engaging user experiences. Imagine using a graphical, clickable UI instead of reading text responses and typing all your prompts:
 
 <div style={{ width: '100%', maxWidth: '800px', margin: '0 auto' }}>
   <video 
@@ -29,11 +29,11 @@ Extensions built on MCP-UI allow Goose Desktop to provide interactive and engagi
 </div>
 
 <br/>
-MCP-UI-enabled extensions return content that Goose can render as embedded UI elements for rich, dynamic, and streamlined interactions.
+MCP-UI-enabled extensions return content that goose can render as embedded UI elements for rich, dynamic, and streamlined interactions.
 
 ## Try It Out
 
-See how interactive responses work in Goose. 
+See how interactive responses work in goose. 
 
 ### Add Enabled Extension
 
@@ -52,6 +52,7 @@ For this exercise, we'll add an MCP-UI-enabled extension that connects to [MCP-U
     <TabItem value="cli" label="goose CLI">
         <CLIExtensionInstructions
           name="rich_demo"
+          description="Demo MCP-UI-enabled extension"
           type="http"
           url="https://mcp-aharvard.netlify.app/mcp"
           timeout={300}
@@ -61,7 +62,7 @@ For this exercise, we'll add an MCP-UI-enabled extension that connects to [MCP-U
 
 ### Interact in Chat
 
-In Goose Desktop, ask:
+In goose Desktop, ask:
 
 - `Help me select seats for my flight`
 
diff --git a/documentation/docs/mcp/_template_.mdx b/documentation/docs/mcp/_template_.mdx
index af9e836cbc3d..f88efb6898d2 100644
--- a/documentation/docs/mcp/_template_.mdx
+++ b/documentation/docs/mcp/_template_.mdx
@@ -1,6 +1,6 @@
 ---
 title: {Extension Name} Extension
-description: Add {Extension Name} MCP Server as a Goose Extension
+description: Add {Extension Name} MCP Server as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
@@ -14,7 +14,7 @@ import GooseBuiltinInstaller from '@site/src/components/GooseBuiltinInstaller';
 <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/VIDEO_ID" />
 
 
-This tutorial covers how to add the [{Extension Name} MCP Server](/) as a Goose extension to enable file operations, repository management, search functionality, and more.
+This tutorial covers how to add the [{Extension Name} MCP Server](/) as a goose extension to enable ________________.
 
 :::tip TLDR
 <Tabs groupId="interface">
@@ -38,55 +38,89 @@ This tutorial covers how to add the [{Extension Name} MCP Server](/) as a Goose
 
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
-      <!-- For external MCP servers (npx, uvx, git, etc.) -->
-      <GooseDesktopInstaller
-        extensionId="{extension_id}"
-        extensionName="{Extension Name}"
-        description="{Extension description}"
-        command="npx"
-        args={["-y", "@package/name"]}
-        cliCommand="{command}"
-        timeout={300}
-        note="Note that you'll need Node.js installed on your system to run this command, as it uses npx."
-      />
-
-      <!-- For built-in extensions -->
-      <GooseBuiltinInstaller
-        extensionName="{Extension Name}"
-        description="{Extension description}"
-        extensionId="{extension_id}"
-      />
-
-      <!-- For external MCP servers with environment variables -->
-      <GooseDesktopInstaller
-        extensionId="{extension_id}"
-        extensionName="{Extension Name}"
-        description="{Extension description}"
-        command="npx"
-        args={["-y", "@package/name"]}
-        cliCommand="{command}"
-        timeout={300}
-        envVars={[
-          { key: "API_KEY", value: "••••••••••••••••" }
-        ]}
-        infoNote={
-          <>
-            Get your API key from{" "}
-            <a href="https://example.com/api-keys" target="_blank" rel="noopener noreferrer">
-              example.com
-            </a>.
-          </>
-        }
-        note="Note that you'll need Node.js installed on your system to run this command, as it uses npx."
-      />
-    </TabItem>
+
+    <!-- For built-in extensions -->
+    <GooseBuiltinInstaller
+      extensionName="{Extension Name}"
+      description="{Extension description}"
+      extensionId="{extension_id}"
+    />
+
+    <!-- For external STDIO MCP servers (npx, uvx, git, etc.) -->
+    <GooseDesktopInstaller
+      extensionId="{extension_id}"
+      extensionName="{Extension Name}"
+      description="{Extension description}"
+      type="stdio"
+      command="npx"
+      args={["-y", "@package/name"]}
+      timeout={300}
+      envVars={[
+        { name: "API_KEY", label: "••••••••••••••••" }
+      ]}
+      apiKeyLink="https://example.com/api-keys"
+      apiKeyLinkText="Service Access Token"
+    />
+
+    <!-- For external SSE or HTTP MCP servers -->
+    <GooseDesktopInstaller
+      extensionId="{extension_id}"
+      extensionName="{Extension Name}"
+      description="{Extension description}"
+      type="sse"                                    // or "http"
+      url="https://example-server.com/endpoint"
+      envVars={[                                    // also used for http request headers
+        { name: "SOME_KEY", label: "Description or placeholder value" }
+      ]}
+      apiKeyLink="https://example.com/api-keys"
+      apiKeyLinkText="Service Access Token"
+    />
+
+  </TabItem>
   <TabItem value="cli" label="goose CLI">
-      <CLIExtensionInstructions
+
+    <!-- For external STDIO MCP servers (npx, uvx, git, etc.) -->
+    <CLIExtensionInstructions
       name="{Extension Name}"
-      command="{command}"
+      description="{Extension description}"
+      type="stdio"
+      command="{full command with args}"
       timeout={300}
+      envVars={[
+        { key: "API_KEY", value: "••••••••••••••••" }
+      ]}
+      infoNote={
+        <>
+          Get your API key from 
+          <a href="https://example.com/api-keys" target="_blank" rel="noopener noreferrer">
+            example.com
+          </a> and paste it in.
+        </>
+      }
     />
+
+    <!-- For external SSE or HTTP MCP servers -->
+    <CLIExtensionInstructions
+      name="{Extension Name}"
+      description="{Extension description}"
+      type="sse"                                    // or "http"
+      url="https://example-server.com/endpoint"
+      timeout={300}
+      envVars={[                                    // also used for http request headers
+        { key: "API_KEY", value: "••••••••••••••••" }
+      ]}
+      infoNote={
+        <>
+          Get your API key from{" "}
+          <a href="https://example.com/api-keys" target="_blank" rel="noopener noreferrer">
+            example.com
+          </a>.
+        </>
+      }
+    />
+    
   </TabItem>
+</Tabs>
 
 ## Example Usage
 
diff --git a/documentation/docs/mcp/apify-mcp.md b/documentation/docs/mcp/apify-mcp.md
index 38d49afc9eec..480f357739fa 100644
--- a/documentation/docs/mcp/apify-mcp.md
+++ b/documentation/docs/mcp/apify-mcp.md
@@ -7,7 +7,6 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CLIExtensionInstructions from '@site/src/components/CLIExtensionInstructions';
 import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
-import { PanelLeft } from 'lucide-react';
 
 This tutorial covers how to add the [Apify MCP server](https://mcp.apify.com) as a goose extension, enabling goose to call thousands of tools from [Apify Store](https://apify.com/store) to extract data from social media, e-commerce sites, search engines, online maps, or any other website.
 
@@ -20,50 +19,56 @@ This tutorial covers how to add the [Apify MCP server](https://mcp.apify.com) as
 :::tip TLDR
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
-  Use `Add custom extension` in Settings → Extensions to add a `Streamable HTTP` extension type with:
+   [Launch the installer](goose://extension?type=streamable_http&url=https%3A%2F%2Fmcp.apify.com&id=apify&name=Apify&description=Extract%20data%20from%20any%20website%20with%20thousands%20of%20scrapers%2C%20crawlers%2C%20and%20automations%20on%20Apify%20Store&header=Authorization%3DBearer%20YOUR_APIFY_TOKEN)
   </TabItem>
   <TabItem value="cli" label="goose CLI">
-  Use `goose configure` to add a `Remote Extension (Streaming HTTP)` extension type with:
+  Add a `Remote Extension (Streaming HTTP)` extension type with:
+
+  **Endpoint URL**
+  ```
+  https://mcp.apify.com
+  ```
   </TabItem>
 </Tabs>
 
-  **Endpoint URL**
-```
-https://mcp.apify.com
-```
+  **Custom Request Header**
+  ```
+  Authorization: Bearer <YOUR_APIFY_TOKEN>
+  ```
 :::
 
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
-    1. Obtain an [Apify Token](https://console.apify.com/settings/integrations)  
-    2. Click the <PanelLeft className="inline" size={16} /> button in the top-left to open the sidebar  
-    3. Click `Extensions`  
-    4. Click `Add custom extension`  
-    5. On the `Add custom extension` modal, enter the following:  
-       - **Extension Name**: Apify  
-       - **Type**: Streamable HTTP  
-       - **Endpoint**: `https://mcp.apify.com`  
-       - **Request Headers**:  
-          - **Header name**: `Authorization`  
-          - **Value**: `Bearer <YOUR_APIFY_TOKEN>`  
-    6. Click `+ Add` to save the header  
-    7. Click `Add Extension` to save the extension
-    9. Navigate to the chat  
+    <GooseDesktopInstaller
+      extensionId="apify"
+      extensionName="Apify"
+      description="Extract data from any website with thousands of scrapers, crawlers, and automations on Apify Store"
+      type="http"
+      url="https://mcp.apify.com"
+      envVars={[
+        { name: "Authorization", label: "Bearer YOUR_APIFY_TOKEN" }
+      ]}
+      apiKeyLink="https://console.apify.com/settings/integrations"
+      apiKeyLinkText="Apify Token"
+    />
   </TabItem>
 
   <TabItem value="cli" label="goose CLI">
     <CLIExtensionInstructions
-      name="apify-mcp"
+      name="Apify"
+      description="Extract data from any website with thousands of scrapers, crawlers, and automations on Apify Store"
       type="http"
       url="https://mcp.apify.com"
       timeout={300}
       envVars={[
         { key: "Authorization", value: "Bearer apify_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }
       ]}
+      infoNote={
+        <>
+          Obtain your <a href="https://console.apify.com/settings/integrations" target="_blank" rel="noopener noreferrer">Apify Token</a> and paste it in as the <code>Bearer</code> token.
+        </>
+      }
     />
-    :::info
-    Obtain your <a href="https://console.apify.com/settings/integrations" target="_blank" rel="noopener noreferrer">Apify Token</a> and paste it in.
-    :::
   </TabItem>
 </Tabs>
 
@@ -94,35 +99,37 @@ APIFY_TOKEN: <YOUR_APIFY_TOKEN>
 
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
-    1. Obtain an [Apify Token](https://console.apify.com/settings/integrations)  
-    2. Click the <PanelLeft className="inline" size={16} /> button in the top-left to open the sidebar  
-    3. Click `Extensions`  
-    4. Click `Add custom extension`  
-    5. On the `Add custom extension` modal, enter the following:  
-       - **Extension Name**: Apify  
-       - **Type**: STDIO
-       - **Command**: `npx -y @apify/actors-mcp-server`  
-       - **Environment Variables**:  
-          - **Variable name**: `APIFY_TOKEN`  
-          - **Value**: `<YOUR_APIFY_TOKEN>`  
-    6. Click `+ Add` to save the header  
-    7. Click `Add Extension` to save the extension  
-    9. Navigate to the chat  
+    <GooseDesktopInstaller
+      extensionId="mcp_apify_local"
+      extensionName="Apify Local MCP Server"
+      description="Extract data from any website with thousands of scrapers, crawlers, and automations on Apify Store"
+      type="stdio"
+      command="npx"
+      args={["-y", "@apify/actors-mcp-server"]}
+      envVars={[
+        { name: "APIFY_TOKEN", label: "<YOUR_APIFY_TOKEN>" }
+      ]}
+      apiKeyLink="https://console.apify.com/settings/integrations"
+      apiKeyLinkText="Apify Token"
+    />
   </TabItem>
 
   <TabItem value="cli" label="goose CLI">
     <CLIExtensionInstructions
-      name="apify-mcp"
+      name="Apify Local MCP Server"
+      description="Extract data from any website with thousands of scrapers, crawlers, and automations on Apify Store"
       type="stdio"
       command="npx -y @apify/actors-mcp-server"
       timeout={300}
       envVars={[
         { key: "APIFY_TOKEN", value: "apify_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }
       ]}
+      infoNote={
+        <>
+          Obtain your <a href="https://console.apify.com/settings/integrations" target="_blank" rel="noopener noreferrer">Apify Token</a> and paste it in.
+        </>
+      }
     />
-    :::info
-    Obtain your <a href="https://console.apify.com/settings/integrations" target="_blank" rel="noopener noreferrer">Apify Token</a> and paste it in.
-    :::  
   </TabItem>
 </Tabs>
 
@@ -135,7 +142,7 @@ The Apify MCP server lets you connect goose to [Apify Store](https://apify.com/s
 
 In this example, goose will use the [Google Places Scraper](https://apify.com/compass/crawler-google-places) Actor to identify the most credible, top-rated Italian restaurant in Prague based on public ratings, reviews, and fine-dining recognition.
 
-### Goose Prompt
+### goose Prompt
 
 ```
 
@@ -143,7 +150,7 @@ In this example, goose will use the [Google Places Scraper](https://apify.com/co
 
 ```
 
-### Goose Output
+### goose Output
 
 ```
 
diff --git a/documentation/docs/mcp/container-use-mcp.md b/documentation/docs/mcp/container-use-mcp.md
index 5b285e3a81ce..2d078015426e 100644
--- a/documentation/docs/mcp/container-use-mcp.md
+++ b/documentation/docs/mcp/container-use-mcp.md
@@ -1,6 +1,6 @@
 ---
 title: Container Use Extension
-description: Use Container-Use MCP as a Goose Extension
+description: Use Container-Use MCP as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
@@ -11,7 +11,7 @@ import YouTubeShortEmbed from '@site/src/components/YouTubeShortEmbed';
 
 <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/X3tf61_Tak0" />
 
-This tutorial covers how to add the [Container Use MCP Server](https://container-use.com) as a Goose extension enabling Goose to work in an isolated environment.
+This tutorial covers how to add the [Container Use MCP Server](https://container-use.com) as a goose extension enabling goose to work in an isolated environment.
 
 :::tip TLDR
 <Tabs groupId="interface">
@@ -52,6 +52,7 @@ You'll need [Docker](https://www.docker.com/) installed on your system. If you w
       <TabItem value="cli" label="goose CLI">
           <CLIExtensionInstructions
             name="Container Use"
+            description="Run container automation with container-use"
             command="npx -y mcp-remote https://container-use.com/mcp"
             timeout={300}
           />
@@ -77,6 +78,7 @@ You'll need [Docker](https://www.docker.com/) installed on your system. If you w
       <TabItem value="cli" label="goose CLI">
           <CLIExtensionInstructions
             name="Container Use"
+            description="Run container automation with container-use"
             command="container-use stdio"
             timeout={300}
           />
@@ -96,7 +98,7 @@ Here's a simple example of updating a file-based to-do app to use a SQLite datab
 Run a container agent to add a feature to save my to-do list data in sqlite, build and run tests, but use a separate Git branch so my main code stays safe.
 ```
 
-#### Goose Output
+#### goose Output
 
 ```
 I'll help you create a container environment to add SQLite functionality to your to-do list application on a separate Git branch. Let me start by creating the environment and examining your current code structure.
diff --git a/documentation/docs/mcp/dev.to-mcp.md b/documentation/docs/mcp/dev.to-mcp.md
index 993cc283a52a..4784fa3055d8 100644
--- a/documentation/docs/mcp/dev.to-mcp.md
+++ b/documentation/docs/mcp/dev.to-mcp.md
@@ -1,6 +1,6 @@
 ---
 title: Dev.to Extension
-description: Add Dev.to MCP Server as a Goose Extension
+description: Add Dev.to MCP Server as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
@@ -12,7 +12,7 @@ import { PanelLeft } from 'lucide-react';
 
 <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/nkdksdxHxaQ" />  
 
-This tutorial covers how to add the [Dev.to MCP Server](https://github.com/nickytonline/dev-to-mcp) as a Goose extension to enable access to the Dev.to public API. With this extension, Goose can fetch articles, tags, user info, comments, and more—without requiring authentication.
+This tutorial covers how to add the [Dev.to MCP Server](https://github.com/nickytonline/dev-to-mcp) as a goose extension to enable access to the Dev.to public API. With this extension, goose can fetch articles, tags, user info, comments, and more—without requiring authentication.
 
 :::tip TLDR
 <Tabs groupId="interface">
@@ -70,6 +70,7 @@ Your server will now be running at:
   <TabItem value="cli" label="goose CLI" default>
       <CLIExtensionInstructions
         name="dev.to"
+        description="Access Dev.to articles and content"
         type="http"
         url="http://localhost:3000/mcp"
         timeout={300}
@@ -79,11 +80,11 @@ Your server will now be running at:
 
 ## Example Usage
 
-In this example, Goose uses the `Dev.to MCP` extension to fetch the 5 most recent JavaScript articles and instantly turn them into a personalized learning hub.
+In this example, goose uses the `Dev.to MCP` extension to fetch the 5 most recent JavaScript articles and instantly turn them into a personalized learning hub.
 
-### Goose Prompt
+### goose Prompt
 ```
-Hey Goose, fetch the 5 most recent JavaScript articles from Dev.to
+Hey goose, fetch the 5 most recent JavaScript articles from Dev.to
 Create a simple HTML landing page that:
 
 1. Lists each article title as a clickable link
@@ -97,7 +98,7 @@ Create a simple HTML landing page that:
 The goal is to save me time by quickly showing what’s worth reading and help me learn faster by giving actionable practice ideas.
 ```
 
-### Goose Output
+### goose Output
 
 :::note Desktop
 
diff --git a/documentation/docs/mcp/figma-mcp.md b/documentation/docs/mcp/figma-mcp.md
index 9f237a840c66..c21c1c612648 100644
--- a/documentation/docs/mcp/figma-mcp.md
+++ b/documentation/docs/mcp/figma-mcp.md
@@ -1,6 +1,6 @@
 ---
 title: Figma Extension
-description: Add Figma Dev Mode MCP Server as a Goose Extension
+description: Add Figma Dev Mode MCP Server as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
@@ -10,7 +10,7 @@ import CLIExtensionInstructions from '@site/src/components/CLIExtensionInstructi
 import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
 import { PanelLeft } from 'lucide-react';
 
-This tutorial covers how to add the [Figma Dev Mode MCP Server](https://help.figma.com/hc/en-us/articles/32132100833559-Guide-to-the-Dev-Mode-MCP-Server) as a Goose extension to enable interaction with Figma files, designs, and components.
+This tutorial covers how to add the [Figma Dev Mode MCP Server](https://help.figma.com/hc/en-us/articles/32132100833559-Guide-to-the-Dev-Mode-MCP-Server) as a goose extension to enable interaction with Figma files, designs, and components.
 
 :::info
 The MCP Server requires a Dev or Full seat on Professional, Organization, or Enterprise Figma plans.
@@ -49,7 +49,7 @@ The Dev Mode MCP Server must be enabled in the [Figma desktop app](https://www.f
    2. In the right panel, toggle `Enable MCP server`
    :::
 
-2. Add the Figma extension to Goose:
+2. Add the Figma extension to goose:
    <Tabs groupId="interface">
      <TabItem value="ui" label="goose Desktop" default>
        <GooseDesktopInstaller
@@ -63,6 +63,7 @@ The Dev Mode MCP Server must be enabled in the [Figma desktop app](https://www.f
      <TabItem value="cli" label="goose CLI">
        <CLIExtensionInstructions            
          name="figma"
+         description="Convert Figma designs into code and extract design context"
          type="http"
          url="http://127.0.0.1:3845/mcp"
          timeout={300}
@@ -72,7 +73,7 @@ The Dev Mode MCP Server must be enabled in the [Figma desktop app](https://www.f
 
 ## Example Usage
 
-The Figma extension in Goose works alongside the Figma desktop app. You can use the extension to:
+The Figma extension in goose works alongside the Figma desktop app. You can use the extension to:
 - Convert Figma designs into production-ready code (React, Vue, HTML/CSS, etc.)
 - Extract design tokens, variables, and generate design system rules
 - Capture visual references of your designs
@@ -82,16 +83,16 @@ Let's try converting a Figma design into React code. First, copy the link:
   2. In the layers panel, right-click any frame or component and choose `Copy link to selection`
 
 :::tip
-You can provide Goose with a Figma link or simply select an element in the Figma desktop app.
+You can provide goose with a Figma link or simply select an element in the Figma desktop app.
 :::
 
-### Goose Prompt
+### goose Prompt
 
 ```
 Convert this to React: https://www.figma.com/design/B6IFM1qjwxJw5fOYJYKRl5/Buttons-?node-id=351-8&m=dev
 ```
 
-### Goose Output
+### goose Output
 
 :::note Desktop
 
@@ -156,7 +157,7 @@ export default function Component2() {
 
 #### Component Structure:
 - **Background**: Light gray rounded container (#d9d9d9)
-- **Logo**: Goose silhouette image positioned on the left side
+- **Logo**: goose silhouette image positioned on the left side
 - **Text**: "ask goose" text positioned on the right in dark gray (#333b43)
 
 The component maintains the exact visual hierarchy and styling from your Figma design while being fully responsive and ready to integrate into a React application with Tailwind CSS.
diff --git a/documentation/docs/mcp/firecrawl-mcp.md b/documentation/docs/mcp/firecrawl-mcp.md
index 7eecda98c953..a009410e7987 100644
--- a/documentation/docs/mcp/firecrawl-mcp.md
+++ b/documentation/docs/mcp/firecrawl-mcp.md
@@ -54,6 +54,7 @@ Note that you'll need [Node.js](https://nodejs.org/) installed on your system to
   <TabItem value="cli" label="goose CLI">
     <CLIExtensionInstructions
       name="firecrawl"
+      description="Web scraping and crawling capabilities"
       type="stdio"
       command="npx -y firecrawl-mcp"
       timeout={300}
diff --git a/documentation/docs/mcp/github-mcp.md b/documentation/docs/mcp/github-mcp.md
index 28026f881e29..0c274b602c12 100644
--- a/documentation/docs/mcp/github-mcp.md
+++ b/documentation/docs/mcp/github-mcp.md
@@ -7,7 +7,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import YouTubeShortEmbed from '@site/src/components/YouTubeShortEmbed';
 import CLIExtensionInstructions from '@site/src/components/CLIExtensionInstructions';
-import { PanelLeft } from 'lucide-react';
+import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
 
 <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/TbmQDv3SQOE" />
 
@@ -16,17 +16,18 @@ This tutorial covers how to add the [GitHub MCP Server](https://github.com/githu
 :::tip TLDR
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
-  Use `Add custom extension` in Settings → Extensions to add a `Streamable HTTP` extension type with:
+   [Launch the installer](goose://extension?type=streamable_http&url=https%3A%2F%2Fapi.githubcopilot.com%2Fmcp%2F&id=github&name=GitHub&description=GitHub%20repository%20management%20and%20operations&header=Authorization%3DBearer%20YOUR_GITHUB_PERSONAL_ACCESS_TOKEN)
   </TabItem>
   <TabItem value="cli" label="goose CLI">
-  Use `goose configure` to add a `Remote Extension (Streaming HTTP)` extension type with:
-  </TabItem>
-</Tabs>
+  Add a `Remote Extension (Streaming HTTP)` extension type with:
 
   **Endpoint URL**
   ```
   https://api.githubcopilot.com/mcp/
   ```
+  </TabItem>
+</Tabs>
+
   **Custom Request Header**
   ```
   Authorization: Bearer <YOUR_GITHUB_PERSONAL_ACCESS_TOKEN>
@@ -38,25 +39,24 @@ These steps configure the Remote MCP Server. For other deployment options, see t
 
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
-    1. Obtain a [GitHub Personal Access Token](https://github.com/settings/personal-access-tokens)
-    2. Click the <PanelLeft className="inline" size={16} /> button in the top-left to open the sidebar
-    3. Click `Extensions`
-    4. Click `Add custom extension`
-    5. On the `Add custom extension` modal, enter the following:
-       - **Extension Name**: GitHub
-       - **Type**: Streamable HTTP
-       - **Endpoint**: `https://api.githubcopilot.com/mcp/`
-       - **Request Headers**: 
-         - **Header name**: `Authorization`
-         - **Value**: `Bearer <YOUR_GITHUB_PERSONAL_ACCESS_TOKEN>` 
-    6. Click `+ Add` to save the header
-    7. Click `Add Extension` to save the extension
-    8. Navigate to the chat
+    <GooseDesktopInstaller
+      extensionId="github"
+      extensionName="GitHub"
+      description="GitHub repository management and operations"
+      type="http"
+      url="https://api.githubcopilot.com/mcp/"
+      envVars={[
+        { name: "Authorization", label: "Bearer YOUR_GITHUB_PERSONAL_ACCESS_TOKEN" }
+      ]}
+      apiKeyLink="https://github.com/settings/personal-access-tokens"
+      apiKeyLinkText="GitHub Personal Access Token"
+    />
 
   </TabItem>
   <TabItem value="cli" label="goose CLI">
     <CLIExtensionInstructions
       name="github"
+      description="GitHub repository management and operations"
       type="http"
       url="https://api.githubcopilot.com/mcp/"
       timeout={300}
@@ -65,7 +65,7 @@ These steps configure the Remote MCP Server. For other deployment options, see t
       ]}
       infoNote={
         <>
-          Obtain your <a href="https://github.com/settings/personal-access-tokens" target="_blank" rel="noopener noreferrer">GitHub Personal Access Token</a> and paste it in
+          Obtain your <a href="https://github.com/settings/personal-access-tokens" target="_blank" rel="noopener noreferrer">GitHub Personal Access Token</a> and paste it in as the <code>Bearer</code> token.
         </>
       }
     />
@@ -80,12 +80,12 @@ When creating my [GitHub Personal Access Token](https://github.com/settings/pers
 * Read access to metadata
 * Read and Write access to code, commit status, issues, and pull requests
 
-### Goose Prompt
+### goose Prompt
 ```
 create a new branch called hello-world in my angiejones/goose-demo repository. Update the README.md file to say "this was written by goose" and commit it. Open a pull request with your changes.
 ```
 
-### Goose Output
+### goose Output
 
 ```
 I'll help you create a new branch, update the README, and open a pull request. Let me break this down into steps:
diff --git a/documentation/docs/mcp/gitmcp-mcp.md b/documentation/docs/mcp/gitmcp-mcp.md
index 785c8f8aed2a..4419a9e44c5b 100644
--- a/documentation/docs/mcp/gitmcp-mcp.md
+++ b/documentation/docs/mcp/gitmcp-mcp.md
@@ -1,6 +1,6 @@
 ---
 title: GitMCP Extension
-description: Add Git MCP Server as a Goose Extension
+description: Add Git MCP Server as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
@@ -12,7 +12,7 @@ import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
 
 <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/6aV8pinnUS8" /> 
 
-This tutorial covers how to add the [Git MCP Server](https://github.com/idosal/git-mcp) as a Goose extension to give LLMs live access to GitHub repos, enabling smart documentation search, code exploration, and accurate project insights.
+This tutorial covers how to add the [Git MCP Server](https://github.com/idosal/git-mcp) as a goose extension to give LLMs live access to GitHub repos, enabling smart documentation search, code exploration, and accurate project insights.
 
 :::tip TLDR
 <Tabs groupId="interface">
@@ -47,6 +47,7 @@ This tutorial covers how to add the [Git MCP Server](https://github.com/idosal/g
   <TabItem value="cli" label="goose CLI">
       <CLIExtensionInstructions
         name="Git MCP"
+        description="Git MCP server for up-to-date docs and project insights"
         command="npx -y mcp-remote https://gitmcp.io/docs"
         timeout={300}
       />
@@ -55,15 +56,15 @@ This tutorial covers how to add the [Git MCP Server](https://github.com/idosal/g
 
 ## Example Usage
 
-In this example, Goose uses GitMCP to pull real-time documentation from the `openai/whisper` GitHub repository, explore how the speech-to-text model works, and surface accurate setup instructions and command-line usage—all directly from the source.
+In this example, goose uses GitMCP to pull real-time documentation from the `openai/whisper` GitHub repository, explore how the speech-to-text model works, and surface accurate setup instructions and command-line usage—all directly from the source.
 
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
-   1. Open a new session in Goose Desktop
+   1. Open a new session in goose Desktop
   </TabItem>
   <TabItem value="cli" label="goose CLI">
 
-  1. Open a terminal and start a new Goose session:
+  1. Open a terminal and start a new goose session:
 
   ```sh
   goose session
@@ -72,7 +73,7 @@ In this example, Goose uses GitMCP to pull real-time documentation from the `ope
   </TabItem>
 </Tabs>
 
-### Goose Prompt
+### goose Prompt
 ```
   Can you help me understand how the OpenAI Whisper speech-to-text model works?
 
@@ -86,7 +87,7 @@ In this example, Goose uses GitMCP to pull real-time documentation from the `ope
 
   Give me the response in a Markdown guide format.
 ```
-### Goose Output
+### goose Output
 
 :::note Desktop
 
diff --git a/documentation/docs/mcp/goose-docs-mcp.md b/documentation/docs/mcp/goose-docs-mcp.md
index 3a421dd933f8..545d5d5ac3c6 100644
--- a/documentation/docs/mcp/goose-docs-mcp.md
+++ b/documentation/docs/mcp/goose-docs-mcp.md
@@ -1,23 +1,21 @@
 ---
-title: Goose Docs Extension
+title: goose Docs Extension
 
-description: Add Goose Docs MCP Server as a Goose Extension
+description: Add goose Docs MCP Server as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CLIExtensionInstructions from '@site/src/components/CLIExtensionInstructions';
 import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
-import GooseBuiltinInstaller from '@site/src/components/GooseBuiltinInstaller';
 
 
-
-This tutorial covers how to add the [Goose Docs MCP Server](https://github.com/idosal/git-mcp) as a Goose extension to enable Goose to answer questions about itself.
+This tutorial covers how to add the [goose Docs MCP Server](https://github.com/idosal/git-mcp) as a goose extension to enable goose to answer questions about itself.
 
 :::tip TLDR
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
-  [Launch the installer](goose://extension?cmd=npx&arg=mcp-remote&arg=https%3A%2F%2Fblock.gitmcp.io%2Fgoose%2F&id=goose-docs&name=Goose%20Docs&description=gitmcp%20for%20Goose%20documentation)
+  [Launch the installer](goose://extension?cmd=npx&arg=mcp-remote&arg=https%3A%2F%2Fblock.gitmcp.io%2Fgoose%2F&id=goose-docs&name=goose%20Docs&description=gitmcp%20for%20goose%20documentation)
   </TabItem>
   <TabItem value="cli" label="goose CLI">
   **Command**
@@ -34,8 +32,8 @@ This tutorial covers how to add the [Goose Docs MCP Server](https://github.com/i
   <TabItem value="ui" label="goose Desktop" default>
     <GooseDesktopInstaller
       extensionId="goose-docs"
-      extensionName="Goose Docs"
-      description="GitMCP for Goose documentation"
+      extensionName="goose Docs"
+      description="GitMCP for goose documentation"
       command="npx"
       args={["mcp-remote", "https://block.gitmcp.io/goose/"]}
       cliCommand="npx mcp-remote https://block.gitmcp.io/goose/"
@@ -45,7 +43,8 @@ This tutorial covers how to add the [Goose Docs MCP Server](https://github.com/i
  </TabItem>
   <TabItem value="cli" label="goose CLI">
       <CLIExtensionInstructions
-        name="Goose Docs"
+        name="goose Docs"
+        description="GitMCP for goose documentation"
         command="npx mcp-remote https://block.gitmcp.io/goose/"
         timeout={300}
       />
@@ -54,15 +53,15 @@ This tutorial covers how to add the [Goose Docs MCP Server](https://github.com/i
 
 
 ## Example Usage
-GitMCP allows you to convert any Git repository into a Goose extension. The Goose Docs MCP Server is a great example of this, as it provides a way for Goose to answer questions about itself.
+GitMCP allows you to convert any Git repository into a goose extension. The goose Docs MCP Server is a great example of this, as it provides a way for goose to answer questions about itself.
 
-Let's ask Goose to create a recipe for us! It will use the Goose Docs MCP Server to find the relevant information.
+Let's ask goose to create a recipe for us! It will use the goose Docs MCP Server to find the relevant information.
 
 
-### Goose Prompt
+### goose Prompt
 
 ```
-hey Goose, I want to create a recipe for automated code review that my development team can use. Can you look at the Goose documentation to understand the recipe format, then create a recipe that:
+hey goose, I want to create a recipe for automated code review that my development team can use. Can you look at the goose documentation to understand the recipe format, then create a recipe that:
 
 
 1. Reviews pull requests for:
@@ -80,16 +79,16 @@ hey Goose, I want to create a recipe for automated code review that my developme
 
 3. Should output structured results that can be parsed by CI/CD systems
 
-Please research the recipe format first using the Goose Docs extension, then create a complete recipe file with proper YAML structure, parameters, and any needed extensions. 
+Please research the recipe format first using the goose Docs extension, then create a complete recipe file with proper YAML structure, parameters, and any needed extensions. 
 Make it something a development team could immediately use in their workflow.
 ```
 
 
-### Goose Output
+### goose Output
 
 :::note Desktop
 
-Perfect! I've created a comprehensive automated code review recipe based on the Goose documentation research. Here's what I've built for your development team:
+Perfect! I've created a comprehensive automated code review recipe based on the goose documentation research. Here's what I've built for your development team:
 
 #### 📋 Recipe Overview
 
@@ -165,7 +164,7 @@ The structured JSON output makes it perfect for CI/CD pipelines:
 #### 📁 **File Structure**
 
 The recipe is saved as `automated-code-review.yaml` in your current directory and includes:
-- Proper YAML structure following Goose recipe format
+- Proper YAML structure following goose recipe format
 - Comprehensive parameter definitions with defaults
 - Built-in developer extension for file system access
 - Detailed JSON schema for structured output
@@ -528,7 +527,7 @@ response:
             description: "ISO timestamp of when review was performed"
           reviewer:
             type: string
-            description: "Goose automated code review"
+            description: "goose automated code review"
           language:
             type: string
             description: "Programming language reviewed"
diff --git a/documentation/docs/mcp/gotohuman-mcp.md b/documentation/docs/mcp/gotohuman-mcp.md
index d9072580780f..b6690a32c488 100644
--- a/documentation/docs/mcp/gotohuman-mcp.md
+++ b/documentation/docs/mcp/gotohuman-mcp.md
@@ -1,6 +1,6 @@
 ---
 title: gotoHuman Extension
-description: Add gotoHuman MCP Server as a Goose Extension
+description: Add gotoHuman MCP Server as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
@@ -12,7 +12,7 @@ import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
 
 <!-- <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/6aV8pinnUS8" />  -->
 
-This tutorial covers how to add the [gotoHuman MCP Server](https://github.com/gotohuman/gotohuman-mcp-server) as a Goose extension to bring **human-in-the-loop approvals** into your AI workflows. With gotoHuman, Goose can pause and request a review before continuing, perfect for blog drafts, code reviews,compliance checks, etc.  
+This tutorial covers how to add the [gotoHuman MCP Server](https://github.com/gotohuman/gotohuman-mcp-server) as a goose extension to bring **human-in-the-loop approvals** into your AI workflows. With gotoHuman, goose can pause and request a review before continuing, perfect for blog drafts, code reviews,compliance checks, etc.  
 
 
 :::tip TLDR
@@ -53,6 +53,7 @@ This tutorial covers how to add the [gotoHuman MCP Server](https://github.com/go
   <TabItem value="cli" label="goose CLI">
       <CLIExtensionInstructions
         name="gotoHuman MCP"
+        description="gotoHuman MCP server for human-in-the-loop approvals"
         command="npx -y @gotohuman/mcp-server"
         timeout={300}
         envVars={[
@@ -75,15 +76,15 @@ Follow the steps to create a template and ensure you set a **Webhook Endpoint**
 :::
 
 
-In this example, Goose sends a LinkedIn post draft to gotoHuman for approval using the `n8n news to post` template that was created.
+In this example, goose sends a LinkedIn post draft to gotoHuman for approval using the `n8n news to post` template that was created.
 
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
-   1. Open a new session in Goose Desktop
+   1. Open a new session in goose Desktop
   </TabItem>
   <TabItem value="cli" label="goose CLI">
 
-  1. Open a terminal and start a new Goose session:
+  1. Open a terminal and start a new goose session:
 
   ```sh
   goose session
@@ -92,23 +93,23 @@ In this example, Goose sends a LinkedIn post draft to gotoHuman for approval usi
   </TabItem>
 </Tabs>
 
-### Goose Prompt
+### goose Prompt
 ```
-Send this blog draft about Goose to gotoHuman for review using my `n8n news to post` form. 
+Send this blog draft about goose to gotoHuman for review using my `n8n news to post` form. 
 
 Include today’s date as the timestamp, these links: 
-[Goose Docs: https://block.github.io/goose/, gotoHuman: https://gotohuman.com/], 
-summarize it as ‘Introducing Goose’s integration with gotoHuman for human approvals,’ 
+[goose Docs: https://block.github.io/goose/, gotoHuman: https://gotohuman.com/], 
+summarize it as ‘Introducing goose’s integration with gotoHuman for human approvals,’ 
 and here’s the draft:
 
-Goose is an open-source AI agent that runs locally on your machine, right in your terminal or IDE. 
-It connects to MCP servers like gotoHuman to extend its abilities. While Goose can automate tasks, 
+goose is an open-source AI agent that runs locally on your machine, right in your terminal or IDE. 
+It connects to MCP servers like gotoHuman to extend its abilities. While goose can automate tasks, 
 sometimes you need a human in the loop. With gotoHuman MCP, you can add approval steps into any workflow;
 from reviewing a LinkedIn post draft to signing off on a code change. 
-Once approved, Goose can continue where it left off. 
+Once approved, goose can continue where it left off. 
 This makes agent workflows safer, more collaborative, and better suited for real-world teams.
 ```
-### Goose Output
+### goose Output
 
 :::note Desktop
 
@@ -123,7 +124,7 @@ Let me search for more technical details and examples:
 
 `─── Request-human-review-with-form ────────────`
 
-Perfect! I've successfully sent your Goose blog draft to gotoHuman for review using your "n8n news to post" form. Here's what was submitted:
+Perfect! I've successfully sent your goose blog draft to gotoHuman for review using your "n8n news to post" form. Here's what was submitted:
 Review Request Details
 
 - Form Used: n8n news to post
@@ -133,17 +134,17 @@ Review Request Details
 Submitted Content
 
 - Timestamp: 2025-09-23
-- Summary: Introducing Goose's integration with gotoHuman for human approvals
+- Summary: Introducing goose's integration with gotoHuman for human approvals
 - Links:
-    - Goose Docs
+    - goose Docs
     - gotoHuman
-- Draft: Your complete blog post about Goose's integration with gotoHuman
+- Draft: Your complete blog post about goose's integration with gotoHuman
 
 The review request has been created and is now ready for human approval. You can access it through the review link provided above. Once the review is completed, you'll be able to proceed with publishing or making any requested changes to the blog post.
 :::
 
 ## Review in gotoHuman
 
-Now if you open the **Review Link** from Goose’s output, you’ll see the request waiting in your gotoHuman dashboard:  
+Now if you open the **Review Link** from goose’s output, you’ll see the request waiting in your gotoHuman dashboard:  
 
 ![](/img/gotohuman.png)
diff --git a/documentation/docs/mcp/jetbrains-mcp.md b/documentation/docs/mcp/jetbrains-mcp.md
index b28e3ea6a3c5..9548e3f4f0e2 100644
--- a/documentation/docs/mcp/jetbrains-mcp.md
+++ b/documentation/docs/mcp/jetbrains-mcp.md
@@ -1,6 +1,6 @@
 ---
 title: JetBrains Extension
-description: Use JetBrains MCP Server as a Goose Extension
+description: Use JetBrains MCP Server as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
@@ -12,7 +12,7 @@ import { PanelLeft } from 'lucide-react';
 
 <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/1fP5elf9qQM" />
 
-This tutorial covers how to add the JetBrains extension to integrate with any JetBrains IDE. While Goose can use the [Developer extension](/docs/mcp/developer-mcp) for developer-centric tasks, the JetBrains extension provides a more integrated and project-aware way to work with code.
+This tutorial covers how to add the JetBrains extension to integrate with any JetBrains IDE. While goose can use the [Developer extension](/docs/mcp/developer-mcp) for developer-centric tasks, the JetBrains extension provides a more integrated and project-aware way to work with code.
 
 ## Configuration
 
@@ -47,7 +47,7 @@ This tutorial covers how to add the JetBrains extension to integrate with any Je
        4. Click `OK` to save your changes and start the server
        5. Copy the `url` value from the config
 
-    2. Add the JetBrains extension to Goose, replacing "YOUR_IDE_SPECIFIC_URL" in the instructions with the URL you copied:
+    2. Add the JetBrains extension to goose, replacing "YOUR_IDE_SPECIFIC_URL" in the instructions with the URL you copied:
        <Tabs groupId="interface">
          <TabItem value="ui" label="goose Desktop" default>
            1. Click the <PanelLeft className="inline" size={16} /> button in the top-left to open the sidebar
@@ -63,6 +63,7 @@ This tutorial covers how to add the JetBrains extension to integrate with any Je
          <TabItem value="cli" label="goose CLI">
            <CLIExtensionInstructions            
              name="jetbrains"
+             description="Integrate goose with any JetBrains IDE"
              type="sse"
              url="YOUR_IDE_SPECIFIC_URL"
              timeout={300}
@@ -77,7 +78,7 @@ This tutorial covers how to add the JetBrains extension to integrate with any Je
     :::tip TLDR
     <Tabs groupId="interface">
       <TabItem value="ui" label="goose Desktop" default>
-      [Launch the installer](goose://extension?cmd=npx&arg=-y&arg=%40jetbrains%2Fmcp-proxy&id=jetbrains&name=JetBrains&description=Integrate%20Goose%20with%20any%20JetBrains%20IDE)
+      [Launch the installer](goose://extension?cmd=npx&arg=-y&arg=%40jetbrains%2Fmcp-proxy&id=jetbrains&name=JetBrains&description=Integrate%20goose%20with%20any%20JetBrains%20IDE)
       </TabItem>
       <TabItem value="cli" label="goose CLI">
       **Command**
@@ -101,14 +102,14 @@ This tutorial covers how to add the JetBrains extension to integrate with any Je
 
     1. Add the [MCP Server plugin](https://plugins.jetbrains.com/plugin/26071-mcp-server) to your IDE.
 
-    2. Add the JetBrains extension to Goose:
+    2. Add the JetBrains extension to goose:
 
        <Tabs groupId="interface">
          <TabItem value="ui" label="goose Desktop" default>
            <GooseDesktopInstaller
              extensionId="jetbrains"
              extensionName="JetBrains"
-             description="Integrate Goose with any JetBrains IDE"
+             description="Integrate goose with any JetBrains IDE"
              command="npx"
              args={["-y", "@jetbrains/mcp-proxy"]}
              timeout={300}
@@ -117,6 +118,7 @@ This tutorial covers how to add the JetBrains extension to integrate with any Je
          <TabItem value="cli" label="goose CLI">
              <CLIExtensionInstructions
                name="jetbrains"
+               description="Integrate goose with any JetBrains IDE"
                command="npx -y @jetbrains/mcp-proxy"
                timeout={300}
              />
@@ -138,16 +140,16 @@ Anthropic's Claude 4 Sonnet was used for this task.
 <Tabs groupId="interface">
   <TabItem value="ui" label="goose Desktop" default>
    1. Open [IntelliJ](https://www.jetbrains.com/idea/download) (JetBrains' Java and Kotlin IDE)
-   2. Open a new session in Goose Desktop
+   2. Open a new session in goose Desktop
    :::note
-   You will interact with two separate apps: the Goose Desktop app and the IntelliJ IDE.
+   You will interact with two separate apps: the goose Desktop app and the IntelliJ IDE.
    :::
 
   </TabItem>
   <TabItem value="cli" label="goose CLI">
 
   1. Open [IntelliJ](https://www.jetbrains.com/idea/download) (JetBrains' Java and Kotlin IDE)
-  2. Open a terminal within your IDE and start a new Goose session:
+  2. Open a terminal within your IDE and start a new goose session:
 
   ```sh
   goose session
@@ -157,17 +159,17 @@ Anthropic's Claude 4 Sonnet was used for this task.
 </Tabs>
 
 :::tip 
-When using Goose to refactor code, it's recommended to commit your code to version control _before_ making changes. This way, you have a clean snapshot to compare against, making it easy to review Goose’s modifications, revert if needed, and track improvements.
+When using goose to refactor code, it's recommended to commit your code to version control _before_ making changes. This way, you have a clean snapshot to compare against, making it easy to review goose’s modifications, revert if needed, and track improvements.
 :::
 
-### Goose Prompt
+### goose Prompt
 ```
 using the JetBrains IDE tools, upgrade this project to use the latest Java LTS version and refactor the codebase to use newer Java features where beneficial.
 ```
 
-After 2 minutes, Goose was done with the upgrade! 🎉
+After 2 minutes, goose was done with the upgrade! 🎉
 
-### Goose Output
+### goose Output
 
 ```md
 I'll make several improvements to modernize this codebase to use Java 21 (latest LTS) features. Here are the changes I'll implement:
@@ -247,7 +249,7 @@ The codebase is now using the latest Java LTS version (21) and incorporates many
 
 
 
-Using the JetBrains extension provided several advantages and made it easier for Goose to:
+Using the JetBrains extension provided several advantages and made it easier for goose to:
 - navigate through the codebase
 - track changes
 - make consistent modifications across files
diff --git a/documentation/docs/mcp/neon-mcp.md b/documentation/docs/mcp/neon-mcp.md
index cff97afbc421..1debe3fdd5f2 100644
--- a/documentation/docs/mcp/neon-mcp.md
+++ b/documentation/docs/mcp/neon-mcp.md
@@ -1,6 +1,6 @@
 ---
 title: Neon Extension
-description: Add Neon MCP Server as a Goose Extension
+description: Add Neon MCP Server as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
@@ -9,7 +9,7 @@ import CLIExtensionInstructions from '@site/src/components/CLIExtensionInstructi
 import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
 import { PanelLeft } from 'lucide-react';
 
-This tutorial covers how to add the [Neon MCP Server](https://github.com/neondatabase/mcp-server-neon) as a Goose extension to interact with your Neon Postgres databases and manage your projects, branches, and more.
+This tutorial covers how to add the [Neon MCP Server](https://github.com/neondatabase/mcp-server-neon) as a goose extension to interact with your Neon Postgres databases and manage your projects, branches, and more.
 
 Neon offers two versions of the MCP server:
 
@@ -57,6 +57,7 @@ The Neon MCP Server grants powerful database management capabilities and is inte
     <TabItem value="cli" label="goose CLI">
       <CLIExtensionInstructions
         name="neon-mcp-remote"
+        description="Manage Neon Postgres databases, projects, and branches"
         type="http"
         url="https://mcp.neon.tech/mcp"
         timeout={300}
@@ -103,6 +104,7 @@ The Neon MCP Server grants powerful database management capabilities and is inte
     <TabItem value="cli" label="goose CLI">
       <CLIExtensionInstructions
         name="Neon MCP"
+        description="Manage Neon Postgres databases, projects, and branches"
         command="npx -y @neondatabase/mcp-server-neon start <YOUR_NEON_API_KEY>"
         timeout={300}
       />
@@ -118,13 +120,13 @@ For all setup and configuration options, see the [official Neon MCP Server docum
 
 Get an overview of all your Neon database projects and their configurations.
 
-### Goose Prompt
+### goose Prompt
 
 ```
 List my Neon projects
 ```
 
-### Goose Output
+### goose Output
 
 ```
 I'll help you list your Neon projects using the neon__list_projects tool. By default, it will show the first 10 projects.
@@ -164,13 +166,13 @@ All projects are running PostgreSQL 17 and have autoscaling configured between 1
 
 Discover what tables and schemas exist within a specific project.
 
-### Goose Prompt
+### goose Prompt
 
 ```
 What tables do I have in my neon-auth-mcp-oauth project?
 ```
 
-### Goose Output
+### goose Output
 
 ```
 In your neon-auth-mcp-oauth project, there is one table:
@@ -182,13 +184,13 @@ users_sync in the neon_auth schema
 
 Run queries against your database tables to retrieve and analyze your data.
 
-### Goose Prompt
+### goose Prompt
 
 ```
 Count the rows in the users_sync table.
 ```
 
-### Goose Output
+### goose Output
 
 ```
 I'll count the rows in the neon_auth.users_sync table using a COUNT query.
diff --git a/documentation/docs/mcp/reddit-mcp.md b/documentation/docs/mcp/reddit-mcp.md
index 5900542cd1a1..6936e090e868 100644
--- a/documentation/docs/mcp/reddit-mcp.md
+++ b/documentation/docs/mcp/reddit-mcp.md
@@ -1,7 +1,7 @@
 ---
 title: Reddit Extension
 
-description: Add Reddit MCP Server as a Goose Extension
+description: Add Reddit MCP Server as a goose Extension
 ---
 
 import Tabs from '@theme/Tabs';
@@ -13,7 +13,7 @@ import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
 <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/VBtFinHieHA" /> 
 
 
-This tutorial covers how to add the [Reddit MCP Server](https://github.com/adhikasp/mcp-reddit) as a Goose extension to fetch trending threads, analyze Reddit post content, and explore subreddit discussions.
+This tutorial covers how to add the [Reddit MCP Server](https://github.com/adhikasp/mcp-reddit) as a goose extension to fetch trending threads, analyze Reddit post content, and explore subreddit discussions.
 
 :::tip TLDR
 <Tabs groupId="interface">
@@ -49,6 +49,7 @@ Note that you'll need [uv](https://docs.astral.sh/uv/#installation) installed on
   <TabItem value="cli" label="goose CLI">
     <CLIExtensionInstructions
       name="Reddit MCP"
+      description="Fetch and analyze Reddit content"
       command="uvx --from git+https://github.com/adhikasp/mcp-reddit.git mcp-reddit"
       timeout={300}
     />
@@ -58,17 +59,17 @@ Note that you'll need [uv](https://docs.astral.sh/uv/#installation) installed on
 
 ## Example Usage
 
-In this example, I’ll use Goose with the Reddit MCP Server to build a custom news feed for AI topics. Goose will pull top AI threads from Reddit and turn them into a scrollable, social media-style feed with images and highlights.
+In this example, I’ll use goose with the Reddit MCP Server to build a custom news feed for AI topics. goose will pull top AI threads from Reddit and turn them into a scrollable, social media-style feed with images and highlights.
 
 It’s like Reddit, but curated just for you.
 
-### Goose Prompt
+### goose Prompt
 
 > goose using the reddit MCP server, create a personalized social feed of the latest AI threads. Include images and format it like a real social media app.
 
 
 
-### Goose Output
+### goose Output
 
 :::note Desktop
 
diff --git a/documentation/docs/mcp/rube-mcp.md b/documentation/docs/mcp/rube-mcp.md
index 30f0603b3c0b..1640a7ac6ff9 100644
--- a/documentation/docs/mcp/rube-mcp.md
+++ b/documentation/docs/mcp/rube-mcp.md
@@ -1,6 +1,6 @@
 ---
 title: Rube Extension
-description: Add Rube as a Goose Extension to connect with 500+ apps
+description: Add Rube as a goose Extension to connect with 500+ apps
 ---
 
 import Tabs from '@theme/Tabs';
@@ -9,7 +9,7 @@ import CLIExtensionInstructions from '@site/src/components/CLIExtensionInstructi
 import GooseDesktopInstaller from '@site/src/components/GooseDesktopInstaller';
 import { PanelLeft } from 'lucide-react';
 
-This tutorial covers how to add [Rube](https://rube.app) as a Goose extension to enable seamless integration with 500+ apps including Slack, Gmail, Notion, Google Workspace, Microsoft Office, GitHub, and many more.
+This tutorial covers how to add [Rube](https://rube.app) as a goose extension to enable seamless integration with 500+ apps including Slack, Gmail, Notion, Google Workspace, Microsoft Office, GitHub, and many more.
 
 :::tip TLDR
 <Tabs groupId="interface">
@@ -49,6 +49,7 @@ Rube is a platform powered by Composio that provides unified access to 500+ apps
   <TabItem value="cli" label="goose CLI">
     <CLIExtensionInstructions
       name="rube"
+      description="Seamlessly connect across 500+ applications including Slack, Gmail, Notion, Google Workspace, Microsoft Office, GitHub, and many more"
       type="http"
       url="https://rube.app/mcp"
       timeout={300}
@@ -68,7 +69,7 @@ Rube uses OAuth browser authentication, which means:
 
 ## Example Usage
 
-Once Rube is configured, you can interact with 500+ apps directly through Goose. Here are some examples:
+Once Rube is configured, you can interact with 500+ apps directly through goose. Here are some examples:
 
 **Email Management**
 ```
diff --git a/documentation/docs/mcp/vercel-mcp.md b/documentation/docs/mcp/vercel-mcp.md
index b280d50e180e..e812c94efc8b 100644
--- a/documentation/docs/mcp/vercel-mcp.md
+++ b/documentation/docs/mcp/vercel-mcp.md
@@ -1,6 +1,6 @@
 ---
 title: Vercel Extension
-description: Add Vercel MCP Server as a Goose Extension for managing your deployments
+description: Add Vercel MCP Server as a goose Extension for managing your deployments
 ---
 
 import Tabs from '@theme/Tabs';
@@ -11,7 +11,7 @@ import CLIExtensionInstructions from '@site/src/components/CLIExtensionInstructi
 
 <YouTubeShortEmbed videoUrl="https://www.youtube.com/embed/-Y-werFKtTw" />
 
-This tutorial covers how to add the [Vercel MCP Server](https://vercel.com/docs/mcp/vercel-mcp) as a Goose extension to manage your Vercel projects and deployment status directly from Goose.
+This tutorial covers how to add the [Vercel MCP Server](https://vercel.com/docs/mcp/vercel-mcp) as a goose extension to manage your Vercel projects and deployment status directly from goose.
 
 :::info
 Note that you'll need [Node.js](https://nodejs.org/) installed on your system to run installation commands, which use `npx`.
@@ -45,6 +45,7 @@ Note that you'll need [Node.js](https://nodejs.org/) installed on your system to
   <TabItem value="cli" label="goose CLI">
     <CLIExtensionInstructions
       name="Vercel"
+      description="Access Vercel deployments and manage projects"
       type="http"
       url="https://mcp.vercel.com"
       timeout={300}
@@ -54,14 +55,14 @@ Note that you'll need [Node.js](https://nodejs.org/) installed on your system to
 
 ## Example Usage
 
-### Goose Prompt
+### goose Prompt
 ```
 Get a list of my Vercel projects via the Vercel MCP server, and build me a table showing when I last deployed the project and other details I should know about their status.
 ```
 
 The first time you use the Vercel MCP server, you will be prompted to authenticate with Vercel via OAuth.
 
-### Goose Output
+### goose Output
 ```
 I'll help you get your Vercel projects and create a table with deployment details. Let me first get your teams to identify which team to use for listing projects.
 
diff --git a/documentation/src/components/CLIExtensionInstructions.tsx b/documentation/src/components/CLIExtensionInstructions.tsx
index 3d4305a29288..9ae6bb627b3f 100644
--- a/documentation/src/components/CLIExtensionInstructions.tsx
+++ b/documentation/src/components/CLIExtensionInstructions.tsx
@@ -9,6 +9,7 @@ interface EnvVar {
 
 interface CLIExtensionInstructionsProps {
   name: string;
+  description: string;
   type?: 'stdio' | 'sse' | 'http';
   command?: string; // Only for stdio
   url?: string; // For both sse and http
@@ -19,6 +20,7 @@ interface CLIExtensionInstructionsProps {
 
 export default function CLIExtensionInstructions({
   name,
+  description,
   type = 'stdio',
   command,
   url,
@@ -169,7 +171,7 @@ ${
 └`}</CodeBlock>
 
       <ol start={6}>
-        <li>Choose to add a description. If you select <code>No</code>, Goose will skip it.</li>
+        <li>Enter a description for this extension.</li>
       </ol>
       <CodeBlock language="sh">{`┌   goose-configure 
 │
@@ -191,8 +193,8 @@ ${
 │  ${timeout}
 │
 // highlight-start
-◆  Would you like to add a description?
-│  No
+◆  Enter a description for this extension:
+│  ${description}
 // highlight-end
 └`}</CodeBlock>
 
@@ -200,8 +202,8 @@ ${
         <li>
           {hasEnvVars
             ? isHttp
-              ? <>Add custom header{envVars.length > 1 ? 's' : ''} for {name}.</>
-              : <>Add environment variable{envVars.length > 1 ? 's' : ''} for {name}.</>
+              ? <>Add {envVars.length > 1 ? 'custom headers' : 'a custom header'} for this extension.</>
+              : <>Add {envVars.length > 1 ? 'environment variables' : 'an environment variable'} for this extension.</>
             : isHttp
             ? <>Choose <code>No</code> when asked to add custom headers.</>
             : <>Choose <code>No</code> when asked to add environment variables.</>
@@ -229,8 +231,8 @@ ${
 ◇  Please set the timeout for this tool (in secs):
 │  ${timeout}
 │
-◇  Would you like to add a description?
-│  No
+◇  Enter a description for this extension:
+│  ${description}
 │
 // highlight-start
 ◆  ${lastStepText}
@@ -270,8 +272,8 @@ ${
 ◇  Please set the timeout for this tool (in secs):
 │  ${timeout}
 │
-◇  Would you like to add a description?
-│  No
+◇  Enter a description for this extension:
+│  ${description}
 │
 // highlight-start
 ◆  ${lastStepText}
diff --git a/documentation/src/components/GooseDesktopInstaller.tsx b/documentation/src/components/GooseDesktopInstaller.tsx
index fe1780a50cc3..4c3e6a4e9dbf 100644
--- a/documentation/src/components/GooseDesktopInstaller.tsx
+++ b/documentation/src/components/GooseDesktopInstaller.tsx
@@ -124,7 +124,7 @@ export default function GooseDesktopInstaller({
         <li>
           <a href={buildGooseUrl()}>Launch the installer</a>
         </li>
-        <li>Click <code>OK</code> to confirm the installation</li>
+        <li>Click <code>Yes</code> to confirm the installation</li>
         {shouldShowConfigurationSteps && (
           <>
             <li>{step3Content}</li>