diff --git a/CHANGES.md b/CHANGES.md
index a340366352..291d520443 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -123,6 +123,12 @@
 - Fix asset icon broken on Asset tab [#9587](https://github.com/penpot/penpot/issues/9587) (PR: [#9612](https://github.com/penpot/penpot/pull/9612))
 - Fix text fill color stops updating in multiselect with texts [#9608](https://github.com/penpot/penpot/issues/9608) (PR: [#9549](https://github.com/penpot/penpot/pull/9549))
 
+## 2.15.4 (Unreleased)
+
+### :bug: Bugs fixed
+
+- Emit `create-shape-layout` for flex/grid layout creation from plugins and MCP (same event as workspace) [Github #9652](https://github.com/penpot/penpot/issues/9652)
+
 ## 2.15.3
 
 ### :bug: Bugs fixed
diff --git a/docs/_includes/layouts/base.njk b/docs/_includes/layouts/base.njk
index 076acbffec..97fc32e20b 100644
--- a/docs/_includes/layouts/base.njk
+++ b/docs/_includes/layouts/base.njk
@@ -84,7 +84,7 @@
               <path d="M68.318 0L31.941 51.237v28.961L.286 95.255 0 95.121v188.952l123.419 58.309 7.542 3.56 7.542-3.56 123.418-58.309V95.121l-.232.11-31.665-15.062V51.237l-1.107-1.559L193.645 0l-36.38 51.237v.05l-26.47-37.281L104.528 51l-.939-1.322L68.318 0zm6.437 29.762l14.07 19.816H47.811L61.72 29.995l13.036-.233zm125.324 0l14.072 19.816h-41.012l13.903-19.583 13.037-.233zM137.23 43.77l14.07 19.813h-41.008L124.195 44l13.035-.23zM43.923 59.564h19.452v65.497l-19.452-9.19V59.564zm29.438 0h19.354v79.356l-19.354-9.142V59.564zm95.89 0h19.45v70.146l-19.45 9.188V59.564zm29.435 0h19.352v56.285l-19.352 9.142V59.564zM106.4 73.57h19.451v81.004l-19.451-9.19V73.57zm29.438 0h19.352v71.971l-19.352 9.145V73.57zm924.624 7.15l-.096 36.464-19.553-.134v14.857h19.61v78.333c0 5.705.445 10.996 1.348 15.873l.009.042.007.044c1.107 4.982 2.979 9.326 5.65 12.95 2.692 3.654 6.295 6.463 10.645 8.36 4.437 2.11 9.836 3.096 16.17 3.096 2.887 0 6.193-.47 9.981-1.373a90.691 90.691 0 0011.285-3.492l2.202-.84-4.751-14.248-2.492 1.15c-4.84 2.098-9.583 3.667-14.656 3.695-4.087 0-7.299-.587-9.651-1.6-2.245-1.215-3.98-2.738-5.298-4.629-1.375-2.15-2.385-4.622-3.025-7.463-.491-3.143-.748-6.645-.748-10.518v-79.38h36.342v-14.844H1077.1V80.72h-16.637zM230.02 95.096l17.126 7.002-17.126 8.09V95.095zm-198.08.025v15.09l-17.122-8.09 17.122-7zm802.504 18.8l.001.002v.002c-8.243 0-16.244 2.03-23.884 6.031l-.01.007-.012.006c-6.172 3.312-11.324 6.77-16.74 10.856l-.096-13.762H777.61v187.141h16.414V237.31c5.379 3.67 10.692 6.85 15.895 9.163l.026.01.027.014c6.529 2.72 12.96 4.108 19.247 4.108 7.652 0 14.986-1.557 21.917-4.658l.013-.005.015-.008c7.106-3.28 13.324-7.946 18.592-13.941l-.005.002c5.456-6.184 9.708-13.62 12.762-22.242 3.073-8.675 4.585-18.459 4.585-29.319 0-19.865-4.26-35.933-13.01-47.97l-.003-.006c-8.818-12.304-22.34-18.537-39.64-18.537zm-397.499.002v.002c-8.243 0-16.244 2.03-23.884 6.031l-.01.007-.012.006c-6.172 3.312-11.324 6.772-16.74 10.858l-.096-13.764H380.11v187.143h16.414v-66.894c5.379 3.67 10.692 6.848 15.895 9.16l.026.014.028.012c6.528 2.72 12.958 4.11 19.246 4.11 7.652 0 14.986-1.558 21.917-4.659l.013-.007.015-.006c7.106-3.28 13.324-7.946 18.592-13.941l-.005.001c5.456-6.183 9.708-13.618 12.762-22.241 3.073-8.675 4.585-18.459 4.585-29.32 0-19.864-4.26-35.933-13.01-47.97l-.003-.005c-8.817-12.304-22.338-18.537-39.639-18.537zm267.246 0v.002c-9.113 0-17.375 2.306-24.569 6.91-5.873 3.616-11.564 8.222-17.142 13.445l.115-17.217h-15.765v130.406h16.417v-94.62c7.284-7.373 13.843-14.357 19.506-17.917l.02-.014.02-.013c5.715-3.756 11.989-5.61 19.046-5.61 9.77 0 16.07 2.884 19.925 8.59l.022.032.024.033c4.045 5.6 6.332 14.962 6.332 28.107v81.412h16.415v-82.984c0-16.688-3.059-29.35-9.668-37.847-6.622-8.515-17.134-12.715-30.698-12.715zm-134.972.002c-7.331 0-14.503 1.659-21.42 4.93l-.01.006c-6.764 3.11-12.876 7.682-18.298 13.647l-.002.002c-5.287 5.833-9.533 12.995-12.76 21.425l-.01.022-.007.022c-3.075 8.501-4.593 18.028-4.593 28.548s1.518 20.049 4.593 28.55l.009.029.013.03c3.233 8.263 7.572 15.42 13.018 21.412l.015.012.011.015c5.453 5.817 11.854 10.299 19.133 13.392l.009.004.01.004c7.447 3.087 15.367 4.63 23.687 4.63 9.459 0 17.36-1.32 23.714-4.118l.013-.007c6.178-2.648 11.843-5.48 16.994-8.5l2.03-1.188-7.144-13.493L605.93 225c-4.517 3.346-8.972 5.427-14.335 7.44-5.093 1.803-11.373 2.728-17.93 2.728-6.832 0-12.9-.649-18.294-3.095-5.45-2.645-10.123-6.175-14.083-10.62-3.792-4.625-6.783-10.087-8.96-16.446l-.001-.006c-1.93-5.795-2.945-12.072-3.3-18.708h90.5c0-2.558.246-5.015.255-7.163v-4.706c0-18.854-4.374-33.79-13.39-44.463-8.998-10.65-21.63-16.035-37.171-16.035v-.001zm397.808 0c-7.818 0-15.318 1.554-22.418 4.649-7.104 3.096-13.407 7.576-18.85 13.383l-.014.014-.016.015c-5.295 5.843-9.541 13.1-12.768 21.704l-.005.012-.006.015c-3.077 8.506-4.59 18.12-4.59 28.81 0 10.69 1.513 20.305 4.59 28.811l.011.03.013.03c3.23 8.254 7.475 15.324 12.753 21.148l.015.013.014.016c5.444 5.807 11.746 10.285 18.85 13.381 7.1 3.096 14.602 4.65 22.42 4.65 7.819 0 15.32-1.554 22.42-4.65 7.27-3.093 13.585-7.575 18.863-13.396 5.465-5.832 9.724-12.922 12.783-21.196 3.258-8.514 4.863-18.14 4.863-28.837 0-10.692-1.604-20.315-4.86-28.826-3.054-8.614-7.31-15.885-12.787-21.731-5.279-5.82-11.592-10.303-18.862-13.396-7.1-3.095-14.6-4.65-22.418-4.65h-.001zm-951.946 5.004l108.337 51.178v155.59L15.082 274.519v-155.59zm231.755 0v155.59l-108.334 51.178v-155.59l108.334-51.178zm322.641 9.842h.002c10.75 0 18.852 3.647 25.038 11.134l.005.011.008.011c5.748 6.807 8.88 17.511 9.22 32.04h-74.538c.78-6.15 2.074-11.798 4.1-16.723 2.515-5.69 5.586-10.488 9.203-14.438 3.8-3.96 7.955-6.882 12.506-8.833l.033-.016.033-.015c4.566-2.12 9.33-3.171 14.39-3.171zm-134.36.26v.002c6.826 0 12.488 1.325 17.114 3.878l.03.014.029.017c4.685 2.423 8.428 5.844 11.349 10.387l.012.019.011.016c2.936 4.404 5.096 9.763 6.438 16.137l.006.031.009.03c1.52 6.416 2.287 13.372 2.287 20.874 0 8.323-1.104 15.91-3.285 22.787l-.007.019-.006.018c-2.02 6.733-4.856 12.468-8.492 17.261-3.63 4.786-7.952 8.447-13.028 11.067-5.06 2.611-10.479 3.91-16.39 3.91-4.471 0-9.768-1.132-15.842-3.494-5.688-2.212-12.01-7.647-18.827-13.056v-69.463c7.23-6.16 13.974-12.007 20.127-15.245l.009-.004.011-.007c6.52-3.51 12.647-5.198 18.444-5.198zm397.497 0l.002.002c6.827 0 12.489 1.325 17.115 3.878l.03.014.029.017c4.685 2.423 8.428 5.844 11.348 10.387l.013.019.011.016c2.936 4.404 5.096 9.763 6.438 16.137l.006.031.009.03c1.52 6.416 2.287 13.372 2.287 20.874 0 8.323-1.104 15.91-3.285 22.787l-.01.019-.005.018c-2.02 6.733-4.856 12.468-8.492 17.261-3.63 4.786-7.952 8.447-13.028 11.067-5.059 2.611-10.479 3.91-16.39 3.91-4.47 0-9.768-1.132-15.842-3.494-5.687-2.212-12.01-7.647-18.827-13.056v-69.463c7.23-6.16 13.974-12.007 20.127-15.245l.01-.005.01-.006c6.52-3.51 12.647-5.198 18.444-5.198zm134.414 0v.002c5.911 0 11.331 1.3 16.39 3.91l.044.02.04.021c5.223 2.448 9.595 6.004 13.206 10.765l.027.038.03.035c3.798 4.624 6.797 10.183 8.981 16.736 2.17 6.51 3.272 13.824 3.272 21.969 0 7.965-1.1 15.19-3.272 21.707-2.184 6.553-5.183 12.11-8.981 16.734l-.017.022-.014.022c-3.614 4.6-8.012 8.182-13.272 10.814-5.064 2.448-10.505 3.671-16.434 3.671-5.921 0-11.358-1.221-16.417-3.664-5.087-2.63-9.503-6.226-13.304-10.849-3.629-4.624-6.548-10.191-8.734-16.75-2.173-6.517-3.274-13.742-3.274-21.707 0-8.145 1.103-15.458 3.274-21.97 2.188-6.565 5.11-12.138 8.745-16.766l.003-.004.004-.007c3.801-4.79 8.2-8.364 13.255-10.81l.03-.015.027-.013c5.059-2.611 10.48-3.911 16.391-3.911z"></path>
             </svg>
           </a>
-          <span>Design as code</span>
+          <span>Full-Stack Design</span>
         </div>
         <ul class="footer-block">
           <li class="footer-block--title">Product</li>
diff --git a/docs/mcp/index.md b/docs/mcp/index.md
index d473eff10c..e0d31fe6ce 100644
--- a/docs/mcp/index.md
+++ b/docs/mcp/index.md
@@ -109,7 +109,7 @@ Because **remote MCP** does not expose local file-system access:
 
 ## Quick start
 
-If you just want to try Penpot MCP quickly, follow this path for the **hosted (remote) MCP server**.
+If you just want to try Penpot AI workflows quickly through the MCP, follow this path for the **hosted (remote) MCP server**.
 
 ### Remote MCP in 5 steps
 
diff --git a/frontend/src/app/plugins/shape.cljs b/frontend/src/app/plugins/shape.cljs
index c09e59711b..06231083a9 100644
--- a/frontend/src/app/plugins/shape.cljs
+++ b/frontend/src/app/plugins/shape.cljs
@@ -1018,7 +1018,7 @@
                  :else
                  (do (st/emit!
                       (dwsl/create-layout-from-id id :flex :from-frame? true :calculate-params? false)
-                      (se/event plugin-id "create-layout" :layout "flex"))
+                      (se/event plugin-id "create-shape-layout" :layout "flex"))
                      (flex/flex-layout-proxy plugin-id file-id page-id id)))))
 
            :addGridLayout
