diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4603025f..8e20cdb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,99 @@
 # Changelog
 
+## [6.0.0-alpha.21]
+
+**Release: December 27, 2025**
+
+### 🌟 Key Highlights
+
+1. **Consistent Menu System**: All agents now use standardized 2-letter menu codes (e.g., "rd" for research, "ca" for create-architecture)
+2. **Planning Artifacts Architecture**: Phase 1-3 workflows now properly segregate planning artifacts from documentation
+3. **Windows Installer Fixed Again**: Updated inquirer to resolve multiselection tool issues
+4. **Auto-Injected Features**: Chat and party mode automatically injected into all agents
+5. **Validation System**: All agents now pass comprehensive new validation checks
+
+### 🎯 Consistent Menu System (Major Feature)
+
+**Standardized 2-Letter Codes:**
+
+- **Compound Menu Triggers**: All agents now use consistent 2-letter compound trigger format (e.g., `bmm-rd`, `bmm-ca`)
+- **Improved UX**: Shorter, more memorable command shortcuts across all modules
+- **Module Prefixing**: Menu items properly scoped by module prefix (bmm-, bmgd-, cis-, bmb-)
+- **Universal Pattern**: All 22 agents updated to follow the same menu structure
+
+**Agent Updates:**
+
+- **BMM Module**: 9 agents with standardized menus (pm, analyst, architect, dev, ux-designer, tech-writer, sm, tea, quick-flow-solo-dev)
+- **BMGD Module**: 6 agents with standardized menus (game-architect, game-designer, game-dev, game-qa, game-scrum-master, game-solo-dev)
+- **CIS Module**: 6 agents with standardized menus (innovation-strategist, design-thinking-coach, creative-problem-solver, brainstorming-coach, presentation-master, storyteller)
+- **BMB Module**: 3 agents with standardized menus (bmad-builder, agent-builder, module-builder, workflow-builder)
+- **Core Module**: BMAD Master agent updated with consistent menu patterns
+
+### 📁 Planning Artifacts Architecture
+
+**Content Segregation Implementation:**
+
+- **Phase 1-3 Workflows**: All planning workflows now use `planning_artifacts` folder (default changed from `docs`)
+- **Proper Input Discovery**: Workflows follow consistent input discovery patterns from planning artifacts
+- **Output Management**: Planning artifacts properly separated from long-term documentation
+- **Affected Workflows**:
+  - Product Brief: Updated discovery and output to planning artifacts
+  - PRD: Fixed discovery and output to planning artifacts
+  - UX Design: Updated all steps for proper artifact handling
+  - Architecture: Updated discovery and output flow
+  - Game Architecture: Updated for planning artifacts
+  - Story Creation: Updated workflow output paths
+
+**File Organization:**
+
+- **Planning Artifacts**: Ephemeral planning documents (prd.md, product-brief.md, ux-design.md, architecture.md)
+- **Documentation**: Long-term project documentation (separate from planning)
+- **Module Configuration**: BMM and BMGD modules updated with proper default paths
+
+### 🪟 Windows Installer Fixes
+
+**Inquirer Multiselection Fix:**
+
+- **Updated Inquirer Version**: Resolved tool multiselection issues that were causing Windows installer failures
+- **Better Compatibility**: Improved handling of checkbox and multi-select prompts on Windows(?)
+
+### 🤖 Agent System Improvements
+
+**Auto-Injected Features:**
+
+- **Chat Mode**: Automatically injected into all agents during compilation
+- **Party Mode**: Automatically injected into all agents during compilation
+- **Reduced Manual Configuration**: No need to manually add these features to agent definitions
+- **Consistent Behavior**: All agents now have uniform access to chat and party mode capabilities
+
+**Agent Normalization:**
+
+- **All Agents Validated**: All 22 agents pass comprehensive validation checks
+- **Schema Enforcement**: Proper compound trigger validation implemented
+- **Metadata Cleanup**: Removed obsolete and inconsistent metadata patterns
+- **Test Fixtures Updated**: Validation test fixtures aligned with new requirements
+
+### 🔧 Bug Fixes & Cleanup
+
+**Docusaurus Merge Recovery:**
+
+- **Restored Agent Files**: Fixed agent files accidentally modified in Docusaurus merge (PR #1191)
+- **Reference Cleanup**: Removed obsolete agent reference examples (journal-keeper, security-engineer, trend-analyst)
+- **Test Fixture Updates**: Aligned test fixtures with current validation requirements
+
+**Code Quality:**
+
+- **Schema Improvements**: Enhanced agent schema validation with better error messages
+- **Removed Redundancy**: Cleaned up duplicate and obsolete agent definitions
+- **Installer Cleanup**: Removed unused configuration code from BMM installer
+
+**Planning Artifacts Path:**
+- Default: `planning_artifacts/` (configurable in module.yaml)
+- Previous: `docs/`
+- Benefit: Clear separation between planning work and permanent documentation
+
+---
+
 ## [6.0.0-alpha.20]
 
 **Release: December 23, 2025**
diff --git a/package.json b/package.json
index a9539a48..90722299 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "bmad-method",
-  "version": "6.0.0-alpha.20",
+  "version": "6.0.0-alpha.21",
   "description": "Breakthrough Method of Agile AI-driven Development",
   "keywords": [
     "agile",
diff --git a/src/modules/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-04-ux-alignment.md b/src/modules/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-04-ux-alignment.md
index e3ddd53b..f531f24a 100644
--- a/src/modules/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-04-ux-alignment.md
+++ b/src/modules/bmm/workflows/3-solutioning/check-implementation-readiness/steps/step-04-ux-alignment.md
@@ -64,8 +64,8 @@ I will:
 
 Search patterns:
 
-- `{output_folder}/*ux*.md` (whole document)
-- `{output_folder}/*ux*/index.md` (sharded)
+- `{planning_artifacts}/*ux*.md` (whole document)
+- `{planning_artifacts}/*ux*/index.md` (sharded)
 - Look for UI-related terms in other documents
 
 ### 3. If UX Document Exists