diff --git a/packages/visual-editor/src/components/testing/screenshots/Grid/[desktop] version 45 - CTAs with Dark background.png b/packages/visual-editor/src/components/testing/screenshots/Grid/[desktop] version 45 - CTAs with Dark background.png
index fef3cb865..32f21bad7 100644
Binary files a/packages/visual-editor/src/components/testing/screenshots/Grid/[desktop] version 45 - CTAs with Dark background.png and b/packages/visual-editor/src/components/testing/screenshots/Grid/[desktop] version 45 - CTAs with Dark background.png differ
diff --git a/packages/visual-editor/src/components/testing/screenshots/Grid/[mobile] version 45 - CTAs with Dark background.png b/packages/visual-editor/src/components/testing/screenshots/Grid/[mobile] version 45 - CTAs with Dark background.png
index cfbca0ec8..4123389ed 100644
Binary files a/packages/visual-editor/src/components/testing/screenshots/Grid/[mobile] version 45 - CTAs with Dark background.png and b/packages/visual-editor/src/components/testing/screenshots/Grid/[mobile] version 45 - CTAs with Dark background.png differ
diff --git a/packages/visual-editor/src/components/testing/screenshots/Grid/[tablet] version 45 - CTAs with Dark background.png b/packages/visual-editor/src/components/testing/screenshots/Grid/[tablet] version 45 - CTAs with Dark background.png
index d4220f54b..a165f298b 100644
Binary files a/packages/visual-editor/src/components/testing/screenshots/Grid/[tablet] version 45 - CTAs with Dark background.png and b/packages/visual-editor/src/components/testing/screenshots/Grid/[tablet] version 45 - CTAs with Dark background.png differ
diff --git a/packages/visual-editor/src/components/testing/screenshots/Locator/[mobile] latest version default props.png b/packages/visual-editor/src/components/testing/screenshots/Locator/[mobile] latest version default props.png
index 144bfb309..552a6108a 100644
Binary files a/packages/visual-editor/src/components/testing/screenshots/Locator/[mobile] latest version default props.png and b/packages/visual-editor/src/components/testing/screenshots/Locator/[mobile] latest version default props.png differ
diff --git a/packages/visual-editor/src/components/testing/screenshots/Locator/[tablet] latest version default props.png b/packages/visual-editor/src/components/testing/screenshots/Locator/[tablet] latest version default props.png
index 40a6a4579..ffd6d13ed 100644
Binary files a/packages/visual-editor/src/components/testing/screenshots/Locator/[tablet] latest version default props.png and b/packages/visual-editor/src/components/testing/screenshots/Locator/[tablet] latest version default props.png differ
diff --git a/packages/visual-editor/src/components/testing/screenshots/PhotoGallerySection/[desktop] version 59 with showSectionHeading false.png b/packages/visual-editor/src/components/testing/screenshots/PhotoGallerySection/[desktop] version 59 with showSectionHeading false.png
index 78479fbdf..b9bf47805 100644
Binary files a/packages/visual-editor/src/components/testing/screenshots/PhotoGallerySection/[desktop] version 59 with showSectionHeading false.png and b/packages/visual-editor/src/components/testing/screenshots/PhotoGallerySection/[desktop] version 59 with showSectionHeading false.png differ
diff --git a/packages/visual-editor/src/editor/types.ts b/packages/visual-editor/src/editor/types.ts
index 61250d0dc..201d69b9b 100644
--- a/packages/visual-editor/src/editor/types.ts
+++ b/packages/visual-editor/src/editor/types.ts
@@ -4,6 +4,7 @@ export type LocalDevOptions = {
   locale?: string;
   locales?: string[];
   layoutScopeKey?: string;
+  themeScopeKey?: string;
   initialLayoutData?: Record<string, unknown>;
   showOverrideButtons?: boolean;
 };
