diff --git a/.changeset/chilly-yaks-listen.md b/.changeset/chilly-yaks-listen.md
deleted file mode 100644
index 8a4217f757..0000000000
--- a/.changeset/chilly-yaks-listen.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-'@evidence-dev/tailwind': patch
----
-
-[!] BREAKING CHANGE:
-Custom theme colors are converted implicitly to kebab-case by tailwindcss
-
-This means that some color defined in `evidence.config.yaml` as `myCustomColor`
-should be used as (for example) `text-my-custom-color`. (`text-myCustomColor` will not work)
-
-When referencing custom theme colors in Javascript the original case should still be used
-(for example) `myCustomColor` would still be `<BarChart ... fillColor=myCustomColor />`
-_NOT_ `<BarChart ... fillColor="my-custom-color" />`
diff --git a/.changeset/cool-vans-lick.md b/.changeset/cool-vans-lick.md
deleted file mode 100644
index ab834e3315..0000000000
--- a/.changeset/cool-vans-lick.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@evidence-dev/sdk': patch
----
-
-Handle malformed source directories when creating new sources
diff --git a/.changeset/four-mugs-taste.md b/.changeset/four-mugs-taste.md
deleted file mode 100644
index c9778c7be4..0000000000
--- a/.changeset/four-mugs-taste.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-'@evidence-dev/source-javascript': patch
-'@evidence-dev/component-utilities': patch
-'@evidence-dev/preprocess': patch
-'@evidence-dev/sdk': patch
-'@evidence-dev/universal-sql': patch
-'@evidence-dev/core-components': patch
-'@evidence-dev/tailwind': patch
----
-
-bump vitest
diff --git a/.changeset/hungry-donkeys-run.md b/.changeset/hungry-donkeys-run.md
deleted file mode 100644
index 8c764299cc..0000000000
--- a/.changeset/hungry-donkeys-run.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@evidence-dev/sdk': patch
-'@evidence-dev/universal-sql': patch
----
-
-Fix type errors
diff --git a/.changeset/kind-fishes-mate.md b/.changeset/kind-fishes-mate.md
deleted file mode 100644
index 57b2c12d93..0000000000
--- a/.changeset/kind-fishes-mate.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@evidence-dev/core-components': patch
-'@evidence-dev/tailwind': patch
-'@evidence-dev/evidence': patch
----
-
-Use theme class instead of data-
diff --git a/.changeset/nasty-pumas-wait.md b/.changeset/nasty-pumas-wait.md
deleted file mode 100644
index 94a5fe7329..0000000000
--- a/.changeset/nasty-pumas-wait.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@evidence-dev/core-components': patch
----
-
-Dont hide entire kebab menu when neverShowQueries is true
diff --git a/.changeset/ninety-boats-brake.md b/.changeset/ninety-boats-brake.md
new file mode 100644
index 0000000000..28063d098a
--- /dev/null
+++ b/.changeset/ninety-boats-brake.md
@@ -0,0 +1,8 @@
+---
+'@evidence-dev/evidence': minor
+'evidence-vscode': minor
+'@evidence-dev/sdk': minor
+'@evidence-dev/tailwind': patch
+---
+
+Added better support for remote environments including running in code-server with auto-port forwarding, also added a feature for disabling the automatic building of sources by the dev server
diff --git a/.changeset/seven-books-press.md b/.changeset/seven-books-press.md
deleted file mode 100644
index 8f52e9a4fe..0000000000
--- a/.changeset/seven-books-press.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@evidence-dev/evidence': minor
-'@evidence-dev/core-components': minor
----
-
-Improved settings page UI
diff --git a/.changeset/stale-lizards-wink.md b/.changeset/stale-lizards-wink.md
new file mode 100644
index 0000000000..37eddff410
--- /dev/null
+++ b/.changeset/stale-lizards-wink.md
@@ -0,0 +1,7 @@
+---
+'@evidence-dev/evidence': minor
+'@evidence-dev/sdk': minor
+'@evidence-dev/tailwind': minor
+---
+
+This PR enhances Evidence's development experience and proxy support with improvements to dev command CLI options and developer workflows.
diff --git a/.changeset/strong-wombats-admire.md b/.changeset/strong-wombats-admire.md
deleted file mode 100644
index 6f4dc03056..0000000000
--- a/.changeset/strong-wombats-admire.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@evidence-dev/evidence': patch
----
-
-Add theme.css export for svelte component <style/> tags that need to access tailwind theme
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000000..2fc7144419
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1,2 @@
+nodejs 22.19.0
+pnpm 10.17.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c5fb58620c..993b8acec4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,6 +42,13 @@ To request a feature, a new data source, or ask for help, create a GitHub discus
 
 ### Getting Started
 
+Evidence development can be done in two ways:
+
+1. **Repository Development** (recommended): Work directly in the Evidence repository using the example project
+2. **Local Package Linking**: Link your existing Evidence project to local Evidence packages
+
+#### Repository Development
+
 Follow these steps to test your changes, once you've started the example project (per steps below),
 you should be able to open the `Evidence Development Workspace` on `localhost:3000`. Any subsequent changes you make will be reflected on the website.
 
