diff --git a/docs/API-Reference/editor/Editor.md b/docs/API-Reference/editor/Editor.md
index 4db5c3420a..e139e3fbb8 100644
--- a/docs/API-Reference/editor/Editor.md
+++ b/docs/API-Reference/editor/Editor.md
@@ -1703,3 +1703,18 @@ Constant: Bulls-eye mode, strictly center the text always.
 
 ## CENTERING\_MARGIN
 **Kind**: global constant  
+<a name="getMarkOptionTabstopOutline"></a>
+
+## getMarkOptionTabstopOutline()
+Mark option for a subdued outline box, used to show every remaining stop of an active
+snippet/tab-stop session (see editor/TabstopManager.js) so the user can see at a glance how
+many fields are left and where, even for the ones they haven't tabbed to yet.
+
+**Kind**: global function  
+<a name="getMarkOptionTabstopOutlineActive"></a>
+
+## getMarkOptionTabstopOutlineActive()
+Mark option for the bold/active variant of the above, layered on top of it for whichever stop
+is currently selected in an active snippet/tab-stop session.
+
+**Kind**: global function  
diff --git a/src-node/package-lock.json b/src-node/package-lock.json
index 14ca2e2f48..9cbf71d1f0 100644
--- a/src-node/package-lock.json
+++ b/src-node/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@phcode/node-core",
-    "version": "5.2.4-0",
+    "version": "5.3.0-0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@phcode/node-core",
-            "version": "5.2.4-0",
+            "version": "5.3.0-0",
             "hasInstallScript": true,
             "license": "GNU-AGPL3.0",
             "dependencies": {
diff --git a/src/brackets.config.dist.json b/src/brackets.config.dist.json
index 0e8dfcc466..1a8800fe19 100644
--- a/src/brackets.config.dist.json
+++ b/src/brackets.config.dist.json
@@ -1,9 +1,9 @@
 {
-    "googleAnalyticsID"       : "G-FBK9RP5YK2",
+    "googleAnalyticsID"       : "G-G3DTS3ZR09",
     "googleAnalyticsIDDesktop": "G-M7MX9BYZZ3",
     "mixPanelID"              : "8cb6814f733e37c05cc59b4adad26407",
     "coreAnalyticsID"         : "phoenix",
-    "coreAnalyticsAppName"    : "phoenix-prod",
+    "coreAnalyticsAppName"    : "phoenix-web",
     "coreAnalyticsAppNameDesktop"    : "desktop-prod",
     "environment"             : "production",
     "buildtype"               : "production",
diff --git a/src/index.html b/src/index.html
index 84083453df..481abdc295 100644
--- a/src/index.html
+++ b/src/index.html
@@ -47,14 +47,14 @@
 
     <!-- Open Graph / Facebook -->
     <meta property="og:type" content="website" />
-    <meta property="og:url" content="https://phcode.dev/" />
+    <meta property="og:url" content="https://web.phcode.dev/" />
     <meta property="og:title" content="Phoenix Code | Code Creatively" />
     <meta property="og:description" content="A text editor designed to make coding as intuitive and fun as playing a video game - specially crafted for web developers, designers, and students." />
     <meta property="og:image" content="assets/images/socialcard.png" />
 
     <!-- Twitter -->
     <meta property="twitter:card" content="summary_large_image" />
-    <meta property="twitter:url" content="https://phcode.dev/" />
+    <meta property="twitter:url" content="https://web.phcode.dev/" />
     <meta property="twitter:title" content="Phoenix Code | Code Creatively" />
     <meta property="twitter:description" content="A text editor designed to make coding as intuitive and fun as playing a video game - specially crafted for web developers, designers, and students." />
     <meta property="twitter:image" content="assets/images/socialcard.png" />
@@ -73,10 +73,10 @@
     <script>
         if(["dev.phcode.dev", "staging.phcode.dev"].includes(location.hostname)
             && localStorage.getItem("devDomainsEnabled") !== "true"){
-            alert("Hello explorer, you have reached a development version of phcode.dev that is not for general use and could be very unstable." +
+            alert("Hello explorer, you have reached a development version of Phoenix Code that is not for general use and could be very unstable." +
                 `\n\nIf you know what you are doing and what to visit the dev site, please go to https://${location.hostname}/devEnable.html to enable dev site and visit again.` +
-                "\n\nYou will now be redirected to phcode.dev.");
-            window.location = "https://phcode.dev";
+                "\n\nYou will now be redirected to web.phcode.dev.");
+            window.location = "https://web.phcode.dev";
         }
         if(window.electronAppAPI) {
             window.__ELECTRON__ = true;
@@ -446,6 +446,7 @@
                     'https://phcode.live': true, // phcode prod live preview server
                     'https://ai-panel-onboarding.phcode.dev': true, // Ai panel onboarding iframes
                     'https://phcode.dev': true,
+                    'https://web.phcode.dev': true, // prod web
                     'https://dev.phcode.dev': true,
                     'https://staging.phcode.dev': true,
                     'https://create.phcode.dev': true
diff --git a/src/live-preview-loader.html b/src/live-preview-loader.html
index 546ca6721b..8c085964d5 100644
--- a/src/live-preview-loader.html
+++ b/src/live-preview-loader.html
@@ -94,10 +94,14 @@
             'http://127.0.0.1:5000': true, // playwright tests
             'https://phcode.live': true, // phcode prod live preview server
             'https://phcode.dev': true,
+            'https://web.phcode.dev': true, // prod web
             'https://dev.phcode.dev': true,
             'https://staging.phcode.dev': true,
             'https://create.phcode.dev': true
         };
+        // this page is always served from the phoenix origin, so trust it whichever domain that is.
+        // keeps the loader working on any new phoenix host without another edit here.
+        TRUSTED_ORIGINS[location.origin] = true;
         let okMessageTemplate;
 
         function isTrustedURL(url) {
diff --git a/src/loggerSetup.js b/src/loggerSetup.js
index b768e48f2b..b2240f595d 100644
--- a/src/loggerSetup.js
+++ b/src/loggerSetup.js
@@ -28,6 +28,7 @@
         "phtauri://localhost", // mac or linux desktop
         "https://phtauri.localhost", //windows desktop
         "https://phcode.dev", // prod
+        "https://web.phcode.dev", // prod web
         "https://create.phcode.dev", // extension authoring prod
         "https://dev.phcode.dev", // dev url
         "https://staging.phcode.dev" // staging url
@@ -236,8 +237,8 @@
     function _isSafePathForLogging(pathText) {
         const lower = pathText.toLowerCase();
         const safeStarts = ["phtauri://", "https://phtauri.localhost", "http://localhost",
-            "https://localhost", "https://phcode.dev", "https://create.phcode.dev",
-            "https://dev.phcode.dev", "https://staging.phcode.dev",
+            "https://localhost", "https://phcode.dev", "https://web.phcode.dev",
+            "https://create.phcode.dev", "https://dev.phcode.dev", "https://staging.phcode.dev",
             "/usr/", "/lib/", "/lib64/", "/opt/", "/snap/", "/bin/", "/sbin/", "/etc/",
             "/system/", "/applications/", "c:\\program files", "c:\\windows"];
         for(let prefix of safeStarts){
diff --git a/src/robots.txt b/src/robots.txt
index 5ffe8d9525..a14590b401 100644
--- a/src/robots.txt
+++ b/src/robots.txt
@@ -37,7 +37,7 @@ Disallow: /assets/
 Disallow: /test/
 
 # XML sitemaps
-Sitemap: https://phcode.dev/sitemap-phcode.xml
+Sitemap: https://web.phcode.dev/sitemap-phcode.xml
 Sitemap: https://sitemaps.phcode.io/sitemap-phcode.xml
 
 # more sitemap urls can be given here, but just 1 for now.
diff --git a/src/sitemap-phcode.xml b/src/sitemap-phcode.xml
index 3f6c3ed83e..95e1879775 100644
--- a/src/sitemap-phcode.xml
+++ b/src/sitemap-phcode.xml
@@ -2,7 +2,7 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <!-- Please also modify the file at sitemaps.phcode.io/sitemap-phcode.xml if modifying this file-->
   <url>
-    <loc>https://phcode.dev/download/</loc>
+    <loc>https://web.phcode.dev/download/</loc>
     <changefreq>daily</changefreq>
   </url>
   <url>
@@ -10,7 +10,7 @@
     <changefreq>daily</changefreq>
   </url>
   <url>
-    <loc>https://phcode.dev/</loc>
+    <loc>https://web.phcode.dev/</loc>
     <changefreq>daily</changefreq>
   </url>
   <url>
diff --git a/test/SpecRunner.html b/test/SpecRunner.html
index 719ed09e5b..2920ee7511 100644
--- a/test/SpecRunner.html
+++ b/test/SpecRunner.html
@@ -363,6 +363,7 @@
           'https://phcode.live': true, // phcode prod live preview server
           'https://ai-panel-onboarding.phcode.dev': true, // Ai panel onboarding iframes
           'https://phcode.dev': true,
+          'https://web.phcode.dev': true, // prod web
           'https://dev.phcode.dev': true,
           'https://staging.phcode.dev': true,
           'https://create.phcode.dev': true