diff --git a/packages/visual-editor/src/internal/components/LayoutEditor.tsx b/packages/visual-editor/src/internal/components/LayoutEditor.tsx
index 9c7c5a33b..16d594589 100644
--- a/packages/visual-editor/src/internal/components/LayoutEditor.tsx
+++ b/packages/visual-editor/src/internal/components/LayoutEditor.tsx
@@ -206,9 +206,9 @@ export const LayoutEditor = (props: LayoutEditorProps) => {
         }
       }
 
-      // Otherwise start fresh from Content
+      // Otherwise start fresh from published layout data
       devLogger.log(
-        "Layout Dev Mode - No localStorage. Using layout data from Content"
+        "Layout Dev Mode - No localStorage. Using published layout data"
       );
       if (layoutData) {
         setPuckInitialHistory({
@@ -221,12 +221,12 @@ export const LayoutEditor = (props: LayoutEditorProps) => {
       return;
     }
 
-    // Nothing in save_state table, start fresh from Content
+    // Nothing in save_state table, start fresh from published layout data
     if (!layoutSaveState) {
       clearVisualConfigLocalStorage();
 
       devLogger.log(
-        "Layout Prod Mode - No saveState. Using layout data from Content"
+        "Layout Prod Mode - No saveState. Using published layout data"
       );
       if (layoutData) {
         setPuckInitialHistory({
diff --git a/packages/visual-editor/src/internal/components/ThemeEditor.tsx b/packages/visual-editor/src/internal/components/ThemeEditor.tsx
index f94bdf7e1..667f5db82 100644
--- a/packages/visual-editor/src/internal/components/ThemeEditor.tsx
+++ b/packages/visual-editor/src/internal/components/ThemeEditor.tsx
@@ -88,9 +88,17 @@ export const ThemeEditor = (props: ThemeEditorProps) => {
       const localHistoryArray = lzstring.decompress(
         window.localStorage.getItem(buildVisualConfigLocalStorageKey()) || ""
       );
-      const localHistories = (
-        localHistoryArray ? JSON.parse(localHistoryArray) : []
-      ) as History<AppState>[];
+      let localHistories: History<AppState>[] = [];
+      if (localHistoryArray) {
+        try {
+          localHistories = JSON.parse(localHistoryArray) as History<AppState>[];
+        } catch (error) {
+          console.warn(
+            "Failed to parse local theme editor layout history. Falling back to template layout data.",
+            error
+          );
+        }
+      }
       const histories = localHistories
         .filter((h) => h?.state)
         .map((h) => {
@@ -109,6 +117,12 @@ export const ThemeEditor = (props: ThemeEditorProps) => {
         sendDevLayoutSaveStateData({
           payload: { devSaveStateData: JSON.stringify(layoutToSend) },
         });
+      } else if (layoutData) {
+        devLogger.log("Theme Dev Mode - Using published layout data");
+        setPuckInitialHistory({
+          histories: [{ id: "root", state: { data: layoutData } }],
+          appendData: false,
+        });
       }
       setPuckInitialHistoryFetched(true);
       return;
@@ -150,13 +164,23 @@ export const ThemeEditor = (props: ThemeEditorProps) => {
       // Use localStorage directly if it exists
       if (localHistoryArray) {
         devLogger.log("Theme Dev Mode - Using theme localStorage");
-        histories = JSON.parse(localHistoryArray) as ThemeHistory[];
-        index = histories.length - 1;
-      } else {
+        try {
+          histories = JSON.parse(localHistoryArray) as ThemeHistory[];
+          index = histories.length - 1;
+        } catch (error) {
+          console.warn(
+            "Failed to parse local theme history. Falling back to theme data from Content.",
+            error
+          );
+        }
+      }
+
+      if (!histories?.length) {
         // Otherwise start fresh from Content
         devLogger.log(
           "Theme Dev Mode - No localStorage. Using theme data from Content"
         );
+        index = 0;
         if (themeData) {
           histories = [{ id: "root", data: themeData }];
         }
diff --git a/packages/visual-editor/src/internal/types/templateMetadata.test.ts b/packages/visual-editor/src/internal/types/templateMetadata.test.ts
index ce0875565..355015efd 100644
--- a/packages/visual-editor/src/internal/types/templateMetadata.test.ts
+++ b/packages/visual-editor/src/internal/types/templateMetadata.test.ts
@@ -35,4 +35,18 @@ describe("generateTemplateMetadata", () => {
       "type.image"
     );
   });
+
+  it("uses themeScopeKey for a shared local-dev theme entity", () => {
+    const directoryMetadata = generateTemplateMetadata(undefined, {
+      templateId: "directory",
+      themeScopeKey: "local-editor",
+    });
+    const locatorMetadata = generateTemplateMetadata(undefined, {
+      templateId: "locator",
+      themeScopeKey: "local-editor",
+    });
+
+    expect(directoryMetadata.themeEntityId).toBeDefined();
+    expect(directoryMetadata.themeEntityId).toBe(locatorMetadata.themeEntityId);
+  });
 });
diff --git a/packages/visual-editor/src/internal/types/templateMetadata.ts b/packages/visual-editor/src/internal/types/templateMetadata.ts
index f59f67d8d..2d10ca546 100644
--- a/packages/visual-editor/src/internal/types/templateMetadata.ts
+++ b/packages/visual-editor/src/internal/types/templateMetadata.ts
@@ -133,6 +133,7 @@ export function generateTemplateMetadata(
       entityId: localDevOptions?.entityId ?? cleanString,
       locale,
     });
+  const themeScopeKey = localDevOptions?.themeScopeKey;
   const locales = localDevOptions?.locales?.length
     ? localDevOptions.locales
     : ["en", "es", "fr"];
@@ -141,6 +142,7 @@ export function generateTemplateMetadata(
     siteId: 1337,
     templateId,
     entityId,
+    themeEntityId: themeScopeKey ? hashCode(themeScopeKey) : undefined,
     layoutId: hashCode(layoutScopeKey),
     assignment: "ALL",
     isDevMode: true,
diff --git a/packages/visual-editor/src/local-editor/LocalEditorControls.tsx b/packages/visual-editor/src/local-editor/LocalEditorControls.tsx
index 2cda956b1..a9dad97a6 100644
--- a/packages/visual-editor/src/local-editor/LocalEditorControls.tsx
+++ b/packages/visual-editor/src/local-editor/LocalEditorControls.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import type { LocalEditorEntityOption } from "./types.ts";
+import type { LocalEditorEntityOption, LocalEditorMode } from "./types.ts";
 
 type LocalEditorControlsProps = {
   activeEntities: LocalEditorEntityOption[];
@@ -7,9 +7,11 @@ type LocalEditorControlsProps = {
   controlsDisabled: boolean;
   selectedEntityId?: string;
   selectedLocale: string;
+  selectedMode: LocalEditorMode;
   selectedTemplateId: string;
   onEntityChange: (entityId: string) => void;
   onLocaleChange: (locale: string) => void;
+  onModeChange: (mode: LocalEditorMode) => void;
   onTemplateChange: (templateId: string) => void;
 };
 
@@ -19,9 +21,11 @@ export const LocalEditorControls = ({
   controlsDisabled,
   selectedEntityId,
   selectedLocale,
+  selectedMode,
   selectedTemplateId,
   onEntityChange,
   onLocaleChange,
+  onModeChange,
   onTemplateChange,
 }: LocalEditorControlsProps) => {
   const selectedEntity = activeEntities.find((entity) => {
@@ -53,6 +57,30 @@ export const LocalEditorControls = ({
         </select>
       </ControlGroup>
 
+      <ControlGroup label="Editor">
+        <button
+          type="button"
+          disabled={controlsDisabled}
+          onClick={() => {
+            onModeChange(selectedMode === "layout" ? "theme" : "layout");
+          }}
+          style={{
+            appearance: "none",
+            background: controlsDisabled ? "#f5f5f5" : "#111",
+            border: "1px solid #111",
+            borderRadius: "6px",
+            color: controlsDisabled ? "#777" : "#fff",
+            cursor: controlsDisabled ? "not-allowed" : "pointer",
+            font: "inherit",
+            minHeight: "34px",
+            padding: "6px 10px",
+            textAlign: "left",
+          }}
+        >
+          {selectedMode === "layout" ? "Layout Editor" : "Theme Editor"}
+        </button>
+      </ControlGroup>
+
       <ControlGroup label="Entity">
         <select
           value={selectedEntityId ?? ""}
diff --git a/packages/visual-editor/src/local-editor/LocalEditorShell.tsx b/packages/visual-editor/src/local-editor/LocalEditorShell.tsx
index 406ca7f82..2a80ee82c 100644
--- a/packages/visual-editor/src/local-editor/LocalEditorShell.tsx
+++ b/packages/visual-editor/src/local-editor/LocalEditorShell.tsx
@@ -53,13 +53,24 @@ export const LocalEditorShell = ({
     selectedTemplateDefaults,
     selectedEntity,
     selectedLocale,
+    selectedMode,
   } = React.useMemo(() => {
     return buildLocalEditorSelection(manifest, componentRegistry, searchParams);
   }, [componentRegistry, manifest, searchParams]);
 
   React.useEffect(() => {
-    syncSelectionToUrl(selectedTemplateId, selectedEntity, selectedLocale);
-  }, [selectedEntity?.entityId, selectedLocale, selectedTemplateId]);
+    syncSelectionToUrl(
+      selectedTemplateId,
+      selectedEntity,
+      selectedLocale,
+      selectedMode
+    );
+  }, [
+    selectedEntity?.entityId,
+    selectedLocale,
+    selectedMode,
+    selectedTemplateId,
+  ]);
 
   const documentRequestPath = React.useMemo(() => {
     return buildLocalEditorDocumentRequestPath({
@@ -93,7 +104,7 @@ export const LocalEditorShell = ({
     );
   }, [manifest?.entitiesByTemplate]);
   const controlsDisabled = isManifestLoading || !activeTemplateOptions.length;
-  const editorKey = `${selectedTemplateId}:${selectedLocale}`;
+  const editorKey = `${selectedTemplateId}:${selectedLocale}:${selectedMode}`;
   const shouldRenderEditorFrame =
     isDocumentLoading || (!!documentResponse?.document && !!selectedTemplateId);
   const editorLocalDevOptions = React.useMemo(() => {
@@ -152,6 +163,7 @@ export const LocalEditorShell = ({
         controlsDisabled={controlsDisabled}
         selectedEntityId={selectedEntity?.entityId}
         selectedLocale={selectedLocale}
+        selectedMode={selectedMode}
         selectedTemplateId={selectedTemplateId}
         onEntityChange={(entityId) => {
           updateSearchParam("entityId", entityId);
@@ -159,6 +171,9 @@ export const LocalEditorShell = ({
         onLocaleChange={(locale) => {
           updateSearchParam("locale", locale);
         }}
+        onModeChange={(mode) => {
+          updateSearchParam("mode", mode);
+        }}
         onTemplateChange={(templateId) => {
           updateSearchParam("templateId", templateId);
         }}
@@ -249,6 +264,7 @@ export const LocalEditorShell = ({
                 themeConfig={themeConfig}
                 localDev={true}
                 localDevOptions={editorLocalDevOptions}
+                forceThemeMode={selectedMode === "theme"}
               />
             </VisualEditorProvider>
           )}
diff --git a/packages/visual-editor/src/local-editor/selection.ts b/packages/visual-editor/src/local-editor/selection.ts
index c61c9a600..06e806469 100644
--- a/packages/visual-editor/src/local-editor/selection.ts
+++ b/packages/visual-editor/src/local-editor/selection.ts
@@ -1,6 +1,7 @@
 import type { Config } from "@puckeditor/core";
 import type { LocalDevOptions } from "../editor/types.ts";
 import type {
+  LocalEditorMode,
   LocalEditorEntityOption,
   LocalEditorManifestResponse,
   BuildEditorLocalDevOptionsArgs,
@@ -13,6 +14,7 @@ type SelectionResult = {
   selectedTemplateDefaults?: BuildEditorLocalDevOptionsArgs["selectedTemplateDefaults"];
   selectedEntity?: LocalEditorEntityOption;
   selectedLocale: string;
+  selectedMode: LocalEditorMode;
 };
 
 export const updateSearchParam = (key: string, value: string) => {
@@ -68,6 +70,8 @@ export const buildLocalEditorSelection = (
       selectedTemplateDefaults?.locale,
       manifest?.defaults.locale
     ) ?? "";
+  const selectedMode =
+    searchParams.get("mode") === "theme" ? "theme" : "layout";
 
   return {
     supportedTemplateIds,
@@ -76,13 +80,15 @@ export const buildLocalEditorSelection = (
     selectedTemplateDefaults,
     selectedEntity,
     selectedLocale,
+    selectedMode,
   };
 };
 
 export const syncSelectionToUrl = (
   selectedTemplateId: string,
   selectedEntity: LocalEditorEntityOption | undefined,
-  selectedLocale: string
+  selectedLocale: string,
+  selectedMode: LocalEditorMode
 ) => {
   if (typeof window === "undefined" || !selectedTemplateId) {
     return;
@@ -90,6 +96,7 @@ export const syncSelectionToUrl = (
 
   const nextSearchParams = new URLSearchParams(window.location.search);
   nextSearchParams.set("templateId", selectedTemplateId);
+  nextSearchParams.set("mode", selectedMode);
 
   if (selectedEntity?.entityId) {
     nextSearchParams.set("entityId", selectedEntity.entityId);
@@ -155,6 +162,7 @@ export const buildEditorLocalDevOptions = ({
     locale: selectedLocale,
     locales: selectedEntity?.locales ?? [],
     layoutScopeKey: `${selectedTemplateId}:${selectedLocale}`,
+    themeScopeKey: "local-editor",
     initialLayoutData: selectedTemplateDefaults?.defaultLayoutData as
       | Record<string, unknown>
       | undefined,
diff --git a/packages/visual-editor/src/local-editor/types.ts b/packages/visual-editor/src/local-editor/types.ts
index 615bbb700..cd6cf08f9 100644
--- a/packages/visual-editor/src/local-editor/types.ts
+++ b/packages/visual-editor/src/local-editor/types.ts
@@ -22,6 +22,8 @@ export type LocalEditorShellProps = {
   themeConfig?: ThemeConfig;
 };
 
+export type LocalEditorMode = "layout" | "theme";
+
 export type BuildEditorLocalDevOptionsArgs = {
   selectedTemplateId: string;
   selectedEntity?: LocalEditorEntityOption;
diff --git a/packages/visual-editor/src/utils/applyTheme.test.ts b/packages/visual-editor/src/utils/applyTheme.test.ts
index d43c239f1..dd43ef2ee 100644
--- a/packages/visual-editor/src/utils/applyTheme.test.ts
+++ b/packages/visual-editor/src/utils/applyTheme.test.ts
@@ -1,5 +1,9 @@
 import { describe, it, expect } from "vitest";
-import { applyTheme } from "./applyTheme.ts";
+import {
+  applyTheme,
+  THEME_STYLE_TAG_ID,
+  updateThemeInEditor,
+} from "./applyTheme.ts";
 import { ThemeConfig } from "./themeResolver.ts";
 import { StreamDocument } from "./types/StreamDocument.ts";
 
@@ -16,7 +20,7 @@ describe("buildCssOverridesStyle", () => {
     // Should include Google Font links and the CSS style tag
     expect(result).toContain("fonts.googleapis.com");
     expect(result).toContain(
-      '<style id="visual-editor-theme" type="text/css">.components{'
+      '<style id="visual-editor-theme" type="text/css">:root{'
     );
     expect(result).toContain("--colors-palette-text:red !important;");
     expect(result).toContain(
@@ -58,7 +62,7 @@ describe("buildCssOverridesStyle", () => {
       '<link href="./y-fonts/yextcustom.css" rel="stylesheet">'
     );
     expect(result).toContain(
-      '<style id="visual-editor-theme" type="text/css">.components{'
+      '<style id="visual-editor-theme" type="text/css">:root{'
     );
     expect(result).toContain("--colors-palette-text:black !important;");
     expect(result).toContain(
@@ -76,7 +80,7 @@ describe("buildCssOverridesStyle", () => {
 
     expect(result).toContain("fonts.googleapis.com");
     expect(result).toContain(
-      '<style id="visual-editor-theme" type="text/css">.components{' +
+      '<style id="visual-editor-theme" type="text/css">:root{' +
         "--colors-palette-text:black !important;" +
         "--colors-palette-primary-DEFAULT:hsl(0 68% 51%) !important;" +
         "--colors-palette-primary-foreground:hsl(0 0% 100%) !important;" +
@@ -113,7 +117,7 @@ describe("buildCssOverridesStyle", () => {
         '<link href="https://fonts.googleapis.com/css2?family=Adamina:wght@400&display=swap" rel="stylesheet">' +
         '<style type="text/css">@font-face {\n  font-family: "Adamina Fallback";\n  src: local(\'Georgia\');\n  ' +
         "ascent-override: 100.1884%;\n  descent-override: 27.1032%;\n  size-adjust: 106.9985%;\n  font-weight: 400;\n  font-style: regular;\n}</style>" +
-        '<style id="visual-editor-theme" type="text/css">.components{' +
+        '<style id="visual-editor-theme" type="text/css">:root{' +
         "--colors-palette-text:black !important;" +
         "--colors-palette-primary-DEFAULT:hsl(0 68% 51%) !important;" +
         "--colors-palette-primary-foreground:hsl(0 0% 100%) !important;" +
@@ -214,7 +218,7 @@ describe("buildCssOverridesStyle", () => {
     // Should include Google Font links and the CSS style tag
     expect(result).toContain("fonts.googleapis.com");
     expect(result).toContain(
-      '<style id="visual-editor-theme" type="text/css">.components{'
+      '<style id="visual-editor-theme" type="text/css">:root{'
     );
     expect(result).toContain("--colors-palette-text:black !important;");
     expect(result).toContain(
@@ -259,7 +263,7 @@ describe("buildCssOverridesStyle", () => {
     // Should include Google Font links and the CSS style tag
     expect(result).toContain("fonts.googleapis.com");
     expect(result).toContain(
-      '<style id="visual-editor-theme" type="text/css">.components{'
+      '<style id="visual-editor-theme" type="text/css">:root{'
     );
     expect(result).toContain("--colors-palette-primary:#7ED321 !important");
     expect(result).toContain(
@@ -269,6 +273,25 @@ describe("buildCssOverridesStyle", () => {
       "--colors-palette-secondary-contrast:#FFFFFF !important"
     );
   });
+
+  it("creates the theme style tag when updating the editor without one", async () => {
+    document.getElementById(THEME_STYLE_TAG_ID)?.remove();
+
+    await updateThemeInEditor(
+      {
+        "--colors-palette-primary": "#CF0A2C",
+      },
+      themeConfig,
+      true
+    );
+
+    const styleTag = document.getElementById(THEME_STYLE_TAG_ID);
+    expect(styleTag).not.toBeNull();
+    expect(styleTag?.textContent).toContain(":root{");
+    expect(styleTag?.textContent).toContain(
+      "--colors-palette-primary:#CF0A2C !important"
+    );
+  });
 });
 
 const themeConfig: ThemeConfig = {
diff --git a/packages/visual-editor/src/utils/applyTheme.ts b/packages/visual-editor/src/utils/applyTheme.ts
index 3ba908811..9e017d061 100644
--- a/packages/visual-editor/src/utils/applyTheme.ts
+++ b/packages/visual-editor/src/utils/applyTheme.ts
@@ -145,14 +145,12 @@ const internalApplyTheme = (
 
   devLogger.logData("THEME_VALUES_TO_APPLY", themeValuesToApply);
 
-  return (
-    `.components{` +
-    Object.entries(themeValuesToApply)
-      .filter(([key]) => key.startsWith("--"))
-      .map(([key, value]) => `${key}:${value} !important`)
-      .join(";") +
-    "}"
-  );
+  const cssVariables = Object.entries(themeValuesToApply)
+    .filter(([key]) => key.startsWith("--"))
+    .map(([key, value]) => `${key}:${value} !important`)
+    .join(";");
+
+  return `:root{${cssVariables}}`;
 };
 
 /**
@@ -196,6 +194,19 @@ const updateFontLinksInDocument = (
   }
 };
 
+const getOrCreateThemeStyleTag = (document: Document): HTMLStyleElement => {
+  const existingStyleTag = document.getElementById(THEME_STYLE_TAG_ID);
+  if (existingStyleTag instanceof HTMLStyleElement) {
+    return existingStyleTag;
+  }
+
+  const styleTag = document.createElement("style");
+  styleTag.id = THEME_STYLE_TAG_ID;
+  styleTag.type = "text/css";
+  document.head.appendChild(styleTag);
+  return styleTag;
+};
+
 // Used to avoid creating multiple observers in updateThemeInEditor
 let pendingObserver: MutationObserver | null = null;
 
@@ -215,10 +226,7 @@ export const updateThemeInEditor = async (
   );
 
   const newThemeTag = internalApplyTheme(newTheme, themeConfig);
-  const editorStyleTag = window.document.getElementById(THEME_STYLE_TAG_ID);
-  if (editorStyleTag) {
-    editorStyleTag.innerText = newThemeTag;
-  }
+  getOrCreateThemeStyleTag(window.document).textContent = newThemeTag;
 
   // In the theme editor, all fonts are already loaded
   // In the layout editor, we need to load the in-use fonts after the Puck iframe has loaded
@@ -233,15 +241,14 @@ export const updateThemeInEditor = async (
       const iframe = document.getElementById(
         PUCK_PREVIEW_IFRAME_ID
       ) as HTMLIFrameElement;
-      const pagePreviewStyleTag =
-        iframe?.contentDocument?.getElementById(THEME_STYLE_TAG_ID);
-      if (pagePreviewStyleTag) {
+      const iframeDocument = iframe?.contentDocument;
+      if (iframeDocument) {
         observer.disconnect();
         pendingObserver = null;
 
-        pagePreviewStyleTag.innerText = newThemeTag;
+        getOrCreateThemeStyleTag(iframeDocument).textContent = newThemeTag;
         updateFontLinksInDocument(
-          iframe.contentDocument!,
+          iframeDocument,
           googleFontsToLoad,
           inUseCustomFonts
         );
diff --git a/packages/visual-editor/src/vite-plugin/registry/registryTemplateGenerator.test.ts b/packages/visual-editor/src/vite-plugin/registry/registryTemplateGenerator.test.ts
index 661887fa9..3ce170639 100644
--- a/packages/visual-editor/src/vite-plugin/registry/registryTemplateGenerator.test.ts
+++ b/packages/visual-editor/src/vite-plugin/registry/registryTemplateGenerator.test.ts
@@ -184,6 +184,8 @@ describe.sequential("generateRegistryTemplateFiles", () => {
     expect(localEditorTemplate).toContain(
       'const DEFAULT_LOCAL_EDITOR_ROUTE = "/local-editor";'
     );
+    expect(localEditorTemplate).not.toContain("localEditorTheme");
+    expect(localEditorTemplate).not.toContain("simulatedThemeData");
     expect(localEditorTemplate).not.toContain("../local-editor/generatedFiles");
   });