diff --git a/docs/README.skills.md b/docs/README.skills.md
index 45a9d055..72ce1fb8 100644
--- a/docs/README.skills.md
+++ b/docs/README.skills.md
@@ -37,7 +37,6 @@ Skills differ from other primitives by supporting bundled assets (scripts, code
 | [image-manipulation-image-magick](../skills/image-manipulation-image-magick/SKILL.md) | Process and manipulate images using ImageMagick. Supports resizing, format conversion, batch processing, and retrieving image metadata. Use when working with images, creating thumbnails, resizing wallpapers, or performing batch image operations. | None |
 | [legacy-circuit-mockups](../skills/legacy-circuit-mockups/SKILL.md) | Generate breadboard circuit mockups and visual diagrams using HTML5 Canvas drawing techniques. Use when asked to create circuit layouts, visualize electronic component placements, draw breadboard diagrams, mockup 6502 builds, generate retro computer schematics, or design vintage electronics projects. Supports 555 timers, W65C02S microprocessors, 28C256 EEPROMs, W65C22 VIA chips, 7400-series logic gates, LEDs, resistors, capacitors, switches, buttons, crystals, and wires. | `references/28256-eeprom.md`<br />`references/555.md`<br />`references/6502.md`<br />`references/6522.md`<br />`references/6C62256.md`<br />`references/7400-series.md`<br />`references/assembly-compiler.md`<br />`references/assembly-language.md`<br />`references/basic-electronic-components.md`<br />`references/breadboard.md`<br />`references/common-breadboard-components.md`<br />`references/connecting-electronic-components.md`<br />`references/emulator-28256-eeprom.md`<br />`references/emulator-6502.md`<br />`references/emulator-6522.md`<br />`references/emulator-6C62256.md`<br />`references/emulator-lcd.md`<br />`references/lcd.md`<br />`references/minipro.md`<br />`references/t48eeprom-programmer.md` |
 | [make-skill-template](../skills/make-skill-template/SKILL.md) | Create new Agent Skills for GitHub Copilot from prompts or by duplicating this template. Use when asked to "create a skill", "make a new skill", "scaffold a skill", or when building specialized AI capabilities with bundled resources. Generates SKILL.md files with proper frontmatter, directory structure, and optional scripts/references/assets folders. | None |
-| [mcp-cli](../skills/mcp-cli/SKILL.md) | Interface for MCP (Model Context Protocol) servers via CLI. Use when you need to interact with external tools, APIs, or data sources through MCP servers, list available MCP servers/tools, or call MCP tools from command line. | None |
 | [microsoft-code-reference](../skills/microsoft-code-reference/SKILL.md) | Look up Microsoft API references, find working code samples, and verify SDK code is correct. Use when working with Azure SDKs, .NET libraries, or Microsoft APIs—to find the right method, check parameters, get working examples, or troubleshoot errors. Catches hallucinated methods, wrong signatures, and deprecated patterns by querying official docs. | None |
 | [microsoft-docs](../skills/microsoft-docs/SKILL.md) | Query official Microsoft documentation to understand concepts, find tutorials, and learn how services work. Use for Azure, .NET, Microsoft 365, Windows, Power Platform, and all Microsoft technologies. Get accurate, current information from learn.microsoft.com and other official Microsoft websites—architecture overviews, quickstarts, configuration guides, limits, and best practices. | None |
 | [nuget-manager](../skills/nuget-manager/SKILL.md) | Manage NuGet packages in .NET projects/solutions. Use this skill when adding, removing, or updating NuGet package versions. It enforces using `dotnet` CLI for package management and provides strict procedures for direct file edits only when updating versions. | None |
diff --git a/skills/mcp-cli/SKILL.md b/skills/mcp-cli/SKILL.md
index d5b801ee..57eab286 100644
--- a/skills/mcp-cli/SKILL.md
+++ b/skills/mcp-cli/SKILL.md
@@ -1,30 +1,72 @@
 ---
 name: mcp-cli
 description: Interface for MCP (Model Context Protocol) servers via CLI. Use when you need to interact with external tools, APIs, or data sources through MCP servers, list available MCP servers/tools, or call MCP tools from command line.
+metadata
+  homepage: https://github.com/philschmid/mcp-cli
 ---
 
 # MCP-CLI
 
 Access MCP servers through the command line. MCP enables interaction with external systems like GitHub, filesystems, databases, and APIs.
 
+**Homepage:** https://github.com/philschmid/mcp-cli
+
+## Prerequisites
+
+### Installation
+
+```bash
+# Quick install (recommended)
+curl -fsSL https://raw.githubusercontent.com/philschmid/mcp-cli/main/install.sh | bash
+
+# Or install with Bun (requires Bun)
+bun install -g https://github.com/philschmid/mcp-cli
+
+# Verify installation
+mcp-cli --version
+```
+
+### Configuration
+
+Create `mcp_servers.json` in your current directory or `~/.config/mcp/`:
+
+```json
+{
+  "mcpServers": {
+    "filesystem": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "."]
+    },
+    "github": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-github"]
+    }
+  }
+}
+```
+
+**Documentation:** https://github.com/philschmid/mcp-cli
+
 ## Commands
 
-| Command                            | Output                          |
-| ---------------------------------- | ------------------------------- |
-| `mcp-cli`                          | List all servers and tool names |
-| `mcp-cli <server>`                 | Show tools with parameters      |
-| `mcp-cli <server>/<tool>`          | Get tool JSON schema            |
-| `mcp-cli <server>/<tool> '<json>'` | Call tool with arguments        |
-| `mcp-cli grep "<glob>"`            | Search tools by name            |
+| Command                                 | Output                          |
+| --------------------------------------- | ------------------------------- |
+| `mcp-cli`                               | List all servers and tool names |
+| `mcp-cli info <server>`                 | Show tools with parameters      |
+| `mcp-cli info <server> <tool>`          | Get tool JSON schema            |
+| `mcp-cli call <server> <tool> '<json>'` | Call tool with arguments        |
+| `mcp-cli grep "<glob>"`                 | Search tools by name            |
+
+**Both formats work:** `info <server> <tool>` or `info <server>/<tool>`
 
-**Add `-d` to include descriptions** (e.g., `mcp-cli filesystem -d`)
+**Add `-d` to include descriptions** (e.g., `mcp-cli info filesystem -d`)
 
 ## Workflow
 
 1. **Discover**: `mcp-cli` → see available servers and tools
-2. **Explore**: `mcp-cli <server>` → see tools with parameters
-3. **Inspect**: `mcp-cli <server>/<tool>` → get full JSON input schema
-4. **Execute**: `mcp-cli <server>/<tool> '<json>'` → run with arguments
+2. **Explore**: `mcp-cli info <server>` → see tools with parameters
+3. **Inspect**: `mcp-cli info <server> <tool>` → get full JSON input schema
+4. **Execute**: `mcp-cli call <server> <tool> '<json>'` → run with arguments
 
 ## Examples
 
@@ -33,33 +75,33 @@ Access MCP servers through the command line. MCP enables interaction with extern
 mcp-cli
 
 # See all tools with parameters
-mcp-cli filesystem
+mcp-cli info filesystem
 
 # With descriptions (more verbose)
-mcp-cli filesystem -d
+mcp-cli info filesystem -d
 
 # Get JSON schema for specific tool
-mcp-cli filesystem/read_file
+mcp-cli info filesystem read_file
 
 # Call the tool
-mcp-cli filesystem/read_file '{"path": "./README.md"}'
+mcp-cli call filesystem read_file '{"path": "./README.md"}'
 
 # Search for tools
 mcp-cli grep "*file*"
 
 # JSON output for parsing
-mcp-cli filesystem/read_file '{"path": "./README.md"}' --json
+mcp-cli call filesystem read_file '{"path": "./README.md"}' -j
 
 # Complex JSON with quotes (use heredoc or stdin)
-mcp-cli server/tool <<EOF
+mcp-cli call server tool <<EOF
 {"content": "Text with 'quotes' inside"}
 EOF
 
 # Or pipe from a file/command
-cat args.json | mcp-cli server/tool
+cat args.json | mcp-cli call server tool
 
 # Find all TypeScript files and read the first one
-mcp-cli filesystem/search_files '{"path": "src/", "pattern": "*.ts"}' --json | jq -r '.content[0].text' | head -1 | xargs -I {} sh -c 'mcp-cli filesystem/read_file "{\"path\": \"{}\"}"'
+mcp-cli call filesystem search_files '{"path": "src/", "pattern": "*.ts"}' -j | jq -r '.content[0].text' | head -1 | xargs -I {} sh -c 'mcp-cli call filesystem read_file "{\"path\": \"{}\"}"'
 ```
 
 ## Options