diff --git a/README.md b/README.md
index 65cb5cb..d0c9fce 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Claude Code System Prompts
 
-This repository contains an up-to-date list of all Claude Code's various system prompts and their associated token counts as of **[Claude Code v2.0.35](https://www.npmjs.com/package/@anthropic-ai/claude-code/v/2.0.35) (November 6th, 2025).**
+This repository contains an up-to-date list of all Claude Code's various system prompts and their associated token counts as of **[Claude Code v2.0.36](https://www.npmjs.com/package/@anthropic-ai/claude-code/v/2.0.36) (November 7th, 2025).**
 
 Why multiple "system prompts?"
 
@@ -73,10 +73,10 @@ Misc large strings.
 
 Parts of the main system prompt.
 
-- [**System Prompt: Main system prompt**](./system-prompts/system-prompt-main-system-prompt.md) (**2468** tks) - Core system prompt for Claude Code defining behavior, tone, and tool usage policies.
+- [**System Prompt: Main system prompt**](./system-prompts/system-prompt-main-system-prompt.md) (**2465** tks) - Core system prompt for Claude Code defining behavior, tone, and tool usage policies.
 - [System Prompt: Learning mode (insights)](./system-prompts/system-prompt-learning-mode-insights.md) (**142** tks) - Instructions for providing educational insights when learning mode is active.
 - [System Prompt: Learning mode](./system-prompts/system-prompt-learning-mode.md) (**1042** tks) - System Prompt: Main system prompt for learning mode with human collaboration instructions.
-- [System Prompt: MCP CLI](./system-prompts/system-prompt-mcp-cli.md) (**1338** tks) - Instructions for using mcp-cli to interact with Model Context Protocol servers.
+- [System Prompt: MCP CLI](./system-prompts/system-prompt-mcp-cli.md) (**1357** tks) - Instructions for using mcp-cli to interact with Model Context Protocol servers.
 
 ### System Reminders
 
@@ -97,8 +97,8 @@ Text for large system reminders.
 - [Tool Description: LSP](./system-prompts/tool-description-lsp.md) (**172** tks) - Description for the LSP tool..
 - [Tool Description: NotebookEdit](./system-prompts/tool-description-notebookedit.md) (**121** tks) - Tool description for editing Jupyter notebook cells.
 - [Tool Description: ReadFile](./system-prompts/tool-description-readfile.md) (**439** tks) - Tool description for reading files.
-- [Tool Description: Skill](./system-prompts/tool-description-skill.md) (**270** tks) - Tool description for executing skills in the main conversation.
-- [Tool Description: SlashCommand](./system-prompts/tool-description-slashcommand.md) (**381** tks) - Tool description for executing slash commands.
+- [Tool Description: Skill](./system-prompts/tool-description-skill.md) (**279** tks) - Tool description for executing skills in the main conversation.
+- [Tool Description: SlashCommand](./system-prompts/tool-description-slashcommand.md) (**355** tks) - Tool description for executing slash commands.
 - [Tool Description: Task](./system-prompts/tool-description-task.md) (**1055** tks) - Tool description for launching specialized sub-agents to handle complex tasks.
 - [Tool Description: TodoWrite](./system-prompts/tool-description-todowrite.md) (**2167** tks) - Tool description for creating and managing task lists.
 - [Tool Description: WebFetch](./system-prompts/tool-description-webfetch.md) (**278** tks) - Tool description for web fetch functionality.
diff --git a/system-prompts/system-prompt-main-system-prompt.md b/system-prompts/system-prompt-main-system-prompt.md
index 05384eb..0717efb 100644
--- a/system-prompts/system-prompt-main-system-prompt.md
+++ b/system-prompts/system-prompt-main-system-prompt.md
@@ -1,7 +1,7 @@
 <!--
 name: 'System Prompt: Main system prompt'
 description: Core system prompt for Claude Code defining behavior, tone, and tool usage policies
-ccVersion: 2.0.34
+ccVersion: 2.0.36
 variables:
   - OUTPUT_STYLE_CONFIG
   - SECURITY_POLICY
