diff --git a/demo/golden/baselines/baseline-manifest.json b/demo/golden/baselines/baseline-manifest.json
index 1c69c3bf..9495da83 100644
--- a/demo/golden/baselines/baseline-manifest.json
+++ b/demo/golden/baselines/baseline-manifest.json
@@ -1,8 +1,8 @@
 {
   "schema": 1,
-  "matrixVersion": 5,
-  "acceptedAt": "2026-08-10T06:50:24.011Z",
-  "sourceFingerprint": "64bd56b74cc14a335c24ed415dd6641ad06a141141c647d464620c70fd2ecbd6",
+  "matrixVersion": 6,
+  "acceptedAt": "2026-08-10T15:04:46.442Z",
+  "sourceFingerprint": "fc04a319d946937a0d7fb1f2df149fb0fe5164d616bf18f84cac66f0f69e6890",
   "chromium": "151.0.7922.34",
   "scenarios": {
     "geometry-view-dark-fit": "fbce77f97180cd7d50a997c74d3fa1874ee3be2515a4c09b36dd4e792ebc66df",
@@ -19,22 +19,23 @@
     "geometry-diagonal-45-opening-dark": "fbce77f97180cd7d50a997c74d3fa1874ee3be2515a4c09b36dd4e792ebc66df",
     "openings-thick-wall-dark": "5d9ac6add9a5709318180f4554ac62c1c7e2862bd016be7901a2bd450e021f0c",
     "openings-hidden-view-dark": "799e791830ab63a1c445b8c77650a577d8e881daa1ff47d1dcf4e238eb1cff16",
-    "lighting-glow-sun-dark": "779ab0efd1bb13eb7940b4acb8e98c60f3a91f78ed3453d9bdd46861b0b3a06d",
+    "lighting-glow-sun-dark": "96bc1568319bda267a8b2c3f5eda8e70ca7671ef222195a05a7ad96080691d03",
     "lighting-fill-light-axis-split-dark": "acdbebe845ede66dbbe9de979aad93ba78dc2779d1ec533b238a9bea0d047d1c",
     "lighting-fill-temp-axis-split-dark": "2348b7c6a8594468664755e2fea1b49126e604192599be0a3965f24a0c2d2765",
     "lighting-fill-lqi-axis-split-dark": "584adcfb5541b1dddc814c2674bfce8002566bbb667b10501b7ff49fedef6f9c",
-    "lighting-temp-glow-dark": "978da899cc3757f447665fa635041ca9667f7c6451daa6b65606883f5dd84445",
-    "lighting-temp-glow-light": "eea710b86933f46f7180d9986ead7265ee0625e122f1e08c41d61bee51cae1ec",
-    "lighting-custom-glow-dark": "cbc6928b301090d7587cf3a1d8ceb05dff69fbc11ad9359265b982b16a1c4e0a",
-    "lighting-custom-glow-light": "a1cefd2ddcaf17cae749e9397b50913ee5b06e69321647dd92862cd526bbc1b6",
+    "lighting-temp-glow-dark": "62341e32f5ac3ac4cb7745765be159f77148636c05cd38c8200019df292b4509",
+    "lighting-temp-glow-light": "69aa73ff782e0f516c8bcddc4e726177a18a96b8e3050b83f6b34c39ed182996",
+    "lighting-custom-glow-dark": "9d8d0f18f99fcf6890b222c6b54a4a5749554bb40475c636ba1370f432da7414",
+    "lighting-custom-glow-light": "6bde6176196d4ba5a3d26a675ffa148274b934ffd51ae196996e65382c60b530",
     "lighting-temp-glow-no-sources-dark": "a169cb08967ee59f5aeb415111936cf5952b1c33a96e2bbcee68a1ec029df1c4",
-    "lighting-temp-glow-room-override-dark": "b6e875a6bb1b915f29ea22ed0cfc8bd4b20a26d0c1546f191f9f2d547fb3ebbb",
-    "hover-over-glow-dark": "ba04b494e2f80aa07e45e5b6d07082d7ed8ad0d01cedb9e216503b6811ac36c6",
+    "lighting-temp-glow-room-override-dark": "f9c629f2902e5636852b86ad3283620c7d3ec8bba316ff16f4f7a1e3f13f64fb",
+    "lighting-manual-auto-spill-overlap-dark": "1474e69b33629e7b52e7381110f480eb56d5eca81c54c304634bf65ce9239df2",
+    "hover-over-glow-dark": "f9846a0a91f8bf9f9752dfdd3b3af5ddfa89e25558fcceb3b598557b3584fa09",
     "hover-nested-room-dark": "472f630768f60c3168f64744af891323a64cf71f36f943fc5a56b4f0494efa70",
-    "large-house-zoom-040-dark": "f996bd648661e2b980583cbccdacf88a6b77c8ab0f04c835b93e94500ae77500",
-    "large-house-zoom-250-dark": "25e33a95c1daefa7cc71f868809d5d5490c1186aeb9183ffa4a044efb73b587a",
-    "large-house-warm-remount-dark": "7afe35a759b46ea2f73b441ca08ab734af23dd32df6de29c590af118b2f57728",
-    "device-dialog-desktop-en": "5eeb1e8e23313a952e47a2f32b58003a2c39d209a912fbd903c4c77aa29079c4",
+    "large-house-zoom-040-dark": "1ad9aedab81858f9faa3ca9be1e27cf95917c0b2d0310cfff30920674b73c726",
+    "large-house-zoom-250-dark": "e92a875108fe73a18aa4ca5d4707c6fe5813dea93acae1b7d9923dbfa8d29c46",
+    "large-house-warm-remount-dark": "de3e23328e855f467772e7f2a8af386be040e4e81a65eb67bea1196733c36a69",
+    "device-dialog-desktop-en": "9a40aa140e9834bef2f96aed27916010b22135696f881b1506b1348eaa2a1597",
     "device-dialog-mobile-ru": "5445eb576636362d402f66aa80c3816e01ca7ee75f4ffc86708ff3a43bbfb4a5",
     "decor-color-popover-mobile-ru": "eab3c5c76b27050dbdbc1627371a16916ea30473934de48842c6ab94a045f9db"
   }
diff --git a/demo/golden/baselines/device-dialog-desktop-en.png b/demo/golden/baselines/device-dialog-desktop-en.png
index 514f6457..33603632 100644
Binary files a/demo/golden/baselines/device-dialog-desktop-en.png and b/demo/golden/baselines/device-dialog-desktop-en.png differ
diff --git a/demo/golden/baselines/hover-over-glow-dark.png b/demo/golden/baselines/hover-over-glow-dark.png
index 07778e42..38e67640 100644
Binary files a/demo/golden/baselines/hover-over-glow-dark.png and b/demo/golden/baselines/hover-over-glow-dark.png differ
diff --git a/demo/golden/baselines/large-house-warm-remount-dark.png b/demo/golden/baselines/large-house-warm-remount-dark.png
index 7538c5de..2148e34f 100644
Binary files a/demo/golden/baselines/large-house-warm-remount-dark.png and b/demo/golden/baselines/large-house-warm-remount-dark.png differ
diff --git a/demo/golden/baselines/large-house-zoom-040-dark.png b/demo/golden/baselines/large-house-zoom-040-dark.png
index 7e327e66..af0f0868 100644
Binary files a/demo/golden/baselines/large-house-zoom-040-dark.png and b/demo/golden/baselines/large-house-zoom-040-dark.png differ
diff --git a/demo/golden/baselines/large-house-zoom-250-dark.png b/demo/golden/baselines/large-house-zoom-250-dark.png
index e7cc0080..7acbfdc7 100644
Binary files a/demo/golden/baselines/large-house-zoom-250-dark.png and b/demo/golden/baselines/large-house-zoom-250-dark.png differ
diff --git a/demo/golden/baselines/lighting-custom-glow-dark.png b/demo/golden/baselines/lighting-custom-glow-dark.png
index dc85b120..30185519 100644
Binary files a/demo/golden/baselines/lighting-custom-glow-dark.png and b/demo/golden/baselines/lighting-custom-glow-dark.png differ
diff --git a/demo/golden/baselines/lighting-custom-glow-light.png b/demo/golden/baselines/lighting-custom-glow-light.png
index ae121703..5c7ee535 100644
Binary files a/demo/golden/baselines/lighting-custom-glow-light.png and b/demo/golden/baselines/lighting-custom-glow-light.png differ
diff --git a/demo/golden/baselines/lighting-glow-sun-dark.png b/demo/golden/baselines/lighting-glow-sun-dark.png
index 6053ce0c..ac6af74c 100644
Binary files a/demo/golden/baselines/lighting-glow-sun-dark.png and b/demo/golden/baselines/lighting-glow-sun-dark.png differ
diff --git a/demo/golden/baselines/lighting-manual-auto-spill-overlap-dark.png b/demo/golden/baselines/lighting-manual-auto-spill-overlap-dark.png
new file mode 100644
index 00000000..a85b9a69
Binary files /dev/null and b/demo/golden/baselines/lighting-manual-auto-spill-overlap-dark.png differ
diff --git a/demo/golden/baselines/lighting-temp-glow-dark.png b/demo/golden/baselines/lighting-temp-glow-dark.png
index 27cf3f90..670d0e1d 100644
Binary files a/demo/golden/baselines/lighting-temp-glow-dark.png and b/demo/golden/baselines/lighting-temp-glow-dark.png differ
diff --git a/demo/golden/baselines/lighting-temp-glow-light.png b/demo/golden/baselines/lighting-temp-glow-light.png
index a89df33c..7f1c110c 100644
Binary files a/demo/golden/baselines/lighting-temp-glow-light.png and b/demo/golden/baselines/lighting-temp-glow-light.png differ
diff --git a/demo/golden/baselines/lighting-temp-glow-room-override-dark.png b/demo/golden/baselines/lighting-temp-glow-room-override-dark.png
index 5dc578c8..2750f80e 100644
Binary files a/demo/golden/baselines/lighting-temp-glow-room-override-dark.png and b/demo/golden/baselines/lighting-temp-glow-room-override-dark.png differ