diff --git a/src/modules/bmb/_module-installer/install-config.yaml b/src/modules/bmb/_module-installer/install-config.yaml
index 1fa6cfc7..44a10a8e 100644
--- a/src/modules/bmb/_module-installer/install-config.yaml
+++ b/src/modules/bmb/_module-installer/install-config.yaml
@@ -17,15 +17,15 @@ subheader: "Configure the settings for the BoMB Factory!\nThe agent, workflow an
 
 custom_agent_location:
   prompt: "Where do custom agents get created?"
-  default: "{bmad_folder}/custom/agents"
+  default: "{bmad_folder}/custom/src/agents"
   result: "{project-root}/{value}"
 
 custom_workflow_location:
   prompt: "Where do custom workflows get stored?"
-  default: "{bmad_folder}/custom/workflows"
+  default: "{bmad_folder}/custom/src/workflows"
   result: "{project-root}/{value}"
 
 custom_module_location:
   prompt: "Where do custom modules get stored?"
-  default: "{bmad_folder}/custom/modules"
+  default: "{bmad_folder}/custom/src/modules"
   result: "{project-root}/{value}"
diff --git a/src/modules/cis/agents/presentation-master.agent.yaml b/src/modules/cis/agents/presentation-master.agent.yaml
index 79b7b7fa..7d5672cf 100644
--- a/src/modules/cis/agents/presentation-master.agent.yaml
+++ b/src/modules/cis/agents/presentation-master.agent.yaml
@@ -4,7 +4,7 @@ agent:
   metadata:
     id: "{bmad_folder}/cis/agents/presentation-master.md"
     name: Caravaggio
-    title: Visual Communication & Presentation Expert
+    title: Visual Communication + Presentation Expert
     icon: 🎨
     module: cis
 
diff --git a/tools/cli/commands/agent-install.js b/tools/cli/commands/agent-install.js
index a9dcb493..031d40c2 100644
--- a/tools/cli/commands/agent-install.js
+++ b/tools/cli/commands/agent-install.js
@@ -82,7 +82,7 @@ module.exports = {
         // Discover agents from custom location
         const customAgentLocation = config.custom_agent_location
           ? resolvePath(config.custom_agent_location, config)
-          : path.join(config.bmadFolder, 'custom', 'agents');
+          : path.join(config.bmadFolder, 'custom', 'src', 'agents');
 
         console.log(chalk.dim(`Searching for agents in: ${customAgentLocation}\n`));
 
diff --git a/tools/cli/installers/lib/core/installer.js b/tools/cli/installers/lib/core/installer.js
index 63a1db20..2bea3cd1 100644
--- a/tools/cli/installers/lib/core/installer.js
+++ b/tools/cli/installers/lib/core/installer.js
@@ -1619,7 +1619,17 @@ class Installer {
         }
       }
 
-      // Regenerate manifests after compilation
+      // Reinstall custom agents from _cfg/custom/agents/ sources
+      spinner.start('Rebuilding custom agents...');
+      const customAgentResults = await this.reinstallCustomAgents(projectDir, bmadDir);
+      if (customAgentResults.count > 0) {
+        spinner.succeed(`Rebuilt ${customAgentResults.count} custom agent${customAgentResults.count > 1 ? 's' : ''}`);
+        agentCount += customAgentResults.count;
+      } else {
+        spinner.succeed('No custom agents found to rebuild');
+      }
+
+      // Regenerate manifests after compilation (including custom agents)
       spinner.start('Regenerating manifests...');
       const installedModules = entries
         .filter((e) => e.isDirectory() && e.name !== '_cfg' && e.name !== 'docs' && e.name !== 'agents' && e.name !== 'core')