@@ -75,6 +82,16 @@ pnpm run dev:core-components
 pnpm run dev:example-project
 ```
 
+#### Local Package Linking
+
+If you prefer to develop using your existing Evidence project instead of the example project:
+
+1. Clone and build the Evidence repository
+2. Link local packages in your project's `package.json`
+3. Configure Tailwind CSS and Vite for local development
+
+For detailed setup instructions, see [DEVELOP.md](./DEVELOP.md).
+
 #### Cannot find package Error
 
 If you get: `Error [ERR_MODULE_NOT_FOUND]: Cannot find package [...]`. You might need to clean the `caches`
diff --git a/DEVELOP.md b/DEVELOP.md
new file mode 100644
index 0000000000..bfff37550b
--- /dev/null
+++ b/DEVELOP.md
@@ -0,0 +1,156 @@
+# Development Setup with Local Evidence Packages
+
+## When to Use This Guide
+
+**Most Evidence development should use the standard process:** Work directly in the Evidence repository using the example project, as documented in [CONTRIBUTING.md](./CONTRIBUTING.md). This is simpler, faster, and recommended for most contributors developing Evidence components and framework code.
+
+**Use this local package linking approach only when:**
+- **Developing the Evidence CLI** - Testing template population, file watching, or CLI-specific features
+- **End-to-end testing** - Testing the complete Evidence user experience with real project structures
+- **Testing with your own Evidence project** - You need to validate changes against your specific setup
+
+The key difference: the example project uses `vite dev` directly and bypasses Evidence's CLI template system, while real Evidence projects use `evidence dev` which converts Evidence project structure (pages/, sources/, queries/) into SvelteKit structure.
+
+## Overview
+
+This guide explains how to link your existing Evidence project to local Evidence packages for development, allowing you to edit Evidence source code and see changes immediately in your own project.
+
+## Prerequisites
+
+- An existing Evidence project
+- Local clone of the Evidence repository
+- Node.js and npm installed
+
+## Step 1: Clone Evidence Repository
+
+```bash
+git clone https://github.com/evidence-dev/evidence.git
+cd evidence
+git checkout release-2025-02-20  # Use stable release branch
+npm install
+npm run build
+```
+
+## Step 2: Configure Your Evidence Project
+
+In your Evidence project's `package.json`, replace Evidence package references with local file paths:
+
+```json
+{
+  "dependencies": {
+    "@evidence-dev/core-components": "file:../evidence/packages/ui/core-components",
+    "@evidence-dev/component-utilities": "file:../evidence/packages/lib/component-utilities",
+    "@evidence-dev/sdk": "file:../evidence/packages/lib/sdk",
+    "@evidence-dev/db-commons": "file:../evidence/packages/lib/db-commons",
+    "@evidence-dev/universal-sql": "file:../evidence/packages/lib/universal-sql",
+    "@evidence-dev/tailwind": "file:../evidence/packages/ui/tailwind"
+  },
+  "devDependencies": {
+    "@sveltejs/adapter-static": "3.0.1",
+    "@sveltejs/kit": "2.8.4",
+    "@sveltejs/vite-plugin-svelte": "3.1.2",
+    "@tailwindcss/vite": "^4.0.0",
+    "svelte": "4.2.19",
+    "vite": "5.4.14"
+  }
+}
+```
+
+**Important**: Use exact versions to match Evidence's dependencies, especially Svelte 4.2.19.
+
+## Step 3: Fix Tailwind CSS Content Scanning
+
+When using local packages, Tailwind CSS v4 cannot find Evidence component files. You need to update the Evidence Tailwind configuration:
+
+Edit `/path/to/evidence/packages/ui/tailwind/src/config/config.js`:
+
+```javascript
+export const config = {
+  content: [
+    // Core Evidence components source files (for local development)
+    '../../../core-components/src/**/*.{html,js,svelte,ts,md}',
+    './node_modules/@evidence-dev/core-components/src/**/*.{html,js,svelte,ts,md}',
+    './node_modules/@evidence-dev/core-components/dist/**/*.{html,js,svelte,ts,md}',
+
+    // Additional Evidence UI packages
+    '../../../*/src/**/*.{html,js,svelte,ts,md}',
+    './node_modules/@evidence-dev/*/src/**/*.{html,js,svelte,ts,md}',
+    './node_modules/@evidence-dev/*/dist/**/*.{html,js,svelte,ts,md}',
+
+    // Consumer project files
+    './src/**/*.{html,js,svelte,ts,md}',
+    './.evidence/template/src/**/*.{html,js,svelte,ts,md}'
+  ],
+  // ... rest of existing config
+}
+```
+
+## Step 4: Update Vite Configuration
+
+In your project's `vite.config.js`, exclude core-components from optimization:
+
+```javascript
+export default {
+  // ... other config
+  optimizeDeps: {
+    exclude: [
+      'svelte-icons',
+      '@evidence-dev/universal-sql',
+      '$evidence/config',
+      '$evidence/themes',
+      '@evidence-dev/core-components'  // Add this line
+    ]
+  }
+}
+```
+
+## Step 5: Install Dependencies and Run
+
+```bash
+# Install with force to handle local package linking
+npm install --force
+
+# Start development server
+npm run dev
+```
+
+## Why This Setup is Needed
+
+### Svelte Version Compatibility
+Evidence is built with Svelte 4.2.19, but newer projects might default to Svelte 5. Version mismatches cause compilation errors.
+
+### Tailwind CSS Content Scanning
+Tailwind CSS v4 scans files to determine which utility classes to generate. When using local packages instead of published npm packages, the file paths change and Tailwind cannot find Evidence component files, resulting in missing CSS rules and broken styling.
+
+### Vite Dependency Optimization
+Vite pre-bundles dependencies for faster loading. Local packages need different handling than published packages, so core-components should be excluded from optimization.
+
+## Troubleshooting
+
+### Styling Issues (Oversized Icons, Missing CSS)
+This typically indicates Tailwind isn't finding Evidence component files. Verify:
+1. The Tailwind config includes the correct content paths
+2. The Evidence repository is built (`npm run build` in Evidence repo)
+3. File paths in `package.json` are correct relative to your project
+
+### Build Errors
+Check that:
+1. Svelte versions match exactly (4.2.19)
+2. SvelteKit version is compatible (2.8.4)
+3. All local package paths exist and are built
+
+### Force Reinstall
+If packages seem corrupted:
+```bash
+rm -rf node_modules package-lock.json
+npm install --force
+```
+
+## Development Workflow
+
+1. Make changes to Evidence source code
+2. Build Evidence packages: `cd evidence && npm run postinstall`e
+3. Changes should automatically reflect in your project (HMR)
+4. For major changes, restart your dev server
+
+This setup allows you to develop Evidence components locally while maintaining a working project environment.
\ No newline at end of file
diff --git a/e2e/base-path/CHANGELOG.md b/e2e/base-path/CHANGELOG.md
index 90c5616c99..4695d88fe3 100644
--- a/e2e/base-path/CHANGELOG.md
+++ b/e2e/base-path/CHANGELOG.md
@@ -1,5 +1,24 @@
 # e2e-base-path
 
+## 0.0.20
+
+### Patch Changes
+
+- Updated dependencies [aac1170db]
+  - @evidence-dev/evidence@40.1.1
+
+## 0.0.19
+
+### Patch Changes
+
+- Updated dependencies [64486c669]
+- Updated dependencies [4efd427a7]
+- Updated dependencies [656543815]
+- Updated dependencies [7713d3e73]
+- Updated dependencies [1709f885e]
+  - @evidence-dev/core-components@5.2.0
+  - @evidence-dev/evidence@40.1.0
+
 ## 0.0.18
 
 ### Patch Changes
diff --git a/e2e/base-path/package.json b/e2e/base-path/package.json
index 9474ba270a..41663d7443 100644
--- a/e2e/base-path/package.json
+++ b/e2e/base-path/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-base-path",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "scripts": {
     "build": "cross-env EVIDENCE_BUILD_DIR=./build/my-base-path evidence build",
     "build:strict": "cross-env EVIDENCE_BUILD_DIR=./build/my-base-path evidence build:strict",
diff --git a/e2e/dev-server-startup/CHANGELOG.md b/e2e/dev-server-startup/CHANGELOG.md
index 0de67522b7..b72974c3c8 100644
--- a/e2e/dev-server-startup/CHANGELOG.md
+++ b/e2e/dev-server-startup/CHANGELOG.md
@@ -1,5 +1,24 @@
 # e2e-dev-server-startup
 
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies [aac1170db]
+  - @evidence-dev/evidence@40.1.1
+
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies [64486c669]
+- Updated dependencies [4efd427a7]
+- Updated dependencies [656543815]
+- Updated dependencies [7713d3e73]
+- Updated dependencies [1709f885e]
+  - @evidence-dev/core-components@5.2.0
+  - @evidence-dev/evidence@40.1.0
+
 ## 0.0.6
 
 ### Patch Changes
diff --git a/e2e/dev-server-startup/package.json b/e2e/dev-server-startup/package.json
index edd53b2c61..884de3a256 100644
--- a/e2e/dev-server-startup/package.json
+++ b/e2e/dev-server-startup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-dev-server-startup",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "scripts": {
     "build": "evidence build",
     "build:strict": "evidence build:strict",
diff --git a/e2e/prerender/CHANGELOG.md b/e2e/prerender/CHANGELOG.md
index 94549c5bde..d48156f8c5 100644
--- a/e2e/prerender/CHANGELOG.md
+++ b/e2e/prerender/CHANGELOG.md
@@ -1,5 +1,24 @@
 # e2e-prerender
 
+## 0.0.24
+
+### Patch Changes
+
+- Updated dependencies [aac1170db]
+  - @evidence-dev/evidence@40.1.1
+
+## 0.0.23
+
+### Patch Changes
+
+- Updated dependencies [64486c669]
+- Updated dependencies [4efd427a7]
+- Updated dependencies [656543815]
+- Updated dependencies [7713d3e73]
+- Updated dependencies [1709f885e]
+  - @evidence-dev/core-components@5.2.0
+  - @evidence-dev/evidence@40.1.0
+
 ## 0.0.22
 
 ### Patch Changes
diff --git a/e2e/prerender/package.json b/e2e/prerender/package.json
index e55ebeb74c..85e9869cbb 100644
--- a/e2e/prerender/package.json
+++ b/e2e/prerender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-prerender",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "scripts": {
     "build": "evidence build",
     "build:strict": "evidence build:strict",
diff --git a/e2e/spa/CHANGELOG.md b/e2e/spa/CHANGELOG.md
index f5391ac671..476810ee0a 100644
--- a/e2e/spa/CHANGELOG.md
+++ b/e2e/spa/CHANGELOG.md
@@ -1,5 +1,24 @@
 # e2e-spa
 
+## 0.0.35
+
+### Patch Changes
+
+- Updated dependencies [aac1170db]
+  - @evidence-dev/evidence@40.1.1
+
+## 0.0.34
+
+### Patch Changes
+
+- Updated dependencies [64486c669]
+- Updated dependencies [4efd427a7]
+- Updated dependencies [656543815]
+- Updated dependencies [7713d3e73]
+- Updated dependencies [1709f885e]
+  - @evidence-dev/core-components@5.2.0
+  - @evidence-dev/evidence@40.1.0
+
 ## 0.0.33
 
 ### Patch Changes
diff --git a/e2e/spa/package.json b/e2e/spa/package.json
index b2a0fdacd9..7656d4e011 100644
--- a/e2e/spa/package.json
+++ b/e2e/spa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-spa",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "scripts": {
     "build": "cross-env VITE_EVIDENCE_SPA=true evidence build",
     "build:strict": "cross-env VITE_EVIDENCE_SPA=true evidence build:strict",
diff --git a/e2e/themes/CHANGELOG.md b/e2e/themes/CHANGELOG.md
index dd3717734b..fe92ecfd76 100644
--- a/e2e/themes/CHANGELOG.md
+++ b/e2e/themes/CHANGELOG.md
@@ -1,5 +1,24 @@
 # e2e-themes
 
+## 0.0.31
+
+### Patch Changes
+
+- Updated dependencies [aac1170db]
+  - @evidence-dev/evidence@40.1.1
+
+## 0.0.30
+
+### Patch Changes
+
+- Updated dependencies [64486c669]
+- Updated dependencies [4efd427a7]
+- Updated dependencies [656543815]
+- Updated dependencies [7713d3e73]
+- Updated dependencies [1709f885e]
+  - @evidence-dev/core-components@5.2.0
+  - @evidence-dev/evidence@40.1.0
+
 ## 0.0.29
 
 ### Patch Changes
diff --git a/e2e/themes/package.json b/e2e/themes/package.json
index 78744492aa..ea84f8d38a 100644
--- a/e2e/themes/package.json
+++ b/e2e/themes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-themes",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "scripts": {
     "build": "cross-env evidence build",
     "build:strict": "cross-env evidence build:strict",
diff --git a/packages/datasources/javascript/CHANGELOG.md b/packages/datasources/javascript/CHANGELOG.md
index f81853a42a..af2e34bd92 100644
--- a/packages/datasources/javascript/CHANGELOG.md
+++ b/packages/datasources/javascript/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @evidence-dev/source-javascript
 
+## 0.0.3
+
+### Patch Changes
+
+- 64486c669: bump vitest
+
 ## 0.0.2
 
 ### Patch Changes
diff --git a/packages/datasources/javascript/package.json b/packages/datasources/javascript/package.json
index e75fb57b8b..4751af4386 100644
--- a/packages/datasources/javascript/package.json
+++ b/packages/datasources/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@evidence-dev/source-javascript",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "",
   "main": "index.js",
   "type": "module",
diff --git a/packages/evidence/CHANGELOG.md b/packages/evidence/CHANGELOG.md
index 6b7a8fa346..b49bd859e5 100644
--- a/packages/evidence/CHANGELOG.md
+++ b/packages/evidence/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @evidence-dev/evidence
 
+## 40.1.1
+
+### Patch Changes
+
+- aac1170db: Add @tailwindcss/vite as a dependency
+
+## 40.1.0
+
+### Minor Changes
+
+- 7713d3e73: Improved settings page UI
+
+### Patch Changes
+
+- 4efd427a7: Use theme class instead of data-
+- 1709f885e: Add theme.css export for svelte component <style/> tags that need to access tailwind theme
+- Updated dependencies [0fd376985]
+- Updated dependencies [64486c669]
+- Updated dependencies [fc185c44c]
+  - @evidence-dev/sdk@3.0.9
+  - @evidence-dev/preprocess@6.0.4
+  - @evidence-dev/universal-sql@2.2.10
+
 ## 40.0.9
 
 ### Patch Changes
diff --git a/packages/evidence/cli.js b/packages/evidence/cli.js
index 0832c129bd..4e61dc829d 100755
--- a/packages/evidence/cli.js
+++ b/packages/evidence/cli.js
@@ -8,7 +8,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import sade from 'sade';
 import { logQueryEvent } from '@evidence-dev/telemetry';
-import { enableDebug, enableStrictMode } from '@evidence-dev/sdk/utils';
+import { enableDebug, enableStrictMode, disableHmr } from '@evidence-dev/sdk/utils';
 import { loadEnv } from 'vite';
 import { createHash } from 'crypto';
 
@@ -60,7 +60,7 @@ const runFileWatcher = function (watchPatterns) {
 
 	var watchers = [];
 
-	watchPatterns.forEach((pattern, item) => {
+	watchPatterns.filter(p => p?.disabled !== true).forEach((pattern, item) => {
 		watchers[item] = chokidar.watch(path.join(pattern.sourceRelative, pattern.filePattern), {
 			ignored: ignoredFiles
 		});
@@ -131,11 +131,13 @@ const watchPatterns = [
 		filePattern: '**'
 	}, // static files (eg images)
 	{
+		mnemonic: 'sources',
 		sourceRelative: './sources/',
 		targetRelative: './.evidence/template/sources/',
 		filePattern: '**'
 	}, // source files (eg csv files)
 	{
+		mnemonic: 'queries',
 		sourceRelative: './queries',
 		targetRelative: './.evidence/template/queries',
 		filePattern: '**'
@@ -145,7 +147,11 @@ const watchPatterns = [
 		targetRelative: './.evidence/template/src/components/',
 		filePattern: '**'
 	}, // custom components
-	{ sourceRelative: '.', targetRelative: './.evidence/template/src/', filePattern: 'app.css' }, // custom theme file
+	{ 
+		sourceRelative: '.', 
+		targetRelative: './.evidence/template/src/', 
+		filePattern: 'app.css' 
+	}, // custom theme file
 	{
 		sourceRelative: './partials',
 		targetRelative: './.evidence/template/partials',
@@ -161,6 +167,7 @@ function removeStaticDir(dir) {
 const strictMode = function () {
 	enableStrictMode();
 };
+
 const buildHelper = function (command, args) {
 	const watchers = runFileWatcher(watchPatterns);
 	const flatArgs = flattenArguments(args);
@@ -177,7 +184,7 @@ const buildHelper = function (command, args) {
 			// used for source query HMR
 			EVIDENCE_DATA_URL_PREFIX: process.env.EVIDENCE_DATA_URL_PREFIX ?? 'static/data',
 			EVIDENCE_DATA_DIR: process.env.EVIDENCE_DATA_DIR ?? './static/data',
-			EVIDENCE_IS_BUILDING: 'true'
+			EVIDENCE_IS_BUILDING: 'true',
 		}
 	});
 	// Copy the outputs to the root of the project upon successful exit
@@ -234,6 +241,8 @@ const prog = sade('evidence');
 
 prog
 	.command('dev')
+	.option('--disable-hmr', 'Disables hot-reloading of certain features [sources,queries]')
+	.option('--disable-watchers', 'Disables watching certain directories [sources,queries]')
 	.option('--debug', 'Enables verbose console logs')
 	.describe('launch the local evidence development environment')
 	.action((args) => {
@@ -243,6 +252,33 @@ prog
 			delete args.debug;
 		}
 
+		if (args['disable-watchers']) {
+			const directories = args['disable-watchers'].split(/\W/).filter(v => v.length > 0);
+			const mnemonics = watchPatterns.filter(p => Object.hasOwn(p, 'mnemonic')).map(p => p.mnemonic);
+			if (directories.some(v => !mnemonics.includes(v))) {
+				console.warn(chalk.yellow(`Unknown watch directory/directories: "${args['disable-watchers']}"`));
+				console.info(`Directories for which watching can be disabled are: ${mnemonics.join(', ') }`);
+				process.exit(1);
+			}
+
+			watchPatterns.forEach(p => {
+				p.disabled = Object.hasOwn(p, 'mnemonic') && directories.includes(p.mnemonic);
+			});
+
+			console.info(chalk.bold(`These directories will not be watched: ${directories.join(', ')}`));
+			delete args['disable-watchers'];
+		}
+
+		if (args['disable-hmr']) {
+			try {
+				disableHmr(args['disable-hmr'].split(/\W/).filter(v => v.length > 0));
+			} catch (_) {
+				console.warn(chalk.yellow(`Unknown HMR feature(s): "${args['disable-hmr']}"`));
+			}
+
+			delete args['disable-hmr'];
+		}
+
 		loadEnvFile();
 
 		const manifestExists = fs.lstatSync(
@@ -280,7 +316,7 @@ ${chalk.bold('[!] Unable to load source manifest')}
 				...process.env,
 				// used for source query HMR
 				EVIDENCE_DATA_URL_PREFIX: process.env.EVIDENCE_DATA_URL_PREFIX ?? 'static/data',
-				EVIDENCE_DATA_DIR: process.env.EVIDENCE_DATA_DIR ?? './static/data'
+				EVIDENCE_DATA_DIR: process.env.EVIDENCE_DATA_DIR ?? './static/data',
 			}
 		});
 
diff --git a/packages/evidence/package.json b/packages/evidence/package.json
index 43a564b387..6af6f2edaf 100644
--- a/packages/evidence/package.json
+++ b/packages/evidence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@evidence-dev/evidence",
-	"version": "40.0.9",
+	"version": "40.1.1",
 	"description": "dependencies for evidence projects",
 	"type": "module",
 	"keywords": [
@@ -47,6 +47,7 @@
 		"@evidence-dev/universal-sql": "workspace:*",
 		"@sveltejs/adapter-static": "3.0.1",
 		"@sveltejs/kit": "2.8.4",
+		"@tailwindcss/vite": "^4.0.0",
 		"chalk": "^5.3.0",
 		"chokidar": "3.6.0",
 		"fs-extra": "11.2.0",
diff --git a/packages/evidence/scripts/build-template.js b/packages/evidence/scripts/build-template.js
index cc3b6caddd..42facae7a8 100644
--- a/packages/evidence/scripts/build-template.js
+++ b/packages/evidence/scripts/build-template.js
@@ -45,107 +45,116 @@ const configFileLocation = new URL('svelte.config.js', import.meta.url);
 fs.writeFileSync('./template/svelte.config.js', fs.readFileSync(configFileLocation));
 
 fsExtra.outputFileSync(
-	'./template/vite.config.js',
-	`import { sveltekit } from "@sveltejs/kit/vite"
-	import { createLogger } from 'vite';
-	import { sourceQueryHmr, configVirtual, queryDirectoryHmr } from '@evidence-dev/sdk/build/vite';
-	import { isDebug } from '@evidence-dev/sdk/utils';
-	import { log } from "@evidence-dev/sdk/logger";
-	import { evidenceThemes } from '@evidence-dev/tailwind/vite-plugin';
-	import tailwindcss from '@tailwindcss/vite';
-
-
-	process.removeAllListeners('warning');
-	process.on('warning', (warning) => {
-	  if (warning.name === 'ExperimentalWarning' && 
-	      warning.message.includes('CommonJS module') && 
-	      warning.message.includes('ES Module')) {
-	    return;
-	  }
-	  console.warn(warning);
-	});
+	'./template/vite.config.js', `
+import { sveltekit } from "@sveltejs/kit/vite"
+import { createLogger } from 'vite';
+import { sourceQueryHmr, configVirtual, queryDirectoryHmr } from '@evidence-dev/sdk/build/vite';
+import { isDebug, isHmrEnabled } from '@evidence-dev/sdk/utils';
+import { log } from "@evidence-dev/sdk/logger";
+import { evidenceThemes } from '@evidence-dev/tailwind/vite-plugin';
+import tailwindcss from '@tailwindcss/vite';
+
+
+process.removeAllListeners('warning');
+process.on('warning', (warning) => {
+	if (warning.name === 'ExperimentalWarning' && 
+		warning.message.includes('CommonJS module') && 
+		warning.message.includes('ES Module')) {
+		return;
+	}
+	console.warn(warning);
+});
 
 
-	const logger = createLogger();
-
-    const strictFs = (process.env.NODE_ENV === 'development') ? false : true;
-    /** @type {import('vite').UserConfig} */
-     const config = 
-    {
-        plugins: [tailwindcss(), sveltekit(), configVirtual(), queryDirectoryHmr, sourceQueryHmr(), evidenceThemes()],
-        optimizeDeps: {
-            include: ['echarts-stat', 'echarts', 'blueimp-md5', 'nanoid', '@uwdata/mosaic-sql',
-				// We need these to prevent HMR from doing a full page reload
-				...(process.env.EVIDENCE_DISABLE_INCLUDE ? [] : [
-					'@evidence-dev/core-components',
-					// Evidence packages injected into process-queries
-					${preprocess.injectedEvidenceImports.map((i) => `'${i.from}'`).join(',')},
-					'debounce', 
-					'@duckdb/duckdb-wasm',
-					'apache-arrow'
-				])
-				
-			],
-            exclude: ['svelte-icons', '@evidence-dev/universal-sql', '$evidence/config', '$evidence/themes']
-        },
-        ssr: {
-            external: ['@evidence-dev/telemetry', 'blueimp-md5', 'nanoid', '@uwdata/mosaic-sql', '@evidence-dev/sdk/plugins']
-        },
-        server: {
-            fs: {
-                strict: strictFs // allow template to get dependencies outside the .evidence folder
-            },
-			hmr: {
-				overlay: false
-			}
-        },
-		build: {
-			// 🚩 Triple check this
-			minify: isDebug() ? false : true,
-			target: isDebug() ? 'esnext' : undefined,
-			rollupOptions: {
-				external: [/^@evidence-dev\\/tailwind\\/fonts\\//],
-				onwarn(warning, warn) {
-					if (warning.code === 'EVAL') return;
-					warn(warning);
-				}
-			}
+const logger = createLogger();
+
+const strictFs = (process.env.NODE_ENV === 'development') ? false : true;
+/** @type {import('vite').UserConfig} */
+const config =
+{
+	plugins: [
+		tailwindcss(),
+		sveltekit(),
+		configVirtual(),
+		...(isHmrEnabled('queries') ? [queryDirectoryHmr] : []),
+		...(isHmrEnabled('sources') ? [sourceQueryHmr()]  : []),
+		evidenceThemes()
+	],
+	optimizeDeps: {
+		include: ['echarts-stat', 'echarts', 'blueimp-md5', 'nanoid', '@uwdata/mosaic-sql',
+			// We need these to prevent HMR from doing a full page reload
+			...(process.env.EVIDENCE_DISABLE_INCLUDE ? [] : [
+				'@evidence-dev/core-components',
+${ 				// Evidence packages injected into process-queries
+				preprocess.injectedEvidenceImports.map((i) => `\t\t\t\t'${i.from}'`).join(',\n')},
+				'debounce', 
+				'@duckdb/duckdb-wasm',
+				'apache-arrow'
+			])
+		],
+		exclude: ['svelte-icons', '@evidence-dev/universal-sql', '$evidence/config', '$evidence/themes']
+	},
+	ssr: {
+		external: ['@evidence-dev/telemetry', 'blueimp-md5', 'nanoid', '@uwdata/mosaic-sql', '@evidence-dev/sdk/plugins']
+	},
+	server: {
+		fs: {
+			strict: strictFs // allow template to get dependencies outside the .evidence folder
 		},
-		customLogger: logger
-    }
-
-	// Suppress errors when building in non-debug mode
-	if (!isDebug() && process.env.EVIDENCE_IS_BUILDING === 'true') {
-		config.logLevel = 'silent';
-		logger.error = (msg) => log.error(msg);
-		logger.info = () => {};
-		logger.warn = () => {};
-		logger.warnOnce = () => {};
-	} else {
-		const loggerWarn = logger.warn;
-		const loggerOnce = logger.warnOnce
-
-		/**
-		 * @see https://github.com/evidence-dev/evidence/issues/1876
-		 * Ignore the duckdb-wasm sourcemap warning
-		 */
-		logger.warnOnce = (m, o) => {
-			if (m.match(/Sourcemap for ".+\\/node_modules\\/@duckdb\\/duckdb-wasm\\/dist\\/duckdb-browser-eh\\.worker\\.js" points to missing source files/)) return;
-			loggerOnce(m, o)
+		hmr: {
+			overlay: false
+		},
+		allowedHosts: [
+			...(process.env.EVIDENCE_ALLOWED_HOST ? [process.env.EVIDENCE_ALLOWED_HOST] : [])
+		]
+	},
+	build: {
+		// 🚩 Triple check this
+		minify: isDebug() ? false : true,
+		target: isDebug() ? 'esnext' : undefined,
+		rollupOptions: {
+			external: [/^@evidence-dev\\/tailwind\\/fonts\\//],
+			onwarn(warning, warn) {
+				if (warning.code === 'EVAL') return;
+				warn(warning);
+			}
 		}
+	},
+	customLogger: logger
+}
+
+// Suppress errors when building in non-debug mode
+if (!isDebug() && process.env.EVIDENCE_IS_BUILDING === 'true') {
+	config.logLevel = 'silent';
+	logger.error = (msg) => log.error(msg);
+	logger.info = () => {};
+	logger.warn = () => {};
+	logger.warnOnce = () => {};
+} else {
+	const loggerWarn = logger.warn;
+	const loggerOnce = logger.warnOnce
+
+	/**
+	 * @see https://github.com/evidence-dev/evidence/issues/1876
+	 * Ignore the duckdb-wasm sourcemap warning
+	 */
+	logger.warnOnce = (m, o) => {
+		if (m.match(/Sourcemap for ".+\\/node_modules\\/@duckdb\\/duckdb-wasm\\/dist\\/duckdb-browser-eh\\.worker\\.js" points to missing source files/)) return;
+		loggerOnce(m, o)
+	}
 
-		logger.warn = (msg, options) => {
-			// ignore fs/promises warning, used in +layout.js behind if (!browser) check
-			if (msg.includes('Module "fs/promises" has been externalized for browser compatibility')) return;
+	logger.warn = (msg, options) => {
+		// ignore fs/promises warning, used in +layout.js behind if (!browser) check
+		if (msg.includes('Module "fs/promises" has been externalized for browser compatibility')) return;
 
-			// ignore eval warning, used in duckdb-wasm
-			if (msg.includes('Use of eval in') && msg.includes('is strongly discouraged as it poses security risks and may cause issues with minification.')) return;
+		// ignore eval warning, used in duckdb-wasm
+		if (msg.includes('Use of eval in') && msg.includes('is strongly discouraged as it poses security risks and may cause issues with minification.')) return;
 
-			loggerWarn(msg, options);
-		};
-	}
+		loggerWarn(msg, options);
+	};
+}
 
-    export default config`
+export default config`
 );
 
 // Create a readme
diff --git a/packages/extension/package.json b/packages/extension/package.json
index 17fe3b4d41..c0fda6a0c5 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -328,6 +328,11 @@
 					"default": 3000,
 					"description": "Default Evidence server port."
 				},
+				"evidence.disableAutoSourceBuilding": {
+					"type": "boolean",
+					"default": false,
+					"description": "Disable the automatic building of sources by the server. When checked, the server will not automatically rebuild sources or reload when source files change."
+				},
 				"evidence.templateProjectUrl": {
 					"type": "string",
 					"default": "https://github.com/evidence-dev/template",
@@ -495,7 +500,7 @@
 						"completionEvents": [
 							"onCommand:startServer"
 						],
-						"when": "evidence.hasProject == true"
+						"when": "evidence.hasProject == true && !evidence.serverRunning"
 					}
 				]
 			}
diff --git a/packages/extension/src/commands/build.ts b/packages/extension/src/commands/build.ts
index 495ad79380..3b22ad32fb 100644
--- a/packages/extension/src/commands/build.ts
+++ b/packages/extension/src/commands/build.ts
@@ -44,7 +44,7 @@ export async function installDependencies() {
 	if (!isSupportedNodeVersion(nodeVersion)) {
 		promptToInstallNodeJsAndRestart(nodeVersion);
 	} else {
-		if (isServerRunning()) {
+		if (await isServerRunning()) {
 			stopServer();
 			await timeout(1000);
 		} else {
@@ -72,7 +72,7 @@ export async function updateDependencies() {
 	const cdCommand = packageJsonFolder ? `cd ${packageJsonFolder} ; ` : '';
 	const cdBackCommand = packageJsonFolder ? `; cd ${workspaceFolderPath}` : '';
 
-	if (isServerRunning()) {
+	if (await isServerRunning()) {
 		stopServer();
 		await timeout(1000);
 	}
@@ -89,7 +89,7 @@ export async function updateDependencies() {
  * @see https://docs.evidence.dev/deployment/overview#build-process
  */
 export async function buildProject() {
-	if (isServerRunning()) {
+	if (await isServerRunning()) {
 		stopServer();
 		await timeout(1000);
 	}
@@ -103,7 +103,7 @@ export async function buildProject() {
  * @see https://docs.evidence.dev/deployment/overview#buildstrict
  */
 export async function buildProjectStrict() {
-	if (isServerRunning()) {
+	if (await isServerRunning()) {
 		stopServer();
 		await timeout(1000);
 	}
diff --git a/packages/extension/src/commands/preview.ts b/packages/extension/src/commands/preview.ts
index d620175e50..30f318d351 100644
--- a/packages/extension/src/commands/preview.ts
+++ b/packages/extension/src/commands/preview.ts
@@ -1,4 +1,4 @@
-import { commands, workspace, Uri, ViewColumn } from 'vscode';
+import { commands, workspace, Uri, ViewColumn, window } from 'vscode';
 
 import { Commands } from './commands';
 import { getExtensionContext } from '../extensionContext';
@@ -25,78 +25,82 @@ export const localAppUrl = `http://localhost`;
  * For the Evidence markdown documents in the /pages/ folder,
  * opens the requested app page in the built-in simple browser webview.
  *
