diff --git a/src/mcp.ts b/src/mcp.ts
index 4e870e73..6578333c 100644
--- a/src/mcp.ts
+++ b/src/mcp.ts
@@ -14,26 +14,30 @@ export const runMCPInstall = async (options: {
   signup: boolean;
   region?: CloudRegion;
 }) => {
-  clack.intro('Installing the PostHog MCP server.');
+  clack.intro(chalk.bgGreenBright('Installing the PostHog MCP server'));
 
   await addMCPServerToClientsStep({
     cloudRegion: options.region,
     askPermission: false,
   });
 
-  clack.outro(`${chalk.green(
-    'You might need to restart your MCP clients to see the changes.',
-  )}
+  clack.log.message(
+    `${chalk.greenBright(
+      'You might need to restart your MCP clients to see the changes.',
+    )}`,
+  );
 
-Get started with some prompts like:
+  clack.log.message(`Get started with some prompts like:
+- What feature flags do I have active?
+- Add a new feature flag for our homepage redesign
+- What are my most common errors?`);
 
-  - What feature flags do I have active?
-  - Add a new feature flag for our homepage redesign
-  - What are my most common errors?
-`);
+  clack.log.message(`Check out our MCP Server documentation:
+${chalk.blueBright(`https://posthog.com/docs/model-context-protocol`)}`);
 };
 
 export const runMCPRemove = async () => {
+  clack.intro(chalk.bgRed('Removing the PostHog MCP server'));
   const results = await removeMCPServerFromClientsStep({});
 
   if (results.length === 0) {
@@ -41,12 +45,13 @@ export const runMCPRemove = async () => {
     return;
   }
 
-  clack.outro(`PostHog MCP server removed from:
-  ${results.map((c) => `- ${c}`).join('\n  ')}
-  
-  ${chalk.green(
-    'You might need to restart your MCP clients to see the changes.',
-  )}`);
+  clack.log.success(`PostHog MCP server removed from:`);
+  results.map((c) => clack.log.message(`- ${c}`));
+  clack.outro(
+    `${chalk.green(
+      'You might need to restart your MCP clients to see the changes.\n\n',
+    )}`,
+  );
 };
 
 export const getPersonalApiKey = async (options: {
diff --git a/src/steps/add-mcp-server-to-clients/index.ts b/src/steps/add-mcp-server-to-clients/index.ts
index e7ec1165..3dbf14dc 100644
--- a/src/steps/add-mcp-server-to-clients/index.ts
+++ b/src/steps/add-mcp-server-to-clients/index.ts
@@ -2,11 +2,8 @@ import type { Integration } from '../../lib/constants';
 import { traceStep } from '../../telemetry';
 import { analytics } from '../../utils/analytics';
 import clack from '../../utils/clack';
-import {
-  abort,
-  abortIfCancelled,
-  askForCloudRegion,
-} from '../../utils/clack-utils';
+import chalk from 'chalk';
+import { abortIfCancelled, askForCloudRegion } from '../../utils/clack-utils';
 import { MCPClient } from './MCPClient';
 import { CursorMCPClient } from './clients/cursor';
 import { ClaudeMCPClient } from './clients/claude';
@@ -46,7 +43,7 @@ export const addMCPServerToClientsStep = async ({
     ? await abortIfCancelled(
         clack.select({
           message:
-            'Would you like to install the PostHog MCP server to use PostHog in your editor?',
+            'Would you like to install the MCP server to use PostHog in your editor?',
           options: [
             { value: true, label: 'Yes' },
             { value: false, label: 'No' },
@@ -60,14 +57,33 @@ export const addMCPServerToClientsStep = async ({
     return [];
   }
 
-  const clients = await getSupportedClients();
+  const supportedClients = await getSupportedClients();
+
+  const { multiselect } = await import('@clack/prompts');
+  const selectedClientNames = await abortIfCancelled(
+    multiselect({
+      message: `Select which MCP clients to install the MCP server to: ${chalk.dim(
+        '(Toggle: Space, Confirm: Enter, Toggle All: A, Cancel: CTRL + C)',
+      )}`,
+      options: supportedClients.map((client) => ({
+        value: client.name,
+        label: client.name,
+      })),
+      initialValues: supportedClients.map((client) => client.name),
+      required: true,
+    }),
+    integration,
+  );
+
+  const clients = supportedClients.filter((client) =>
+    selectedClientNames.includes(client.name),
+  );
 
   const installedClients = await getInstalledClients();
 
   if (installedClients.length > 0) {
     clack.log.warn(
-      `The PostHog MCP server is already configured for:
-
+      `The MCP server is already configured for:
   ${installedClients.map((c) => `- ${c.name}`).join('\n  ')}`,
     );
 
@@ -111,7 +127,7 @@ export const addMCPServerToClientsStep = async ({
   });
 
   clack.log.success(
-    `Added the PostHog MCP server to:
+    `Added the MCP server to:
   ${clients.map((c) => `- ${c.name}`).join('\n  ')} `,
   );
 
@@ -139,40 +155,36 @@ export const removeMCPServerFromClientsStep = async ({
     return [];
   }
 
-  const removeServers: boolean = await abortIfCancelled(
-    clack.select({
-      message: `Found the PostHog MCP server in ${installedClients.length} clients. Would you like to remove it?`,
-      options: [
-        {
-          value: true,
-          label: 'Yes',
-          hint: `Remove PostHog MCP server`,
-        },
-        {
-          value: false,
-          label: 'No',
-          hint: 'Keep the MCP server configuration',
-        },
-      ],
+  const { multiselect } = await import('@clack/prompts');
+  const selectedClientNames = await abortIfCancelled(
+    multiselect({
+      message: `Select which clients to remove the MCP server from: ${chalk.dim(
+        '(Toggle: Space, Confirm: Enter, Toggle All: A, Cancel: CTRL + C)',
+      )}`,
+      options: installedClients.map((client) => ({
+        value: client.name,
+        label: client.name,
+      })),
+      initialValues: installedClients.map((client) => client.name),
     }),
     integration,
   );
 
-  if (!removeServers) {
+  const clientsToRemove = installedClients.filter((client) =>
+    selectedClientNames.includes(client.name),
+  );
+
+  if (clientsToRemove.length === 0) {
     analytics.capture('wizard interaction', {
-      action: 'declined to remove mcp servers',
-      clients: installedClients.map((c) => c.name),
+      action: 'no mcp servers selected for removal',
       integration,
     });
-
-    await abort('The MCP server was not removed.');
     return [];
   }
 
   const results = await traceStep('removing mcp servers', async () => {
-    await removeMCPServer(installedClients);
-
-    return installedClients.map((c) => c.name);
+    await removeMCPServer(clientsToRemove);
+    return clientsToRemove.map((c) => c.name);
   });
 
   analytics.capture('wizard interaction', {