diff --git a/.changeset/config.json b/.changeset/config.json
index a1e6e616e..4c1c9d360 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -12,8 +12,18 @@
   "access": "public",
   "baseBranch": "master",
   "updateInternalDependencies": "patch",
-  "ignore": [
-    "@openzeppelin/wizard-cairo-alpha",
-    "ui"
-  ]
+  "privatePackages": {
+    "version": true,
+    "tag": false
+  },
+  "changedFilePatterns": [
+    "**",
+    "!src/cairo_alpha/**",
+    "!src/polkadot/**",
+    "!api/**",
+    "!public/**",
+    "!scripts/deno/**",
+    "!src/**/App.svelte"
+  ],
+  "ignore": ["@openzeppelin/wizard-cairo-alpha"]
 }
diff --git a/.claude/skills/changeset/SKILL.md b/.claude/skills/changeset/SKILL.md
index 8180602a1..46ee76dfa 100644
--- a/.claude/skills/changeset/SKILL.md
+++ b/.claude/skills/changeset/SKILL.md
@@ -30,6 +30,7 @@ First line is a high-level summary without leading dash (PR number gets appended
 5. **Multiple packages**: Multiple packages can share a changeset file with different bump levels in the frontmatter. Use separate files only when packages need unrelated descriptions.
 6. **Bump levels**: Follow semver based on current package version. `x.y.z` (>=1.0.0): major for breaking, minor for features, patch for fixes. `0.x.y`: minor for breaking, patch for features/fixes. `0.0.x`: patch for everything.
 7. **New unpublished packages**: Still need a changeset to bump the initial version in package.json and for the changes to appear in the resulting changelog.
+8. **UI that ships in MCP Apps**: `ui` is private (versioned in-repo, not published to npm). MCP App HTML is built from `ui` when `@openzeppelin/contracts-mcp` is published. Changes to Wizard controls or other UI that ships in MCP Apps need **one changeset listing both** `ui` and `@openzeppelin/contracts-mcp`. Web-only UI (Cairo Alpha, Polkadot, `App.svelte`) does not need a changeset. Never version `ui` in a changeset without also listing `@openzeppelin/contracts-mcp`.
 
 ## Steps
 
diff --git a/.github/workflows/changeset.yml b/.github/workflows/changeset.yml
index 4a4ecac92..ea900ab32 100644
--- a/.github/workflows/changeset.yml
+++ b/.github/workflows/changeset.yml
@@ -26,3 +26,5 @@ jobs:
         uses: ./.github/actions/setup
       - name: Check changeset
         run: npx changeset status --since=origin/${{ github.base_ref }}
+      - name: Check UI changesets include contracts-mcp
+        run: node scripts/release/check-mcp-ui-changeset.mjs origin/${{ github.base_ref }}
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
index bad20d1a0..ae826ecef 100644
--- a/.github/workflows/version.yml
+++ b/.github/workflows/version.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - master
+    # Skip pushes that only affect the Netlify UI deployment. If changes affect
+    # contract-specific controls which are part of the packaged HTML files for MCP Apps,
+    # those PRs also add a .changeset file, so this workflow still runs.
     paths-ignore:
       - 'packages/ui/**'
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4c9829099..a07a31754 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -96,5 +96,8 @@ From the `packages/mcp` directory:
 As a contributor, we ask that you fork this repository, work on your own fork and then submit pull requests. The pull requests will be reviewed and eventually merged into the main repo. See ["Fork-a-Repo"](https://help.github.com/articles/fork-a-repo/) for how this works.
 
 ### Adding Changesets
-If your PR modifies code generation logic under `packages/core`, you will need to add changesets for the relevant packages to summarize the changes. The PR's `Changeset` GitHub check will give an error if this condition is not satisfied.
+Published packages (`packages/core/*`, `packages/common`, `packages/cli`, `packages/mcp`) use [Changesets](https://github.com/changesets/changesets) for versioning. The PR's `Changeset` GitHub check fails when a changed publishable package has no changeset. Use the `ignore-changeset` label only when a bump is genuinely not needed.
+
+The `ui` package is private (Netlify + MCP App source) and is versioned in-repo but not published. MCP App HTML is built from `ui` when `@openzeppelin/contracts-mcp` is published. If your PR changes Wizard controls or other UI that ships in MCP Apps, add **one changeset that lists both** `ui` and `@openzeppelin/contracts-mcp`. Web-only UI (for example Cairo Alpha, Polkadot, or the web Wizard `App.svelte` shells) does not require a changeset.
+
 - To add a changeset: from the root directory, run `yarn changeset`
diff --git a/package.json b/package.json
index 7ce24e546..6ad086e74 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.1",
     "@changesets/cli": "^2.29.2",
+    "@changesets/read": "^0.6.5",
     "@eslint/js": "^9.21.0",
     "concurrently": "^9.1.2",
     "eslint": "^9.33.0",
@@ -49,4 +50,3 @@
     "typescript-eslint": "^8.29.0"
   }
 }
-
diff --git a/packages/cli/src/cli.test.ts.md b/packages/cli/src/cli.test.ts.md
index 0b67d12f7..0563ba4fd 100644
--- a/packages/cli/src/cli.test.ts.md
+++ b/packages/cli/src/cli.test.ts.md
@@ -53,7 +53,7 @@ Generated by [AVA](https://avajs.dev).
       --permit                              Whether without paying gas, token holders will be able to allow third parties to transfer from their account.␊
       --votes <blocknumber|timestamp>       Whether to keep track of historical balances for voting in on-chain governance. Voting durations can be expressed as block numbers or timestamps.␊
       --flashmint                           Whether to include built-in flash loans to allow lending tokens without requiring collateral as long as they're returned in the same transaction.␊
-      --crossChainBridging <custom|erc7786native|superchain>  Whether to allow authorized bridge contracts to mint and burn tokens for cross-chain transfers. Options are to use custom bridges on any chain, to embed an ERC-7786 based bridge directly in the token contract, or to use the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.␊
+      --crossChainBridging <custom|erc7786native|superchain>  Whether to allow authorized bridge contracts to mint and burn tokens for crosschain transfers. Options are to use custom bridges on any chain, to embed an ERC-7786 based bridge directly in the token contract, or to use the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.␊
       --crossChainLinkAllowOverride         Whether to allow replacing a crosschain link that has already been registered. Only used if crossChainBridging is set to "erc7786native".␊
       --namespacePrefix <string>            The prefix for ERC-7201 namespace identifiers. It should be derived from the project name or a unique naming convention specific to the project. Used only if the contract includes storage variables and upgradeability is enabled. Default is "myProject".␊
       --access <ownable|roles|managed>      The type of access control to provision. Ownable is a simple mechanism with a single account authorized for all privileged actions. Roles is a flexible mechanism with a separate role for each privileged action. A role can have many authorized accounts. Managed enables a central contract to define a policy that allows certain callers to access certain functions.␊
@@ -81,7 +81,7 @@ Generated by [AVA](https://avajs.dev).
       --mintable                            Whether privileged accounts will be able to create more supply or emit more tokens␊
       --incremental                         Whether new tokens will be automatically assigned an incremental id␊
       --votes <blocknumber|timestamp>       Whether to keep track of individual units for voting in on-chain governance. Voting durations can be expressed as block numbers or timestamps (defaulting to block number if not specified).␊
-      --crossChainBridging <erc7786native>  Whether to embed an ERC-7786 based bridge directly in the token contract, making it natively crosschain. Cross-chain transfers with registered counterparts burn the token on the source chain and mint it on the destination chain. If also using incremental token ids, mint only on a single chain and link counterparts without minting, otherwise colliding ids can strand bridged tokens.␊
+      --crossChainBridging <erc7786native>  Whether to embed an ERC-7786 based bridge directly in the token contract, making it natively crosschain. Crosschain transfers with registered counterparts burn the token on the source chain and mint it on the destination chain. If also using incremental token ids, mint only on a single chain and link counterparts without minting, otherwise colliding ids can strand bridged tokens.␊
       --crossChainLinkAllowOverride         Whether to allow replacing a crosschain link that has already been registered. Only used if crossChainBridging is set to "erc7786native".␊
       --access <ownable|roles|managed>      The type of access control to provision. Ownable is a simple mechanism with a single account authorized for all privileged actions. Roles is a flexible mechanism with a separate role for each privileged action. A role can have many authorized accounts. Managed enables a central contract to define a policy that allows certain callers to access certain functions.␊
       --upgradeable <transparent|uups>      Whether the smart contract is upgradeable. Transparent uses more complex proxy with higher overhead, requires less changes in your contract. Can also be used with beacons. UUPS uses simpler proxy with less overhead, requires including extra code in your contract. Allows flexibility for authorizing upgrades.␊
@@ -106,7 +106,7 @@ Generated by [AVA](https://avajs.dev).
       --mintable                            Whether privileged accounts will be able to create more supply or emit more tokens␊
       --supply                              Whether to keep track of total supply of tokens␊
       --updatableUri                        Whether privileged accounts will be able to set a new URI for all token types␊
-      --crossChainBridging <erc7786native>  Whether to embed an ERC-7786 based bridge directly in the token contract, making it natively crosschain. Cross-chain transfers with registered counterparts burn the tokens on the source chain and mint them on the destination chain.␊
+      --crossChainBridging <erc7786native>  Whether to embed an ERC-7786 based bridge directly in the token contract, making it natively crosschain. Crosschain transfers with registered counterparts burn the tokens on the source chain and mint them on the destination chain.␊
       --crossChainLinkAllowOverride         Whether to allow replacing a crosschain link that has already been registered. Only used if crossChainBridging is set to "erc7786native".␊
       --access <ownable|roles|managed>      The type of access control to provision. Ownable is a simple mechanism with a single account authorized for all privileged actions. Roles is a flexible mechanism with a separate role for each privileged action. A role can have many authorized accounts. Managed enables a central contract to define a policy that allows certain callers to access certain functions.␊
       --upgradeable <transparent|uups>      Whether the smart contract is upgradeable. Transparent uses more complex proxy with higher overhead, requires less changes in your contract. Can also be used with beacons. UUPS uses simpler proxy with less overhead, requires including extra code in your contract. Allows flexibility for authorizing upgrades.␊
@@ -135,7 +135,7 @@ Generated by [AVA](https://avajs.dev).
       --permit                              Whether without paying gas, token holders will be able to allow third parties to transfer from their account.␊
       --votes <blocknumber|timestamp>       Whether to keep track of historical balances for voting in on-chain governance. Voting durations can be expressed as block numbers or timestamps.␊
       --flashmint                           Whether to include built-in flash loans to allow lending tokens without requiring collateral as long as they're returned in the same transaction.␊
-      --crossChainBridging <custom|erc7786native|superchain>  Whether to allow authorized bridge contracts to mint and burn tokens for cross-chain transfers. Options are to use custom bridges on any chain, to embed an ERC-7786 based bridge directly in the token contract, or to use the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.␊
+      --crossChainBridging <custom|erc7786native|superchain>  Whether to allow authorized bridge contracts to mint and burn tokens for crosschain transfers. Options are to use custom bridges on any chain, to embed an ERC-7786 based bridge directly in the token contract, or to use the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.␊
       --crossChainLinkAllowOverride         Whether to allow replacing a crosschain link that has already been registered. Only used if crossChainBridging is set to "erc7786native".␊
       --namespacePrefix <string>            The prefix for ERC-7201 namespace identifiers. It should be derived from the project name or a unique naming convention specific to the project. Used only if the contract includes storage variables and upgradeability is enabled. Default is "myProject".␊
       --access <ownable|roles|managed>      The type of access control to provision. Ownable is a simple mechanism with a single account authorized for all privileged actions. Roles is a flexible mechanism with a separate role for each privileged action. A role can have many authorized accounts. Managed enables a central contract to define a policy that allows certain callers to access certain functions.␊
@@ -166,7 +166,7 @@ Generated by [AVA](https://avajs.dev).
       --permit                              Whether without paying gas, token holders will be able to allow third parties to transfer from their account.␊
       --votes <blocknumber|timestamp>       Whether to keep track of historical balances for voting in on-chain governance. Voting durations can be expressed as block numbers or timestamps.␊
       --flashmint                           Whether to include built-in flash loans to allow lending tokens without requiring collateral as long as they're returned in the same transaction.␊
-      --crossChainBridging <custom|erc7786native|superchain>  Whether to allow authorized bridge contracts to mint and burn tokens for cross-chain transfers. Options are to use custom bridges on any chain, to embed an ERC-7786 based bridge directly in the token contract, or to use the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.␊
+      --crossChainBridging <custom|erc7786native|superchain>  Whether to allow authorized bridge contracts to mint and burn tokens for crosschain transfers. Options are to use custom bridges on any chain, to embed an ERC-7786 based bridge directly in the token contract, or to use the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.␊
       --crossChainLinkAllowOverride         Whether to allow replacing a crosschain link that has already been registered. Only used if crossChainBridging is set to "erc7786native".␊
       --namespacePrefix <string>            The prefix for ERC-7201 namespace identifiers. It should be derived from the project name or a unique naming convention specific to the project. Used only if the contract includes storage variables and upgradeability is enabled. Default is "myProject".␊
       --access <ownable|roles|managed>      The type of access control to provision. Ownable is a simple mechanism with a single account authorized for all privileged actions. Roles is a flexible mechanism with a separate role for each privileged action. A role can have many authorized accounts. Managed enables a central contract to define a policy that allows certain callers to access certain functions.␊
diff --git a/packages/cli/src/cli.test.ts.snap b/packages/cli/src/cli.test.ts.snap
index d947d2712..3f2666151 100644
Binary files a/packages/cli/src/cli.test.ts.snap and b/packages/cli/src/cli.test.ts.snap differ
diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
index 73d3c1d11..796ea5554 100644
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
 
+## 0.5.5 (2026-08-07)
+
+- Standardize crosschain terminology in user-facing text. ([#840](https://github.com/OpenZeppelin/contracts-wizard/pull/840))
+
 ## 0.5.4 (2026-07-31)
 
 - Add Solidity cross-chain options for ERC721, ERC1155, and Governor using OpenZeppelin Contracts 5.7. ([#825](https://github.com/OpenZeppelin/contracts-wizard/pull/825))
diff --git a/packages/common/package.json b/packages/common/package.json
index 5734fb178..913821c05 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-common",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Common library for OpenZeppelin Contracts Wizard components. Used internally.",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
@@ -34,7 +34,7 @@
     "zod": "^4.0"
   },
   "devDependencies": {
-    "@openzeppelin/wizard": "^0.10.12",
+    "@openzeppelin/wizard": "^0.10.13",
     "@openzeppelin/wizard-cairo": "^3.0.0",
     "@openzeppelin/wizard-stellar": "^0.6.3",
     "@openzeppelin/wizard-stylus": "^0.3.0",
diff --git a/packages/common/src/ai/descriptions/solidity.ts b/packages/common/src/ai/descriptions/solidity.ts
index 19504ad32..d176019bc 100644
--- a/packages/common/src/ai/descriptions/solidity.ts
+++ b/packages/common/src/ai/descriptions/solidity.ts
@@ -36,7 +36,7 @@ export const solidityERC20Descriptions = {
   flashmint:
     "Whether to include built-in flash loans to allow lending tokens without requiring collateral as long as they're returned in the same transaction.",
   crossChainBridging:
-    'Whether to allow authorized bridge contracts to mint and burn tokens for cross-chain transfers. Options are to use custom bridges on any chain, to embed an ERC-7786 based bridge directly in the token contract, or to use the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.',
+    'Whether to allow authorized bridge contracts to mint and burn tokens for crosschain transfers. Options are to use custom bridges on any chain, to embed an ERC-7786 based bridge directly in the token contract, or to use the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.',
   crossChainLinkAllowOverride: crossChainLinkAllowOverrideDescription,
   premintChainId: 'The chain ID of the network on which to premint tokens.',
   callback:
@@ -52,7 +52,7 @@ export const solidityERC721Descriptions = {
   votes:
     'Whether to keep track of individual units for voting in on-chain governance. Voting durations can be expressed as block numbers or timestamps (defaulting to block number if not specified).',
   crossChainBridging:
-    'Whether to embed an ERC-7786 based bridge directly in the token contract, making it natively crosschain. Cross-chain transfers with registered counterparts burn the token on the source chain and mint it on the destination chain. If also using incremental token ids, mint only on a single chain and link counterparts without minting, otherwise colliding ids can strand bridged tokens.',
+    'Whether to embed an ERC-7786 based bridge directly in the token contract, making it natively crosschain. Crosschain transfers with registered counterparts burn the token on the source chain and mint it on the destination chain. If also using incremental token ids, mint only on a single chain and link counterparts without minting, otherwise colliding ids can strand bridged tokens.',
   crossChainLinkAllowOverride: crossChainLinkAllowOverrideDescription,
 };
 
@@ -61,7 +61,7 @@ export const solidityERC1155Descriptions = {
   supply: 'Whether to keep track of total supply of tokens',
   updatableUri: 'Whether privileged accounts will be able to set a new URI for all token types',
   crossChainBridging:
-    'Whether to embed an ERC-7786 based bridge directly in the token contract, making it natively crosschain. Cross-chain transfers with registered counterparts burn the tokens on the source chain and mint them on the destination chain.',
+    'Whether to embed an ERC-7786 based bridge directly in the token contract, making it natively crosschain. Crosschain transfers with registered counterparts burn the tokens on the source chain and mint them on the destination chain.',
   crossChainLinkAllowOverride: crossChainLinkAllowOverrideDescription,
 };
 
diff --git a/packages/core/solidity/CHANGELOG.md b/packages/core/solidity/CHANGELOG.md
index eadb312c4..175bf0b25 100644
--- a/packages/core/solidity/CHANGELOG.md
+++ b/packages/core/solidity/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
 
+## 0.10.13 (2026-08-07)
+
+- Standardize crosschain terminology in user-facing text. ([#840](https://github.com/OpenZeppelin/contracts-wizard/pull/840))
+
 ## 0.10.12 (2026-07-31)
 
 - Add Solidity cross-chain options for ERC721, ERC1155, and Governor using OpenZeppelin Contracts 5.7. ([#825](https://github.com/OpenZeppelin/contracts-wizard/pull/825))
diff --git a/packages/core/solidity/package.json b/packages/core/solidity/package.json
index 3252652fb..ddd9086e6 100644
--- a/packages/core/solidity/package.json
+++ b/packages/core/solidity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard",
-  "version": "0.10.12",
+  "version": "0.10.13",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
diff --git a/packages/core/solidity/src/erc20.test.ts b/packages/core/solidity/src/erc20.test.ts
index 51690d840..99c533077 100644
--- a/packages/core/solidity/src/erc20.test.ts
+++ b/packages/core/solidity/src/erc20.test.ts
@@ -300,7 +300,7 @@ test('erc20 crossChainBridging superchain, premintChainId required', async t =>
   );
   t.is(
     (error as OptionsError).messages.premintChainId,
-    'Chain ID is required when using Premint with Cross-Chain Bridging',
+    'Chain ID is required when using Premint with Crosschain Bridging',
   );
 });
 
diff --git a/packages/core/solidity/src/erc20.ts b/packages/core/solidity/src/erc20.ts
index 0e3055dbb..b4b070826 100644
--- a/packages/core/solidity/src/erc20.ts
+++ b/packages/core/solidity/src/erc20.ts
@@ -273,7 +273,7 @@ function addPremint(
   if (crossChainBridging) {
     if (premintChainId === '') {
       throw new OptionsError({
-        premintChainId: 'Chain ID is required when using Premint with Cross-Chain Bridging',
+        premintChainId: 'Chain ID is required when using Premint with Crosschain Bridging',
       });
     }
 
diff --git a/packages/mcp/CHANGELOG.md b/packages/mcp/CHANGELOG.md
index 8564b8a27..24548b021 100644
--- a/packages/mcp/CHANGELOG.md
+++ b/packages/mcp/CHANGELOG.md
@@ -1,6 +1,24 @@
 # Changelog
 
 
+## 0.6.3 (2026-08-07)
+
+- Standardize crosschain terminology in user-facing text. ([#840](https://github.com/OpenZeppelin/contracts-wizard/pull/840))
+- Updated dependencies [[`2c2d516`](https://github.com/OpenZeppelin/contracts-wizard/commit/2c2d5165d9b6fda16a1415cedc0e9ac065adcfa9)]:
+  - @openzeppelin/wizard-common@0.5.5
+  - @openzeppelin/wizard@0.10.13
+
+## 0.6.2 (2026-08-07)
+
+- Shrink MCP App package size by sharing one HTML template per language. ([#838](https://github.com/OpenZeppelin/contracts-wizard/pull/838))
+  - Inject contract kind at serve time instead of shipping near-duplicate HTML per tool.
+  - Scope MCP App Tailwind content away from web-only Wizard shells.
+  - Bundle the Zama logo so it renders in self-contained MCP Apps.
+
+## 0.6.1 (2026-08-05)
+
+- Fix Governor Cross-Chain Execution appearing as an empty dropdown in the MCP App UI. ([#836](https://github.com/OpenZeppelin/contracts-wizard/pull/836))
+
 ## 0.6.0 (2026-07-31)
 
 - **Breaking changes**: Renamed the `erc7984` tool to `confidential-erc7984`. ([#828](https://github.com/OpenZeppelin/contracts-wizard/pull/828))
diff --git a/packages/mcp/package.json b/packages/mcp/package.json
index a4e19de7f..676c5262a 100644
--- a/packages/mcp/package.json
+++ b/packages/mcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/contracts-mcp",
-  "version": "0.6.0",
+  "version": "0.6.3",
   "description": "OpenZeppelin Contracts MCP Server",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@openzeppelin/wizard-common": "^0.5.4",
-    "@openzeppelin/wizard": "^0.10.12",
+    "@openzeppelin/wizard-common": "^0.5.5",
+    "@openzeppelin/wizard": "^0.10.13",
     "@openzeppelin/wizard-stylus": "^0.3.0",
     "@openzeppelin/wizard-stellar": "^0.6.3",
     "@openzeppelin/wizard-cairo": "^3.0.0",
diff --git a/packages/mcp/src/apps/register.test.ts b/packages/mcp/src/apps/register.test.ts
index 50abbf98e..f8df848cf 100644
--- a/packages/mcp/src/apps/register.test.ts
+++ b/packages/mcp/src/apps/register.test.ts
@@ -1,7 +1,16 @@
 import test from 'ava';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { testMcpInfo } from '../helpers.test';
-import { appResourceUri, readAppHtml, registerWizardAppTool, RESOURCE_MIME_TYPE, wizardAppResult } from './register';
+import {
+  appResourceUri,
+  getToolAppSpec,
+  MCP_KIND_PLACEHOLDER,
+  readAppHtml,
+  registerWizardAppTool,
+  RESOURCE_MIME_TYPE,
+  TOOL_APP_SPECS,
+  wizardAppResult,
+} from './register';
 import { registerSolidityERC20 } from '../solidity/tools/erc20';
 
 test('solidity-erc20 registers UI metadata', t => {
@@ -12,25 +21,42 @@ test('solidity-erc20 registers UI metadata', t => {
   t.is(tool._meta?.['ui/resourceUri'], appResourceUri('solidity-erc20'));
 });
 
-test('MCP App HTML artifacts exist for Wizard-backed tools', async t => {
-  // One tool per language; registerWizardAppTool fails closed for the rest at server start.
-  const tools = [
-    'solidity-erc20',
-    'solidity-erc721',
-    'cairo-erc20',
-    'stellar-fungible',
-    'stylus-erc20',
-    'confidential-erc7984',
-    'uniswap-hooks',
-  ];
+test('TOOL_APP_SPECS entries have distinct per-tool URIs and known overrides', t => {
+  const tools = Object.keys(TOOL_APP_SPECS);
+  t.true(tools.length >= 26, `expected at least 26 tools, got ${tools.length}`);
   for (const tool of tools) {
+    const spec = getToolAppSpec(tool);
+    t.truthy(spec.template, `${tool} missing template`);
+    t.truthy(spec.kind, `${tool} missing kind`);
+    t.is(appResourceUri(tool), `ui://openzeppelin/${tool}.html`);
+  }
+  t.is(TOOL_APP_SPECS['solidity-rwa']?.kind, 'RealWorldAsset');
+  t.is(TOOL_APP_SPECS['uniswap-hooks']?.kind, 'Hooks');
+});
+
+test('MCP App HTML artifacts exist and inject kind for Wizard-backed tools', async t => {
+  const tools = Object.keys(TOOL_APP_SPECS).sort();
+  for (const tool of tools) {
+    const spec = getToolAppSpec(tool);
     const html = await readAppHtml(tool);
     t.true(html.includes('<!DOCTYPE html>'), `${tool} missing doctype`);
     t.true(html.includes('<script>'), `${tool} missing script`);
     t.true(html.length > 10_000, `${tool} HTML unexpectedly small`);
+    t.false(html.includes(MCP_KIND_PLACEHOLDER), `${tool} still contains kind placeholder`);
+    t.true(html.includes(spec.kind), `${tool} missing injected kind ${spec.kind}`);
   }
 });
 
+test('kind injection differentiates tools that share a language template', async t => {
+  const erc20 = await readAppHtml('solidity-erc20');
+  const erc721 = await readAppHtml('solidity-erc721');
+  t.not(erc20, erc721, 'shared language template must produce distinct per-tool HTML after kind inject');
+  t.false(erc20.includes(MCP_KIND_PLACEHOLDER));
+  t.false(erc721.includes(MCP_KIND_PLACEHOLDER));
+  // Kind names also appear as Controls keys in the full language bundle; the mount argument is what differs.
+  t.true(Math.abs(erc20.length - erc721.length) < 32, 'injected HTML should only differ by kind string length');
+});
+
 /**
  * Guards the two properties the hosted server depends on. mcp.openzeppelin.com consumes this
  * package as a library, so one long-lived process serves many sessions: the read must not block
@@ -50,14 +76,24 @@ test('RESOURCE_MIME_TYPE is the MCP Apps profile', t => {
   t.is(RESOURCE_MIME_TYPE, 'text/html;profile=mcp-app');
 });
 
-test('missing App HTML fails closed with build:apps guidance', t => {
+test('kind placeholder stays in sync across mcp, ui, and packaging script', async t => {
+  const { readFile } = await import('fs/promises');
+  const { join } = await import('path');
+  const uiPlaceholderSrc = await readFile(join(__dirname, '../../../ui/src/mcp-apps/kind-placeholder.ts'), 'utf-8');
+  const packageScript = await readFile(join(__dirname, '../../../ui/scripts/package-mcp-apps.mjs'), 'utf-8');
+  const assignment = new RegExp(`MCP_KIND_PLACEHOLDER\\s*=\\s*'${MCP_KIND_PLACEHOLDER}'`);
+  t.regex(uiPlaceholderSrc, assignment);
+  t.regex(packageScript, assignment);
+});
+
+test('missing App mapping fails closed with guidance', t => {
   const err = t.throws(() => readAppHtml('definitely-missing-tool-xyz'));
   t.true(err instanceof Error);
-  t.regex((err as Error).message, /MCP App HTML missing/);
-  t.regex((err as Error).message, /build:apps/);
+  t.regex((err as Error).message, /MCP App mapping missing/);
+  t.regex((err as Error).message, /TOOL_APP_SPECS|build:apps/);
 });
 
-test('registerWizardAppTool fails closed when HTML missing', t => {
+test('registerWizardAppTool fails closed when mapping missing', t => {
   const server = new McpServer(testMcpInfo);
   const err = t.throws(() =>
     registerWizardAppTool(
@@ -73,8 +109,7 @@ test('registerWizardAppTool fails closed when HTML missing', t => {
     ),
   );
   t.true(err instanceof Error);
-  t.regex((err as Error).message, /MCP App HTML missing/);
-  t.regex((err as Error).message, /build:apps/);
+  t.regex((err as Error).message, /MCP App mapping missing/);
 });
 
 test('wizardAppResult sets top-level isError on failure', t => {
@@ -88,3 +123,27 @@ test('wizardAppResult sets top-level isError on failure', t => {
   t.is(fail.structuredContent.code, undefined);
   t.is(fail.structuredContent.error, 'bad options');
 });
+
+/**
+ * Live registry check via compiled createServer (ava/ts-node cannot load server.ts .js imports).
+ * Ensures every mapped tool got registerWizardAppTool UI metadata and a registered UI resource
+ * (not a bare registerTool with hand-copied _meta).
+ */
+test('createServer wires MCP App UI metadata for every TOOL_APP_SPECS tool', t => {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports -- ava/ts-node cannot load server.ts .js imports
+  const { createServer } = require('../../dist/server.js') as { createServer: () => McpServer };
+  const server = createServer();
+  const { _registeredTools: tools, _registeredResources: resources } = server as unknown as {
+    _registeredTools: Record<string, { _meta?: { ui?: { resourceUri?: string }; [key: string]: unknown } }>;
+    _registeredResources: Record<string, unknown>;
+  };
+
+  for (const toolName of Object.keys(TOOL_APP_SPECS)) {
+    const tool = tools[toolName];
+    const uri = appResourceUri(toolName);
+    t.truthy(tool, `createServer did not register '${toolName}'`);
+    t.is(tool!._meta?.ui?.resourceUri, uri, `${toolName} missing UI resourceUri`);
+    t.is(tool!._meta?.['ui/resourceUri'], uri, `${toolName} missing ui/resourceUri`);
+    t.true(uri in resources, `${toolName} advertises ${uri} but createServer did not registerResource that URI`);
+  }
+});
diff --git a/packages/mcp/src/apps/register.ts b/packages/mcp/src/apps/register.ts
index dc1d9db0a..98717ae42 100644
--- a/packages/mcp/src/apps/register.ts
+++ b/packages/mcp/src/apps/register.ts
@@ -11,29 +11,115 @@ const RESOURCE_URI_META_KEY = 'ui/resourceUri';
 
 const APPS_DIR = path.join(__dirname, '..', '..', 'apps');
 
+/**
+ * Kind placeholder baked into language HTML templates by the UI build.
+ * Duplicated in packages/ui (kind-placeholder.ts, package-mcp-apps.mjs); kept aligned by
+ * `kind placeholder stays in sync` in register.test.ts.
+ */
+export const MCP_KIND_PLACEHOLDER = '__OZ_MCP_KIND__';
+export type AppTemplate = 'solidity' | 'cairo' | 'stellar' | 'stylus' | 'confidential' | 'uniswap-hooks';
+
+export type ToolAppSpec = {
+  template: AppTemplate;
+  kind: string;
+};
+
+/**
+ * Exhaustive tool → language template + kind map.
+ * Kept in lockstep with packages/core kinds by `TOOL_APP_SPECS matches every core kind and UI language entry`
+ * in server.test.ts — do not add tools here without that test (and the UI entries/<language>.ts) passing.
+ * Overrides match MCP_TOOL_NAME_OVERRIDES in server.test.ts: solidity-rwa ← RealWorldAsset, uniswap-hooks ← Hooks.
+ */
+export const TOOL_APP_SPECS: Readonly<Record<string, ToolAppSpec>> = {
+  'solidity-erc20': { template: 'solidity', kind: 'ERC20' },
+  'solidity-erc721': { template: 'solidity', kind: 'ERC721' },
+  'solidity-erc1155': { template: 'solidity', kind: 'ERC1155' },
+  'solidity-stablecoin': { template: 'solidity', kind: 'Stablecoin' },
+  'solidity-rwa': { template: 'solidity', kind: 'RealWorldAsset' },
+  'solidity-account': { template: 'solidity', kind: 'Account' },
+  'solidity-governor': { template: 'solidity', kind: 'Governor' },
+  'solidity-custom': { template: 'solidity', kind: 'Custom' },
+
+  'cairo-erc20': { template: 'cairo', kind: 'ERC20' },
+  'cairo-erc721': { template: 'cairo', kind: 'ERC721' },
+  'cairo-erc1155': { template: 'cairo', kind: 'ERC1155' },
+  'cairo-account': { template: 'cairo', kind: 'Account' },
+  'cairo-multisig': { template: 'cairo', kind: 'Multisig' },
+  'cairo-governor': { template: 'cairo', kind: 'Governor' },
+  'cairo-vesting': { template: 'cairo', kind: 'Vesting' },
+  'cairo-custom': { template: 'cairo', kind: 'Custom' },
+
+  'stellar-fungible': { template: 'stellar', kind: 'Fungible' },
+  'stellar-non-fungible': { template: 'stellar', kind: 'NonFungible' },
+  'stellar-stablecoin': { template: 'stellar', kind: 'Stablecoin' },
+  'stellar-governor': { template: 'stellar', kind: 'Governor' },
+  'stellar-vault': { template: 'stellar', kind: 'Vault' },
+
+  'stylus-erc20': { template: 'stylus', kind: 'ERC20' },
+  'stylus-erc721': { template: 'stylus', kind: 'ERC721' },
+  'stylus-erc1155': { template: 'stylus', kind: 'ERC1155' },
+
+  'confidential-erc7984': { template: 'confidential', kind: 'ERC7984' },
+
+  'uniswap-hooks': { template: 'uniswap-hooks', kind: 'Hooks' },
+};
+
 export function appResourceUri(toolName: string): string {
   return `ui://openzeppelin/${toolName}.html`;
 }
 
-/** Resolve HTML for a tool, throwing build guidance when the artifact is missing. */
-function resolveAppHtmlPath(toolName: string): string {
-  const toolPath = path.join(APPS_DIR, `${toolName}.html`);
-  if (fs.existsSync(toolPath)) {
-    return toolPath;
+export function getToolAppSpec(toolName: string): ToolAppSpec {
+  const spec = TOOL_APP_SPECS[toolName];
+  if (spec === undefined) {
+    throw new Error(
+      `MCP App mapping missing for ${toolName}. ` +
+        `Add it to TOOL_APP_SPECS in packages/mcp/src/apps/register.ts, then run: ` +
+        `yarn --cwd packages/mcp build:apps`,
+    );
+  }
+  return spec;
+}
+
+/** Resolve language HTML template path, throwing build guidance when missing. */
+function resolveAppHtmlPath(template: AppTemplate, toolName: string): string {
+  const templatePath = path.join(APPS_DIR, `${template}.html`);
+  if (fs.existsSync(templatePath)) {
+    return templatePath;
   }
   throw new Error(
-    `MCP App HTML missing for ${toolName} (looked in ${APPS_DIR}). ` +
+    `MCP App HTML missing for ${toolName} (looked for template ${template}.html in ${APPS_DIR}). ` +
       `Run: yarn --cwd packages/mcp build:apps ` +
       `(npm consumers: reinstall the package or report a packaging bug).`,
   );
 }
 
+function injectKind(templateHtml: string, kind: string, toolName: string): string {
+  // Replace the bare placeholder so either "__OZ_MCP_KIND__" or '__OZ_MCP_KIND__' becomes the kind.
+  const matches = templateHtml.split(MCP_KIND_PLACEHOLDER).length - 1;
+  if (matches !== 1) {
+    throw new Error(
+      `MCP App template for ${toolName} must contain exactly one ${MCP_KIND_PLACEHOLDER} ` +
+        `kind placeholder (found ${matches}). Rebuild with yarn --cwd packages/mcp build:apps.`,
+    );
+  }
+  const html = templateHtml.split(MCP_KIND_PLACEHOLDER).join(kind);
+  if (html.includes(MCP_KIND_PLACEHOLDER)) {
+    throw new Error(`MCP App kind injection left a kind placeholder in HTML for ${toolName}`);
+  }
+  if (!html.includes(kind)) {
+    throw new Error(`MCP App kind injection failed to embed kind ${kind} for ${toolName}`);
+  }
+  return html;
+}
+
 /**
  * App HTML is an immutable build artifact, so it is read from disk at most once per tool and then
  * served from memory. Keyed by tool name rather than per request or per session, so the hosted
  * server holds one copy no matter how many sessions open the same app; memory is bounded by the
  * number of tools, not by traffic.
  *
+ * Language templates are shared on disk; kind is injected once per tool on first read.
+ *
  * The in-flight promise is cached so concurrent first reads share a single disk read, and a failed
  * read is evicted so a transient error cannot poison a tool for the process lifetime.
  *
@@ -42,16 +128,37 @@ function resolveAppHtmlPath(toolName: string): string {
  * refactor. See that test for why the hosted server depends on them.
  */
 const htmlCache = new Map<string, Promise<string>>();
+const templateCache = new Map<AppTemplate, Promise<string>>();
 
-export function readAppHtml(toolName: string): Promise<string> {
-  const cached = htmlCache.get(toolName);
+function readTemplateHtml(template: AppTemplate, toolName: string): Promise<string> {
+  const cached = templateCache.get(template);
   if (cached !== undefined) {
     return cached;
   }
-  const pending = fs.promises.readFile(resolveAppHtmlPath(toolName), 'utf-8').catch((e: unknown) => {
-    htmlCache.delete(toolName);
+  const pending = fs.promises.readFile(resolveAppHtmlPath(template, toolName), 'utf-8').catch((e: unknown) => {
+    templateCache.delete(template);
     throw e;
   });
+  templateCache.set(template, pending);
+  return pending;
+}
+
+export function readAppHtml(toolName: string): Promise<string> {
+  const cached = htmlCache.get(toolName);
+  if (cached !== undefined) {
+    return cached;
+  }
+  // Resolve mapping synchronously so unknown tools fail before advertising UI.
+  const spec = getToolAppSpec(toolName);
+  // Fail closed on missing template before caching a doomed read.
+  resolveAppHtmlPath(spec.template, toolName);
+
+  const pending = readTemplateHtml(spec.template, toolName)
+    .then(templateHtml => injectKind(templateHtml, spec.kind, toolName))
+    .catch((e: unknown) => {
+      htmlCache.delete(toolName);
+      throw e;
+    });
   htmlCache.set(toolName, pending);
   return pending;
 }
@@ -60,7 +167,8 @@ export function readAppHtml(toolName: string): Promise<string> {
 function registerWizardAppResource(server: McpServer, toolName: string, options?: { title?: string }): void {
   const uri = appResourceUri(toolName);
   // Fail closed: do not register a UI resource that cannot be served.
-  resolveAppHtmlPath(toolName);
+  const spec = getToolAppSpec(toolName);
+  resolveAppHtmlPath(spec.template, toolName);
   server.registerResource(
     options?.title ?? `${toolName} UI`,
     uri,
diff --git a/packages/mcp/src/server.test.ts b/packages/mcp/src/server.test.ts
index e6d88ec89..5728c1456 100644
--- a/packages/mcp/src/server.test.ts
+++ b/packages/mcp/src/server.test.ts
@@ -1,10 +1,13 @@
 import test from 'ava';
 import { readdir } from 'fs/promises';
+import { existsSync } from 'fs';
 import { join } from 'path';
 import { readFile } from 'fs/promises';
+import { TOOL_APP_SPECS } from './apps/register';
 
 const PACKAGES_CORE_PATH = join(__dirname, '../../core');
 const PACKAGES_MCP_SRC_PATH = join(__dirname);
+const PACKAGES_UI_MCP_ENTRIES = join(__dirname, '../../ui/src/mcp-apps/entries');
 const SERVER_TS_PATH = join(__dirname, 'server.ts');
 const INDEX_TS_PATH = join(__dirname, 'index.ts');
 
@@ -59,6 +62,18 @@ async function listMcpLanguageDirs() {
   return mcpDirs.filter(name => coreLanguages.has(name));
 }
 
+/** All contract kinds from each language that has both a packages/core and packages/mcp folder. */
+async function listExpectedWizardTools(): Promise<{ language: string; kind: string; toolName: string }[]> {
+  const expected: { language: string; kind: string; toolName: string }[] = [];
+  for (const language of await listMcpLanguageDirs()) {
+    const kindSource = await readFile(join(PACKAGES_CORE_PATH, language, 'src', 'kind.ts'), 'utf-8');
+    for (const kind of kindsFromSource(kindSource)) {
+      expected.push({ language, kind, toolName: coreKindToToolName(language, kind) });
+    }
+  }
+  return expected;
+}
+
 test('each core language has mcp tools folder', async t => {
   const coreDirs = (await listDirNames(PACKAGES_CORE_PATH)).filter(name => !MCP_EXCLUDED_LANGUAGES.includes(name));
   const mcpDirs = await listMcpLanguageDirs();
@@ -94,24 +109,81 @@ test('each mcp tools folder is exported from index.ts', async t => {
  * entry` in packages/cli: a kind added to an existing core language must also get an MCP tool.
  * Languages are the core∩mcp intersection; a core language with no MCP folder at all is the first
  * test's job to report.
+ *
+ * Also requires that tool to be registered via `registerWizardAppTool` (not a bare `registerTool`),
+ * so MCP App UI cannot be skipped while still satisfying name/map checks.
  */
 test('each core kind has an mcp tool', async t => {
   for (const language of await listMcpLanguageDirs()) {
     const kindSource = await readFile(join(PACKAGES_CORE_PATH, language, 'src', 'kind.ts'), 'utf-8');
     const toolsDir = join(PACKAGES_MCP_SRC_PATH, language, 'tools');
     const toolFiles = (await readdir(toolsDir)).filter(name => name.endsWith('.ts') && !name.endsWith('.test.ts'));
-    const toolSources = (await Promise.all(toolFiles.map(name => readFile(join(toolsDir, name), 'utf-8')))).join('\n');
+    const toolFileSources = await Promise.all(
+      toolFiles.map(async name => [name, await readFile(join(toolsDir, name), 'utf-8')] as const),
+    );
 
     for (const kind of kindsFromSource(kindSource)) {
       const expectedTool = coreKindToToolName(language, kind);
-      t.true(
-        toolSources.includes(`'${expectedTool}'`),
+      const definingFile = toolFileSources.find(([, src]) => src.includes(`'${expectedTool}'`));
+      t.truthy(
+        definingFile,
         `Expected MCP tool '${expectedTool}' registered in ${language}/tools for core kind '${kind}'`,
       );
+      t.true(
+        definingFile![1].includes('registerWizardAppTool'),
+        `Expected '${expectedTool}' in ${language}/tools/${definingFile![0]} to use registerWizardAppTool so MCP App UI is wired`,
+      );
+      t.true(
+        new RegExp(String.raw`registerWizardAppTool\s*\(\s*\w+\s*,\s*'${expectedTool}'`).test(definingFile![1]),
+        `Expected registerWizardAppTool(..., '${expectedTool}', ...) in ${language}/tools/${definingFile![0]}`,
+      );
     }
   }
 });
 
+/**
+ * MCP Apps kind injection depends on TOOL_APP_SPECS. Keep it in lockstep with core kinds and
+ * UI language entries — a new kind/language must update the map and add entries/<language>.ts,
+ * or this fails in CI before publish.
+ */
+test('TOOL_APP_SPECS matches every core kind and UI language entry', async t => {
+  const expectedTools = await listExpectedWizardTools();
+  const expectedNames = expectedTools.map(e => e.toolName).sort();
+  const actualNames = Object.keys(TOOL_APP_SPECS).sort();
+
+  t.deepEqual(
+    actualNames,
+    expectedNames,
+    'TOOL_APP_SPECS keys must equal core-derived MCP tool names (add/remove map entries when kinds change)',
+  );
+
+  for (const { language, kind, toolName } of expectedTools) {
+    const spec = TOOL_APP_SPECS[toolName];
+    if (spec === undefined) {
+      t.fail(`TOOL_APP_SPECS missing '${toolName}'`);
+      continue;
+    }
+    t.is(String(spec.template), language, `${toolName} template must be language '${language}'`);
+    t.is(spec.kind, kind, `${toolName} kind must be '${kind}'`);
+  }
+
+  const templates = [...new Set(Object.values(TOOL_APP_SPECS).map(s => s.template))].sort();
+  for (const template of templates) {
+    const entryPath = join(PACKAGES_UI_MCP_ENTRIES, `${template}.ts`);
+    t.true(existsSync(entryPath), `MCP App UI entry missing for template '${template}' (expected ${entryPath})`);
+  }
+
+  const entryFiles = (await readdir(PACKAGES_UI_MCP_ENTRIES))
+    .filter(name => name.endsWith('.ts'))
+    .map(name => name.replace(/\.ts$/, ''))
+    .sort();
+  t.deepEqual(
+    entryFiles,
+    templates,
+    'packages/ui/src/mcp-apps/entries must match TOOL_APP_SPECS templates exactly (no stale or missing language entries)',
+  );
+});
+
 test('each mcp tools folder is registered in server.ts', async t => {
   const mcpDirs = await listMcpLanguageDirs();
 
diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
new file mode 100644
index 000000000..327aec5e2
--- /dev/null
+++ b/packages/ui/CHANGELOG.md
@@ -0,0 +1,17 @@
+# Changelog
+
+
+## 0.0.3 (2026-08-07)
+
+- Standardize crosschain terminology in user-facing text. ([#840](https://github.com/OpenZeppelin/contracts-wizard/pull/840))
+
+## 0.0.2 (2026-08-07)
+
+- Shrink MCP App package size by sharing one HTML template per language. ([#838](https://github.com/OpenZeppelin/contracts-wizard/pull/838))
+  - Inject contract kind at serve time instead of shipping near-duplicate HTML per tool.
+  - Scope MCP App Tailwind content away from web-only Wizard shells.
+  - Bundle the Zama logo so it renders in self-contained MCP Apps.
+
+## 0.0.1 (2026-08-05)
+
+- Fix Governor Cross-Chain Execution appearing as an empty dropdown in the MCP App UI. ([#836](https://github.com/OpenZeppelin/contracts-wizard/pull/836))
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 29186cfa3..dc389d0bb 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.0.0",
+  "version": "0.0.3",
   "private": true,
   "scripts": {
     "prepare": "echo \"Nothing to prepare\"",
diff --git a/packages/ui/public/icons/zama.png b/packages/ui/public/icons/zama.png
deleted file mode 100644
index 858ef1855..000000000
Binary files a/packages/ui/public/icons/zama.png and /dev/null differ
diff --git a/packages/ui/rollup.mcp-apps.config.mjs b/packages/ui/rollup.mcp-apps.config.mjs
index 8a5a76c78..66e01de7d 100644
--- a/packages/ui/rollup.mcp-apps.config.mjs
+++ b/packages/ui/rollup.mcp-apps.config.mjs
@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
@@ -11,20 +12,30 @@ import styles from 'rollup-plugin-styles';
 import svelte from 'rollup-plugin-svelte';
 import { terser } from 'rollup-plugin-terser';
 
+const nodeRequire = createRequire(import.meta.url);
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 process.env.NODE_ENV = 'production';
 
 const entriesDir = path.join(__dirname, 'src/mcp-apps/entries');
-const only = process.env.SINGLE_APP?.trim();
+/** Optional: MCP_APP_LANGUAGE=<language> builds only that language entry (e.g. solidity, cairo). */
+const only = process.env.MCP_APP_LANGUAGE?.trim();
 const entryFiles = fs
   .readdirSync(entriesDir)
   .filter(f => f.endsWith('.ts'))
   .filter(f => !only || path.basename(f, '.ts') === only);
 if (entryFiles.length === 0) {
-  throw new Error(only ? `No MCP App entry matching SINGLE_APP="${only}"` : `No MCP App entries in ${entriesDir}`);
+  throw new Error(
+    only
+      ? `No MCP App entry matching MCP_APP_LANGUAGE="${only}" (expected a language name like solidity)`
+      : `No MCP App entries in ${entriesDir}`,
+  );
 }
 
 const svelteConfig = (await import('./svelte.config.js')).default;
+const nesting = nodeRequire('tailwindcss/nesting');
+const tailwindcss = nodeRequire('tailwindcss');
+const autoprefixer = nodeRequire('autoprefixer');
+const mcpTailwindConfig = nodeRequire('./tailwind.mcp-apps.config.js');
 
 /** @type {import('rollup').RollupOptions[]} */
 export default entryFiles.map(file => {
@@ -47,6 +58,10 @@ export default entryFiles.map(file => {
       styles({
         mode: 'inject',
         sourceMap: false,
+        // Use MCP-scoped Tailwind content; do not load packages/ui/postcss.config.js
+        // (that config points at the full web Wizard content globs).
+        config: false,
+        plugins: [nesting, tailwindcss(mcpTailwindConfig), autoprefixer],
       }),
 
       alias({
diff --git a/packages/ui/scripts/package-mcp-apps.mjs b/packages/ui/scripts/package-mcp-apps.mjs
index 59790de9e..1bfb48167 100644
--- a/packages/ui/scripts/package-mcp-apps.mjs
+++ b/packages/ui/scripts/package-mcp-apps.mjs
@@ -3,7 +3,11 @@
  * After Rollup builds IIFE bundles under public/build/mcp/*.js,
  * produce single-file HTML documents with inlined JS for MCP resources/read.
  *
- * Optional: SINGLE_APP=<entry-name> packages only that app (keeps other HTML).
+ * Language templates (solidity.html, …) contain the kind placeholder "__OZ_MCP_KIND__",
+ * which packages/mcp replaces with the tool's kind at serve time.
+ *
+ * Optional: MCP_APP_LANGUAGE=<language> packages only that language template (keeps other HTML).
+ * Example: MCP_APP_LANGUAGE=solidity
  */
 import fs from 'fs';
 import fsp from 'fs/promises';
@@ -14,7 +18,10 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const mcpBuildDir = path.join(__dirname, '..', 'public', 'build', 'mcp');
 const entriesDir = path.join(__dirname, '..', 'src', 'mcp-apps', 'entries');
 const outDir = path.join(__dirname, '..', '..', 'mcp', 'apps');
-const only = process.env.SINGLE_APP?.trim();
+const only = process.env.MCP_APP_LANGUAGE?.trim();
+
+/** Same value as MCP_KIND_PLACEHOLDER in kind-placeholder.ts / packages/mcp (test-enforced). */
+const MCP_KIND_PLACEHOLDER = '__OZ_MCP_KIND__';
 
 if (!fs.existsSync(mcpBuildDir)) {
   console.error(`Missing MCP build dir: ${mcpBuildDir}`);
@@ -34,7 +41,7 @@ if (allEntryNames.length === 0) {
 
 const expectedNames = only ? allEntryNames.filter(name => name === only) : allEntryNames;
 if (expectedNames.length === 0) {
-  console.error(`No MCP App entry matching SINGLE_APP="${only}"`);
+  console.error(`No MCP App entry matching MCP_APP_LANGUAGE="${only}" (expected a language name like solidity)`);
   process.exit(1);
 }
 
@@ -55,6 +62,16 @@ if (missingJs.length > 0) {
 // has to hold the iframe open until then.
 const INITIAL_HEIGHT_PX = 560;
 
+function assertExactlyOneKindPlaceholder(name, html) {
+  const matches = html.split(MCP_KIND_PLACEHOLDER).length - 1;
+  if (matches !== 1) {
+    throw new Error(
+      `MCP App template "${name}" must contain exactly one ${MCP_KIND_PLACEHOLDER} ` +
+        `kind placeholder for serve-time kind injection (found ${matches}).`,
+    );
+  }
+}
+
 // Each app is independent, so read/write them concurrently rather than one at a time.
 await Promise.all(
   expectedNames.map(async name => {
@@ -79,6 +96,18 @@ ${js}
 </body>
 </html>
 `;
+    assertExactlyOneKindPlaceholder(name, html);
+
+    // Light CSS sanity: Control layout class present; a known web-only utility absent.
+    if (!html.includes('controls-section')) {
+      throw new Error(`MCP App template "${name}" missing expected Control CSS class controls-section`);
+    }
+    for (const webOnly of ['100vh-84px', 'rounded-l-3xl']) {
+      if (html.includes(webOnly)) {
+        throw new Error(`MCP App template "${name}" unexpectedly contains web-only class ${webOnly}`);
+      }
+    }
+
     const outPath = path.join(outDir, `${name}.html`);
     await fsp.writeFile(outPath, html);
     console.log(`Wrote ${outPath} (${Math.round(html.length / 1024)} KiB)`);
@@ -88,5 +117,5 @@ ${js}
 if (only) {
   console.log(`Packaged MCP App "${only}" (other apps left unchanged).`);
 } else {
-  console.log(`Verified ${expectedNames.length} MCP App HTML artifacts match entries.`);
+  console.log(`Verified ${expectedNames.length} MCP App HTML language templates match entries.`);
 }
diff --git a/packages/ui/src/common/icons/ZamaIcon.svelte b/packages/ui/src/common/icons/ZamaIcon.svelte
new file mode 100644
index 000000000..5c5b889ca
--- /dev/null
+++ b/packages/ui/src/common/icons/ZamaIcon.svelte
@@ -0,0 +1,7 @@
+<!-- Inlined PNG so MCP Apps (self-contained HTML) can render the Zama logo without a public asset. -->
+<img
+  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEwAAABMCAIAAABI9cZ8AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAATKADAAQAAAABAAAATAAAAAAWucfgAAAC+klEQVR4Ae2aP1ATQRTGDSCowTNjIU0aLZlJK/RoqYVWzFhQUCgFKXHEUuNAZworCjsqG1u0j6Wj41hpQ6OVBIMCIn7qzE6K493bd7t3u8lLtXP7733vd7vv7V4qx2/Pnhr038igC/yrT0UOCmUlqSQj8oC+rhHBIk1VkqR7IqpUkhHBIk1VkqR7IqocCpJjAiDd3ki3VxF0zN8lqR4n1d+240hEPn95rr1ZtZ3JSftbcz/Xmzu2Qw3F66oibV+LUNsryVDJ2Nol2V2xidenrPdxW8tS2wviB8apRHTv+qoz0Xk//nBxN1U/8TCONYn0416rdrdVQ4EQc1KV5HU9aSxPz9+8G19pJ9tfRsXjBy0S3JBaIcESy/vfMVyR+QEa14Qo0hXAcEV++DS29KSWZwUabaYQFkmswPbmpDHOVSEUkdtfR5daNWCkhU1fPqQbpNZmDJrax/nDfwfUSfogXr90tNbszjQOBLOXLBIAV54m2Ehp0xdu7i3P92Q5HUYuU6RvgMZx5YhkArw+u49XVAywTJEvXp95vJHQKxAXVquLu7fnfhhD8xQKJYkojxW41ZmgLZ5pHK41d7DT0M34tcWJ5KRpALg8/x3bDF8Ap2URIplpmnOARr93kRyAsAYRAgyNWW4LHkUyAWLtPXvwbfrKL7fC+kfzJZIJMGeU71dClL2IfLRxPvOkmydNI/SkVjkWiQz7fvtCZp5dDEAj2KVI0ANDM3RqAUECX2yuze6n1np66EYkM03zFyRo7zgQycmzPUV5WpupzSUycIAORHIAYhpceDtP04z1zIKEJDPPLiDKM0VafwtBeLizepE+KGHu+tTRwo09LEWmHfxmVxsHtgcUa5IfP5/OVAiLcaeYGU74wvpbrje7dctzpuT7Sf+UUZRVZBSYGEYqSYaTomhiHUIQJDm7qz/xCEu2l5TWIQQTJOX85UzuN12Tct+F1VNJhsVDbo2SlPsurJ5KMiwecmuUpNx3YfVUkmHxkFujJOW+C6vnUJD8A99kAqL5ivrIAAAAAElFTkSuQmCC"
+  height="16"
+  width="16"
+  alt="Zama"
+/>
diff --git a/packages/ui/src/confidential/ERC7984Controls.svelte b/packages/ui/src/confidential/ERC7984Controls.svelte
index 579876994..ecae382fc 100644
--- a/packages/ui/src/confidential/ERC7984Controls.svelte
+++ b/packages/ui/src/confidential/ERC7984Controls.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import HelpTooltip from '../common/HelpTooltip.svelte';
+  import ZamaIcon from '../common/icons/ZamaIcon.svelte';
 
   import type { KindedOptions, OptionsErrorMessages } from '@openzeppelin/wizard-confidential';
   import { infoDefaults } from '@openzeppelin/wizard';
@@ -98,7 +99,7 @@
     <div class="checkbox-group">
       <label class:checked={opts.networkConfig === 'zama-ethereum'}>
         <input type="radio" bind:group={opts.networkConfig} value="zama-ethereum" />
-        Zama Ethereum &nbsp;<img src="icons/zama.png" height="16" alt="Zama" />
+        Zama Ethereum &nbsp;<ZamaIcon />
         <HelpTooltip
           >Uses the FHEVM contracts provided by Zama on the Ethereum (mainnet) and Sepolia networks.</HelpTooltip
         >
diff --git a/packages/ui/src/mcp-apps/entries/cairo-account.ts b/packages/ui/src/mcp-apps/entries/cairo-account.ts
deleted file mode 100644
index 81708e653..000000000
--- a/packages/ui/src/mcp-apps/entries/cairo-account.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { cairoAdapter } from '../cairo/adapter';
-
-void mountKindApp(cairoAdapter, 'Account');
diff --git a/packages/ui/src/mcp-apps/entries/cairo-custom.ts b/packages/ui/src/mcp-apps/entries/cairo-custom.ts
deleted file mode 100644
index 94488da39..000000000
--- a/packages/ui/src/mcp-apps/entries/cairo-custom.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { cairoAdapter } from '../cairo/adapter';
-
-void mountKindApp(cairoAdapter, 'Custom');
diff --git a/packages/ui/src/mcp-apps/entries/cairo-erc1155.ts b/packages/ui/src/mcp-apps/entries/cairo-erc1155.ts
deleted file mode 100644
index 79bbca455..000000000
--- a/packages/ui/src/mcp-apps/entries/cairo-erc1155.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { cairoAdapter } from '../cairo/adapter';
-
-void mountKindApp(cairoAdapter, 'ERC1155');
diff --git a/packages/ui/src/mcp-apps/entries/cairo-erc20.ts b/packages/ui/src/mcp-apps/entries/cairo-erc20.ts
deleted file mode 100644
index 1fcdec6be..000000000
--- a/packages/ui/src/mcp-apps/entries/cairo-erc20.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { cairoAdapter } from '../cairo/adapter';
-
-void mountKindApp(cairoAdapter, 'ERC20');
diff --git a/packages/ui/src/mcp-apps/entries/cairo-erc721.ts b/packages/ui/src/mcp-apps/entries/cairo-erc721.ts
deleted file mode 100644
index 6c225d710..000000000
--- a/packages/ui/src/mcp-apps/entries/cairo-erc721.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { cairoAdapter } from '../cairo/adapter';
-
-void mountKindApp(cairoAdapter, 'ERC721');
diff --git a/packages/ui/src/mcp-apps/entries/cairo-governor.ts b/packages/ui/src/mcp-apps/entries/cairo-governor.ts
deleted file mode 100644
index a9453a55d..000000000
--- a/packages/ui/src/mcp-apps/entries/cairo-governor.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { cairoAdapter } from '../cairo/adapter';
-
-void mountKindApp(cairoAdapter, 'Governor');
diff --git a/packages/ui/src/mcp-apps/entries/cairo-multisig.ts b/packages/ui/src/mcp-apps/entries/cairo-multisig.ts
deleted file mode 100644
index 852d5dc36..000000000
--- a/packages/ui/src/mcp-apps/entries/cairo-multisig.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { cairoAdapter } from '../cairo/adapter';
-
-void mountKindApp(cairoAdapter, 'Multisig');
diff --git a/packages/ui/src/mcp-apps/entries/cairo-vesting.ts b/packages/ui/src/mcp-apps/entries/cairo-vesting.ts
deleted file mode 100644
index 561ecc9bb..000000000
--- a/packages/ui/src/mcp-apps/entries/cairo-vesting.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { cairoAdapter } from '../cairo/adapter';
-
-void mountKindApp(cairoAdapter, 'Vesting');
diff --git a/packages/ui/src/mcp-apps/entries/cairo.ts b/packages/ui/src/mcp-apps/entries/cairo.ts
new file mode 100644
index 000000000..1b1ac6b65
--- /dev/null
+++ b/packages/ui/src/mcp-apps/entries/cairo.ts
@@ -0,0 +1,4 @@
+import { mountLanguageApp } from '../mount';
+import { cairoAdapter } from '../cairo/adapter';
+
+void mountLanguageApp(cairoAdapter);
diff --git a/packages/ui/src/mcp-apps/entries/confidential-erc7984.ts b/packages/ui/src/mcp-apps/entries/confidential-erc7984.ts
deleted file mode 100644
index 6e30d4e50..000000000
--- a/packages/ui/src/mcp-apps/entries/confidential-erc7984.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { confidentialAdapter } from '../confidential/adapter';
-
-void mountKindApp(confidentialAdapter, 'ERC7984');
diff --git a/packages/ui/src/mcp-apps/entries/confidential.ts b/packages/ui/src/mcp-apps/entries/confidential.ts
new file mode 100644
index 000000000..b087756d0
--- /dev/null
+++ b/packages/ui/src/mcp-apps/entries/confidential.ts
@@ -0,0 +1,4 @@
+import { mountLanguageApp } from '../mount';
+import { confidentialAdapter } from '../confidential/adapter';
+
+void mountLanguageApp(confidentialAdapter);
diff --git a/packages/ui/src/mcp-apps/entries/solidity-account.ts b/packages/ui/src/mcp-apps/entries/solidity-account.ts
deleted file mode 100644
index d377be217..000000000
--- a/packages/ui/src/mcp-apps/entries/solidity-account.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { solidityAdapter } from '../solidity/adapter';
-
-void mountKindApp(solidityAdapter, 'Account');
diff --git a/packages/ui/src/mcp-apps/entries/solidity-custom.ts b/packages/ui/src/mcp-apps/entries/solidity-custom.ts
deleted file mode 100644
index aa81cab4f..000000000
--- a/packages/ui/src/mcp-apps/entries/solidity-custom.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { solidityAdapter } from '../solidity/adapter';
-
-void mountKindApp(solidityAdapter, 'Custom');
diff --git a/packages/ui/src/mcp-apps/entries/solidity-erc1155.ts b/packages/ui/src/mcp-apps/entries/solidity-erc1155.ts
deleted file mode 100644
index b1cf17141..000000000
--- a/packages/ui/src/mcp-apps/entries/solidity-erc1155.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { solidityAdapter } from '../solidity/adapter';
-
-void mountKindApp(solidityAdapter, 'ERC1155');
diff --git a/packages/ui/src/mcp-apps/entries/solidity-erc20.ts b/packages/ui/src/mcp-apps/entries/solidity-erc20.ts
deleted file mode 100644
index d5bf1a895..000000000
--- a/packages/ui/src/mcp-apps/entries/solidity-erc20.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { solidityAdapter } from '../solidity/adapter';
-
-void mountKindApp(solidityAdapter, 'ERC20');
diff --git a/packages/ui/src/mcp-apps/entries/solidity-erc721.ts b/packages/ui/src/mcp-apps/entries/solidity-erc721.ts
deleted file mode 100644
index 669e5f558..000000000
--- a/packages/ui/src/mcp-apps/entries/solidity-erc721.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { solidityAdapter } from '../solidity/adapter';
-
-void mountKindApp(solidityAdapter, 'ERC721');
diff --git a/packages/ui/src/mcp-apps/entries/solidity-governor.ts b/packages/ui/src/mcp-apps/entries/solidity-governor.ts
deleted file mode 100644
index a37945234..000000000
--- a/packages/ui/src/mcp-apps/entries/solidity-governor.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { solidityAdapter } from '../solidity/adapter';
-
-void mountKindApp(solidityAdapter, 'Governor');
diff --git a/packages/ui/src/mcp-apps/entries/solidity-rwa.ts b/packages/ui/src/mcp-apps/entries/solidity-rwa.ts
deleted file mode 100644
index 997ebdd7b..000000000
--- a/packages/ui/src/mcp-apps/entries/solidity-rwa.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { solidityAdapter } from '../solidity/adapter';
-
-void mountKindApp(solidityAdapter, 'RealWorldAsset');
diff --git a/packages/ui/src/mcp-apps/entries/solidity-stablecoin.ts b/packages/ui/src/mcp-apps/entries/solidity-stablecoin.ts
deleted file mode 100644
index 143ba5eb5..000000000
--- a/packages/ui/src/mcp-apps/entries/solidity-stablecoin.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { solidityAdapter } from '../solidity/adapter';
-
-void mountKindApp(solidityAdapter, 'Stablecoin');
diff --git a/packages/ui/src/mcp-apps/entries/solidity.ts b/packages/ui/src/mcp-apps/entries/solidity.ts
new file mode 100644
index 000000000..d291359fd
--- /dev/null
+++ b/packages/ui/src/mcp-apps/entries/solidity.ts
@@ -0,0 +1,4 @@
+import { mountLanguageApp } from '../mount';
+import { solidityAdapter } from '../solidity/adapter';
+
+void mountLanguageApp(solidityAdapter);
diff --git a/packages/ui/src/mcp-apps/entries/stellar-fungible.ts b/packages/ui/src/mcp-apps/entries/stellar-fungible.ts
deleted file mode 100644
index 0a3c8a34e..000000000
--- a/packages/ui/src/mcp-apps/entries/stellar-fungible.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { stellarAdapter } from '../stellar/adapter';
-
-void mountKindApp(stellarAdapter, 'Fungible');
diff --git a/packages/ui/src/mcp-apps/entries/stellar-governor.ts b/packages/ui/src/mcp-apps/entries/stellar-governor.ts
deleted file mode 100644
index ed2276df0..000000000
--- a/packages/ui/src/mcp-apps/entries/stellar-governor.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { stellarAdapter } from '../stellar/adapter';
-
-void mountKindApp(stellarAdapter, 'Governor');
diff --git a/packages/ui/src/mcp-apps/entries/stellar-non-fungible.ts b/packages/ui/src/mcp-apps/entries/stellar-non-fungible.ts
deleted file mode 100644
index 211ff2b9f..000000000
--- a/packages/ui/src/mcp-apps/entries/stellar-non-fungible.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { stellarAdapter } from '../stellar/adapter';
-
-void mountKindApp(stellarAdapter, 'NonFungible');
diff --git a/packages/ui/src/mcp-apps/entries/stellar-stablecoin.ts b/packages/ui/src/mcp-apps/entries/stellar-stablecoin.ts
deleted file mode 100644
index 885178b24..000000000
--- a/packages/ui/src/mcp-apps/entries/stellar-stablecoin.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { stellarAdapter } from '../stellar/adapter';
-
-void mountKindApp(stellarAdapter, 'Stablecoin');
diff --git a/packages/ui/src/mcp-apps/entries/stellar-vault.ts b/packages/ui/src/mcp-apps/entries/stellar-vault.ts
deleted file mode 100644
index e36da22ac..000000000
--- a/packages/ui/src/mcp-apps/entries/stellar-vault.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { stellarAdapter } from '../stellar/adapter';
-
-void mountKindApp(stellarAdapter, 'Vault');
diff --git a/packages/ui/src/mcp-apps/entries/stellar.ts b/packages/ui/src/mcp-apps/entries/stellar.ts
new file mode 100644
index 000000000..d92e6f15b
--- /dev/null
+++ b/packages/ui/src/mcp-apps/entries/stellar.ts
@@ -0,0 +1,4 @@
+import { mountLanguageApp } from '../mount';
+import { stellarAdapter } from '../stellar/adapter';
+
+void mountLanguageApp(stellarAdapter);
diff --git a/packages/ui/src/mcp-apps/entries/stylus-erc1155.ts b/packages/ui/src/mcp-apps/entries/stylus-erc1155.ts
deleted file mode 100644
index b6c1fd66d..000000000
--- a/packages/ui/src/mcp-apps/entries/stylus-erc1155.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { stylusAdapter } from '../stylus/adapter';
-
-void mountKindApp(stylusAdapter, 'ERC1155');
diff --git a/packages/ui/src/mcp-apps/entries/stylus-erc20.ts b/packages/ui/src/mcp-apps/entries/stylus-erc20.ts
deleted file mode 100644
index 3b08a1310..000000000
--- a/packages/ui/src/mcp-apps/entries/stylus-erc20.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { stylusAdapter } from '../stylus/adapter';
-
-void mountKindApp(stylusAdapter, 'ERC20');
diff --git a/packages/ui/src/mcp-apps/entries/stylus-erc721.ts b/packages/ui/src/mcp-apps/entries/stylus-erc721.ts
deleted file mode 100644
index 2839885bd..000000000
--- a/packages/ui/src/mcp-apps/entries/stylus-erc721.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { mountKindApp } from '../mount';
-import { stylusAdapter } from '../stylus/adapter';
-
-void mountKindApp(stylusAdapter, 'ERC721');
diff --git a/packages/ui/src/mcp-apps/entries/stylus.ts b/packages/ui/src/mcp-apps/entries/stylus.ts
new file mode 100644
index 000000000..aafd6a822
--- /dev/null
+++ b/packages/ui/src/mcp-apps/entries/stylus.ts
@@ -0,0 +1,4 @@
+import { mountLanguageApp } from '../mount';
+import { stylusAdapter } from '../stylus/adapter';
+
+void mountLanguageApp(stylusAdapter);
diff --git a/packages/ui/src/mcp-apps/entries/uniswap-hooks.ts b/packages/ui/src/mcp-apps/entries/uniswap-hooks.ts
index 6decc37af..04abcc3a7 100644
--- a/packages/ui/src/mcp-apps/entries/uniswap-hooks.ts
+++ b/packages/ui/src/mcp-apps/entries/uniswap-hooks.ts
@@ -1,4 +1,4 @@
-import { mountKindApp } from '../mount';
+import { mountLanguageApp } from '../mount';
 import { uniswapHooksAdapter } from '../uniswap-hooks/adapter';
 
-void mountKindApp(uniswapHooksAdapter, 'Hooks');
+void mountLanguageApp(uniswapHooksAdapter);
diff --git a/packages/ui/src/mcp-apps/kind-placeholder.ts b/packages/ui/src/mcp-apps/kind-placeholder.ts
new file mode 100644
index 000000000..1aa4dcbe0
--- /dev/null
+++ b/packages/ui/src/mcp-apps/kind-placeholder.ts
@@ -0,0 +1,6 @@
+/**
+ * Kind placeholder baked into language MCP App templates at build time.
+ * packages/mcp replaces it with the real kind string at serve time (must remain unique in the bundle).
+ * Duplicated in packages/mcp and package-mcp-apps.mjs; kept aligned by register.test.ts.
+ */
+export const MCP_KIND_PLACEHOLDER = '__OZ_MCP_KIND__';
diff --git a/packages/ui/src/mcp-apps/mount.ts b/packages/ui/src/mcp-apps/mount.ts
index e144071fd..c8dd83352 100644
--- a/packages/ui/src/mcp-apps/mount.ts
+++ b/packages/ui/src/mcp-apps/mount.ts
@@ -4,10 +4,27 @@ import type { SvelteComponent } from 'svelte';
 import KindApp from './KindApp.svelte';
 import type { KindAdapter } from './adapter';
 import { readHostSendCaps } from './deliver-contract';
+import { MCP_KIND_PLACEHOLDER } from './kind-placeholder';
 
 /** Stable iframe height for hosts that size from ui/notifications/size-changed. */
 export const MCP_APP_HEIGHT_PX = 560;
 
+type AdapterKind<Adapter extends KindAdapter> = Extract<keyof Adapter['controls'], string>;
+
+/**
+ * Mount a language MCP App entry. Bundles every kind for the language; the kind argument is the
+ * build-time placeholder `__OZ_MCP_KIND__`, which packages/mcp replaces with the tool's real kind
+ * at serve time. Prefer this over `mountKindApp` in `entries/*.ts`.
+ */
+export function mountLanguageApp<Adapter extends KindAdapter>(
+  adapter: Adapter,
+  target: HTMLElement = document.body,
+): Promise<{ app: App; component: SvelteComponent }> {
+  // TypeScript needs a real AdapterKind here; any key is fine — only the runtime string matters,
+  // and that remains MCP_KIND_PLACEHOLDER until serve-time injection.
+  return mountKindApp(adapter, MCP_KIND_PLACEHOLDER as AdapterKind<Adapter>, target);
+}
+
 /**
  * Mount a fixed-kind Wizard MCP App.
  * Component script runs synchronously and registers tool handlers on `mcpApp`
@@ -23,7 +40,7 @@ export async function mountKindApp<Adapter extends KindAdapter>(
   adapter: Adapter,
   // Adapters are declared with `satisfies KindAdapter`, so their `controls` keys stay literal and
   // a kind this language does not have is a compile error rather than a blank controls pane.
-  kind: Extract<keyof Adapter['controls'], string>,
+  kind: AdapterKind<Adapter>,
   target: HTMLElement = document.body,
 ): Promise<{ app: App; component: SvelteComponent }> {
   const app = new App({ name: `OpenZeppelin ${kind}`, version: '1.0.0' }, {}, { autoResize: false });
diff --git a/packages/ui/src/solidity/ERC1155Controls.svelte b/packages/ui/src/solidity/ERC1155Controls.svelte
index ec2dd909e..65a763a41 100644
--- a/packages/ui/src/solidity/ERC1155Controls.svelte
+++ b/packages/ui/src/solidity/ERC1155Controls.svelte
@@ -81,10 +81,10 @@
 </section>
 
 <ExpandableToggleRadio
-  label="Cross-Chain Bridging"
+  label="Crosschain Bridging"
   bind:value={opts.crossChainBridging}
   defaultValue="erc7786native"
-  helpContent="Adds built-in support to mint and burn tokens for cross-chain transfers with registered counterparts."
+  helpContent="Adds built-in support to mint and burn tokens for crosschain transfers with registered counterparts."
   helpLink="https://docs.openzeppelin.com/contracts/5.x/api/token/erc1155#ERC1155Crosschain"
 >
   <div class="checkbox-group">
diff --git a/packages/ui/src/solidity/ERC20Controls.svelte b/packages/ui/src/solidity/ERC20Controls.svelte
index 6f20fab3c..09d9ac626 100644
--- a/packages/ui/src/solidity/ERC20Controls.svelte
+++ b/packages/ui/src/solidity/ERC20Controls.svelte
@@ -184,10 +184,10 @@
 </ExpandableToggleRadio>
 
 <ExpandableToggleRadio
-  label="Cross-Chain Bridging"
+  label="Crosschain Bridging"
   bind:value={opts.crossChainBridging}
   defaultValue="custom"
-  helpContent="Allows authorized bridge contracts to mint and burn tokens for cross-chain transfers."
+  helpContent="Allows authorized bridge contracts to mint and burn tokens for crosschain transfers."
   helpLink="https://docs.openzeppelin.com/contracts/5.x/api/token/erc20#ERC20Bridgeable"
 >
   <div class="checkbox-group">
diff --git a/packages/ui/src/solidity/ERC721Controls.svelte b/packages/ui/src/solidity/ERC721Controls.svelte
index 66cff372a..3ee407a10 100644
--- a/packages/ui/src/solidity/ERC721Controls.svelte
+++ b/packages/ui/src/solidity/ERC721Controls.svelte
@@ -39,7 +39,7 @@
 
   $: requireAccessControl = erc721.isAccessControlRequired(opts);
 
-  // Show notice when Auto Increment Ids is combined with Cross-Chain Bridging
+  // Show notice when Auto Increment Ids is combined with Crosschain Bridging
   let incrementalLabel: HTMLElement;
   let bridgingLabel: HTMLElement;
   let incrementalTooltip: TippyInstance | undefined;
@@ -160,10 +160,10 @@
 </ExpandableToggleRadio>
 
 <ExpandableToggleRadio
-  label="Cross-Chain Bridging"
+  label="Crosschain Bridging"
   bind:value={opts.crossChainBridging}
   defaultValue="erc7786native"
-  helpContent="Adds built-in support to mint and burn tokens for cross-chain transfers with registered counterparts."
+  helpContent="Adds built-in support to mint and burn tokens for crosschain transfers with registered counterparts."
   helpLink="https://docs.openzeppelin.com/contracts/5.x/api/token/erc721#ERC721Crosschain"
 >
   <div class="checkbox-group">
diff --git a/packages/ui/src/solidity/GovernorControls.svelte b/packages/ui/src/solidity/GovernorControls.svelte
index 4818c416c..ff6bd297e 100644
--- a/packages/ui/src/solidity/GovernorControls.svelte
+++ b/packages/ui/src/solidity/GovernorControls.svelte
@@ -154,7 +154,7 @@
 
     <label class:checked={opts.crossChainExecution}>
       <input type="checkbox" bind:checked={opts.crossChainExecution} />
-      Cross-Chain Execution
+      Crosschain Execution
       <HelpTooltip link="https://docs.openzeppelin.com/contracts/5.x/api/governance#GovernorCrosschain">
         Lets passed proposals relay execution to other chains through ERC-7786 gateways. Requires a
         <code>CrosschainRemoteExecutor</code> contract, controlled by this governor, deployed on each target chain.
diff --git a/packages/ui/src/solidity/RealWorldAssetControls.svelte b/packages/ui/src/solidity/RealWorldAssetControls.svelte
index fdec26599..c25a95a7e 100644
--- a/packages/ui/src/solidity/RealWorldAssetControls.svelte
+++ b/packages/ui/src/solidity/RealWorldAssetControls.svelte
@@ -228,10 +228,10 @@
 {/if}
 
 <ExpandableToggleRadio
-  label="Cross-Chain Bridging"
+  label="Crosschain Bridging"
   bind:value={opts.crossChainBridging}
   defaultValue="custom"
-  helpContent="Allows authorized bridge contracts to mint and burn tokens for cross-chain transfers."
+  helpContent="Allows authorized bridge contracts to mint and burn tokens for crosschain transfers."
   helpLink="https://docs.openzeppelin.com/contracts/5.x/api/token/erc20#ERC20Bridgeable"
 >
   <div class="checkbox-group">
diff --git a/packages/ui/src/solidity/StablecoinControls.svelte b/packages/ui/src/solidity/StablecoinControls.svelte
index 6a4da90f0..30fa07a79 100644
--- a/packages/ui/src/solidity/StablecoinControls.svelte
+++ b/packages/ui/src/solidity/StablecoinControls.svelte
@@ -221,10 +221,10 @@
 </ExpandableToggleRadio>
 
 <ExpandableToggleRadio
-  label="Cross-Chain Bridging"
+  label="Crosschain Bridging"
   bind:value={opts.crossChainBridging}
   defaultValue="custom"
-  helpContent="Allows authorized bridge contracts to mint and burn tokens for cross-chain transfers."
+  helpContent="Allows authorized bridge contracts to mint and burn tokens for crosschain transfers."
   helpLink="https://docs.openzeppelin.com/contracts/5.x/api/token/erc20#ERC20Bridgeable"
 >
   <div class="checkbox-group">
diff --git a/packages/ui/src/solidity/crosschain-incremental-tooltip.ts b/packages/ui/src/solidity/crosschain-incremental-tooltip.ts
index 6f0e8355a..efd3cde6e 100644
--- a/packages/ui/src/solidity/crosschain-incremental-tooltip.ts
+++ b/packages/ui/src/solidity/crosschain-incremental-tooltip.ts
@@ -1,7 +1,7 @@
 import { manualNoticeTooltipProps } from './manual-notice-tooltip';
 
 /**
- * Tippy.js properties for the warning shown when combining Auto Increment Ids with Cross-Chain Bridging.
+ * Tippy.js properties for the warning shown when combining Auto Increment Ids with Crosschain Bridging.
  */
 export const crosschainIncrementalTooltipProps = manualNoticeTooltipProps(
   '<strong>Important:</strong> Token IDs auto-increment independently on each chain. Mint only on a single chain and link counterparts that do not mint, otherwise colliding IDs can strand bridged tokens.',
diff --git a/packages/ui/tailwind.mcp-apps.config.js b/packages/ui/tailwind.mcp-apps.config.js
new file mode 100644
index 000000000..58616e16d
--- /dev/null
+++ b/packages/ui/tailwind.mcp-apps.config.js
@@ -0,0 +1,60 @@
+const fs = require('fs');
+const path = require('path');
+const fg = require('fast-glob');
+
+/**
+ * Tailwind content for MCP App bundles: scan Controls and shared UI used by adapters,
+ * but exclude web-only App shells that pull unused layout utilities into the CSS.
+ *
+ * Language globs are derived from mcp-apps/entries so a new language entry automatically
+ * includes `src/<language>/` — do not hardcode language folders here.
+ */
+const root = path.dirname(require.resolve('./tailwind.mcp-apps.config.js'));
+const entriesDir = path.join(root, 'src', 'mcp-apps', 'entries');
+const languages = fs
+  .readdirSync(entriesDir)
+  .filter(f => f.endsWith('.ts'))
+  .map(f => path.basename(f, '.ts'));
+
+const contentGlobs = [
+  'src/mcp-apps/**/*.{html,svelte,ts}',
+  'src/common/**/*.{svelte,ts,css}',
+  ...languages.map(lang => `src/${lang}/**/*.{svelte,ts}`),
+];
+
+const content = fg
+  .sync(contentGlobs, { cwd: root, absolute: true })
+  .filter(file => path.basename(file) !== 'App.svelte');
+
+module.exports = {
+  content,
+
+  theme: {
+    extend: {
+      spacing: {
+        74: '18.5rem',
+      },
+      keyframes: {
+        'fade-in': {
+          '0%': { opacity: '0' },
+          '100%': { opacity: '1' },
+        },
+        'fade-up': {
+          '0%': { opacity: '0', transform: 'translateY(1rem)' },
+          '100%': { opacity: '1', transform: 'translateY(0)' },
+        },
+        'fade-down': {
+          '0%': { opacity: '0', transform: 'translateY(-1rem)' },
+          '100%': { opacity: '1', transform: 'translateY(0)' },
+        },
+      },
+      animation: {
+        'fade-in': 'fade-in 0.3s ease-out',
+        'fade-up': 'fade-up 0.2s ease-out',
+        'fade-down': 'fade-down 0.5s ease-out',
+        'spin-slow': 'spin 2s linear infinite',
+      },
+    },
+  },
+  plugins: [],
+};
diff --git a/scripts/release/check-mcp-ui-changeset.mjs b/scripts/release/check-mcp-ui-changeset.mjs
new file mode 100644
index 000000000..0b118087b
--- /dev/null
+++ b/scripts/release/check-mcp-ui-changeset.mjs
@@ -0,0 +1,37 @@
+#!/usr/bin/env node
+
+/**
+ * Fail if a changeset lists `ui` but not `@openzeppelin/contracts-mcp`.
+ *
+ * `ui` is private (in-repo version only). App HTML is published only as part of
+ * contracts-mcp, so a ui-only changeset must not land.
+ *
+ * `changeset status` already requires a `ui` changeset when UI sources change.
+ */
+
+import getChangesets from '@changesets/read';
+
+const UI = 'ui';
+const MCP = '@openzeppelin/contracts-mcp';
+const sinceRef = process.argv[2];
+const missing = [];
+
+for (const changeset of await getChangesets(process.cwd(), sinceRef)) {
+  const names = new Set(changeset.releases.map(release => release.name));
+  if (names.has(UI) && !names.has(MCP)) {
+    missing.push(changeset.id);
+  }
+}
+
+if (missing.length === 0) {
+  process.exit(0);
+}
+
+console.error(
+  `These changesets version \`${UI}\` without \`${MCP}\`:\n` +
+    missing.map(id => `  - .changeset/${id}.md`).join('\n') +
+    `\n\nList both packages so MCP App HTML is published with the UI change.\n` +
+    `Example frontmatter:\n` +
+    `---\n'${UI}': patch\n'${MCP}': patch\n---`,
+);
+process.exit(1);
diff --git a/scripts/release/format-changelog.mjs b/scripts/release/format-changelog.mjs
index 2f45dda52..14ac451b1 100644
--- a/scripts/release/format-changelog.mjs
+++ b/scripts/release/format-changelog.mjs
@@ -2,7 +2,7 @@
 
 // Adjusts the format of the changelog that changesets generates.
 
-import { readFileSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { getSupportedLanguageInCoreSubfolder } from '../language-input.mjs';
 
@@ -10,6 +10,9 @@ function formatChangelog(dir) {
   console.log(`Formatting changelog for ${dir}...`);
 
   const changelogPath = join(dir, 'CHANGELOG.md');
+  if (!existsSync(changelogPath)) {
+    return;
+  }
 
   const changelog = readFileSync(changelogPath, 'utf8');
 
@@ -43,3 +46,4 @@ for (const languageFolder of languageFolders) {
 }
 formatChangelog('./packages/common');
 formatChangelog('./packages/mcp');
+formatChangelog('./packages/ui');