- * @param uri Optional Uri of the markdown document to preview.
+ * @param uri Optional file location of the markdown document to preview.
+ * No http/https Urls supported.
  *
  * @see Simple browser extension implementation:
  *  https://github.com/microsoft/vscode/pull/109276
  */
 export async function preview(uri?: Uri) {
-	// default page url
-	let pageUrl: string = '/';
-
 	// check if the open workspace has an Evidence project
 	const isEvidenceProject = getExtensionContext().workspaceState.get(Context.HasEvidenceProject);
 
-	if ((!uri || uri.path === '/') && isEvidenceProject && isServerRunning()) {
-		// open the default app page in the built-in simple browser webview
-		const homePage: Uri = await getAppPageUri('/');
-		openPageView(homePage);
-
-		// wait for the server to load the app home page
-		await waitFor(homePage.toString(true), 1000, 30000); // encoding, ms interval, max total wait time ms
+	// check if the Evidence dev server is running
+	const isEvidenceServerRunning = await isServerRunning();
 
-		// call the built-in simple browser once more
-		// to load the home page content on server startup
-		openPageView(homePage);
+	if (!isEvidenceProject || !isEvidenceServerRunning) {
+		// show standard markdown document preview
+		commands.executeCommand(Commands.MarkdownShowPreview, uri);
 		return;
 	}
 
-	if (uri) {
-		// log preview document or page request in output channel for troubleshooting
-		const outputChannel = getOutputChannel();
-		if (uri.scheme === 'file ') {
-			outputChannel.appendLine(`Requested document preview: ${uri.fsPath}`); // skip encoding
-		} else if (uri.scheme === 'http' || uri.scheme === 'https') {
-			// must be a valide http or https
-			outputChannel.appendLine(`Requested page preview: ${uri.path}`); // skip encoding
-		}
+	// from this point on, we know this is an Evidence project with a server running
+	if (!uri || uri.path === '/') {
+		// open the default app page in the built-in simple browser webview
+		const homePageUris = await getAppPageUri('/');
+		// I suspect this to be causing the confusing message "Please reopen the preview"
+		// openPageView(homePage);
+
+		// to know when the server is ready to serve the page, we ping the local
+		// uri of the page 
+		await waitFor(homePageUris.internal.toString(true), 
+			500, 30_000); // encoding, ms interval, max total wait time ms
+
+		// call the built-in simple browser once more to load the home page content 
+		// on server startup, note that this is a browser running on the local machine
+		// and not the remote workspace environment.
+		openPageView(homePageUris.external);
+		return;
 	}
 
-	if (!isEvidenceProject || !isServerRunning() || /\/pages\/|\\pages\\/.test(uri?.path ?? '')) {
-		// show standard markdown document preview
-		commands.executeCommand(Commands.MarkdownShowPreview, uri);
+	// from this point on, we know that "uri" is not 'undefined' or '/'
+	const outputChannel = getOutputChannel();
+	if (uri.scheme !== 'file') {
+		// this should never happen
+		outputChannel.appendLine(`Only document preview is supported, preview received: ${
+			uri.toString(true)}`); // skip encoding
 		return;
+	} else {
+		outputChannel.appendLine(`Requested document preview: ${
+			uri?.fsPath}`); // skip encoding
 	}
 
-	// create web page url from page Uri
-	if (uri && (uri.scheme === 'http' || uri.scheme === 'https')) {
-		pageUrl = uri.toString(true); // skip encoding
-	} else if (
-		uri &&
-		uri.scheme === 'file' &&
-		workspace.workspaceFolders &&
-		isEvidenceProject &&
-		isServerRunning()
-	) {
+	// from this point on, we know it is file uri which we need to map to an external app url
+	if (workspace.workspaceFolders) {
+		let pageUrlPath = uri.fsPath;
+
 		// get project folder root path
 		const workspaceFolderPath: string = getWorkspaceFolder()!.uri.fsPath;
 
 		// create web page url from file Uri by converting .md path to app page path
-		let pagePath: string = uri.fsPath
+		pageUrlPath = pageUrlPath
 			.replace(workspaceFolderPath, '')
 			.split('\\')
 			.join('/')
 			.replace('/pages/', '')
 			.replace('index.md', '')
 			.replace('.md', '');
-		pageUrl = `/${pagePath}`;
+		pageUrlPath = `/${pageUrlPath}`;
+		
+		// create external app page Uri from page url path
+		const pageUri: Uri = (await getAppPageUri(pageUrlPath)).external;
+		
+		// open requested page in the built-in simple browser webview
+		openPageView(pageUri);
+		return;
 	}
 
-	// create external app page Uri from page url
-	const pageUri: Uri = await getAppPageUri(pageUrl);
-
-	// open requested page in the built-in simple browser webview
-	openPageView(pageUri);
+	window.showErrorMessage('Preview is not possible without a folder opened.');
 }
 
 /**
@@ -104,7 +108,7 @@ export async function preview(uri?: Uri) {
  *
  * @param pageUri Uri of the page to open.
  */
-async function openPageView(pageUri: Uri) {
+export async function openPageView(pageUri: Uri) {
 	const previewType: string = <string>getConfig(Settings.PreviewType);
 
 	if (pageUri) {
diff --git a/packages/extension/src/commands/server.ts b/packages/extension/src/commands/server.ts
index d954347994..b9df8143da 100644
--- a/packages/extension/src/commands/server.ts
+++ b/packages/extension/src/commands/server.ts
@@ -1,20 +1,30 @@
-import { commands, env, workspace, Uri } from 'vscode';
+import { window, commands, env, workspace, Uri, ViewColumn } from 'vscode';
 
 import { Commands } from './commands';
-import { Settings, getConfig } from '../config';
+import { Context, Settings, getConfig, getWorkspaceFolder } from '../config';
 import { getOutputChannel } from '../output';
 import { closeTerminal, sendCommand } from '../terminal';
-import { localAppUrl, preview } from './preview';
+import { localAppUrl, openPageView, preview } from './preview';
 import { getNodeVersion, isSupportedNodeVersion, promptToInstallNodeJsAndRestart } from '../node';
 import { statusBar } from '../statusBar';
 import { timeout } from '../utils/timer';
-import { tryPort } from '../utils/httpUtils';
+import { isHostname, tryPort } from '../utils/httpUtils';
 import { hasDependencies } from './build';
 import { telemetryService } from '../extension';
 import { hasManifest, getTypesFromConnections, getPackageJsonFolder } from '../utils/jsonUtils';
-
-const localhost = 'localhost';
-let _running: boolean = false;
+import { isProcessRunning } from '../utils/shellUtils';
+
+const localhost = ['127.0.0.1', '::1', 'localhost'];
+// Formerly this was managed as a simple boolean variable which was problematic
+// in a workspace extension in remote development scenarios.
+// (namely, we often ended up with the _running variable being false
+//  while the Evidence dev server launched by the extension is still up and running)
+const _running = async (): Promise<boolean> => {
+	const workspaceFolder = getWorkspaceFolder();
+	if (!workspaceFolder) return false;
+
+	return await isProcessRunning('evidence dev', workspaceFolder.uri.fsPath);
+};
 let _activePort: number = <number>getConfig(Settings.DefaultPort);
 
 // Set a context key
@@ -27,57 +37,86 @@ const setContext = (key: any, value: any) => {
  * and rewrites the host name for the host and port forwarding
  * when running in GitHub Codespaces.
  *
- * @param pageUrl Optional target web page Url.
+ * @param pageUrlPath Optional, the path part of the app Url
+ * to be converted to an external app Url
  *
- * @returns Rewritten page Uri with the active server port number,
- * and rewritten host name for the host and port forwarding
- * when running in GitHub Codespaces.
+ * @returns An object that contains both the internal and the
+ * external Urls. The internal Url can be used by workspace
+ * actions such as pinging while the external Url is the one
+ * we can safely open in a browser on the local system when
+ * vscode is running at a remoteworkspace (e.g. using code-
+ * server, SSH, or in GitHub Codespaces)
  */
-export async function getAppPageUri(pageUrl?: string): Promise<Uri> {
+export async function getAppPageUri(pageUrlPath?: string): Promise<{
+	internal: Uri, external: Uri}
+> {
 	const defaultPort = <number>getConfig(Settings.DefaultPort);
-	const serverUrl = `${localAppUrl}:${defaultPort}`;
-	if (pageUrl === undefined) {
-		pageUrl = serverUrl;
-	} else if (pageUrl.startsWith('/')) {
-		// construct page url for page path wihtout host and port
-		pageUrl = `${localAppUrl}:${defaultPort}${pageUrl}`;
-	}
-
-	// get external web page url
-	let pageUri: Uri = await env.asExternalUri(Uri.parse(pageUrl));
 
 	// update active server port number
-	if (!_running) {
+	if (!(await _running())) {
 		//pageUri.authority.startsWith(localhost) && !isServerRunning()) {
 		// get the next available localhost port number
 		_activePort = await tryPort(defaultPort);
 	}
 
-	// rewrite requested app page url to use the new active localhost server port
-	pageUri = Uri.parse(
-		pageUri
-			.toString(true) // skip encoding
-			.replace(`:${defaultPort}/`, `:${_activePort}/`)
-	);
+	const internalServerUrl = `${localAppUrl}:${_activePort ?? defaultPort}`;
+	let internalPageUri = Uri.parse(internalServerUrl);
 
+	// get external web page url
+	let externalPageUri: Uri = await env.asExternalUri(Uri.parse(internalServerUrl));
+
+	// it seems that "asExternalUri" only converts the host part of the Url to its
+	// external form, and discards the path part of the Url when present. Hence this
+	// should be added after the convertion to an external Url.
+	if (pageUrlPath?.startsWith('/')) {
+		// append page path to the external base path 
+		// (e.g. /proxy/3710 + /another = /proxy/3710/another)
+		// handle potential trailing/leading slashes to avoid double slashes
+		const basePath = externalPageUri.path.endsWith('/') ? 
+			externalPageUri.path.slice(0, -1) : externalPageUri.path;
+		externalPageUri = externalPageUri.with({ path: basePath + pageUrlPath });
+	}
+
+	// The assumption here is that EVIDENCE_BASE_PATH has been injected into the local dev
+	// server instance as well (check startServer).
+	internalPageUri = internalPageUri.with({
+		path: externalPageUri.path
+	});
+		
 	const outputChannel = getOutputChannel();
-	outputChannel.appendLine(`Requested app page: ${pageUri.toString(true)}`); // skip encoding
-	return pageUri;
+	outputChannel.appendLine(`Requested app page: ${externalPageUri} ${
+		internalPageUri.toString(true) == externalPageUri.toString(true) ?
+			'' : `(this is ${internalPageUri.toString(true)} on the remote)`
+	}`);
+
+	return {
+		internal: internalPageUri,
+		external: externalPageUri,
+	};
 }
 
 /**
  * Starts Evidence app dev server, and opens Evidence app preview
  * in the built-in vscode simple browser.
  *
- * @param pageFileUri Optional Uri of the starting page to load in preview.
+ * @param pageFileUri Optional (internal) Uri of the starting page 
+ * to be loaded in the preview.
  */
 export async function startServer(pageUri?: Uri) {
+
+	if (await isServerRunning()) {
+		window.showInformationMessage('There is an Evidence server already running!');
+		return ;
+	}
+
 	telemetryService?.sendEvent('startServer');
 
 	if (!pageUri) {
-		pageUri = await getAppPageUri('/');
+		pageUri = (await getAppPageUri('/')).external;
 	}
 
+	const pageHostname = pageUri.authority.split(':')[0];
+
 	// check if we need to run command in a different directory than root of the project:
 	const workspaceFolderPath = workspace.workspaceFolders
 		? workspace.workspaceFolders[0].uri.fsPath
@@ -121,12 +160,12 @@ export async function startServer(pageUri?: Uri) {
 			telemetryService?.sendEvent('runSources', { sources: sourceNames.join(', ') });
 		}
 
-		if (!_running) {
+		if (!(await _running())) {
 			// use the last saved active port number to start dev server if using simple browser
 			let serverPortParameter = ` --port ${_activePort}`;
 
 			let devServerHostParameter: string = '';
-			if (!pageUri.authority.startsWith(localhost)) {
+			if (!localhost.includes(pageHostname)) {
 				// use remote host parameter to start dev server on github codespaces
 				devServerHostParameter = ' --host 0.0.0.0';
 			}
@@ -137,9 +176,24 @@ export async function startServer(pageUri?: Uri) {
 				serverPortParameter = '';
 			}
 
+			let envVariables: string = '';
+			if (isHostname(pageHostname)) {
+				envVariables += `EVIDENCE_ALLOWED_HOST=${pageHostname} `;
+			}
+
+			if (!(['', '/'].includes(pageUri.path))) {
+				envVariables += `EVIDENCE_BASE_PATH=${pageUri.path.replace(/\/$/, '')} `;
+			}
+
+			// prepare disable flags for automatic source building
+			let disableFlags = '';
+			if (getConfig(Settings.DisableAutoSourceBuilding, false)) {
+				disableFlags = ' --disable-watchers sources,queries --disable-hmr sources,queries';
+			}
+
 			// start dev server via terminal command
 			sendCommand(
-				`${cdCommand}${dependencyCommand}${sourcesCommand}npm exec evidence dev --${devServerHostParameter}${serverPortParameter}${previewParameter}${cdBackCommand}`
+				`${cdCommand}${dependencyCommand}${sourcesCommand}${envVariables}npm exec evidence dev --${devServerHostParameter}${serverPortParameter}${previewParameter}${disableFlags}${cdBackCommand}`
 			);
 		}
 
@@ -149,8 +203,7 @@ export async function startServer(pageUri?: Uri) {
 		// update server status and show running status bar icon
 		statusBar.showRunning();
 
-		_running = true;
-		setContext('evidence.serverRunning', _running);
+		setContext(Context.IsServerRunning, true);
 
 		if (previewType.includes('internal')) {
 			// wait for the dev server to start
@@ -165,14 +218,12 @@ export async function startServer(pageUri?: Uri) {
 			}
 		}
 
-		if (_running === true) {
+		if (await _running()) {
 			// set focus back to the active vscode editor group
 			commands.executeCommand(Commands.FocusActiveEditorGroup);
 
 			// open app preview if previewType is set to internal (simple browser)
-			if (previewType === 'internal' || previewType === 'internal - side-by-side') {
-				preview(pageUri);
-			}
+			preview();
 
 			// change button to stop server
 			statusBar.showStop();
@@ -185,8 +236,8 @@ export async function startServer(pageUri?: Uri) {
  *
  * @returns True if Evidence dev server is running, and false otherwise.
  */
-export function isServerRunning() {
-	return _running;
+export async function isServerRunning() {
+	return await _running();
 }
 
 /**
@@ -212,9 +263,9 @@ export async function stopServer() {
 	closeTerminal();
 
 	// reset server state and status display
-	_running = false;
-	setContext('evidence.serverRunning', _running);
+	setContext(Context.IsServerRunning, false);
 	_activePort = <number>getConfig(Settings.DefaultPort);
 	statusBar.showStart();
 	telemetryService?.sendEvent('stopServer');
 }
+
diff --git a/packages/extension/src/commands/settings.ts b/packages/extension/src/commands/settings.ts
index 3feb9103c8..8384ec4efb 100644
--- a/packages/extension/src/commands/settings.ts
+++ b/packages/extension/src/commands/settings.ts
@@ -27,10 +27,12 @@ export async function viewExtensionSettings() {
 
 /**
  * Opens Evidence app settings page in the built-in vscode simple browser webview.
+ * 
+ * @deprecated
  */
 export async function viewAppSettings() {
-	const settingsPageUri: Uri = await getAppPageUri(settingsPagePath);
-	if (!isServerRunning()) {
+	const settingsPageUri: Uri = (await getAppPageUri(settingsPagePath)).external;
+	if (!(await isServerRunning())) {
 		startServer(settingsPageUri);
 	} else {
 		// show app settings page in simple browser webview
diff --git a/packages/extension/src/commands/sources.ts b/packages/extension/src/commands/sources.ts
index 265bf7631f..bf8a644751 100644
--- a/packages/extension/src/commands/sources.ts
+++ b/packages/extension/src/commands/sources.ts
@@ -7,7 +7,7 @@ import { workspace } from 'vscode';
 
 export async function runSources() {
 	let serverRunning = false;
-	if (isServerRunning()) {
+	if (await isServerRunning()) {
 		serverRunning = true;
 		stopServer();
 		await timeout(1000);
diff --git a/packages/extension/src/config.ts b/packages/extension/src/config.ts
index 2255eddc20..24ec493072 100644
--- a/packages/extension/src/config.ts
+++ b/packages/extension/src/config.ts
@@ -12,14 +12,16 @@ export const enum Settings {
 	AutoStart = 'autoStart',
 	TemplateProjectUrl = 'templateProjectUrl',
 	PreviewType = 'previewType',
-	SlashCommands = 'slashCommands'
+	SlashCommands = 'slashCommands',
+	DisableAutoSourceBuilding = 'disableAutoSourceBuilding'
 }
 
 /**
  * Evidence extension context and state keys.
  */
 export const enum Context {
-	HasEvidenceProject = 'evidence.hasProject'
+	HasEvidenceProject = 'evidence.hasProject',
+	IsServerRunning = 'evidence.serverRunning',
 }
 
 /**
diff --git a/packages/extension/src/extension.ts b/packages/extension/src/extension.ts
index d979b56ce5..7d174c7f88 100644
--- a/packages/extension/src/extension.ts
+++ b/packages/extension/src/extension.ts
@@ -37,7 +37,7 @@ import {
 	hasManifest
 } from './utils/jsonUtils';
 import { Settings, getConfig, updateProjectContext } from './config';
-import { startServer } from './commands/server';
+import { isServerRunning, startServer } from './commands/server';
 import { openIndex } from './commands/project';
 import { statusBar } from './statusBar';
 import { closeTerminal } from './terminal';
@@ -1643,7 +1643,11 @@ export async function activate(context: ExtensionContext) {
 		const autoStart: boolean = <boolean>getConfig(Settings.AutoStart);
 
 		// show start dev server status
-		statusBar.showStart();
+		if (!(await isServerRunning())) {
+			statusBar.showStart();
+		} else {
+			statusBar.showStop();
+		}
 
 		// open index.md if no other files are open
 		openIndex();
diff --git a/packages/extension/src/node.ts b/packages/extension/src/node.ts
index efb39fe5e9..c94e58c609 100644
--- a/packages/extension/src/node.ts
+++ b/packages/extension/src/node.ts
@@ -1,24 +1,64 @@
-import { exec } from 'child_process';
-import { window, env, ExtensionContext, Uri } from 'vscode';
+import { window, env, Uri } from 'vscode';
 import { showRestartPrompt } from './views/prompts';
 import { getExtensionContext } from './extensionContext';
+import { getWorkspaceFolder } from './config';
+import { executeCommand, executeShellCommand } from './utils/shellUtils';
 
-const downloadNodeJs = 'Download NodeJS (LTS Version)';
+const downloadNodeJs    = 'Download NodeJS (LTS Version)';
 const downloadNodeJsUrl = 'https://nodejs.org/en/download';
 
 /**
- * Gets NodeJS version.
+ * Gets command version while trying to use the user's login shell 
+ * environment. This is in order to support the variety of tooling 
+ * and version managers there are: such as asdf, nvm, fnm, etc.
  *
- * @returns The NodeJS version.
+ * @param {'node' | 'node'} cmd
+ * @returns The tooling cmd version.
  */
-export async function getNodeVersion() {
-	let nodeVersion;
+async function getToolingVersion(cmd: 'node' | 'npm') {
+	// Strategy 1: Use login shell in current workspace directory
+	// This loads the user's shell configuration and version manager setup
 	try {
-		nodeVersion = await executeCommand('node --version');
+		const workspaceFolder = getWorkspaceFolder();
+		const cwd = workspaceFolder?.uri.fsPath || process.cwd();
+
+		const cmdVersion = await executeShellCommand(`${cmd} --version`, cwd);
+		if (typeof cmdVersion === 'string' && cmdVersion.length > 0) {
+			return cmdVersion;
+		}
+	} catch (e) {
+		// Continue to fallback strategy
+	}
+
+	// Strategy 2: Fallback to direct command (for system-installed Node)
+	try {
+		const cmdVersion = await executeCommand(`${cmd} --version`);
+		if (typeof cmdVersion === 'string' && cmdVersion.length > 0) {
+			return cmdVersion;
+		}
 	} catch (e) {
-		nodeVersion = 'none';
+		// cmd not found
 	}
-	return nodeVersion;
+
+	return 'none';
+}
+
+/**
+ * Gets NodeJS version.
+ *
+ * @returns The NodeJS version (e.g. 'v22.19.0').
+ */
+export async function getNodeVersion() {
+	return await getToolingVersion('node');
+}
+
+/**
+ * Gets NPM version.
+ *
+ * @returns The NPM version (e.g. '10.9.3').
+ */
+export async function getNpmVersion() {
+	return await getToolingVersion('npm');
 }
 
 /**
@@ -60,34 +100,6 @@ export function isSupportedNodeVersion(nodeVersion: string): boolean {
 	return false;
 }
 
-/**
- * Gets NPM version.
- *
- * @returns The NPM version.
- */
-export async function getNpmVersion() {
-	return await executeCommand('npm --version');
-}
-
-/**
- * Executes command using node child_process.exec.
- *
- * @see https://nodejs.org/api/child_process.html#child_processexeccommand-options-callback
- *
- * @param command The node command to execute.
- * @returns The stdout of the executed command.
- */
-export function executeCommand(command: string): Promise<string> {
-	return new Promise((resolve, reject) => {
-		exec(command, (error, stdout, stderr) => {
-			if (error) {
-				reject(error);
-			} else {
-				resolve(stdout);
-			}
-		});
-	});
-}
 
 export async function promptToInstallNodeJsAndRestart(currentVersion: string | undefined) {
 	const context = getExtensionContext();
diff --git a/packages/extension/src/terminal.ts b/packages/extension/src/terminal.ts
index a074c5f634..3594cdf6f5 100644
--- a/packages/extension/src/terminal.ts
+++ b/packages/extension/src/terminal.ts
@@ -1,4 +1,4 @@
-import { env, window, Disposable, ExtensionContext, OutputChannel, Terminal, Uri } from 'vscode';
+import { window, ExtensionContext, OutputChannel, Terminal } from 'vscode';
 
 import { getExtensionContext } from './extensionContext';
 import { getNodeVersion, isSupportedNodeVersion, promptToInstallNodeJsAndRestart } from './node';
@@ -12,11 +12,15 @@ const terminalName = 'Evidence';
 /**
  * Evidence terminal instance.
  */
-let _terminal: Terminal | undefined;
+// Formerly this was managed as a simple variable which was problematic
+// in a workspace extension in remote development scenarios.
+// (namely, we often ended up with the _terminal variable being undefined
+//  while the Terminal launched by the extension is still up and running)
+let _terminal: () => Terminal | undefined = () =>
+		window.terminals.find(terminal => terminal.name === terminalName);
 let _outputChannel: OutputChannel | undefined;
 let _nodeVersion: string | undefined;
 let _currentDirectory: string | undefined;
-let _disposable: Disposable | undefined;
 
 /**
  * Gets Evidence treminal instance.
@@ -26,36 +30,26 @@ let _disposable: Disposable | undefined;
  * @returns VScode Terminal instance.
  */
 async function getTerminal(
-	context: ExtensionContext,
+	_context: ExtensionContext,
 	workingDirectory?: string
 ): Promise<Terminal> {
 	_outputChannel = getOutputChannel();
-	if (_terminal === undefined) {
-		_terminal = window.createTerminal(terminalName);
-		_terminal.show(false);
-		// _terminal.sendText('node -v');
+
+	let terminal = _terminal();
+	if (terminal === undefined) {
+		terminal = window.createTerminal(terminalName);
+		terminal.show(false);
 		_nodeVersion = await getNodeVersion();
 		_outputChannel.appendLine(`Using node ${_nodeVersion}`);
-
-		// dispose this terminal when terminal panel is closed
-		_disposable = window.onDidCloseTerminal((e: Terminal) => {
-			if (e.name === terminalName) {
-				_terminal = undefined;
-				_disposable?.dispose();
-				_disposable = undefined;
-			}
-		});
-
-		context.subscriptions.push(_disposable);
 		_currentDirectory = undefined;
 	}
 
 	if (_currentDirectory !== workingDirectory && workingDirectory && workingDirectory.length > 0) {
-		_terminal.sendText(`cd "${workingDirectory}"`, true); // add new line
+		terminal.sendText(`cd "${workingDirectory}"`, true); // add new line
 		_currentDirectory = workingDirectory;
 	}
 
-	return _terminal;
+	return terminal;
 }
 
 /**
@@ -94,10 +88,10 @@ export async function sendCommand(
  * Closes active Evidence app terminal.
  */
 export function closeTerminal() {
-	if (_terminal) {
-		_terminal.show(false);
-		_terminal.sendText(`\x03`);
-		_terminal.dispose();
-		_terminal = undefined;
+	const terminal = _terminal();
+	if (terminal !== undefined) {
+		terminal.show(false);
+		terminal.sendText(`\x03`);
+		terminal.dispose();
 	}
 }
diff --git a/packages/extension/src/utils/httpUtils.ts b/packages/extension/src/utils/httpUtils.ts
index 10952cd4c4..bffce6d6ce 100644
--- a/packages/extension/src/utils/httpUtils.ts
+++ b/packages/extension/src/utils/httpUtils.ts
@@ -47,7 +47,7 @@ export async function tryPort(port = 3000): Promise<number> {
  * @param url The url to ping.
  * @returns Url ping result promise.
  */
-export function ping(url: string) {
+export function ping(url: string, timeout: number = 1000) {
 	const promise = new Promise<boolean>((resolve) => {
 		const useHttps = url.indexOf('https') === 0;
 		const request = useHttps ? https.request : http.request;
@@ -56,18 +56,34 @@ export function ping(url: string) {
 		const outputChannel = getOutputChannel();
 		outputChannel.appendLine(`Pinging page: ${url}`);
 
-		const pingRequest = request(url, () => {
-			resolve(true);
-			pingRequest.destroy();
-		});
+		try {
+			const urlObj = new URL(url);
+			const options = {
+				hostname: urlObj.hostname,
+				port: urlObj.port || (useHttps ? 443 : 80),
+				path: urlObj.pathname + urlObj.search,
+				method: 'HEAD', // HEAD is better for ping
+				timeout
+			};
 
-		pingRequest.on('error', () => {
-			resolve(false);
-			pingRequest.destroy();
-		});
+			const pingRequest = request(options, (res) => {
+				resolve(true); // Any response means server is reachable
+				pingRequest.destroy();
+			});
+
+			pingRequest.on('error', () => {
+				resolve(false);
+			});
+
+			pingRequest.on('timeout', () => {
+				resolve(false);
+				pingRequest.destroy();
+			});
 
-		pingRequest.write('');
-		pingRequest.end();
+			pingRequest.end();
+		} catch (error) {
+			resolve(false);
+		}
 	});
 
 	return promise;
@@ -76,17 +92,17 @@ export function ping(url: string) {
 /**
  * Waits for a url to be pingable.
  *
- * @param url The url to ping.
+ * @param url The (internal) url to ping.
  * @param interval The interval to wait between pings.
  * @param max The maximum amount of time to wait.
  *
  * @returns Url ping result promise.
  */
-export async function waitFor(url: string, interval = 200, max = 30_000) {
+export async function waitFor(url: string, interval = 500, max = 30_000) {
 	let time = Math.ceil(max / interval);
 	while (time > 0) {
 		time -= 1;
-		if (await ping(url)) {
+		if (await ping(url, interval)) {
 			return true;
 		}
 		await timeout(interval);
@@ -94,3 +110,18 @@ export async function waitFor(url: string, interval = 200, max = 30_000) {
 
 	return false;
 }
+
+/**
+ * Checks if the authority part of a URL is a host name
+ * rather than an IP address.
+ *
+ * @param hostname The host part of a URL.
+ *
+ * @returns True if it's not an IP address, false if it is
+ */
+export function isHostname(hostname: string) {
+  const ipv4Pattern = /^(\d{1,3}\.){3}\d{1,3}$/;
+  const ipv6Pattern = /^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/;
+  return !ipv4Pattern.test(hostname) && 
+		!ipv6Pattern.test(hostname);
+}
\ No newline at end of file
diff --git a/packages/extension/src/utils/shellUtils.ts b/packages/extension/src/utils/shellUtils.ts
new file mode 100644
index 0000000000..420bbd00a9
--- /dev/null
+++ b/packages/extension/src/utils/shellUtils.ts
@@ -0,0 +1,84 @@
+import { exec } from 'child_process';
+import { promisify } from 'util';
+
+const execAsync = promisify(exec);
+
+/**
+ * Checks if a process with given command is running in the specified directory
+ */
+export async function isProcessRunning(
+	command: string,
+	workingDirectory: string
+): Promise<boolean> {
+	try {
+		// On Unix-like systems (including WSL)
+		const { stdout } = await execAsync(
+			`ps aux | grep "${command}" | grep -v grep | grep "${workingDirectory}"`
+		);
+		return stdout.trim().length > 0;
+	} catch {
+		return false;
+	}
+}
+
+/**
+ * Gets process ID for a command running in specified directory
+ */
+export async function getProcessId(
+	command: string,
+	workingDirectory: string
+): Promise<number | undefined> {
+	try {
+		const { stdout } = await execAsync(
+			`ps aux | grep "${command}" | grep -v grep | grep "${workingDirectory}" | awk '{print $2}'`
+		);
+		const pid = parseInt(stdout.trim().split('\n')[0]);
+		return isNaN(pid) ? undefined : pid;
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Executes command using node child_process.exec.
+ *
+ * @see https://nodejs.org/api/child_process.html#child_processexeccommand-options-callback
+ *
+ * @param command The node command to execute.
+ * @returns The stdout of the executed command.
+ */
+export function executeCommand(command: string): Promise<string> {
+	return new Promise((resolve, reject) => {
+		exec(command, (error, stdout, stderr) => {
+			if (error) {
+				reject(error);
+			} else {
+				resolve(stdout.trim());
+			}
+		});
+	});
+}
+
+/**
+ * Executes command using the user's login shell to load version manager environments.
+ * This works with asdf, nvm, fnm, volta, and other version managers.
+ *
+ * @param command The command to execute.
+ * @param cwd Optional working directory.
+ * @returns The stdout of the executed command.
+ */
+export function executeShellCommand(command: string, cwd?: string): Promise<string> {
+	return new Promise((resolve, reject) => {
+		// Use login shell to load user's environment (version managers)
+		const shell = process.env.SHELL || '/bin/bash';
+		const shellCommand = `${shell} -l -c "${command}"`;
+
+		exec(shellCommand, { cwd }, (error, stdout, _stderr) => {
+			if (error) {
+				reject(error);
+			} else {
+				resolve(stdout.trim());
+			}
+		});
+	});
+}
\ No newline at end of file
diff --git a/packages/lib/component-utilities/CHANGELOG.md b/packages/lib/component-utilities/CHANGELOG.md
index 66ff087032..a71fcf16ac 100644
--- a/packages/lib/component-utilities/CHANGELOG.md
+++ b/packages/lib/component-utilities/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @evidence-dev/component-utilities
 
+## 4.0.9
+
+### Patch Changes
+
+- 64486c669: bump vitest
+- Updated dependencies [0fd376985]
+- Updated dependencies [64486c669]
+- Updated dependencies [fc185c44c]
+  - @evidence-dev/sdk@3.0.9
+
 ## 4.0.8
 
 ### Patch Changes
diff --git a/packages/lib/component-utilities/package.json b/packages/lib/component-utilities/package.json
index bc74e291f4..3686c4d584 100644
--- a/packages/lib/component-utilities/package.json
+++ b/packages/lib/component-utilities/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@evidence-dev/component-utilities",
-	"version": "4.0.8",
+	"version": "4.0.9",
 	"description": "",
 	"main": "index.js",
 	"exports": {
diff --git a/packages/lib/preprocess/CHANGELOG.md b/packages/lib/preprocess/CHANGELOG.md
index 76f1ae9f08..ce3e1ad9c4 100644
--- a/packages/lib/preprocess/CHANGELOG.md
+++ b/packages/lib/preprocess/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @evidence-dev/preprocess
 
+## 6.0.4
+
+### Patch Changes
+
+- 64486c669: bump vitest
+
 ## 6.0.3
 
 ### Patch Changes
diff --git a/packages/lib/preprocess/package.json b/packages/lib/preprocess/package.json
index 7d4c01db1f..b9d3d8426f 100644
--- a/packages/lib/preprocess/package.json
+++ b/packages/lib/preprocess/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@evidence-dev/preprocess",
-	"version": "6.0.3",
+	"version": "6.0.4",
 	"description": "Markdown preprocessor for evidence.dev projects",
 	"author": "evidence.dev",
 	"license": "MIT",
diff --git a/packages/lib/sdk/CHANGELOG.md b/packages/lib/sdk/CHANGELOG.md
index d0d15c0b08..2103bf6edf 100644
--- a/packages/lib/sdk/CHANGELOG.md
+++ b/packages/lib/sdk/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @evidence-dev/sdk
 
+## 3.0.9
+
+### Patch Changes
+
+- 0fd376985: Handle malformed source directories when creating new sources
+- 64486c669: bump vitest
+- fc185c44c: Fix type errors
+- Updated dependencies [64486c669]
+- Updated dependencies [fc185c44c]
+  - @evidence-dev/universal-sql@2.2.10
+
 ## 3.0.8
 
 ### Patch Changes
diff --git a/packages/lib/sdk/package.json b/packages/lib/sdk/package.json
index 41d711e99d..07813b700b 100644
--- a/packages/lib/sdk/package.json
+++ b/packages/lib/sdk/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@evidence-dev/sdk",
-	"version": "3.0.8",
+	"version": "3.0.9",
 	"description": "",
 	"bin": {
 		"evidence-sdk": "./src/cli.js"
diff --git a/packages/lib/sdk/src/configuration/schemas/deployment.schema.js b/packages/lib/sdk/src/configuration/schemas/deployment.schema.js
index 0df63d57f3..c74c778973 100644
--- a/packages/lib/sdk/src/configuration/schemas/deployment.schema.js
+++ b/packages/lib/sdk/src/configuration/schemas/deployment.schema.js
@@ -4,6 +4,6 @@ export const DeploymentConfigSchema = z.object({
 	basePath: z
 		.string()
 		.optional()
-		.default('')
+		.default(process.env.EVIDENCE_BASE_PATH || '')
 		.refine((value) => !value || value.startsWith('/'), { message: 'basePath must start with /' })
 });
diff --git a/packages/lib/sdk/src/lib/hmr.js b/packages/lib/sdk/src/lib/hmr.js
new file mode 100644
index 0000000000..acfa888ecb
--- /dev/null
+++ b/packages/lib/sdk/src/lib/hmr.js
@@ -0,0 +1,63 @@
+/// <reference types="vite/client" />
+
+import chalk from 'chalk';
+
+/** @param {unknown} directory 
+ *  @returns {('sources' | 'queries')[]} */
+const validateHmrDirectory = (directory) => {
+	const validValues = ['sources', 'queries'];
+
+	if (typeof directory === 'string') 
+		directory = [directory];
+	
+	if (Array.isArray(directory)) {
+		const uniqueDirectories = [...new Set(directory).values()];
+		if (uniqueDirectories.every(v => typeof v === 'string' 
+				&& validValues.includes(v))) return uniqueDirectories;
+	} 
+	
+	throw new Error('HMR can only be disabled/enabled for "sources", "queries"');
+};
+
+/** @param {('sources' | 'queries') | ('sources' | 'queries')[]} directory  */
+export const disableHmr = (directory) => {
+	if (typeof process === 'undefined') {
+		throw new Error('HMR can only be disabled on the server side');
+	}
+
+	directory = validateHmrDirectory(directory);
+	console.info(chalk.bold.yellow(
+		`Evidence will not re-build the sources or hydrate the application automatically ` +
+		`when files within the ${directory.join('/')} folder(s) are changed.`
+	));
+	directory.forEach(v => {
+		process.env[`EVIDENCE_DISABLE_${v.toUpperCase()}_HMR`] = 'true';
+	});
+}
+
+/** @param {('sources' | 'queries') | ('sources' | 'queries')[]} directory  */
+export const enableHmr = (directory) => {
+	if (typeof process === 'undefined') {
+		throw new Error('HMR can only be enabled on the server side');
+	}
+
+	directory = validateHmrDirectory(directory);
+	directory.forEach(v => {
+		delete process.env[`EVIDENCE_DISABLE_${v.toUpperCase()}_HMR`];
+	});
+}
+
+/** @param {('sources' | 'queries') | ('sources' | 'queries')[]} directory
+  * @returns {boolean | undefined} */
+export const isHmrEnabled = (directory) => {
+	directory = validateHmrDirectory(directory);
+	/** @param {string} v */
+	const envName = (v) => `EVIDENCE_DISABLE_${v.toUpperCase()}_HMR`;
+
+	if (typeof process !== 'undefined')
+		return directory.every(v => 
+			process.env[envName(v)] !== 'true');
+	if (typeof import.meta.env !== 'undefined')
+		return directory.every(v => 
+			import.meta.env[envName(v)] !== 'true');
+}
\ No newline at end of file
diff --git a/packages/lib/sdk/src/utils/index.js b/packages/lib/sdk/src/utils/index.js
index 582da2078b..2207ec724f 100644
--- a/packages/lib/sdk/src/utils/index.js
+++ b/packages/lib/sdk/src/utils/index.js
@@ -5,3 +5,4 @@ export * from '../lib/history/index.js';
 export * from '../lib/debug.js';
 export * from './browserDebounce.js';
 export * from '../lib/strict.js';
+export * from '../lib/hmr.js';
diff --git a/packages/lib/universal-sql/CHANGELOG.md b/packages/lib/universal-sql/CHANGELOG.md
index b942892baf..a84b057c71 100644
--- a/packages/lib/universal-sql/CHANGELOG.md
+++ b/packages/lib/universal-sql/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @evidence-dev/universal-sql
 
+## 2.2.10
+
+### Patch Changes
+
+- 64486c669: bump vitest
+- fc185c44c: Fix type errors
+
 ## 2.2.9
 
 ### Patch Changes
diff --git a/packages/lib/universal-sql/package.json b/packages/lib/universal-sql/package.json
index e5d71d5556..1bd6abeaf9 100644
--- a/packages/lib/universal-sql/package.json
+++ b/packages/lib/universal-sql/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@evidence-dev/universal-sql",
-	"version": "2.2.9",
+	"version": "2.2.10",
 	"description": "",
 	"keywords": [],
 	"author": "",
diff --git a/packages/ui/core-components/CHANGELOG.md b/packages/ui/core-components/CHANGELOG.md
index 402c5a041c..0f95f4a63f 100644
--- a/packages/ui/core-components/CHANGELOG.md
+++ b/packages/ui/core-components/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @evidence-dev/core-components
 
+## 5.2.0
+
+### Minor Changes
+
+- 7713d3e73: Improved settings page UI
+
+### Patch Changes
+
+- 64486c669: bump vitest
+- 4efd427a7: Use theme class instead of data-
+- 656543815: Dont hide entire kebab menu when neverShowQueries is true
+- Updated dependencies [254a90551]
+- Updated dependencies [64486c669]
+- Updated dependencies [4efd427a7]
+  - @evidence-dev/tailwind@3.0.9
+  - @evidence-dev/component-utilities@4.0.9
+
 ## 5.1.2
 
 ### Patch Changes
diff --git a/packages/ui/core-components/package.json b/packages/ui/core-components/package.json
index c244720f1c..6917dd2946 100644
--- a/packages/ui/core-components/package.json
+++ b/packages/ui/core-components/package.json
@@ -24,7 +24,7 @@
 	"main": "./dist/index.js",
 	"type": "module",
 	"types": "./dist/index.d.ts",
-	"version": "5.1.2",
+	"version": "5.2.0",
 	"evidence": {
 		"components": true
 	},
diff --git a/packages/ui/core-components/src/lib/organisms/layout/BreadCrumbs.svelte b/packages/ui/core-components/src/lib/organisms/layout/BreadCrumbs.svelte
index 41263f2b0a..0ab331dcdd 100644
--- a/packages/ui/core-components/src/lib/organisms/layout/BreadCrumbs.svelte
+++ b/packages/ui/core-components/src/lib/organisms/layout/BreadCrumbs.svelte
@@ -19,7 +19,7 @@
 	export function buildCrumbs(pathArray, fileTree) {
 		const crumbs = [{ href: '/', title: 'Home' }];
 		pathArray.forEach((path, i) => {
-			if (path != '' && `/${path}` !== config.deployment.basePath) {
+			if (path != '') {
 				crumbs.push({
 					href: '/' + pathArray.slice(0, i + 1).join('/'),
 					title: decodeURIComponent(path.replace(/_/g, ' ').replace(/-/g, ' '))
@@ -57,7 +57,9 @@
 	import { addBasePath } from '@evidence-dev/sdk/utils/svelte';
 	export let fileTree;
 
-	$: crumbs = buildCrumbs($page.url.pathname.split('/').slice(1), fileTree);
+	let crumbs = [];
+
+	$: crumbs = buildCrumbs($page.url.pathname.replace(config.deployment.basePath || '', '').split('/').slice(1), fileTree);
 </script>
 
 <div class="flex items-start mt-0 whitespace-nowrap overflow-auto">
diff --git a/packages/ui/core-components/src/lib/organisms/layout/EvidenceDefaultLayout.svelte b/packages/ui/core-components/src/lib/organisms/layout/EvidenceDefaultLayout.svelte
index 4c27e4652e..1c3dd68581 100644
--- a/packages/ui/core-components/src/lib/organisms/layout/EvidenceDefaultLayout.svelte
+++ b/packages/ui/core-components/src/lib/organisms/layout/EvidenceDefaultLayout.svelte
@@ -99,7 +99,7 @@
 
 	$: fileMap = convertFileTreeToFileMap(fileTree);
 
-	$: routeFrontMatter = fileMap.get($page.route.id)?.frontMatter;
+	$: routeFrontMatter = fileMap.get($page.route?.id)?.frontMatter;
 
 	$: sidebarFrontMatter = routeFrontMatter?.sidebar;
 
@@ -213,7 +213,7 @@
 				'print:w-[650px] print:md:w-[841px] mx-auto print:md:px-0 print:px-0 px-6 sm:px-8 md:px-12 flex justify-start'}
 			style="max-width:{maxWidthEffective}px;"
 		>
-			{#if !hideSidebar && sidebarFrontMatter !== 'never' && $page.route.id !== '/settings'}
+			{#if !hideSidebar && sidebarFrontMatter !== 'never' && $page.route?.id !== '/settings'}
 				<div class="print:hidden">
 					<Sidebar
 						{fileTree}
@@ -229,7 +229,7 @@
 				</div>
 			{/if}
 			<main
-				class={($page.route.id === '/settings'
+				class={($page.route?.id === '/settings'
 					? 'w-full mt-16 sm:mt-20 '
 					: (!hideSidebar && !['hide', 'never'].includes(sidebarFrontMatter) ? 'md:pl-8 ' : '') +
 						(!hideTocEffective ? 'md:pr-8 ' : '') +
@@ -241,9 +241,9 @@
 								? ' mt-4 sm:mt-8 '
 								: ' mt-4 sm:mt-[26px] ')) + 'flex-grow overflow-x-hidden print:px-0 print:mt-8'}
 			>
-				{#if !hideBreadcrumbsEffective && $page.route.id !== '/settings'}
+				{#if !hideBreadcrumbsEffective && $page.route?.id !== '/settings'}
 					<div class="print:hidden">
-						{#if $page.route.id !== '/settings'}
+						{#if $page.route?.id !== '/settings'}
 							<BreadCrumbs {fileTree} />
 						{/if}
 					</div>
@@ -256,7 +256,7 @@
 					<LoadingSkeleton />
 				{/if}
 			</main>
-			{#if !hideTocEffective && $page.route.id !== '/settings'}
+			{#if !hideTocEffective && $page.route?.id !== '/settings'}
 				<div class="print:hidden">
 					<TableOfContents hideHeader={hideHeaderEffective} />
 				</div>
diff --git a/packages/ui/core-components/src/lib/organisms/layout/sidebar/Sidebar.svelte b/packages/ui/core-components/src/lib/organisms/layout/sidebar/Sidebar.svelte
index 53ec74c0bb..9993e8d75c 100644
--- a/packages/ui/core-components/src/lib/organisms/layout/sidebar/Sidebar.svelte
+++ b/packages/ui/core-components/src/lib/organisms/layout/sidebar/Sidebar.svelte
@@ -3,6 +3,7 @@
 	import { browser } from '$app/environment';
 	import { fly, fade, crossfade } from 'svelte/transition';
 	import { cubicInOut } from 'svelte/easing';
+	import { config } from '$evidence/config';
 
 	import { lock, unlock } from 'tua-body-scroll-lock';
 	import { afterUpdate } from 'svelte';
@@ -133,7 +134,7 @@
 					</a>
 					{#each firstLevelFiles as file}
 						{#if file.children.length === 0 && file.href && (file.frontMatter?.sidebar_link !== false || file.frontMatter?.sidebar_link === undefined)}
-							{@const active = $page.url.pathname.toUpperCase() === file.href.toUpperCase() + '/'}
+							{@const active = $page.url.pathname.replace(config.deployment.basePath, '').toUpperCase() === file.href.toUpperCase() + '/'}
 							<a
 								class="group inline-block py-1 capitalize transition-colors duration-100 {active
 									? 'text-primary'
@@ -181,7 +182,7 @@
 							{#each file.children as secondLevelFile}
 								{#if secondLevelFile.href && (secondLevelFile.frontMatter?.sidebar_link !== false || secondLevelFile.frontMatter?.sidebar_link === undefined)}
 									{@const active =
-										$page.url.pathname.toUpperCase() === secondLevelFile.href.toUpperCase() + '/'}
+										$page.url.pathname.replace(config.deployment.basePath, '').toUpperCase() === secondLevelFile.href.toUpperCase() + '/'}
 									<a
 										class="group inline-block py-1 capitalize transition-colors duration-100 {active
 											? 'text-primary'
@@ -211,7 +212,7 @@
 									{#each secondLevelFile.children as thirdLevelFile}
 										{#if thirdLevelFile.href && (thirdLevelFile.frontMatter?.sidebar_link !== false || thirdLevelFile.frontMatter?.sidebar_link === undefined)}
 											{@const active =
-												$page.url.pathname.toUpperCase() ===
+												$page.url.pathname.replace(config.deployment.basePath, '').toUpperCase() ===
 												thirdLevelFile.href.toUpperCase() + '/'}
 											<a
 												href={addBasePath(thirdLevelFile.href)}
@@ -254,7 +255,7 @@
 				</a>
 				{#each firstLevelFiles as file}
 					{#if file.children.length === 0 && file.href && (file.frontMatter?.sidebar_link !== false || file.frontMatter?.sidebar_link === undefined)}
-						{@const active = $page.url.pathname.toUpperCase() === file.href.toUpperCase() + '/'}
+						{@const active = $page.url.pathname.replace(config.deployment.basePath, '').toUpperCase() === file.href.toUpperCase() + '/'}
 						<a
 							class="group inline-block py-1 capitalize transition-all duration-100 {active
 								? 'text-primary'
@@ -302,7 +303,7 @@
 						{#each file.children as secondLevelFile}
 							{#if secondLevelFile.href && (secondLevelFile.frontMatter?.sidebar_link !== false || secondLevelFile.frontMatter?.sidebar_link === undefined)}
 								{@const active =
-									$page.url.pathname.toUpperCase() === secondLevelFile.href.toUpperCase() + '/'}
+									$page.url.pathname.replace(config.deployment.basePath, '').toUpperCase() === secondLevelFile.href.toUpperCase() + '/'}
 								<a
 									href={addBasePath(secondLevelFile.href)}
 									class="group inline-block py-1 capitalize transition-all duration-100 {active
@@ -332,7 +333,7 @@
 								{#each secondLevelFile.children as thirdLevelFile}
 									{#if thirdLevelFile.href && (thirdLevelFile.frontMatter?.sidebar_link !== false || thirdLevelFile.frontMatter?.sidebar_link === undefined)}
 										{@const active =
-											$page.url.pathname.toUpperCase() === thirdLevelFile.href.toUpperCase() + '/'}
+											$page.url.pathname.replace(config.deployment.basePath, '').toUpperCase() === thirdLevelFile.href.toUpperCase() + '/'}
 										<div
 											class="relative py-1 first:pt-0.5 first:mt-1 last:pb-0.5 last:mb-1 pl-3 border-l ml-[1px] transition-all duration-200 hover:border-base-content"
 										>
diff --git a/packages/ui/tailwind/CHANGELOG.md b/packages/ui/tailwind/CHANGELOG.md
index 1367f9984f..bfc9ba6786 100644
--- a/packages/ui/tailwind/CHANGELOG.md
+++ b/packages/ui/tailwind/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @evidence-dev/tailwind
 
+## 3.0.9
+
+### Patch Changes
+
+- 254a90551: [!] BREAKING CHANGE:
+  Custom theme colors are converted implicitly to kebab-case by tailwindcss
+
+  This means that some color defined in `evidence.config.yaml` as `myCustomColor`
+  should be used as (for example) `text-my-custom-color`. (`text-myCustomColor` will not work)
+
+  When referencing custom theme colors in Javascript the original case should still be used
+  (for example) `myCustomColor` would still be `<BarChart ... fillColor=myCustomColor />`
+  _NOT_ `<BarChart ... fillColor="my-custom-color" />`
+
+- 64486c669: bump vitest
+- 4efd427a7: Use theme class instead of data-
+- Updated dependencies [0fd376985]
+- Updated dependencies [64486c669]
+- Updated dependencies [fc185c44c]
+  - @evidence-dev/sdk@3.0.9
+
 ## 3.0.8
 
 ### Patch Changes
diff --git a/packages/ui/tailwind/package.json b/packages/ui/tailwind/package.json
index c8c1745af5..bb904d59ef 100644
--- a/packages/ui/tailwind/package.json
+++ b/packages/ui/tailwind/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@evidence-dev/tailwind",
-	"version": "3.0.8",
+	"version": "3.0.9",
 	"description": "",
 	"keywords": [],
 	"author": "",
diff --git a/packages/ui/tailwind/src/config/config.js b/packages/ui/tailwind/src/config/config.js
index afb05e8308..b87da703c0 100644
--- a/packages/ui/tailwind/src/config/config.js
+++ b/packages/ui/tailwind/src/config/config.js
@@ -9,6 +9,19 @@ const themes = buildThemes(themesConfig);
 
 /** @type {Partial<import('tailwindcss').Config>} */
 export const config = {
+	content: [
+		// Core Evidence components source files (for local development)
+		'../../../core-components/src/**/*.{html,js,svelte,ts,md}',
+		'./node_modules/@evidence-dev/core-components/src/**/*.{html,js,svelte,ts,md}',
+		'./node_modules/@evidence-dev/core-components/dist/**/*.{html,js,svelte,ts,md}',
+		// Additional Evidence UI packages
+		'../../../*/src/**/*.{html,js,svelte,ts,md}',
+		'./node_modules/@evidence-dev/*/src/**/*.{html,js,svelte,ts,md}',
+		'./node_modules/@evidence-dev/*/dist/**/*.{html,js,svelte,ts,md}',
+		// Consumer project files
+		'./src/**/*.{html,js,svelte,ts,md}',
+		'./.evidence/template/src/**/*.{html,js,svelte,ts,md}'
+	],
 	theme: {
 		extend: {
 			fontFamily: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3906492a37..a9605051f3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -843,6 +843,9 @@ importers:
       '@sveltejs/vite-plugin-svelte':
         specifier: 3.1.2
         version: 3.1.2(svelte@4.2.19)(vite@5.4.14)
+      '@tailwindcss/vite':
+        specifier: ^4.0.0
+        version: 4.0.6(vite@5.4.14)
       autoprefixer:
         specifier: ^10.4.7
         version: 10.4.20(postcss@8.5.2)
@@ -1090,7 +1093,7 @@ importers:
         version: 5.4.2
       vitest:
         specifier: ^2.1.9
-        version: 2.1.9
+        version: 2.1.9(yaml@2.7.0)
 
   packages/lib/sdk:
     dependencies:
@@ -1213,7 +1216,7 @@ importers:
         version: 5.4.14(@types/node@20.17.18)
       vitest:
         specifier: ^2.1.9
-        version: 2.1.9(@types/node@20.17.18)(jsdom@23.2.0)
+        version: 2.1.9(@types/node@20.17.18)(jsdom@23.2.0)(yaml@2.7.0)
       yaml:
         specifier: ^2.3.4
         version: 2.7.0
@@ -1562,7 +1565,7 @@ importers:
         version: 5.4.14(@types/node@20.11.28)
       vitest:
         specifier: ^2.1.9
-        version: 2.1.9
+        version: 2.1.9(yaml@2.7.0)
 
   packages/ui/icons:
     dependencies:
@@ -5380,8 +5383,6 @@ packages:
       '@parcel/logger': 2.12.0
       '@parcel/utils': 2.12.0
       lmdb: 2.8.5
-    transitivePeerDependencies:
-      - '@swc/helpers'
     dev: true
 
   /@parcel/cache@2.13.3(@parcel/core@2.13.3):
@@ -6392,6 +6393,8 @@ packages:
       '@parcel/types': 2.12.0(@parcel/core@2.13.3)
       '@parcel/utils': 2.12.0
       nullthrows: 1.1.1
+    transitivePeerDependencies:
+      - '@swc/helpers'
     dev: true
 
   /@parcel/workers@2.13.3(@parcel/core@2.13.3):
@@ -8942,7 +8945,7 @@ packages:
       std-env: 3.8.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 2.1.9(@types/node@20.17.18)(jsdom@23.2.0)
+      vitest: 2.1.9(@types/node@20.17.18)(jsdom@23.2.0)(yaml@2.7.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -8966,7 +8969,7 @@ packages:
     resolution: {integrity: sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==}
     peerDependencies:
       msw: ^2.4.9
-      vite: ^5.0.0
+      vite: '>=6.0.0'
     peerDependenciesMeta:
       msw:
         optional: true
@@ -10004,7 +10007,7 @@ packages:
     hasBin: true
     dependencies:
       caniuse-lite: 1.0.30001699
-      electron-to-chromium: 1.5.98
+      electron-to-chromium: 1.5.99
       node-releases: 2.0.19
       update-browserslist-db: 1.1.2(browserslist@4.24.4)
 
@@ -11284,8 +11287,8 @@ packages:
   /ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  /electron-to-chromium@1.5.98:
-    resolution: {integrity: sha512-bI/LbtRBxU2GzK7KK5xxFd2y9Lf9XguHooPYbcXWy6wUoT8NMnffsvRhPmSeUHLSDKAEtKuTaEtK4Ms15zkIEA==}
+  /electron-to-chromium@1.5.99:
+    resolution: {integrity: sha512-77c/+fCyL2U+aOyqfIFi89wYLBeSTCs55xCZL0oFH0KjqsvSvyh6AdQ+UIl1vgpnQQE6g+/KK8hOIupH6VwPtg==}
 
   /emittery@0.10.2:
     resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==}
@@ -19110,9 +19113,10 @@ packages:
       debug: 4.4.0
       es-module-lexer: 1.6.0
       pathe: 1.1.2
-      vite: 5.4.14(@types/node@20.11.28)
+      vite: 6.1.0(@types/node@20.17.18)(yaml@2.7.0)
     transitivePeerDependencies:
       - '@types/node'
+      - jiti
       - less
       - lightningcss
       - sass
@@ -19121,6 +19125,8 @@ packages:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
     dev: true
 
   /vite-node@2.1.9(@types/node@20.11.28):
@@ -19132,9 +19138,10 @@ packages:
       debug: 4.4.0
       es-module-lexer: 1.6.0
       pathe: 1.1.2
-      vite: 5.4.14(@types/node@20.11.28)
+      vite: 6.1.0(@types/node@20.11.28)
     transitivePeerDependencies:
       - '@types/node'
+      - jiti
       - less
       - lightningcss
       - sass
@@ -19143,9 +19150,11 @@ packages:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
     dev: true
 
-  /vite-node@2.1.9(@types/node@20.17.18):
+  /vite-node@2.1.9(@types/node@20.17.18)(yaml@2.7.0):
     resolution: {integrity: sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -19154,9 +19163,10 @@ packages:
       debug: 4.4.0
       es-module-lexer: 1.6.0
       pathe: 1.1.2
-      vite: 5.4.14(@types/node@20.17.18)
+      vite: 6.1.0(@types/node@20.17.18)(yaml@2.7.0)
     transitivePeerDependencies:
       - '@types/node'
+      - jiti
       - less
       - lightningcss
       - sass
@@ -19165,6 +19175,8 @@ packages:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
 
   /vite-node@2.1.9(@types/node@22.13.2):
     resolution: {integrity: sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==}
@@ -19175,9 +19187,10 @@ packages:
       debug: 4.4.0
       es-module-lexer: 1.6.0
       pathe: 1.1.2
-      vite: 5.4.14(@types/node@22.13.2)
+      vite: 6.1.0(@types/node@22.13.2)
     transitivePeerDependencies:
       - '@types/node'
+      - jiti
       - less
       - lightningcss
       - sass
@@ -19186,8 +19199,35 @@ packages:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
     dev: false
 
+  /vite-node@2.1.9(yaml@2.7.0):
+    resolution: {integrity: sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    dependencies:
+      cac: 6.7.14
+      debug: 4.4.0
+      es-module-lexer: 1.6.0
+      pathe: 1.1.2
+      vite: 6.1.0(@types/node@20.17.18)(yaml@2.7.0)
+    transitivePeerDependencies:
+      - '@types/node'
+      - jiti
+      - less
+      - lightningcss
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - tsx
+      - yaml
+    dev: true
+
   /vite@5.4.14(@types/node@20.11.28):
     resolution: {integrity: sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -19303,6 +19343,150 @@ packages:
       fsevents: 2.3.3
     dev: false
 
+  /vite@6.1.0(@types/node@20.11.28):
+    resolution: {integrity: sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      jiti: '>=1.21.0'
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      sass-embedded: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+    dependencies:
+      '@types/node': 20.11.28
+      esbuild: 0.24.2
+      postcss: 8.5.2
+      rollup: 4.34.6
+    optionalDependencies:
+      fsevents: 2.3.3
+    dev: true
+
+  /vite@6.1.0(@types/node@20.17.18)(yaml@2.7.0):
+    resolution: {integrity: sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      jiti: '>=1.21.0'
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      sass-embedded: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+    dependencies:
+      '@types/node': 20.17.18
+      esbuild: 0.24.2
+      postcss: 8.5.2
+      rollup: 4.34.6
+      yaml: 2.7.0
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  /vite@6.1.0(@types/node@22.13.2):
+    resolution: {integrity: sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      jiti: '>=1.21.0'
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      sass-embedded: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+    dependencies:
+      '@types/node': 22.13.2
+      esbuild: 0.24.2
+      postcss: 8.5.2
+      rollup: 4.34.6
+    optionalDependencies:
+      fsevents: 2.3.3
+    dev: false
+
   /vitefu@0.2.5(vite@5.4.14):
     resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==}
     peerDependencies:
@@ -19359,6 +19543,7 @@ packages:
       vite-node: 2.1.9
       why-is-node-running: 2.3.0
     transitivePeerDependencies:
+      - jiti
       - less
       - lightningcss
       - msw
@@ -19368,6 +19553,8 @@ packages:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
     dev: true
 
   /vitest@2.1.9(@types/node@20.11.28):
@@ -19417,6 +19604,7 @@ packages:
       vite-node: 2.1.9(@types/node@20.11.28)
       why-is-node-running: 2.3.0
     transitivePeerDependencies:
+      - jiti
       - less
       - lightningcss
       - msw
@@ -19426,9 +19614,11 @@ packages:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
     dev: true
 
-  /vitest@2.1.9(@types/node@20.17.18)(jsdom@23.2.0):
+  /vitest@2.1.9(@types/node@20.17.18)(jsdom@23.2.0)(yaml@2.7.0):
     resolution: {integrity: sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -19473,9 +19663,10 @@ packages:
       tinypool: 1.0.2
       tinyrainbow: 1.2.0
       vite: 5.4.14(@types/node@20.17.18)
-      vite-node: 2.1.9(@types/node@20.17.18)
+      vite-node: 2.1.9(@types/node@20.17.18)(yaml@2.7.0)
       why-is-node-running: 2.3.0
     transitivePeerDependencies:
+      - jiti
       - less
       - lightningcss
       - msw
@@ -19485,6 +19676,8 @@ packages:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
 
   /vitest@2.1.9(@types/node@22.13.2):
     resolution: {integrity: sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==}
@@ -19533,6 +19726,7 @@ packages:
       vite-node: 2.1.9(@types/node@22.13.2)
       why-is-node-running: 2.3.0
     transitivePeerDependencies:
+      - jiti
       - less
       - lightningcss
       - msw
@@ -19542,8 +19736,70 @@ packages:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
     dev: false
 
+  /vitest@2.1.9(yaml@2.7.0):
+    resolution: {integrity: sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': 2.1.9
+      '@vitest/ui': 2.1.9
+      happy-dom: '*'
+      jsdom: '*'
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+    dependencies:
+      '@vitest/expect': 2.1.9
+      '@vitest/mocker': 2.1.9(vite@5.4.14)
+      '@vitest/pretty-format': 2.1.9
+      '@vitest/runner': 2.1.9
+      '@vitest/snapshot': 2.1.9
+      '@vitest/spy': 2.1.9
+      '@vitest/utils': 2.1.9
+      chai: 5.1.2
+      debug: 4.4.0
+      expect-type: 1.1.0
+      magic-string: 0.30.17
+      pathe: 1.1.2
+      std-env: 3.8.0
+      tinybench: 2.9.0
+      tinyexec: 0.3.2
+      tinypool: 1.0.2
+      tinyrainbow: 1.2.0
+      vite: 5.4.14(@types/node@20.11.28)
+      vite-node: 2.1.9(yaml@2.7.0)
+      why-is-node-running: 2.3.0
+    transitivePeerDependencies:
+      - jiti
+      - less
+      - lightningcss
+      - msw
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - tsx
+      - yaml
+    dev: true
+
   /void-elements@3.1.0:
     resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
     engines: {node: '>=0.10.0'}
@@ -19964,7 +20220,6 @@ packages:
     resolution: {integrity: sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==}
     engines: {node: '>= 14'}
     hasBin: true
-    dev: false
 
   /yargs-parser@18.1.3:
     resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
diff --git a/sites/docs/CHANGELOG.md b/sites/docs/CHANGELOG.md
index 71ae61df6e..90c8d1e374 100644
--- a/sites/docs/CHANGELOG.md
+++ b/sites/docs/CHANGELOG.md
@@ -1,5 +1,30 @@
 # evidence-docs
 
+## 0.0.59
+
+### Patch Changes
+
+- Updated dependencies [aac1170db]
+  - @evidence-dev/evidence@40.1.1
+
+## 0.0.58
+
+### Patch Changes
+
+- Updated dependencies [254a90551]
+- Updated dependencies [0fd376985]
+- Updated dependencies [64486c669]
+- Updated dependencies [fc185c44c]
+- Updated dependencies [4efd427a7]
+- Updated dependencies [656543815]
+- Updated dependencies [7713d3e73]
+- Updated dependencies [1709f885e]
+  - @evidence-dev/tailwind@3.0.9
+  - @evidence-dev/sdk@3.0.9
+  - @evidence-dev/component-utilities@4.0.9
+  - @evidence-dev/core-components@5.2.0
+  - @evidence-dev/evidence@40.1.0
+
 ## 0.0.57
 
 ### Patch Changes
diff --git a/sites/docs/package.json b/sites/docs/package.json
index d535c27b51..4c52009272 100644
--- a/sites/docs/package.json
+++ b/sites/docs/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "my-evidence-project",
 	"private": true,
-	"version": "0.0.57",
+	"version": "0.0.59",
 	"scripts": {
 		"build": "evidence build",
 		"build:strict": "evidence build:strict",
diff --git a/sites/example-project/CHANGELOG.md b/sites/example-project/CHANGELOG.md
index 61b5d3a673..e796196180 100644
--- a/sites/example-project/CHANGELOG.md
+++ b/sites/example-project/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @evidence-dev/components
 
+## 3.5.49
+
+### Patch Changes
+
+- Updated dependencies [254a90551]
+- Updated dependencies [0fd376985]
+- Updated dependencies [64486c669]
+- Updated dependencies [fc185c44c]
+- Updated dependencies [4efd427a7]
+- Updated dependencies [656543815]
+- Updated dependencies [7713d3e73]
+  - @evidence-dev/tailwind@3.0.9
+  - @evidence-dev/sdk@3.0.9
+  - @evidence-dev/component-utilities@4.0.9
+  - @evidence-dev/preprocess@6.0.4
+  - @evidence-dev/universal-sql@2.2.10
+  - @evidence-dev/core-components@5.2.0
+
 ## 3.5.48
 
 ### Patch Changes
diff --git a/sites/example-project/package.json b/sites/example-project/package.json
index abafad9e84..0cbf66b0ba 100644
--- a/sites/example-project/package.json
+++ b/sites/example-project/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@evidence-dev/components",
-	"version": "3.5.48",
+	"version": "3.5.49",
 	"scripts": {
 		"dev": "cross-env EVIDENCE_PAGES_DIR=./src/pages EVIDENCE_DATA_DIR=./static/data EVIDENCE_DATA_URL_PREFIX=static/data vite dev --port 3000",
 		"build": "cross-env EVIDENCE_PAGES_DIR=./src/pages NODE_OPTIONS=--max-old-space-size=8192 vite build",
diff --git a/sites/test-env/CHANGELOG.md b/sites/test-env/CHANGELOG.md
index f18c4ad90d..ff42f605b4 100644
--- a/sites/test-env/CHANGELOG.md
+++ b/sites/test-env/CHANGELOG.md
@@ -1,5 +1,31 @@
 # evidence-test-environment
 
+## 3.0.87
+
+### Patch Changes
+
+- Updated dependencies [aac1170db]
+  - @evidence-dev/evidence@40.1.1
+
+## 3.0.86
+
+### Patch Changes
+
+- Updated dependencies [254a90551]
+- Updated dependencies [0fd376985]
+- Updated dependencies [64486c669]
+- Updated dependencies [fc185c44c]
+- Updated dependencies [4efd427a7]
+- Updated dependencies [656543815]
+- Updated dependencies [7713d3e73]
+- Updated dependencies [1709f885e]
+  - @evidence-dev/tailwind@3.0.9
+  - @evidence-dev/sdk@3.0.9
+  - @evidence-dev/source-javascript@0.0.3
+  - @evidence-dev/component-utilities@4.0.9
+  - @evidence-dev/core-components@5.2.0
+  - @evidence-dev/evidence@40.1.0
+
 ## 3.0.85
 
 ### Patch Changes
diff --git a/sites/test-env/package.json b/sites/test-env/package.json
index 0ea2d8c512..5041db0edf 100644
--- a/sites/test-env/package.json
+++ b/sites/test-env/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "evidence-test-environment",
-	"version": "3.0.85",
+	"version": "3.0.87",
 	"private": true,
 	"scripts": {
 		"build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 evidence build",