@@ -1033,7 +1033,7 @@
 
                  :else
                  (do (st/emit! (dwsl/create-layout-from-id id :grid :from-frame? true :calculate-params? false))
-                     (se/event plugin-id "create-layout" :layout "grid")
+                     (se/event plugin-id "create-shape-layout" :layout "grid")
                      (grid/grid-layout-proxy plugin-id file-id page-id id)))))
 
            ;; Make masks for groups
diff --git a/mcp/README.md b/mcp/README.md
index 24e283077f..97d97c97e1 100644
--- a/mcp/README.md
+++ b/mcp/README.md
@@ -270,7 +270,6 @@ The Penpot MCP server can be configured using environment variables.
 | `PENPOT_MCP_SERVER_PORT`           | Port for the HTTP/SSE server                                               | `4401`       |
 | `PENPOT_MCP_WEBSOCKET_PORT`        | Port for the WebSocket server (plugin connection)                          | `4402`       |
 | `PENPOT_MCP_REPL_PORT`             | Port for the REPL server (development/debugging)                           | `4403`       |
-| `PENPOT_MCP_SERVER_ADDRESS`        | Hostname or IP address via which clients can reach the MCP server          | `localhost`  |
 | `PENPOT_MCP_REMOTE_MODE`           | Enable remote mode (disables file system access). Set to `true` to enable. | `false`      |
 
 ### Logging Configuration
diff --git a/opencode.json b/opencode.json
deleted file mode 100644
index 6376bc70e5..0000000000
--- a/opencode.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "$schema": "https://opencode.ai/config.json",
-  "instructions": ["AGENTS.md"]
-}