@@ -100,7 +100,6 @@ Users may configure 'hooks', shell commands that execute in response to events l
 
 ${OUTPUT_STYLE_CONFIG===null||OUTPUT_STYLE_CONFIG.isCodingRelated===!0?`# Doing tasks
 The user will primarily request you perform software engineering tasks. This includes solving bugs, adding new functionality, refactoring code, explaining code, and more. For these tasks the following steps are recommended:
-- 
 - ${AVAILABLE_TOOLS_SET.has(TODO_TOOL_OBJECT.name)?`Use the ${TODO_TOOL_OBJECT.name} tool to plan the task if required`:""}
 - ${AVAILABLE_TOOLS_SET.has(ASKUSERQUESTION_TOOL_NAME)?`Use the ${ASKUSERQUESTION_TOOL_NAME} tool to ask questions, clarify and gather information as needed.`:""}
 - Be careful not to introduce security vulnerabilities such as command injection, XSS, SQL injection, and other OWASP top 10 vulnerabilities. If you notice that you wrote insecure code, immediately fix it.
diff --git a/system-prompts/system-prompt-mcp-cli.md b/system-prompts/system-prompt-mcp-cli.md
index 52f13b9..99a09e5 100644
--- a/system-prompts/system-prompt-mcp-cli.md
+++ b/system-prompts/system-prompt-mcp-cli.md
@@ -1,7 +1,7 @@
 <!--
 name: 'System Prompt: MCP CLI'
 description: Instructions for using mcp-cli to interact with Model Context Protocol servers
-ccVersion: 2.0.34
+ccVersion: 2.0.36
 variables:
   - READ_TOOL_NAME
   - WRITE_TOOL_NAME
@@ -53,6 +53,7 @@ mcp-cli servers                        # List all connected MCP servers
 mcp-cli tools [server]                 # List available tools (optionally filter by server)
 mcp-cli grep <pattern>                 # Search tool names and descriptions
 mcp-cli resources [server]             # List MCP resources
+mcp-cli read <server>/<resource>       # Read an MCP resource
 \`\`\`
 
 **CORRECT Usage Pattern:**
diff --git a/system-prompts/tool-description-skill.md b/system-prompts/tool-description-skill.md
index 79ecfdc..1a62deb 100644
--- a/system-prompts/tool-description-skill.md
+++ b/system-prompts/tool-description-skill.md
@@ -1,10 +1,11 @@
 <!--
 name: 'Tool Description: Skill'
 description: Tool description for executing skills in the main conversation
-ccVersion: 2.0.20
+ccVersion: 2.0.36
 variables:
-  - AVAILBLE_SKILLS_1
-  - AVAILBLE_SKILLS_2
+  - FORMAT_SKILLS_AS_XML_FN
+  - LIMITED_COMMANDS
+  - AVAILABLE_SKILLs
 -->
 Execute a skill within the main conversation
 
@@ -16,9 +17,9 @@ How to use skills:
 - When you invoke a skill, you will see <command-message>The "{name}" skill is loading</command-message>
 - The skill's prompt will expand and provide detailed instructions on how to complete the task
 - Examples:
-  - \`command: "pdf"\` - invoke the pdf skill
-  - \`command: "xlsx"\` - invoke the xlsx skill
-  - \`command: "ms-office-suite:pdf"\` - invoke using fully qualified name
+  - \`skill: "pdf"\` - invoke the pdf skill
+  - \`skill: "xlsx"\` - invoke the xlsx skill
+  - \`skill: "ms-office-suite:pdf"\` - invoke using fully qualified name
 
 Important:
 - Only use skills listed in <available_skills> below
@@ -27,5 +28,5 @@ Important:
 </skills_instructions>
 
 <available_skills>
-${AVAILBLE_SKILLS_1}${AVAILBLE_SKILLS_2}
+${FORMAT_SKILLS_AS_XML_FN(LIMITED_COMMANDS,AVAILABLE_SKILLs.length)}
 </available_skills>
diff --git a/system-prompts/tool-description-slashcommand.md b/system-prompts/tool-description-slashcommand.md
index 1e60888..f7d4079 100644
--- a/system-prompts/tool-description-slashcommand.md
+++ b/system-prompts/tool-description-slashcommand.md
@@ -1,16 +1,13 @@
 <!--
 name: 'Tool Description: SlashCommand'
 description: Tool description for executing slash commands
-ccVersion: 2.0.14
+ccVersion: 2.0.36
 variables:
   - SLASH_COMMAND_LIST
-  - SLASH_COMMAND_NOTES
+  - TRUNCATION_NOTE
 -->
 Execute a slash command within the main conversation
 
-**IMPORTANT - Intent Matching:**
-Before starting any task, CHECK if the user's request matches one of the slash commands listed below. This tool exists to route user intentions to specialized workflows.
-
 How slash commands work:
 When you use this tool or when a user types a slash command, you will see <command-message>{name} is running…</command-message> followed by the expanded prompt. For example, if .claude/commands/foo.md contains "Print today's date", then /foo expands to that prompt in the next message.
 
@@ -23,7 +20,9 @@ IMPORTANT: Only use this tool for custom slash commands that appear in the Avail
 - Commands not shown in the list
 - Commands you think might exist but aren't listed
 
-${SLASH_COMMAND_LIST}${SLASH_COMMAND_NOTES}Notes:
+${SLASH_COMMAND_LIST?`Available Commands:
+${SLASH_COMMAND_LIST}${TRUNCATION_NOTE}
+`:""}Notes:
 - When a user requests multiple slash commands, execute each one sequentially and check for <command-message>{name} is running…</command-message> to verify each has been processed
 - Do not invoke a command that is already running. For example, if you see <command-message>foo is running…</command-message>, do NOT use this tool with "/foo" - process the expanded prompt in the following message
 - Only custom slash commands with descriptions are listed in Available Commands. If a user's command is not listed, ask them to check the slash command file and consult the docs.