diff --git a/demo/smoke_backdrop.mjs b/demo/smoke_backdrop.mjs
index c6fe56e2..4dd677b1 100644
--- a/demo/smoke_backdrop.mjs
+++ b/demo/smoke_backdrop.mjs
@@ -257,7 +257,12 @@ const layers = await page.evaluate(() => {
   const c = window.__card;
   const m = c._spaceModel();
   const svgEl = c.renderRoot.querySelector('.stage svg');
-  const kids = [...svgEl.children];
+  // Stage 2 keeps the flat floor DOM byte-for-byte equivalent but places it
+  // in one transformable scene group shared with Iso. Ordering is therefore
+  // measured inside the group that actually owns paper/image/rooms.
+  const layerRoot = [...svgEl.children].find((node) =>
+    node.querySelector?.('.hp-paperg') && node.querySelector?.('.room')) || svgEl;
+  const kids = [...layerRoot.children];
   const idx = (sel) => kids.findIndex((n) => n.matches(sel) || n.querySelector?.(sel));
   const papers = [...svgEl.querySelectorAll('.hp-paper')];
   return {
diff --git a/demo/smoke_bg_color.mjs b/demo/smoke_bg_color.mjs
index 327f79f4..3477b177 100644
--- a/demo/smoke_bg_color.mjs
+++ b/demo/smoke_bg_color.mjs
@@ -197,7 +197,10 @@ const paper = await page.evaluate(async () => {
       && cs.fill !== 'none' && !/rgba\(.*,\s*0\)/.test(cs.fill);
   }
   // …and the picture is drawn ON that paper: image after paper, before walls
-  const kids = [...sr().querySelector('.stage svg').children];
+  const svgEl = sr().querySelector('.stage svg');
+  const layerRoot = [...svgEl.children].find((node) =>
+    node.querySelector?.('.hp-paperg') && node.querySelector?.('.room')) || svgEl;
+  const kids = [...layerRoot.children];
   const idxOf = (sel) => kids.findIndex((n) => n.matches(sel) || n.querySelector?.(sel));
   out.imageAbovePaper = idxOf('image') > idxOf('.hp-paper') && idxOf('image') >= 0;
   out.imageBelowRooms = idxOf('image') < idxOf('.room, .room-outline');
@@ -266,7 +269,9 @@ const drawn = await page.evaluate(async () => {
   });
   // paper first, everything else on top of it (one .hp-paperg group wraps
   // all paper shapes so the daynight drop shadow composites without seams)
-  const first = sr().querySelector('.stage.noplan svg').firstElementChild;
+  const noplanSvg = sr().querySelector('.stage.noplan svg');
+  const noplanLayers = [...noplanSvg.children].find((node) => node.querySelector?.('.hp-paperg')) || noplanSvg;
+  const first = [...noplanLayers.children].find((node) => node.tagName.toLowerCase() !== 'defs');
   out.paperUnderneath = !!first && first.classList.contains('hp-paperg')
     && !!first.firstElementChild && first.firstElementChild.classList.contains('hp-paper');
   // live resize preview: drag the L's right wall 0.625 -> 0.6875 — the paper
diff --git a/demo/smoke_hidden_flag.mjs b/demo/smoke_hidden_flag.mjs
index a8e80eea..1e307cdb 100644
--- a/demo/smoke_hidden_flag.mjs
+++ b/demo/smoke_hidden_flag.mjs
@@ -197,7 +197,13 @@ Object.assign(out, await page.evaluate(async () => {
   },
   // модульный кэш конфига инвалидируется только через это событие — стаб
   // сохраняет колбэк, чтобы следующий тест мог сбросить кэш
-  connection: { subscribeEvents: async (cb) => { window.__hpInvalidate = cb; return () => {}; } } };
+  connection: { subscribeEvents: async (cb, type) => {
+    // #107 added a third, virtual-light subscription. Keep the config event
+    // callback specifically; otherwise the next fixture calls the unrelated
+    // virtual-light listener and reuses this stale shared config snapshot.
+    if (type === 'houseplan_config_updated') window.__hpInvalidate = cb;
+    return () => {};
+  } } };
   const host = document.createElement('div');
   document.body.appendChild(host);
   const card = document.createElement('houseplan-space-card');
diff --git a/demo/smoke_split_corner_wall.mjs b/demo/smoke_split_corner_wall.mjs
index 80e56409..8f5992e5 100644
--- a/demo/smoke_split_corner_wall.mjs
+++ b/demo/smoke_split_corner_wall.mjs
@@ -116,7 +116,7 @@ const res = await page.evaluate(async () => {
   c._setProjection('iso');
   await update();
   out.isoUsesCanonicalBody = !!sr().querySelector('.iso-walls .iso-wall-top')
-    && c._isoSource().build().flat(2).length > 0;
+    && c._isoSource().build().walls.flat(2).length > 0;
   c._setProjection('flat');
   await update();
 
diff --git a/demo/smoke_visual_continuity.mjs b/demo/smoke_visual_continuity.mjs
index b969ec0c..aac20bf6 100644
--- a/demo/smoke_visual_continuity.mjs
+++ b/demo/smoke_visual_continuity.mjs
@@ -42,6 +42,11 @@ const result = await page.evaluate(async (visualFixture) => {
   card._serverCfg = visualFixture.config;
   card._layout = visualFixture.layout;
   card._space = 'golden-lighting';
+  // This fixture starts after a same-route space choice. #131 deliberately
+  // refuses to treat the class initializer/current id as cold-start intent;
+  // mark this injected selection as already adopted navigation so the reload
+  // exercises continuity instead of cold-start precedence.
+  card._navApplied = true;
   card._regSignature = '';
   card.hass = {
     ...card.hass,